From e654398e46e37abf457b2b1122ab898d2c51c49f Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 31 Jul 2010 19:43:15 +0000
Subject: Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1157644 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kmix/mixer_oss4.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'kmix/mixer_oss4.h')

diff --git a/kmix/mixer_oss4.h b/kmix/mixer_oss4.h
index 07a927d0..40f14785 100644
--- a/kmix/mixer_oss4.h
+++ b/kmix/mixer_oss4.h
@@ -3,7 +3,7 @@
 #ifndef MIXER_OSS4_H
 #define MIXER_OSS4_H
 
-#include <qstring.h>
+#include <tqstring.h>
 
 #include "mixer_backend.h"
 #include <sys/soundcard.h>
@@ -14,7 +14,7 @@ public:
   Mixer_OSS4(int device = -1);
   virtual ~Mixer_OSS4();
 
-  virtual QString errorText(int mixer_error);
+  virtual TQString errorText(int mixer_error);
   virtual int readVolumeFromHW( int ctrlnum, Volume &vol );
   virtual int writeVolumeToHW( int ctrlnum, Volume &vol );
   virtual void setEnumIdHW(int ctrlnum, unsigned int idx);
@@ -24,7 +24,7 @@ public:
 
 protected:
 
-  MixDevice::ChannelType classifyAndRename(QString &name, int flags);
+  MixDevice::ChannelType classifyAndRename(TQString &name, int flags);
 
   int wrapIoctl(int ioctlRet);
 
@@ -37,6 +37,6 @@ protected:
   int     m_fd;
   int     m_numExtensions;
   int     m_numMixers;
-  QString m_deviceName;
+  TQString m_deviceName;
 };
 #endif
-- 
cgit v1.2.1