Rename KStandard for enhanced compatibility with KDE4

amarok/src/Options1.ui.h

@@ -32,16 +32,16 @@ void Options1::init()
 
     // Remove browsers which are not actually installed
     for( TQStringList::Iterator it = browsers.begin(), end = browsers.end(); it != end; ) {
-        if( KStandardDirs::findExe( *it ).isEmpty() )
+        if( TDEStandardDirs::findExe( *it ).isEmpty() )
             it = browsers.erase( it );
         else
             ++it;
     }
 #ifdef TQ_WS_MAC
-    if ( KStandardDirs::findExe( "open" ) != TQString() )
+    if ( TDEStandardDirs::findExe( "open" ) != TQString() )
         browsers.prepend( i18n( "Default Browser" ) );
 #else
-    if ( KStandardDirs::findExe( "kfmclient" ) != TQString() )
+    if ( TDEStandardDirs::findExe( "kfmclient" ) != TQString() )
         browsers.prepend( i18n( "Default KDE Browser" ) );
 #endif
 

amarok/src/collectiondb.cpp

@@ -4128,8 +4128,8 @@ CollectionDB::moveFile( const TQString &src, const TQString &dest, bool overwrit
     dir.setFileName(TQString());
 
     // Create the directory.
-    if(!KStandardDirs::exists(dir.path()))
-        if(!KStandardDirs::makeDir(dir.path())) {
+    if(!TDEStandardDirs::exists(dir.path()))
+        if(!TDEStandardDirs::makeDir(dir.path())) {
             debug() << "Unable to create directory " << dir.path() << endl;
         }
 

amarok/src/engine/mas/masengine.cpp

@@ -401,7 +401,7 @@ bool MasEngine::masinit()
         warning() << "MAS daemon not running. Starting! Please provide password..." << endl;
         // masd seems not to be running, let's try to run it
         TQCString cmdline;
-        cmdline = TQFile::encodeName( KStandardDirs::findExe( TQString::fromLatin1( "tdesu" ) ) );
+        cmdline = TQFile::encodeName( TDEStandardDirs::findExe( TQString::fromLatin1( "tdesu" ) ) );
         // TODO !!!hardcoded path
         cmdline += " -n -f /usr/local/mas/log/mas-1.log -c ";
         cmdline += "/usr/local/mas/bin/mas-launch";

amarok/src/engine/xine/xine-engine.cpp

@@ -61,7 +61,7 @@ namespace Log
 }
 
 ///returns the configuration we will use. there is no TDEInstance, so using this hacked up method.
-//static inline TQCString configPath() { return TQFile::encodeName(KStandardDirs().localtdedir() + KStandardDirs::kde_default("data") + "amarok/xine-config"); }
+//static inline TQCString configPath() { return TQFile::encodeName(TDEStandardDirs().localtdedir() + TDEStandardDirs::kde_default("data") + "amarok/xine-config"); }
 static inline TQCString configPath() { return TQFile::encodeName(locate( "data", "amarok/") + "xine-config" ); }
 static Fader *s_fader = 0;
 static OutFader *s_outfader = 0;

amarok/src/k3bexporter.cpp

@@ -35,7 +35,7 @@ K3bExporter *K3bExporter::s_instance = 0;
 
 bool K3bExporter::isAvailable() //static
 {
-    return !KStandardDirs::findExe( "k3b" ).isNull();
+    return !TDEStandardDirs::findExe( "k3b" ).isNull();
 }
 
 void K3bExporter::exportTracks( const KURL::List &urls, int openmode )

amarok/src/loader/loader.cpp

@@ -147,7 +147,7 @@ Loader::Loader( TQStringList args )
         TDEInstance instance("amarok"); // TDEGlobal::dirs() crashes without
         if( isSplashEnabled() )
         {
-            m_splash = new KSplashScreen( TQPixmap( KStandardDirs().findResource("data", "amarok/images/splash_screen.jpg")));
+            m_splash = new KSplashScreen( TQPixmap( TDEStandardDirs().findResource("data", "amarok/images/splash_screen.jpg")));
             m_splash->show();
         }
      }

amarok/src/moodbar.cpp

@@ -472,7 +472,7 @@ MoodServer::slotNewJob( void )
   // running.  Then rename the file later.
   m_currentProcess = new Amarok::Process( this );
   m_currentProcess->setPriority( 18 );  // Nice the process
-  *m_currentProcess << KStandardDirs::findExe( "moodbar" ) << "-o"
+  *m_currentProcess << TDEStandardDirs::findExe( "moodbar" ) << "-o"
                     << (m_currentData.m_outfile + ".tmp")
                     << m_currentData.m_infile;
 
@@ -1378,7 +1378,7 @@ Moodbar::copyFile( const TQString &srcPath, const TQString &dstPath )
 bool
 Moodbar::executableExists( void )
 {
-  return !(KStandardDirs::findExe( "moodbar" ).isNull());
+  return !(TDEStandardDirs::findExe( "moodbar" ).isNull());
 }
 
 

amarok/src/socketserver.cpp

@@ -282,7 +282,7 @@ Vis::Selector::Item::stateChange( bool ) //SLOT
     switch( state() ) {
     case On:
         m_proc = new Amarok::Process();
-       *m_proc << KStandardDirs::findExe( m_command )
+       *m_proc << TDEStandardDirs::findExe( m_command )
                << Selector::instance()->m_server->path()
                << text( 0 );