Replaced various '#define' with actual strings - part 5

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 8acb66d55021be66640c0ecc7a9c2d52822327b8)

4 files changed, 6 insertions, 6 deletions

diff --git a/amarok/src/collectionscanner/collectionscanner.cpp b/amarok/src/collectionscanner/collectionscanner.cpp
index 7dace13a..cae1005a 100644
--- a/amarok/src/collectionscanner/collectionscanner.cpp
+++ b/amarok/src/collectionscanner/collectionscanner.cpp
@@ -108,7 +108,7 @@ CollectionScanner::doJob() //SLOT
             << endl;
         else {
             TQTextStream logStream;
-            logStream.setDevice(TQT_TQIODEVICE(&logFile));
+            logStream.setDevice(&logFile);
             logStream.setEncoding(TQTextStream::UnicodeUTF8);
             lastFile = logStream.read();
             logFile.close();
@@ -120,7 +120,7 @@ CollectionScanner::doJob() //SLOT
             << " read-only" << endl;
         else {
             TQTextStream folderStream;
-            folderStream.setDevice(TQT_TQIODEVICE(&folderFile));
+            folderStream.setDevice(&folderFile);
             folderStream.setEncoding(TQTextStream::UnicodeUTF8);
             entries = TQStringList::split( "\n", folderStream.read() );
         }
diff --git a/amarok/src/contextbrowser.cpp b/amarok/src/contextbrowser.cpp
index 21eb7c22..6e21605d 100644
--- a/amarok/src/contextbrowser.cpp
+++ b/amarok/src/contextbrowser.cpp
@@ -2995,7 +2995,7 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st
             fullStarIO.setFormat( "PNG" );
             TQBuffer fullStarBuf;
             fullStarBuf.open( IO_WriteOnly );
-            fullStarIO.setIODevice( TQT_TQIODEVICE(&fullStarBuf) );
+            fullStarIO.setIODevice( &fullStarBuf );
             fullStarIO.write();
             fullStarBuf.close();
             TQCString fullStar = KCodecs::base64Encode( fullStarBuf.buffer(), true );
@@ -3010,7 +3010,7 @@ TQString CurrentTrackJob::statsHTML( int score, int rating, bool statsbox ) //st
                 halfStarIO.setFormat( "PNG" );
                 TQBuffer halfStarBuf;
                 halfStarBuf.open( IO_WriteOnly );
-                halfStarIO.setIODevice( TQT_TQIODEVICE(&halfStarBuf) );
+                halfStarIO.setIODevice( &halfStarBuf );
                 halfStarIO.write();
                 halfStarBuf.close();
                 TQCString halfStar = KCodecs::base64Encode( halfStarBuf.buffer(), true );
diff --git a/amarok/src/mediadevice/daap/daapclient.cpp b/amarok/src/mediadevice/daap/daapclient.cpp
index 53e9a941..0dfa4042 100644
--- a/amarok/src/mediadevice/daap/daapclient.cpp
+++ b/amarok/src/mediadevice/daap/daapclient.cpp
@@ -817,7 +817,7 @@ DaapDownloader::doJob()
         KTempFile* tempNewFile = new KTempFile( TQString(), '.' + TQFileInfo( (*urlIt).path() ).extension() );
         tempNewFile->setAutoDelete( true );
         m_tempFileList.append( tempNewFile );
-        http->getDaap( (*urlIt).path() + (*urlIt).query(), TQT_TQIODEVICE(tempNewFile->file()) );
+        http->getDaap( (*urlIt).path() + (*urlIt).query(), tempNewFile->file() );
         while( !m_ready && !isAborted() )
         {
             msleep( 100 );   //Sleep 100 msec
diff --git a/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.cpp b/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.cpp
index e27f27eb..93140a30 100644
--- a/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.cpp
+++ b/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.cpp
@@ -47,7 +47,7 @@ TQDataStream&
 ContentFetcher::results()
 {
     TQBuffer* bytes = new TQBuffer( readAll() ); 
-    TQIODevice* stream =  KFilterDev::device( TQT_TQIODEVICE(bytes), "application/x-gzip", false );
+    TQIODevice* stream =  KFilterDev::device( bytes, "application/x-gzip", false );
     stream->open( IO_ReadOnly );
     TQDataStream* ds = new TQDataStream( stream );
     return *ds;