summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-31 13:15:17 -0600
committerTimothy Pearson <[email protected]>2013-01-31 13:15:17 -0600
commit05b723e1cfcc90e9fbb5430fe046aed9f4a54b41 (patch)
treef24709437c87f71615435d4884fda44c6015e9f0
parent2c9ac2771083c1cef54f2b58edaf0613af37d109 (diff)
downloadamarok-05b723e1cfcc90e9fbb5430fe046aed9f4a54b41.tar.gz
amarok-05b723e1cfcc90e9fbb5430fe046aed9f4a54b41.zip
Rename KStandard for enhanced compatibility with KDE4
-rw-r--r--amarok/src/Options1.ui.h6
-rw-r--r--amarok/src/collectiondb.cpp4
-rw-r--r--amarok/src/engine/mas/masengine.cpp2
-rw-r--r--amarok/src/engine/xine/xine-engine.cpp2
-rw-r--r--amarok/src/k3bexporter.cpp2
-rw-r--r--amarok/src/loader/loader.cpp2
-rw-r--r--amarok/src/moodbar.cpp4
-rw-r--r--amarok/src/socketserver.cpp2
8 files changed, 12 insertions, 12 deletions
diff --git a/amarok/src/Options1.ui.h b/amarok/src/Options1.ui.h
index e4f8e723..1cf593f5 100644
--- a/amarok/src/Options1.ui.h
+++ b/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
diff --git a/amarok/src/collectiondb.cpp b/amarok/src/collectiondb.cpp
index 589751f8..2f11f4d3 100644
--- a/amarok/src/collectiondb.cpp
+++ b/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;
}
diff --git a/amarok/src/engine/mas/masengine.cpp b/amarok/src/engine/mas/masengine.cpp
index 9b9668bd..dce72ad9 100644
--- a/amarok/src/engine/mas/masengine.cpp
+++ b/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";
diff --git a/amarok/src/engine/xine/xine-engine.cpp b/amarok/src/engine/xine/xine-engine.cpp
index abca1e14..62be1efb 100644
--- a/amarok/src/engine/xine/xine-engine.cpp
+++ b/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;
diff --git a/amarok/src/k3bexporter.cpp b/amarok/src/k3bexporter.cpp
index fbbe731d..cc5de16c 100644
--- a/amarok/src/k3bexporter.cpp
+++ b/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 )
diff --git a/amarok/src/loader/loader.cpp b/amarok/src/loader/loader.cpp
index 12176080..6f98e453 100644
--- a/amarok/src/loader/loader.cpp
+++ b/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();
}
}
diff --git a/amarok/src/moodbar.cpp b/amarok/src/moodbar.cpp
index 1c037c6b..57a8eeee 100644
--- a/amarok/src/moodbar.cpp
+++ b/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());
}
diff --git a/amarok/src/socketserver.cpp b/amarok/src/socketserver.cpp
index 6917767a..541ac492 100644
--- a/amarok/src/socketserver.cpp
+++ b/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 );