1 files changed, 23 insertions, 23 deletions

diff --git a/kmix/mixer.h b/kmix/mixer.h
index 1a94dba6..80bd24ae 100644
--- a/kmix/mixer.h
+++ b/kmix/mixer.h
@@ -26,11 +26,11 @@
 #ifndef MIXER_H
 #define MIXER_H
 
-#include <qstring.h>
-#include <qtimer.h>
-#include <qobject.h>
-#include <qintdict.h>
-#include <qptrlist.h>
+#include <tqstring.h>
+#include <tqtimer.h>
+#include <tqobject.h>
+#include <tqintdict.h>
+#include <tqptrlist.h>
 
 #include "volume.h"
 class Mixer_Backend;
@@ -41,7 +41,7 @@ class Mixer_Backend;
 class Volume;
 class KConfig;
 
-class Mixer : public QObject, virtual public MixerIface
+class Mixer : public TQObject, virtual public MixerIface
 {
       Q_OBJECT
 
@@ -54,7 +54,7 @@ class Mixer : public QObject, virtual public MixerIface
 
       static int numDrivers();
 
-      MixDevice* find(QString& devPK);
+      MixDevice* find(TQString& devPK);
 
       void volumeSave( KConfig *config );
       void volumeLoad( KConfig *config );
@@ -79,27 +79,27 @@ class Mixer : public QObject, virtual public MixerIface
       virtual int close();
 
       /// Returns a detailed state message after errors. Only for diagnostic purposes, no i18n.
-      QString& stateMessage() const;
+      TQString& stateMessage() const;
 
-      virtual QString mixerName();
+      virtual TQString mixerName();
       virtual int devnum();
 
       // Returns the name of the driver, e.g. "OSS" or "ALSA0.9"
-      static QString driverName(int num);
+      static TQString driverName(int num);
 
       /// Returns an unique ID of the Mixer. It currently looks like "<soundcard_descr>:<hw_number>@<driver>"
-      QString& id();
+      TQString& id();
       /// The owner/creator of the Mixer can set an unique name here. This key should never displayed to
       /// the user, but can be used for referencing configuration items and such.
-      void setID(QString& ref_id);
+      void setID(TQString& ref_id);
 
       /// The KMix global master card. Please note that KMix and KMixPanelApplet can have a
       /// different MasterCard's at the moment (but actually KMixPanelApplet does not read/save this yet).
       /// At the moment it is only used for selecting the Mixer to use in KMix's DockIcon.
-      static void setMasterCard(QString& ref_id);
+      static void setMasterCard(TQString& ref_id);
       static Mixer* masterCard();
       /// The global Master Device inside the current MasterCard (as returned by masterCard()).
-      static void setMasterCardDevice(QString& ref_id);
+      static void setMasterCardDevice(TQString& ref_id);
       static MixDevice* masterCardDevice();
 
 
@@ -109,7 +109,7 @@ class Mixer : public QObject, virtual public MixerIface
       /// Returns the master volume device (doesn't work out :-(. See masterCard() and masterCardDevice() instead)
       MixDevice* masterDevice();
       /// Sets the master volume device (doesn't work out :-(. See setMasterCard() and setMasterCardDevice() instead)
-      void setMasterDevice(QString&);
+      void setMasterDevice(TQString&);
 
       /// DCOP oriented methods (look at mixerIface.h for the descriptions)
       virtual void setVolume( int deviceidx, int percentage );
@@ -151,25 +151,25 @@ class Mixer : public QObject, virtual public MixerIface
       void newVolumeLevels(void);
 
    protected:
-      QTimer* _pollingTimer;
+      TQTimer* _pollingTimer;
 
       int m_balance; // from -100 (just left) to 100 (just right)
 
-      QPtrList<MixSet> m_profiles;
-      static QPtrList<Mixer> s_mixers;
+      TQPtrList<MixSet> m_profiles;
+      static TQPtrList<Mixer> s_mixers;
 
    public:
       int setupMixer( MixSet set );
-      static QPtrList<Mixer>& mixers();
+      static TQPtrList<Mixer>& mixers();
 
    private:
      Mixer_Backend *_mixerBackend;
       mutable bool _readSetFromHWforceUpdate;
       static int _dcopID;
-      QString _id;
-      QString _masterDevicePK;
-      static QString _masterCard;
-      static QString _masterCardDevice;
+      TQString _id;
+      TQString _masterDevicePK;
+      static TQString _masterCard;
+      static TQString _masterCardDevice;
 };
 
 #endif