Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1157644 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 11 insertions, 11 deletions

diff --git a/kmix/mixertoolbox.cpp b/kmix/mixertoolbox.cpp
index 38b404ac..857f8d79 100644
--- a/kmix/mixertoolbox.cpp
+++ b/kmix/mixertoolbox.cpp
@@ -20,8 +20,8 @@
  */
 
 
-#include "qwidget.h"
-#include "qstring.h"
+#include "tqwidget.h"
+#include "tqstring.h"
 
 //#include <kdebug.h>
 #include <klocale.h>
@@ -49,23 +49,23 @@
  *          'true' means to scan all backends. 'false' means: After scanning the
  *          current backend the next backend is only scanned if no Mixers were found yet.
  */
-void MixerToolBox::initMixer(QPtrList<Mixer> &mixers, bool multiDriverMode, QString& ref_hwInfoString)
+void MixerToolBox::initMixer(TQPtrList<Mixer> &mixers, bool multiDriverMode, TQString& ref_hwInfoString)
 {
    //kdDebug(67100) << "IN MixerToolBox::initMixer()"<<endl;
 
     // Find all mixers and initalize them
-    QMap<QString,int> mixerNums;
+    TQMap<TQString,int> mixerNums;
     int drvNum = Mixer::numDrivers();
 
     int driverWithMixer = -1;
     bool multipleDriversActive = false;
 
-    QString driverInfo = "";
-    QString driverInfoUsed = "";
+    TQString driverInfo = "";
+    TQString driverInfoUsed = "";
 
     for( int drv1=0; drv1<drvNum; drv1++ )
     {
-      QString driverName = Mixer::driverName(drv1);
+      TQString driverName = Mixer::driverName(drv1);
       if ( driverInfo.length() > 0 )
 	driverInfo += " + ";
       driverInfo += driverName;
@@ -86,7 +86,7 @@ void MixerToolBox::initMixer(QPtrList<Mixer> &mixers, bool multiDriverMode, QStr
     bool autodetectionFinished = false;
     for( int drv=0; drv<drvNum; drv++ )
     {
-	  QString driverName = Mixer::driverName(drv);
+	  TQString driverName = Mixer::driverName(drv);
 
 	  if ( autodetectionFinished ) {
 		// sane exit from loop
@@ -130,9 +130,9 @@ void MixerToolBox::initMixer(QPtrList<Mixer> &mixers, bool multiDriverMode, QStr
 			 * %2, the mixer name, is typically coming from an OS driver. It could contain colons.
 			 * %3, the mixer number, is a number: it does not contain colons.
 			 */
-			QString mixerName = mixer->mixerName();
+			TQString mixerName = mixer->mixerName();
 			mixerName.replace(":","_");
-			QString primaryKeyOfMixer = QString("%1::%2:%3")
+			TQString primaryKeyOfMixer = TQString("%1::%2:%3")
 			    .arg(driverName)
 			    .arg(mixerName)
 			    .arg(mixerNums[mixer->mixerName()]);
@@ -170,7 +170,7 @@ void MixerToolBox::initMixer(QPtrList<Mixer> &mixers, bool multiDriverMode, QStr
 		if ( !drvInfoAppended )
                 {
 		    drvInfoAppended = true;
-		    QString driverName = Mixer::driverName(drv);
+		    TQString driverName = Mixer::driverName(drv);
 		    if ( drv!= 0 && mixers.count() > 0) {
 			driverInfoUsed += " + ";
 		    }