From e654398e46e37abf457b2b1122ab898d2c51c49f Mon Sep 17 00:00:00 2001 From: tpearson 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/mixertoolbox.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'kmix/mixertoolbox.cpp') 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 #include @@ -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 &mixers, bool multiDriverMode, QString& ref_hwInfoString) +void MixerToolBox::initMixer(TQPtrList &mixers, bool multiDriverMode, TQString& ref_hwInfoString) { //kdDebug(67100) << "IN MixerToolBox::initMixer()"< mixerNums; + TQMap mixerNums; int drvNum = Mixer::numDrivers(); int driverWithMixer = -1; bool multipleDriversActive = false; - QString driverInfo = ""; - QString driverInfoUsed = ""; + TQString driverInfo = ""; + TQString driverInfoUsed = ""; for( int drv1=0; drv1 0 ) driverInfo += " + "; driverInfo += driverName; @@ -86,7 +86,7 @@ void MixerToolBox::initMixer(QPtrList &mixers, bool multiDriverMode, QStr bool autodetectionFinished = false; for( int drv=0; drv &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 &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 += " + "; } -- cgit v1.2.1