Rename a number of libraries and executables to avoid conflicts with KDE4

12 files changed, 18 insertions, 18 deletions

diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp
index a6993ae..ba2b129 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.cpp
+++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp
@@ -36,7 +36,7 @@
 #include <kapplication.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktar.h>
 #include <karchive.h>
 #include <dcopref.h>
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.h b/konq-plugins/sidebar/metabar/src/configdialog.h
index 3e10757..190c982 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.h
+++ b/konq-plugins/sidebar/metabar/src/configdialog.h
@@ -24,7 +24,7 @@
 #include <kpushbutton.h>
 #include <klistview.h>
 #include <knuminput.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqptrdict.h>
 #include <tqlistbox.h>
 #include <kactionselector.h>
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
index 9749a5b..0edf060 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
@@ -30,13 +30,13 @@
 #include <kdesktopfile.h>
 #include <ktrader.h>
 #include <krun.h>
-#include <kfilemetainfo.h>
-#include <kconfig.h>
+#include <tdefilemetainfo.h>
+#include <tdeconfig.h>
 #include <kimageio.h>
 #include <kdebug.h>
 #include <kmdcodec.h>
 
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 
 #include <dcopclient.h>
 #include <dcopref.h>
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.h b/konq-plugins/sidebar/metabar/src/defaultplugin.h
index b86b12e..a9feb56 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.h
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.h
@@ -24,7 +24,7 @@
 #include "protocolplugin.h"
 #include "serviceloader.h"
 
-#include <kio/previewjob.h>
+#include <tdeio/previewjob.h>
 
 #include <tqdict.h>
 #include <tqmap.h>
diff --git a/konq-plugins/sidebar/metabar/src/metabar.h b/konq-plugins/sidebar/metabar/src/metabar.h
index 29c8efa..baf40d5 100644
--- a/konq-plugins/sidebar/metabar/src/metabar.h
+++ b/konq-plugins/sidebar/metabar/src/metabar.h
@@ -7,7 +7,7 @@
 
 #include <konqsidebarplugin.h>
 #include <tqstring.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 class Metabar : public KonqSidebarPlugin
diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
index adf316c..aefa5fd 100644
--- a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
@@ -24,7 +24,7 @@
 #include <html_document.h>
 #include <css_value.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqrect.h>
 
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index 7142f15..af44158 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -361,10 +361,10 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg
     }
   }
   
-  else if(protocol == "kcmshell"){
+  else if(protocol == "tdecmshell"){
     TQString module = url.path().remove('/');
     
-    KRun::runCommand("kcmshell " + module);
+    KRun::runCommand("tdecmshell " + module);
   }
   
   else if(protocol == "action"){
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.h b/konq-plugins/sidebar/metabar/src/metabarwidget.h
index 95c1148..aad695b 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.h
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.h
@@ -23,8 +23,8 @@
 
 #include <tdehtml_part.h>
 
-#include <kconfig.h>
-#include <kfileitem.h>
+#include <tdeconfig.h>
+#include <tdefileitem.h>
 #include <kurl.h>
 #include <kservice.h>
 #include <kpopupmenu.h>
diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.h b/konq-plugins/sidebar/metabar/src/protocolplugin.h
index 6683f61..2ffd207 100644
--- a/konq-plugins/sidebar/metabar/src/protocolplugin.h
+++ b/konq-plugins/sidebar/metabar/src/protocolplugin.h
@@ -21,7 +21,7 @@
 #ifndef _PROTOCOL_PLUGIN_H
 #define _PROTOCOL_PLUGIN_H
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <tdehtml_part.h>
 
 #include <html_element.h>
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.h b/konq-plugins/sidebar/metabar/src/serviceloader.h
index 6e47a76..99d85ed 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.h
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.h
@@ -27,7 +27,7 @@
 #include <tqwidget.h>
 
 #include <kpopupmenu.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kmimetype.h>
 #include <kurl.h>
 
diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
index 71fce21..b5186e7 100644
--- a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
@@ -72,7 +72,7 @@ void SettingsPlugin::loadActions(DOM::HTMLElement node)
       TDECModuleInfo kcminfo(service);
       
       DOM::DOMString innerHTML;      
-      MetabarWidget::addEntry(innerHTML, i18n("Run"), "kcmshell:/" + name, kcminfo.icon());
+      MetabarWidget::addEntry(innerHTML, i18n("Run"), "tdecmshell:/" + name, kcminfo.icon());
       node.setInnerHTML(innerHTML);
       
       m_functions->show("actions");
@@ -180,7 +180,7 @@ void SettingsPlugin::slotGotEntries(TDEIO::Job *job, const TDEIO::UDSEntryList &
     kdDebug() << url << endl;
     
     if(type == S_IFREG){
-      url = "kcmshell:/" + KURL(url).filename();
+      url = "tdecmshell:/" + KURL(url).filename();
     }
 
     MetabarWidget::addEntry(innerHTML, name, url, icon);
diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.h b/konq-plugins/sidebar/metabar/src/settingsplugin.h
index c8580de..75f61d3 100644
--- a/konq-plugins/sidebar/metabar/src/settingsplugin.h
+++ b/konq-plugins/sidebar/metabar/src/settingsplugin.h
@@ -23,8 +23,8 @@
 
 #include "protocolplugin.h"
 
-#include <kio/jobclasses.h>
-#include <kio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/job.h>
 
 class SettingsPlugin : public ProtocolPlugin
 {