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, 14 insertions, 14 deletions

diff --git a/kmix/mixer_oss4.cpp b/kmix/mixer_oss4.cpp
index ff1525b3..01b167aa 100644
--- a/kmix/mixer_oss4.cpp
+++ b/kmix/mixer_oss4.cpp
@@ -29,7 +29,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <qregexp.h>
+#include <tqregexp.h>
 #include <kdebug.h>
 
 // Since we're guaranteed an OSS setup here, let's make life easier
@@ -72,10 +72,10 @@ bool Mixer_OSS4::isRecsrcHW(int ctrlnum)
 }
 
 //classifies mixexts according to their name, last classification wins
-MixDevice::ChannelType Mixer_OSS4::classifyAndRename(QString &name, int flags)
+MixDevice::ChannelType Mixer_OSS4::classifyAndRename(TQString &name, int flags)
 {
 	MixDevice::ChannelType cType = MixDevice::UNKNOWN;
-	QStringList classes = QStringList::split ( QRegExp ( "[-,.]" ), name );
+	TQStringList classes = TQStringList::split ( TQRegExp ( "[-,.]" ), name );
 
 
 	if ( flags & MIXF_PCMVOL  ||
@@ -85,7 +85,7 @@ MixDevice::ChannelType Mixer_OSS4::classifyAndRename(QString &name, int flags)
 		cType = MixDevice::VOLUME;
 	}
 
-	for ( QStringList::Iterator it = classes.begin(); it != classes.end(); ++it )
+	for ( TQStringList::Iterator it = classes.begin(); it != classes.end(); ++it )
 	{
 		if ( *it == "line" )
 		{
@@ -143,13 +143,13 @@ MixDevice::ChannelType Mixer_OSS4::classifyAndRename(QString &name, int flags)
 		} else
 		if ( (*it).endsWith("vol") )
 		{
-			QChar &ref = (*it).ref(0);
+			TQChar &ref = (*it).ref(0);
 			ref = ref.upper();
 			cType = MixDevice::VOLUME;
 		}
 		else
 		{
-			QChar &ref = (*it).ref(0);
+			TQChar &ref = (*it).ref(0);
 			ref = ref.upper();
 		}
 	}
@@ -224,7 +224,7 @@ int Mixer_OSS4::open()
 					return 0;
 				}
 
-				QString name = ext.extname;
+				TQString name = ext.extname;
 
 				//skip vmix volume controls and mute controls
 				if ( (name.find("vmix") > -1 && name.find( "pcm") > -1) ||
@@ -318,8 +318,8 @@ int Mixer_OSS4::open()
 						                               name, MixDevice::UNKNOWN,
 						                               MixDevice::ENUM);
 
-						QPtrList<QString> &enumValuesRef = md->enumValues();
-						QString thisElement;
+						TQPtrList<TQString> &enumValuesRef = md->enumValues();
+						TQString thisElement;
 
 						for ( int i = 0; i < ei.nvalues; i++ )
 						{
@@ -327,9 +327,9 @@ int Mixer_OSS4::open()
 
 							if ( thisElement.isEmpty() )
 							{
-								thisElement = QString::number(i);
+								thisElement = TQString::number(i);
 							}
-							enumValuesRef.append( new QString(thisElement) );
+							enumValuesRef.append( new TQString(thisElement) );
 						}
 						m_mixDevices.append(md);
 					}
@@ -354,9 +354,9 @@ int Mixer_OSS4::close()
 	return l_i_ret;
 }
 
-QString Mixer_OSS4::errorText(int mixer_error)
+TQString Mixer_OSS4::errorText(int mixer_error)
 {
-	QString l_s_errmsg;
+	TQString l_s_errmsg;
 
 	switch( mixer_error )
 	{
@@ -663,7 +663,7 @@ int Mixer_OSS4::wrapIoctl(int ioctlRet)
 }
 
 
-QString OSS4_getDriverName()
+TQString OSS4_getDriverName()
 {
 	return "OSS4";
 }