TQt4 port kdemultimedia

This enables compilation under both Qt3 and Qt4


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

1 files changed, 13 insertions, 13 deletions

diff --git a/kmix/mixer_alsa9.cpp b/kmix/mixer_alsa9.cpp
index effcd006..4037f342 100644
--- a/kmix/mixer_alsa9.cpp
+++ b/kmix/mixer_alsa9.cpp
@@ -77,7 +77,7 @@ Mixer_ALSA::identify( snd_mixer_selem_id_t *sid )
 	if ( name == "Master Mono" ) return MixDevice::VOLUME;
         if ( name == "PC Speaker" ) return MixDevice::VOLUME;
         if ( name == "Music" || name == "Synth" || name == "FM" ) return MixDevice::MIDI;
-	if ( name.find( "Headphone", 0, false ) != -1 ) return MixDevice::HEADPHONE;
+	if ( name.tqfind( "Headphone", 0, false ) != -1 ) return MixDevice::HEADPHONE;
 	if ( name == "Bass" ) return MixDevice::BASS;
 	if ( name == "Treble" ) return MixDevice::TREBLE;
 	if ( name == "CD" ) return MixDevice::CD;
@@ -85,14 +85,14 @@ Mixer_ALSA::identify( snd_mixer_selem_id_t *sid )
 	if ( name == "PCM" || name == "Wave" ) return MixDevice::AUDIO;
 	if ( name == "Surround" ) return MixDevice::SURROUND_BACK;
 	if ( name == "Center" ) return MixDevice::SURROUND_CENTERFRONT;
-	if ( name.find( "ac97", 0, false ) != -1 ) return MixDevice::AC97;
-	if ( name.find( "coaxial", 0, false ) != -1 ) return MixDevice::DIGITAL;
-	if ( name.find( "optical", 0, false ) != -1 ) return MixDevice::DIGITAL;
-	if ( name.find( "IEC958", 0, false ) != -1 ) return MixDevice::DIGITAL;
-	if ( name.find( "Mic" ) != -1 ) return MixDevice::MICROPHONE;
-	if ( name.find( "LFE" ) != -1 ) return MixDevice::SURROUND_LFE;
-        if ( name.find( "Monitor" ) != -1 ) return MixDevice::RECMONITOR;
-	if ( name.find( "3D", 0, false ) != -1 ) return MixDevice::SURROUND;  // Should be probably some own icon
+	if ( name.tqfind( "ac97", 0, false ) != -1 ) return MixDevice::AC97;
+	if ( name.tqfind( "coaxial", 0, false ) != -1 ) return MixDevice::DIGITAL;
+	if ( name.tqfind( "optical", 0, false ) != -1 ) return MixDevice::DIGITAL;
+	if ( name.tqfind( "IEC958", 0, false ) != -1 ) return MixDevice::DIGITAL;
+	if ( name.tqfind( "Mic" ) != -1 ) return MixDevice::MICROPHONE;
+	if ( name.tqfind( "LFE" ) != -1 ) return MixDevice::SURROUND_LFE;
+        if ( name.tqfind( "Monitor" ) != -1 ) return MixDevice::RECMONITOR;
+	if ( name.tqfind( "3D", 0, false ) != -1 ) return MixDevice::SURROUND;  // Should be probably some own icon
 
 	return MixDevice::EXTERNAL;
 }
@@ -115,7 +115,7 @@ Mixer_ALSA::open()
 
     // Card information
     if ((unsigned)m_devnum > 31) m_devnum = -1;
-    devName = m_devnum == -1 ? "default" : TQString("hw:%1").arg(m_devnum);
+    devName = m_devnum == -1 ? "default" : TQString("hw:%1").tqarg(m_devnum);
 
     TQString probeMessage;
 
@@ -507,7 +507,7 @@ bool Mixer_ALSA::prepareUpdateFromHW()
 
     // Poll on fds with 10ms timeout
     // Hint: alsamixer has an infinite timeout, but we cannot do this because we would block
-    // the X11 event handling (Qt event loop) with this.
+    // the X11 event handling (TQt event loop) with this.
     //kdDebug(67100) << "Mixer_ALSA::prepareUpdate() 3\n";
     int finished = poll(m_fds, m_count, 10);
     //kdDebug(67100) << "Mixer_ALSA::prepareUpdate() 4\n";
@@ -795,7 +795,7 @@ Mixer_ALSA::writeVolumeToHW( int devnum, Volume& volume )
 	return 0;
 }
 
-QString
+TQString
 Mixer_ALSA::errorText( int mixer_error )
 {
 	TQString l_s_errmsg;
@@ -817,7 +817,7 @@ Mixer_ALSA::errorText( int mixer_error )
 }
 
 
-QString
+TQString
 ALSA_getDriverName()
 {
 	return "ALSA";