1 files changed, 21 insertions, 21 deletions

diff --git a/kmix/mixer.cpp b/kmix/mixer.cpp
index 116e6c23..0e7c36fc 100644
--- a/kmix/mixer.cpp
+++ b/kmix/mixer.cpp
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <qtimer.h>
+#include <tqtimer.h>
 
 #include <klocale.h>
 #include <kconfig.h>
@@ -47,9 +47,9 @@
 #undef KMIX_DCOP_OBJID_TEST
 int Mixer::_dcopID = 0;
 
-QPtrList<Mixer> Mixer::s_mixers;
-QString Mixer::_masterCard;
-QString Mixer::_masterCardDevice;
+TQPtrList<Mixer> Mixer::s_mixers;
+TQString Mixer::_masterCard;
+TQString Mixer::_masterCardDevice;
 
 int Mixer::numDrivers()
 {
@@ -67,7 +67,7 @@ int Mixer::numDrivers()
 /*
  * Returns a reference of the current mixer list.
  */
-QPtrList<Mixer>& Mixer::mixers()
+TQPtrList<Mixer>& Mixer::mixers()
 {
   return s_mixers;
 }
@@ -88,10 +88,10 @@ Mixer::Mixer( int driver, int device ) : DCOPObject( "Mixer" )
   m_balance = 0;
   m_profiles.setAutoDelete( true );
 
-  _pollingTimer = new QTimer(); // will be started on open() and stopped on close()
-  connect( _pollingTimer, SIGNAL(timeout()), this, SLOT(readSetFromHW()));
+  _pollingTimer = new TQTimer(); // will be started on open() and stopped on close()
+  connect( _pollingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(readSetFromHW()));
 
-  QCString objid;
+  TQCString objid;
 #ifndef KMIX_DCOP_OBJID_TEST
   objid.setNum(_mixerBackend->m_devnum);
 #else
@@ -114,14 +114,14 @@ void Mixer::volumeSave( KConfig *config )
 {
     //    kdDebug(67100) << "Mixer::volumeSave()" << endl;
     readSetFromHW();
-    QString grp("Mixer");
+    TQString grp("Mixer");
     grp.append(mixerName());
     _mixerBackend->m_mixDevices.write( config, grp );
 }
 
 void Mixer::volumeLoad( KConfig *config )
 {
-   QString grp("Mixer");
+   TQString grp("Mixer");
    grp.append(mixerName());
    if ( ! config->hasGroup(grp) ) {
       // no such group. Volumes (of this mixer) were never saved beforehand.
@@ -133,7 +133,7 @@ void Mixer::volumeLoad( KConfig *config )
    _mixerBackend->m_mixDevices.read( config, grp );
 
    // set new settings
-   QPtrListIterator<MixDevice> it( _mixerBackend->m_mixDevices );
+   TQPtrListIterator<MixDevice> it( _mixerBackend->m_mixDevices );
    for(MixDevice *md=it.toFirst(); md!=0; md=++it )
    {
        //       kdDebug(67100) << "Mixer::volumeLoad() writeVolumeToHW(" << md->num() << ", "<< md->getVolume() << ")" << endl;
@@ -173,7 +173,7 @@ int Mixer::open()
       }
       else {
          kdError(67100) << "Mixer::open() no master detected." << endl;
-         QString noMaster = "---no-master-detected---";
+         TQString noMaster = "---no-master-detected---";
          setMasterDevice(noMaster); // no master
       }
 	/*
@@ -207,7 +207,7 @@ int Mixer::open()
       else {
           _mixerBackend->prepareSignalling(this);
           // poll once to give the GUI a chance to rebuild it's info
-          QTimer::singleShot( 50, this, SLOT( readSetFromHW() ) );
+          TQTimer::singleShot( 50, this, TQT_SLOT( readSetFromHW() ) );
       }
       return err;
 }
@@ -342,7 +342,7 @@ void Mixer::setBalance(int balance)
   emit newBalance( vol );
 }
 
-QString Mixer::mixerName()
+TQString Mixer::mixerName()
 {
   return _mixerBackend->m_mixerName;
 }
@@ -352,7 +352,7 @@ int Mixer::devnum()
   return _mixerBackend->m_devnum;
 }
 
-QString Mixer::driverName( int driver )
+TQString Mixer::driverName( int driver )
 {
     getDriverNameFunc *f = g_mixerFactories[driver].getDriverName;
     if( f!=0 )
@@ -361,18 +361,18 @@ QString Mixer::driverName( int driver )
         return "unknown";
 }
 
-void Mixer::setID(QString& ref_id)
+void Mixer::setID(TQString& ref_id)
 {
   _id = ref_id;
 }
 
 
-QString& Mixer::id()
+TQString& Mixer::id()
 {
   return _id;
 }
 
-void Mixer::setMasterCard(QString& ref_id)
+void Mixer::setMasterCard(TQString& ref_id)
 {
   // The value is taken over without checking on existance. This allows the User to define
   // a MasterCard that is not always available (e.g. it is an USB hotplugging device).
@@ -400,7 +400,7 @@ Mixer* Mixer::masterCard()
   return mixer;
 }
 
-void Mixer::setMasterCardDevice(QString& ref_id)
+void Mixer::setMasterCardDevice(TQString& ref_id)
 {
   // The value is taken over without checking on existance. This allows the User to define
   // a MasterCard that is not always available (e.g. it is an USB hotplugging device).
@@ -477,13 +477,13 @@ MixDevice* Mixer::masterDevice()
   return find( _masterDevicePK );
 }
 
-void Mixer::setMasterDevice(QString &devPK)
+void Mixer::setMasterDevice(TQString &devPK)
 {
     _masterDevicePK = devPK;
 }
 
 
-MixDevice* Mixer::find(QString& devPK)
+MixDevice* Mixer::find(TQString& devPK)
 {
     MixDevice* md = 0;
     for( md = _mixerBackend->m_mixDevices.first(); md != 0; md = _mixerBackend->m_mixDevices.next() ) {