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

diff --git a/libkcddb/cddb.cpp b/libkcddb/cddb.cpp
index f0ee84e0..c11e086c 100644
--- a/libkcddb/cddb.cpp
+++ b/libkcddb/cddb.cpp
@@ -43,12 +43,12 @@ namespace KCDDB
     // Empty.
   }
 
-    QString
+    TQString
   CDDB::trackOffsetListToId()
   {
     return trackOffsetListToId( trackOffsetList_ );
   }
-    QString
+    TQString
   CDDB::trackOffsetListToId( const TrackOffsetList & list )
   {
     // Taken from version by Michael Matz in kio_audiocd.
@@ -74,7 +74,7 @@ namespace KCDDB
     return TQString::number( id, 16 ).rightJustify( 8, '0' );
   }
 
-    QString
+    TQString
   CDDB::trackOffsetListToString()
   {
     TQString ret;
@@ -100,14 +100,14 @@ namespace KCDDB
     bool
   CDDB::parseGreeting( const TQString & line )
   {
-    uint serverStatus = statusCode( line );
+    uint servertqStatus = statusCode( line );
 
-    if ( 200 == serverStatus )
+    if ( 200 == servertqStatus )
     {
       kdDebug(60010) << "Server response: read-only" << endl;
       readOnly_ = true;
     }
-    else if ( 201 == serverStatus )
+    else if ( 201 == servertqStatus )
     {
       kdDebug(60010) << "Server response: read-write" << endl;
     }
@@ -123,9 +123,9 @@ namespace KCDDB
     bool
   CDDB::parseHandshake( const TQString & line )
   {
-    uint serverStatus = statusCode( line );
+    uint servertqStatus = statusCode( line );
 
-    if ( ( 200 != serverStatus ) && ( 402 != serverStatus ) )
+    if ( ( 200 != servertqStatus ) && ( 402 != servertqStatus ) )
     {
       kdDebug(60010) << "Handshake was too tight. Letting go." << endl;
       return false;
@@ -141,9 +141,9 @@ namespace KCDDB
   {
     TQStringList tokenList = TQStringList::split( ' ', line );
 
-    uint serverStatus = tokenList[ 0 ].toUInt();
+    uint servertqStatus = tokenList[ 0 ].toUInt();
 
-    return serverStatus;
+    return servertqStatus;
   }
 
 /*    CDDB::Transport
@@ -157,7 +157,7 @@ namespace KCDDB
       return SMTP;
   }*/
 
-    QString
+    TQString
   CDDB::resultToString(Result r)
   {
     switch (r)
@@ -200,7 +200,7 @@ namespace KCDDB
     }
   }
 
-/*    QString
+/*    TQString
   CDDB::transportToString(uint t)
   {
     switch (Transport(t))