Rename KStandard for enhanced compatibility with KDE4

12 files changed, 17 insertions, 17 deletions

diff --git a/arts/builder/dirmanager.cpp b/arts/builder/dirmanager.cpp
index 2f22f104..acfd9367 100644
--- a/arts/builder/dirmanager.cpp
+++ b/arts/builder/dirmanager.cpp
@@ -88,7 +88,7 @@ char *DirManager::directory(const char *subdir, const TQString &desc)
 		if(KMessageBox::questionYesNo(0,message,i18n("aRts Folder Missing"),i18n("Create Folder"),i18n("Do Not Create"))
 			== KMessageBox::Yes)
 		{
-			KStandardDirs::makeDir(dir);
+			TDEStandardDirs::makeDir(dir);
 		}
 	}
 
diff --git a/juk/covermanager.cpp b/juk/covermanager.cpp
index 710a465d..fc814bf2 100644
--- a/juk/covermanager.cpp
+++ b/juk/covermanager.cpp
@@ -134,7 +134,7 @@ void CoverManagerPrivate::createDataDir() const
     TQDir dir;
     TQString dirPath(TQDir::cleanDirPath(coverLocation() + "/.."));
     if(!dir.exists(dirPath))
-        KStandardDirs::makeDir(dirPath);
+        TDEStandardDirs::makeDir(dirPath);
 }
 
 void CoverManagerPrivate::saveCovers() const
diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp
index e9c997aa..ca9bbce0 100644
--- a/juk/filerenamer.cpp
+++ b/juk/filerenamer.cpp
@@ -909,8 +909,8 @@ bool FileRenamer::moveFile(const TQString &src, const TQString &dest)
     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())) {
             kdError() << "Unable to create directory " << dir.path() << endl;
             return false;
         }
diff --git a/juk/k3bexporter.cpp b/juk/k3bexporter.cpp
index 91164c93..6aec012f 100644
--- a/juk/k3bexporter.cpp
+++ b/juk/k3bexporter.cpp
@@ -103,7 +103,7 @@ K3bExporter::K3bExporter(Playlist *parent) : PlaylistExporter(parent), m_parent(
 
 KAction *K3bExporter::action()
 {
-    if(!m_action && !KStandardDirs::findExe("k3b").isNull()) {
+    if(!m_action && !TDEStandardDirs::findExe("k3b").isNull()) {
         m_action = new PlaylistAction(
             "export_to_k3b",
             i18n("Add Selected Items to Audio or Data CD"),
@@ -270,7 +270,7 @@ K3bPlaylistExporter::K3bPlaylistExporter(PlaylistBox *parent) : K3bExporter(0),
 
 KAction *K3bPlaylistExporter::action()
 {
-    if(!KStandardDirs::findExe("k3b").isNull()) {
+    if(!TDEStandardDirs::findExe("k3b").isNull()) {
         return new KAction(
             i18n("Add Playlist to Audio or Data CD"),
             SmallIconSet("k3b"),
diff --git a/kaudiocreator/encoder.cpp b/kaudiocreator/encoder.cpp
index dfad467f..9ef0f562 100644
--- a/kaudiocreator/encoder.cpp
+++ b/kaudiocreator/encoder.cpp
@@ -187,7 +187,7 @@ void Encoder::tendToNewJobs() {
 	
 	int lastSlash = desiredFile.findRev('/',-1);
 	if ( lastSlash == -1 ||
-			!(KStandardDirs::makeDir( desiredFile.mid(0,lastSlash), 0775)) ) {
+			!(TDEStandardDirs::makeDir( desiredFile.mid(0,lastSlash), 0775)) ) {
 		KMessageBox::sorry(0, i18n("Cannot place file, unable to make directories."), i18n("Encoding Failed"));
 		emit jobsChanged();
 		updateProgress(job->id, -1);
diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp
index c93f8ae9..d72d4eb5 100644
--- a/kmix/kmixapplet.cpp
+++ b/kmix/kmixapplet.cpp
@@ -172,7 +172,7 @@ KMixApplet::KMixApplet( const TQString& configFile, Type t,
     s_instCount++;
     kdDebug(67100) << "KMixApplet::KMixApplet instancing Applet, s_instCount="<< s_instCount << endl;
 	
-    TDEGlobal::dirs()->addResourceType( "appicon", KStandardDirs::kde_default("data") + "kmix/pics" );
+    TDEGlobal::dirs()->addResourceType( "appicon", TDEStandardDirs::kde_default("data") + "kmix/pics" );
 
     loadConfig();
 	
diff --git a/noatun/library/engine.cpp b/noatun/library/engine.cpp
index e7296191..995e9771 100644
--- a/noatun/library/engine.cpp
+++ b/noatun/library/engine.cpp
@@ -482,14 +482,14 @@ bool Engine::initArts()
 				X11CommConfig.sync();
 			}
 
-			cmdline = TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("tdeinit_wrapper")));
+			cmdline = TQFile::encodeName(TDEStandardDirs::findExe(TQString::fromLatin1("tdeinit_wrapper")));
 			cmdline += " ";
 
 			if (rt)
-				cmdline += TQFile::encodeName(KStandardDirs::findExe(
+				cmdline += TQFile::encodeName(TDEStandardDirs::findExe(
 				TQString::fromLatin1("artswrapper")));
 			else
-				cmdline += TQFile::encodeName(KStandardDirs::findExe(
+				cmdline += TQFile::encodeName(TDEStandardDirs::findExe(
 				TQString::fromLatin1("artsd")));
 
 			cmdline += " ";
diff --git a/noatun/library/vequalizer.cpp b/noatun/library/vequalizer.cpp
index 7b88848a..f4aa60d6 100644
--- a/noatun/library/vequalizer.cpp
+++ b/noatun/library/vequalizer.cpp
@@ -666,7 +666,7 @@ static TQString makePresetFile()
 {
 	TQString basedir=kapp->dirs()->localtdedir()+"/share/apps/noatun/eq.preset/";
 	// now append a filename that doesn't exist
-	KStandardDirs::makeDir(basedir);
+	TDEStandardDirs::makeDir(basedir);
 	TQString fullpath;
 	int num=0;
 	do
diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp
index 249a74e4..cdee37c0 100644
--- a/noatun/modules/kaiman/pref.cpp
+++ b/noatun/modules/kaiman/pref.cpp
@@ -67,7 +67,7 @@ void KaimanPrefDlg::reopen()
 {
     _skinList->clear();
     // fill with available skins
-    TDEGlobal::dirs()->addResourceType("skins", KStandardDirs::kde_default("data") + "noatun/skins/kaiman/");
+    TDEGlobal::dirs()->addResourceType("skins", TDEStandardDirs::kde_default("data") + "noatun/skins/kaiman/");
     TQStringList list = TDEGlobal::dirs()->resourceDirs("skins");
     for (TQStringList::ConstIterator it = list.begin(); it != list.end(); it++)
         readSkinDir(*it);
diff --git a/tdeioslave/audiocd/plugins/audiocdencoder.cpp b/tdeioslave/audiocd/plugins/audiocdencoder.cpp
index 26c108b8..05a1c145 100644
--- a/tdeioslave/audiocd/plugins/audiocdencoder.cpp
+++ b/tdeioslave/audiocd/plugins/audiocdencoder.cpp
@@ -62,12 +62,12 @@ void *loadPlugin(const TQString &libFileName)
 void AudioCDEncoder::findAllPlugins(TDEIO::SlaveBase *slave, TQPtrList<AudioCDEncoder> &encoders){
     TQString foundEncoders;
 
-    KStandardDirs standardDirs;
+    TDEStandardDirs standardDirs;
     TQStringList dirs = standardDirs.findDirs("module", "");
     for (TQStringList::Iterator it = dirs.begin(); it != dirs.end(); ++it) {
         TQDir dir(*it);
         if (!dir.exists()) {
-            kdDebug(7117) << "Directory given by KStandardDirs: " << dir.path() << " doesn't exists!" << endl;
+            kdDebug(7117) << "Directory given by TDEStandardDirs: " << dir.path() << " doesn't exists!" << endl;
             continue;
         }
         dir.setFilter(TQDir::Files | TQDir::Hidden);
diff --git a/tdeioslave/audiocd/plugins/audiocdencoder.h b/tdeioslave/audiocd/plugins/audiocdencoder.h
index 56fe7aa5..164c7aec 100644
--- a/tdeioslave/audiocd/plugins/audiocdencoder.h
+++ b/tdeioslave/audiocd/plugins/audiocdencoder.h
@@ -124,7 +124,7 @@ public:
 
   /**
    * Helper function to load all of the AudioCD Encoders from libraries.
-   * Uses KStandardDirs to find where libraries could be, opens all of the ones
+   * Uses TDEStandardDirs to find where libraries could be, opens all of the ones
    * that we might own audiocd_encoder_* and then uses the symbol 
    * create_audiocd_encoders to obtain the encoders from that library.
    * @param slave ioslave needed if the plugin is going to be used to encode something.
diff --git a/tdeioslave/audiocd/plugins/lame/encoderlame.cpp b/tdeioslave/audiocd/plugins/lame/encoderlame.cpp
index a9a6233f..6040f9a4 100644
--- a/tdeioslave/audiocd/plugins/lame/encoderlame.cpp
+++ b/tdeioslave/audiocd/plugins/lame/encoderlame.cpp
@@ -79,7 +79,7 @@ TQWidget* EncoderLame::getConfigureWidget(TDEConfigSkeleton** manager) const {
 
 bool EncoderLame::init(){
 	// Determine if lame is installed on the system or not.
-	if ( KStandardDirs::findExe( "lame" ).isEmpty() )
+	if ( TDEStandardDirs::findExe( "lame" ).isEmpty() )
 		return false;
 
 	// Ask lame for the list of genres it knows; otherwise it barfs when doing