1 files changed, 15 insertions, 15 deletions

diff --git a/amarok/src/mediadevice/njb/track.cpp b/amarok/src/mediadevice/njb/track.cpp
index e1545516..24a24534 100644
--- a/amarok/src/mediadevice/njb/track.cpp
+++ b/amarok/src/mediadevice/njb/track.cpp
@@ -23,8 +23,8 @@ static const char* rcsid __attribute__((unused)) =
 #include "track.h"
 #include "njbmediadevice.h"
 
-#include <qregexp.h>
-#include <qptrlist.h>
+#include <tqregexp.h>
+#include <tqptrlist.h>
 
 #include <klocale.h>
 
@@ -64,8 +64,8 @@ NjbTrack::NjbTrack( njb_songid_t* song)
     frame = NJB_Songid_Findframe( song, FR_ARTIST );
     if( frame )
     {
-        QString artist = QString::fromUtf8( frame->data.strval );
-        artist.replace( QRegExp( "/" ), "-" );
+        TQString artist = TQString::fromUtf8( frame->data.strval );
+        artist.replace( TQRegExp( "/" ), "-" );
         bundle->setArtist( artist );
     }
     else
@@ -74,8 +74,8 @@ NjbTrack::NjbTrack( njb_songid_t* song)
     frame = NJB_Songid_Findframe( song, FR_ALBUM );
     if( frame)
     {
-        QString album = QString::fromUtf8( frame->data.strval );
-        album.replace( QRegExp( "/" ), "-" );
+        TQString album = TQString::fromUtf8( frame->data.strval );
+        album.replace( TQRegExp( "/" ), "-" );
         bundle->setAlbum( album );
     }
     else
@@ -84,8 +84,8 @@ NjbTrack::NjbTrack( njb_songid_t* song)
     frame = NJB_Songid_Findframe( song, FR_TITLE);
     if( frame )
     {
-        QString title = QString::fromUtf8( frame->data.strval );
-        title.replace( QRegExp( "/"), "-");
+        TQString title = TQString::fromUtf8( frame->data.strval );
+        title.replace( TQRegExp( "/"), "-");
         bundle->setTitle( title );
     }
     else
@@ -103,18 +103,18 @@ NjbTrack::NjbTrack( njb_songid_t* song)
             bundle->setTrack( frame->data.u_int32_val );
             break;
         case NJB_TYPE_STRING:
-            bundle->setTrack( QString::fromUtf8(frame->data.strval).toUInt() );
+            bundle->setTrack( TQString::fromUtf8(frame->data.strval).toUInt() );
             break;
         default:
             bundle->setTrack( 0 );
         }
     }
 
-    QString codec;
+    TQString codec;
     frame = NJB_Songid_Findframe( song, FR_CODEC);
     if( frame )
     {
-        codec = QCString( frame->data.strval).lower();
+        codec = TQCString( frame->data.strval).lower();
         if( codec == "mp3" )
             bundle->setFileType( MetaBundle::mp3 );
         else if (codec == "wma" )
@@ -129,11 +129,11 @@ NjbTrack::NjbTrack( njb_songid_t* song)
     }
 
     frame = NJB_Songid_Findframe( song, FR_FNAME );
-    QString filename;
+    TQString filename;
     if( frame )
     {
         //bundle->setUrl( KURL( frame->data.strval ) );
-        filename = QString::fromUtf8( frame->data.strval );
+        filename = TQString::fromUtf8( frame->data.strval );
 
     }
     if( filename.isEmpty() )
@@ -156,7 +156,7 @@ NjbTrack::NjbTrack( njb_songid_t* song)
             bundle->setYear( frame->data.u_int32_val );
             break;
         case NJB_TYPE_STRING:
-            bundle->setYear( QString::fromUtf8( frame->data.strval ).toInt() );
+            bundle->setYear( TQString::fromUtf8( frame->data.strval ).toInt() );
             break;
         default:
             bundle->setYear( 0 );
@@ -228,7 +228,7 @@ NjbTrack::removeItem( const NjbMediaItem *item )
 
 /* ------------------------------------------------------------------------ */
 trackValueList::iterator
-trackValueList::findTrackByName( const QString& _filename )
+trackValueList::findTrackByName( const TQString& _filename )
 {
     trackValueList::iterator it;
     for( it = begin(); it != end(); it++)