Rename KStandard for enhanced compatibility with KDE4

10 files changed, 14 insertions, 14 deletions

diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp
index 79c504874..2f26b045f 100644
--- a/kicker/extensions/dockbar/dockbarextension.cpp
+++ b/kicker/extensions/dockbar/dockbarextension.cpp
@@ -205,7 +205,7 @@ void DockBarExtension::embedWindow(WId win, TQString command, TQString resName,
     
     if (container == 0) {
 	TQString cmd = command.isNull() ? resClass : command;
-	if (KStandardDirs::findExe(KShell::splitArgs(cmd).front()).isEmpty())
+	if (TDEStandardDirs::findExe(KShell::splitArgs(cmd).front()).isEmpty())
 	    ncmd = true;
 	container = new DockContainer(cmd, this, resName, resClass);
 	addContainer(container);
diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp
index 0521e6413..c39f9a775 100644
--- a/kicker/kicker/core/kicker.cpp
+++ b/kicker/kicker/core/kicker.cpp
@@ -95,7 +95,7 @@ Kicker::Kicker()
 
     dcopClient()->setDefaultObject("Panel");
     disableSessionManagement();
-    TQString dataPathBase = KStandardDirs::kde_default("data").append("kicker/");
+    TQString dataPathBase = TDEStandardDirs::kde_default("data").append("kicker/");
     TDEGlobal::dirs()->addResourceType("mini", dataPathBase + "pics/mini");
     TDEGlobal::dirs()->addResourceType("icon", dataPathBase + "pics");
     TDEGlobal::dirs()->addResourceType("builtinbuttons", dataPathBase + "builtins");
diff --git a/kicker/kicker/ui/exe_dlg.cpp b/kicker/kicker/ui/exe_dlg.cpp
index 209e08270..fcdc76176 100644
--- a/kicker/kicker/ui/exe_dlg.cpp
+++ b/kicker/kicker/ui/exe_dlg.cpp
@@ -128,7 +128,7 @@ void PanelExeDialog::updateIcon()
 void PanelExeDialog::fillCompletion()
 {
     KCompletion *comp = ui->m_exec->completionObject();
-    TQStringList exePaths = KStandardDirs::systemPaths();
+    TQStringList exePaths = TDEStandardDirs::systemPaths();
 
     for (TQStringList::ConstIterator it = exePaths.begin(); it != exePaths.end(); it++)
     {
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index c0b14d1c9..79ed0d6b6 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -122,7 +122,7 @@
 static TQString calculate(const TQString &exp)
 {
    TQString result, cmd;
-   const TQString bc = KStandardDirs::findExe("bc");
+   const TQString bc = TDEStandardDirs::findExe("bc");
    if ( !bc.isEmpty() )
       cmd = TQString("echo %1 | %2").arg(TDEProcess::quote(exp), TDEProcess::quote(bc));
    else
@@ -302,7 +302,7 @@ KMenu::KMenu()
     m_searchInternet->setPixmap(0,icon);
     setTabOrder(m_kcommand, m_searchResultsWidget);
 
-    m_kerryInstalled = !KStandardDirs::findExe(TQString::fromLatin1("kerry")).isEmpty();
+    m_kerryInstalled = !TDEStandardDirs::findExe(TQString::fromLatin1("kerry")).isEmpty();
     m_isShowing = false;
 
     if (!m_kerryInstalled) {
@@ -1353,7 +1353,7 @@ void KMenu::insertStaticItems()
     m_systemView->insertItem( "folder_home", i18n( "Home Folder" ),
                               TQDir::homeDirPath(), "file://"+TQDir::homeDirPath(), nId++, index++ );
 
-    if ( KStandardDirs::exists( TDEGlobalSettings::documentPath() + "/" ) )
+    if ( TDEStandardDirs::exists( TDEGlobalSettings::documentPath() + "/" ) )
     {
         TQString documentPath = TDEGlobalSettings::documentPath();
         if ( documentPath.endsWith( "/" ) )
@@ -2934,7 +2934,7 @@ void KMenu::slotContextMenu(int selected)
         case EditMenu:
 	    accept();
             proc = new TDEProcess(TQT_TQOBJECT(this));
-            *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
+            *proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
             *proc << "/"+m_popupPath.menuPath.section('/',-200,-2) << m_popupPath.menuPath.section('/', -1);
             proc->start();
 	    break;
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index bb1c1fc85..62cc7ec75 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -695,7 +695,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
 
 	case EditItem:
             proc = new TDEProcess(TQT_TQOBJECT(this));
-            *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
+            *proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
             *proc << "/"+relPath_ << static_cast<KService *>(contextKSycocaEntry_)->menuId();
             proc->start();
 	    break;
@@ -739,7 +739,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
 
         case EditMenu:
             proc = new TDEProcess(TQT_TQOBJECT(this));
-            *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
+            *proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
             *proc << "/"+static_cast<KServiceGroup *>(contextKSycocaEntry_)->relPath();
             proc->start();
 	    break;
diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
index e12d6ebc1..34bfb9649 100644
--- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp
+++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp
@@ -28,7 +28,7 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( KonsoleMenu *konsole, bool )
         file = locateLocal( "data", "konsole/bookmarks.xml" );
 
     // import old bookmarks
-    if ( !KStandardDirs::exists( file ) ) {
+    if ( !TDEStandardDirs::exists( file ) ) {
         TQString oldFile = locate( "data", "tdefile/bookmarks.html" );
         if ( !oldFile.isEmpty() )
             importOldBookmarks( oldFile, file );
diff --git a/kicker/menuext/remote/remotemenu.cpp b/kicker/menuext/remote/remotemenu.cpp
index 49cc0db79..f6b9a8a10 100644
--- a/kicker/menuext/remote/remotemenu.cpp
+++ b/kicker/menuext/remote/remotemenu.cpp
@@ -43,7 +43,7 @@ RemoteMenu::RemoteMenu(TQWidget *parent, const char *name,
   : KPanelMenu(parent, name), KDirNotify()
 {
     TDEGlobal::dirs()->addResourceType("remote_entries",
-    KStandardDirs::kde_default("data") + "remoteview");
+    TDEStandardDirs::kde_default("data") + "remoteview");
 
     TQString path = TDEGlobal::dirs()->saveLocation("remote_entries");
 
diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp
index d6de4c39d..6c15e55ac 100644
--- a/kicker/proxy/appletproxy.cpp
+++ b/kicker/proxy/appletproxy.cpp
@@ -84,7 +84,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
     TDEApplication a;
     a.disableSessionManagement();
 
-    TDEGlobal::dirs()->addResourceType("applets", KStandardDirs::kde_default("data") +
+    TDEGlobal::dirs()->addResourceType("applets", TDEStandardDirs::kde_default("data") +
 				     "kicker/applets");
 
     // setup proxy object
diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp
index 55c832439..8c63fd7a8 100644
--- a/kicker/proxy/extensiondebugger.cpp
+++ b/kicker/proxy/extensiondebugger.cpp
@@ -88,7 +88,7 @@ int main( int argc, char ** argv )
     TDEApplication a;
     a.disableSessionManagement();
 
-    TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
+    TDEGlobal::dirs()->addResourceType("extensions", TDEStandardDirs::kde_default("data") +
 				     "kicker/extensions");
 
     TQString df;
diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp
index 23289c633..7f8835d5f 100644
--- a/kicker/proxy/extensionproxy.cpp
+++ b/kicker/proxy/extensionproxy.cpp
@@ -70,7 +70,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
     TDEApplication a;
     a.disableSessionManagement();
 
-    TDEGlobal::dirs()->addResourceType("extensions", KStandardDirs::kde_default("data") +
+    TDEGlobal::dirs()->addResourceType("extensions", TDEStandardDirs::kde_default("data") +
 				     "kicker/extensions");
 
     // setup proxy object