Rename KStandard for enhanced compatibility with KDE4

9 files changed, 41 insertions, 41 deletions

diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp
index 6e573a1..3d0cbb2 100644
--- a/kate/make/plugin_katemake.cpp
+++ b/kate/make/plugin_katemake.cpp
@@ -657,9 +657,9 @@ bool PluginKateMakeView::slotValidate()
 	}
 
 	m_proc->setWorkingDirectory(document_dir);
-	TQString make = KStandardDirs::findExe( "gmake" );
+	TQString make = TDEStandardDirs::findExe( "gmake" );
 	if (make.isEmpty())
-		make = KStandardDirs::findExe("make");
+		make = TDEStandardDirs::findExe("make");
 	*m_proc << make;
 	if( make.isEmpty() || ! m_proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) ) {
 		KMessageBox::error(0, i18n("<b>Error:</b> Failed to run %1.").arg(make.isEmpty() ?
diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp
index e7ce1e2..76d674a 100644
--- a/kate/xmlcheck/plugin_katexmlcheck.cpp
+++ b/kate/xmlcheck/plugin_katexmlcheck.cpp
@@ -292,7 +292,7 @@ bool PluginKateXMLCheckView::slotValidate()
 		kdDebug() << "Warning (slotValidate()): temp file '" << m_tmp_file->name() << "' not deleted: " << m_tmp_file->status() << endl;
 	}
 
-	TQString exe = KStandardDirs::findExe("xmllint");
+	TQString exe = TDEStandardDirs::findExe("xmllint");
 	if( exe.isEmpty() ) {
 		exe = locate("exe", "xmllint");
 	}
diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.cpp b/kicker-applets/mediacontrol/mediacontrolconfig.cpp
index 76ab823..8a10717 100644
--- a/kicker-applets/mediacontrol/mediacontrolconfig.cpp
+++ b/kicker-applets/mediacontrol/mediacontrolconfig.cpp
@@ -63,7 +63,7 @@ MediaControlConfig::MediaControlConfig( ConfigFrontend *cfg, TQWidget *parent, c
 
 	_child->themeListBox->clear();
 	// fill with available skins
-	TDEGlobal::dirs()->addResourceType("themes", KStandardDirs::kde_default("data") + "mediacontrol");
+	TDEGlobal::dirs()->addResourceType("themes", TDEStandardDirs::kde_default("data") + "mediacontrol");
 	TQStringList list = TDEGlobal::dirs()->resourceDirs("themes");
 	for (TQStringList::ConstIterator it = list.constBegin(); it != list.constEnd(); ++it)
 		readSkinDir(*it);
diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp
index 2bf0734..4bfc14b 100644
--- a/konq-plugins/arkplugin/arkplugin.cpp
+++ b/konq-plugins/arkplugin/arkplugin.cpp
@@ -46,7 +46,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
                 m_compAsMapper( 0 ), m_addToMapper( 0 ), m_conf( 0 )
 {
     if ( ( TQCString( kapp->name() ) == "kdesktop" && !kapp->authorize("editable_desktop_icons" ) )
-         || ( KStandardDirs::findExe( "ark" ).isNull() ) )
+         || ( TDEStandardDirs::findExe( "ark" ).isNull() ) )
         return;
 
     m_conf = new TDEConfig( "arkrc" );
@@ -262,7 +262,7 @@ void ArkMenu::compMimeTypes()
     unsigned int itemCount = m_urlList.count();
 
     bool havegz = false;
-    if ( !KStandardDirs::findExe( "gzip" ).isNull() && m_conf->readBoolEntry( "UseGz", true ) )
+    if ( !TDEStandardDirs::findExe( "gzip" ).isNull() && m_conf->readBoolEntry( "UseGz", true ) )
     {
         havegz = true;
         //.gz can only compress one file, not multiple 
@@ -270,7 +270,7 @@ void ArkMenu::compMimeTypes()
     }
 
     bool havebz2 = false;
-    if ( !KStandardDirs::findExe( "bzip2" ).isNull() && m_conf->readBoolEntry( "UseBzip2", true ) )
+    if ( !TDEStandardDirs::findExe( "bzip2" ).isNull() && m_conf->readBoolEntry( "UseBzip2", true ) )
     {
         havebz2 = true;
         //.bz2 can only compress one file, not multiple
@@ -278,27 +278,27 @@ void ArkMenu::compMimeTypes()
     }
 
     bool havelzop = false;
-    if ( !KStandardDirs::findExe( "lzop" ).isNull() && m_conf->readBoolEntry( "UseLzop", false ) )
+    if ( !TDEStandardDirs::findExe( "lzop" ).isNull() && m_conf->readBoolEntry( "UseLzop", false ) )
     {
         havelzop = true;
         m_archiveMimeTypes << "application/x-lzop";
     }
 
     bool havelzma = false;
-    if ( !KStandardDirs::findExe( "lzma" ).isNull() && m_conf->readBoolEntry( "UseLzma", true ) )
+    if ( !TDEStandardDirs::findExe( "lzma" ).isNull() && m_conf->readBoolEntry( "UseLzma", true ) )
     {
         havelzma = true;
         m_archiveMimeTypes << "application/x-lzma";
     }
 
     bool havexz = false;
-    if ( !KStandardDirs::findExe( "xz" ).isNull() && m_conf->readBoolEntry( "UseXz", true ) )
+    if ( !TDEStandardDirs::findExe( "xz" ).isNull() && m_conf->readBoolEntry( "UseXz", true ) )
     {
         havexz = true;
         m_archiveMimeTypes << "application/x-xz";
     }
 
-    if ( !KStandardDirs::findExe( "tar" ).isNull() && m_conf->readBoolEntry( "UseTar", true ) )
+    if ( !TDEStandardDirs::findExe( "tar" ).isNull() && m_conf->readBoolEntry( "UseTar", true ) )
     {
         m_archiveMimeTypes << "application/x-tar";
         if ( havegz )
@@ -316,10 +316,10 @@ void ArkMenu::compMimeTypes()
             m_archiveMimeTypes << "application/x-txz";
     }
 
-    if ( !KStandardDirs::findExe( "lha" ).isNull() && m_conf->readBoolEntry( "UseLha", false ) )
+    if ( !TDEStandardDirs::findExe( "lha" ).isNull() && m_conf->readBoolEntry( "UseLha", false ) )
         m_archiveMimeTypes << "application/x-lha";
 
-    if ( !KStandardDirs::findExe( "zip" ).isNull() && m_conf->readBoolEntry( "UseZip", true ) )
+    if ( !TDEStandardDirs::findExe( "zip" ).isNull() && m_conf->readBoolEntry( "UseZip", true ) )
     {
         m_archiveMimeTypes << "application/x-zip";
 
@@ -327,26 +327,26 @@ void ArkMenu::compMimeTypes()
             m_archiveMimeTypes << "application/x-jar";
     }
 
-    if ( !KStandardDirs::findExe( "rar" ).isNull() && m_conf->readBoolEntry( "UseRar", true ) )
+    if ( !TDEStandardDirs::findExe( "rar" ).isNull() && m_conf->readBoolEntry( "UseRar", true ) )
         m_archiveMimeTypes << "application/x-rar" << "application/x-rar-compressed";
 
-    if ( !KStandardDirs::findExe( "7z" ).isNull() && m_conf->readBoolEntry( "Use7z", true ) )
+    if ( !TDEStandardDirs::findExe( "7z" ).isNull() && m_conf->readBoolEntry( "Use7z", true ) )
         m_archiveMimeTypes << "application/x-7z";
-    else if ( !KStandardDirs::findExe( "7za" ).isNull() && m_conf->readBoolEntry( "Use7za", true ) )
+    else if ( !TDEStandardDirs::findExe( "7za" ).isNull() && m_conf->readBoolEntry( "Use7za", true ) )
         m_archiveMimeTypes << "application/x-7z";
-    else if ( !KStandardDirs::findExe( "7zr" ).isNull() && m_conf->readBoolEntry( "Use7zr", true ) )
+    else if ( !TDEStandardDirs::findExe( "7zr" ).isNull() && m_conf->readBoolEntry( "Use7zr", true ) )
         m_archiveMimeTypes << "application/x-7z";
 
-    if ( !KStandardDirs::findExe( "zoo" ).isNull() && m_conf->readBoolEntry( "UseZoo", false ) )
+    if ( !TDEStandardDirs::findExe( "zoo" ).isNull() && m_conf->readBoolEntry( "UseZoo", false ) )
         m_archiveMimeTypes << "application/x-zoo";
 
-    if ( !KStandardDirs::findExe( "compress" ).isNull() && m_conf->readBoolEntry( "UseCompress", false ) )
+    if ( !TDEStandardDirs::findExe( "compress" ).isNull() && m_conf->readBoolEntry( "UseCompress", false ) )
         m_archiveMimeTypes << "application/x-compress";
 
-    if ( !KStandardDirs::findExe( "bzip" ).isNull() && m_conf->readBoolEntry( "UseBzip", false ) )
+    if ( !TDEStandardDirs::findExe( "bzip" ).isNull() && m_conf->readBoolEntry( "UseBzip", false ) )
         m_archiveMimeTypes << "application/x-bzip";
 
-    if ( !KStandardDirs::findExe( "ar" ).isNull() && m_conf->readBoolEntry( "UseAr", false ) )
+    if ( !TDEStandardDirs::findExe( "ar" ).isNull() && m_conf->readBoolEntry( "UseAr", false ) )
         m_archiveMimeTypes << "application/x-archive";
 
 }
@@ -354,7 +354,7 @@ void ArkMenu::compMimeTypes()
 void ArkMenu::extMimeTypes()
 {
     bool havegz = false;
-    if ( !KStandardDirs::findExe( "gunzip" ).isNull() )
+    if ( !TDEStandardDirs::findExe( "gunzip" ).isNull() )
     {
         havegz = true;
         m_extractMimeTypes << "application/x-gzip";
@@ -362,34 +362,34 @@ void ArkMenu::extMimeTypes()
     }
 
     bool havebz2 = false;
-    if ( !KStandardDirs::findExe( "bunzip2" ).isNull() )
+    if ( !TDEStandardDirs::findExe( "bunzip2" ).isNull() )
     {
         havebz2 = true;
         m_extractMimeTypes << "application/x-bzip2";
     }
 
     bool havelzop = false;
-    if ( !KStandardDirs::findExe( "lzop" ).isNull() )
+    if ( !TDEStandardDirs::findExe( "lzop" ).isNull() )
     {
         havelzop = true;
         m_extractMimeTypes << "application/x-lzop";
     }
 
     bool havelzma = false;
-    if ( !KStandardDirs::findExe( "lzma" ).isNull() )
+    if ( !TDEStandardDirs::findExe( "lzma" ).isNull() )
     {
         havelzma = true;
         m_archiveMimeTypes << "application/x-lzma";
     }
 
     bool havexz = false;
-    if ( !KStandardDirs::findExe( "xz" ).isNull() )
+    if ( !TDEStandardDirs::findExe( "xz" ).isNull() )
     {
         havexz = true;
         m_archiveMimeTypes << "application/x-xz";
     }
 
-    if ( !KStandardDirs::findExe( "tar" ).isNull() )
+    if ( !TDEStandardDirs::findExe( "tar" ).isNull() )
     {
         m_extractMimeTypes << "application/x-tar";
         if ( havegz )
@@ -407,28 +407,28 @@ void ArkMenu::extMimeTypes()
             m_extractMimeTypes << "application/x-txz";
     }
 
-    if ( !KStandardDirs::findExe( "lha" ).isNull() )
+    if ( !TDEStandardDirs::findExe( "lha" ).isNull() )
         m_extractMimeTypes << "application/x-lha";
 
-    if ( !KStandardDirs::findExe( "zip" ).isNull() )
+    if ( !TDEStandardDirs::findExe( "zip" ).isNull() )
         m_extractMimeTypes << "application/x-zip" << "application/x-jar";
 
-    if ( !KStandardDirs::findExe( "unrar" ).isNull() )
+    if ( !TDEStandardDirs::findExe( "unrar" ).isNull() )
         m_extractMimeTypes << "application/x-rar" << "application/x-rar-compressed";
 
-    if ( !KStandardDirs::findExe( "7z" ).isNull() || !KStandardDirs::findExe( "7za" ).isNull() || !KStandardDirs::findExe( "7zr" ).isNull() )
+    if ( !TDEStandardDirs::findExe( "7z" ).isNull() || !TDEStandardDirs::findExe( "7za" ).isNull() || !TDEStandardDirs::findExe( "7zr" ).isNull() )
         m_extractMimeTypes << "application/x-7z";
 
-    if ( !KStandardDirs::findExe( "zoo" ).isNull() )
+    if ( !TDEStandardDirs::findExe( "zoo" ).isNull() )
         m_extractMimeTypes << "application/x-zoo";
 
-    if ( !KStandardDirs::findExe( "uncompress" ).isNull() )
+    if ( !TDEStandardDirs::findExe( "uncompress" ).isNull() )
         m_extractMimeTypes << "application/x-compress";
 
-    if ( !KStandardDirs::findExe( "bunzip" ).isNull() )
+    if ( !TDEStandardDirs::findExe( "bunzip" ).isNull() )
         m_extractMimeTypes << "application/x-bzip";
 
-    if ( !KStandardDirs::findExe( "ar" ).isNull() )
+    if ( !TDEStandardDirs::findExe( "ar" ).isNull() )
         m_extractMimeTypes << "application/x-archive";
 }
 
diff --git a/noatun-plugins/nexscope/noatunplugin.cpp b/noatun-plugins/nexscope/noatunplugin.cpp
index a279d48..e4401ad 100644
--- a/noatun-plugins/nexscope/noatunplugin.cpp
+++ b/noatun-plugins/nexscope/noatunplugin.cpp
@@ -28,7 +28,7 @@ NexPlugin::~NexPlugin()
 
 void NexPlugin::init()
 {
-	process << KStandardDirs::findExe("nexscope.bin");
+	process << TDEStandardDirs::findExe("nexscope.bin");
 
 	// Note that process.start() will fail if findExe fails, so there's no real need
 	// for two separate checks.
diff --git a/noatun-plugins/synaescope/synaescope.cpp b/noatun-plugins/synaescope/synaescope.cpp
index a401704..42ba321 100644
--- a/noatun-plugins/synaescope/synaescope.cpp
+++ b/noatun-plugins/synaescope/synaescope.cpp
@@ -48,7 +48,7 @@ void SynaeScope::init()
 	mPrefs->save();
 	connect(mPrefs, TQT_SIGNAL(configChanged()), this, TQT_SLOT(readConfig()));
 
-	scopeExePath = KStandardDirs::findExe("noatunsynaescope.bin");
+	scopeExePath = TDEStandardDirs::findExe("noatunsynaescope.bin");
 	if (scopeExePath.isEmpty())
 	{
 		KMessageBox::error(0, i18n("Unable to locate noatunsynaescope.bin in your path. Check your installation."));
diff --git a/noatun-plugins/tippercanoe/synaescope.cpp b/noatun-plugins/tippercanoe/synaescope.cpp
index 9435408..9818ab9 100644
--- a/noatun-plugins/tippercanoe/synaescope.cpp
+++ b/noatun-plugins/tippercanoe/synaescope.cpp
@@ -54,7 +54,7 @@ void SynaeScope::init()
 	connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(read(TDEProcess *, char *, int)));
 	pluginMenuItem = napp->pluginMenuAdd(i18n("Toggle Tippecanoe"), TQT_TQOBJECT(this), TQT_SLOT(toggle(void)));
 
-	process << KStandardDirs::findExe("noatuntippecanoe.bin");
+	process << TDEStandardDirs::findExe("noatuntippecanoe.bin");
 
 	// Note that process.start() will fail if findExe fails, so there's no real need
 	// for two separate checks.
diff --git a/noatun-plugins/tyler/file.cpp b/noatun-plugins/tyler/file.cpp
index cd61992..9e5b209 100644
--- a/noatun-plugins/tyler/file.cpp
+++ b/noatun-plugins/tyler/file.cpp
@@ -28,14 +28,14 @@ extern "C"
 
 static TQString getDataPath(void)
 {
-	KStandardDirs &dirs = *TDEGlobal::dirs();
+	TDEStandardDirs &dirs = *TDEGlobal::dirs();
 
 	return dirs.findResource("data", "noatun/tylerstates");
 }
 
 static TQString getSavePath(void)
 {
-	KStandardDirs &dirs = *TDEGlobal::dirs();
+	TDEStandardDirs &dirs = *TDEGlobal::dirs();
 	return dirs.saveLocation("data", "noatun/") + "tylerstates";
 }
 
diff --git a/noatun-plugins/tyler/tyler.cpp b/noatun-plugins/tyler/tyler.cpp
index 39be621..25d844b 100644
--- a/noatun-plugins/tyler/tyler.cpp
+++ b/noatun-plugins/tyler/tyler.cpp
@@ -36,7 +36,7 @@ Tyler::~Tyler()
 
 void Tyler::init()
 {
-	process << KStandardDirs::findExe("noatuntyler.bin");
+	process << TDEStandardDirs::findExe("noatuntyler.bin");
 	connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(processExited(TDEProcess *)));
 
 	// Note that process.start() will fail if findExe fails, so there's no real need