1 files changed, 11 insertions, 11 deletions

diff --git a/amarok/src/scancontroller.cpp b/amarok/src/scancontroller.cpp
index 60c18f10..64182944 100644
--- a/amarok/src/scancontroller.cpp
+++ b/amarok/src/scancontroller.cpp
@@ -55,8 +55,8 @@ void ScanController::setInstance( ScanController* curr )
     currController = curr;
 }
 
-ScanController::ScanController( CollectionDB* parent, bool incremental, const TQStringList& folders )
-    : DependentJob( parent, "CollectionScanner" )
+ScanController::ScanController( CollectionDB* tqparent, bool incremental, const TQStringList& folders )
+    : DependentJob( tqparent, "CollectionScanner" )
     , TQXmlDefaultHandler()
     , m_scanner( new Amarok::ProcIO() )
     , m_folders( TQDeepCopy<TQStringList>( folders ) )
@@ -141,7 +141,7 @@ ScanController::completeJob( void )
     {
         for( it = m_filesAdded.begin(); it != m_filesAdded.end(); ++it )
         {
-            if( m_filesDeleted.contains( it.key() ) )
+            if( m_filesDeleted.tqcontains( it.key() ) )
                 m_filesDeleted.remove( it.key() );
         }
         for( it = m_filesAdded.begin(); it != m_filesAdded.end(); ++it )
@@ -189,7 +189,7 @@ ScanController::initIncremental()
 
     const TQStringList values = CollectionDB::instance()->query(
             TQString( "SELECT deviceid, dir, changedate FROM directories WHERE deviceid IN (%1);" )
-            .arg( deviceIds ) );
+            .tqarg( deviceIds ) );
 
     foreach( values )
     {
@@ -248,7 +248,7 @@ ScanController::doJob()
     //in), so preserve the necessary other tables (eg artist)
     CollectionDB::instance()->prepareTempTables();
 
-    CollectionDB::instance()->invalidateArtistAlbumCache();
+    CollectionDB::instance()->tqinvalidateArtistAlbumCache();
 
 main_loop:
     uint delayCount = 100;
@@ -268,7 +268,7 @@ main_loop:
 
             TQDeepCopy<TQString> data = m_xmlData;
             m_source->setData( data );
-            m_xmlData = TQString::null;
+            m_xmlData = TQString();
 
             m_dataMutex.unlock();
 
@@ -380,7 +380,7 @@ ScanController::requestAcknowledged()
 void
 ScanController::slotFileMoved( const TQString &/*src*/, const TQString &/*dest*/)
 {
-    //why is this needed?  QBob, take a look at this
+    //why is this needed?  TQBob, take a look at this
     /*
     if( m_incremental ) // pedantry
       {
@@ -486,10 +486,10 @@ ScanController::startElement( const TQString&, const TQString& localName, const
     else if( localName == "image" ) {
         // Deserialize CoverBundle list
         TQStringList list = TQStringList::split( "AMAROK_MAGIC", attrs.value( "list" ), true );
-        TQValueList< QPair<TQString, TQString> > covers;
+        TQValueList< TQPair<TQString, TQString> > covers;
 
         for( uint i = 0; i < list.count(); ) {
-            covers += qMakePair( list[i], list[i + 1] );
+            covers += tqMakePair( list[i], list[i + 1] );
             i += 2;
         }
 
@@ -511,7 +511,7 @@ ScanController::customEvent( TQCustomEvent* e )
     {
         debug() << "RestartEvent received." << endl;
 
-        TQFile log( Amarok::saveLocation( TQString::null ) + "collection_scan.log" );
+        TQFile log( Amarok::saveLocation( TQString() ) + "collection_scan.log" );
         if ( !log.open( IO_ReadOnly ) )
         ::warning() << "Failed opening log file " << log.name() << endl;
         else {
@@ -521,7 +521,7 @@ ScanController::customEvent( TQCustomEvent* e )
         }
 
         m_dataMutex.lock();
-        m_xmlData = TQString::null;
+        m_xmlData = TQString();
         delete m_source;
         m_source = new TQXmlInputSource();
         m_dataMutex.unlock();