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

21 files changed, 28 insertions, 28 deletions

diff --git a/konq-plugins/sidebar/delicious/Makefile.am b/konq-plugins/sidebar/delicious/Makefile.am
index cb8eb48..35939eb 100644
--- a/konq-plugins/sidebar/delicious/Makefile.am
+++ b/konq-plugins/sidebar/delicious/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = . pics
 
 METASOURCES = AUTO
-INCLUDES = -I$(kde_includes)/kio $(all_includes)
+INCLUDES = -I$(kde_includes)/tdeio $(all_includes)
 
 ################################
 # these are the headers for your project
diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp
index 8a591b4..919c498 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.cpp
+++ b/konq-plugins/sidebar/delicious/mainWidget.cpp
@@ -32,14 +32,14 @@
 #include <tqdatetime.h>
 
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <krfcdate.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kinputdialog.h>
 
 MainWidget::MainWidget( TDEConfig * config, TQWidget * parent )
diff --git a/konq-plugins/sidebar/delicious/mainWidget.h b/konq-plugins/sidebar/delicious/mainWidget.h
index 4b7361b..733a594 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.h
+++ b/konq-plugins/sidebar/delicious/mainWidget.h
@@ -25,7 +25,7 @@
 
 #include "widget.h"
 
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 #include <tdeparts/browserextension.h>
 
 class TQStringList;
diff --git a/konq-plugins/sidebar/mediaplayer/Makefile.am b/konq-plugins/sidebar/mediaplayer/Makefile.am
index 12ba913..3a79209 100644
--- a/konq-plugins/sidebar/mediaplayer/Makefile.am
+++ b/konq-plugins/sidebar/mediaplayer/Makefile.am
@@ -3,7 +3,7 @@
 SUBDIRS = . pics
 
 # set the include path for X, qt and KDE
-INCLUDES = -I$(kde_includes)/kio -I$(kde_includes)/arts $(all_includes)        
+INCLUDES = -I$(kde_includes)/tdeio -I$(kde_includes)/arts $(all_includes)        
 
 # these are the headers for your project
 noinst_HEADERS = 
diff --git a/konq-plugins/sidebar/mediaplayer/engine.cpp b/konq-plugins/sidebar/mediaplayer/engine.cpp
index e4590b6..92343cc 100644
--- a/konq-plugins/sidebar/mediaplayer/engine.cpp
+++ b/konq-plugins/sidebar/mediaplayer/engine.cpp
@@ -26,7 +26,7 @@ extern "C"
 #include <sys/wait.h>
 }
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
index fc281b4..b615e88 100644
--- a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
+++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
@@ -20,7 +20,7 @@
 #include "mediaplayer.moc"
 #include <kdebug.h>
 #include <ksimpleconfig.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <kglobal.h>
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
 {
diff --git a/konq-plugins/sidebar/newsticker/norsswidget.cpp b/konq-plugins/sidebar/newsticker/norsswidget.cpp
index 8419dff..602b189 100644
--- a/konq-plugins/sidebar/newsticker/norsswidget.cpp
+++ b/konq-plugins/sidebar/newsticker/norsswidget.cpp
@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kdebug.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 #include "sidebarsettings.h"
 #include "configfeeds.h"
 #include "norsswidget.h"
diff --git a/konq-plugins/sidebar/newsticker/nspanel.h b/konq-plugins/sidebar/newsticker/nspanel.h
index 6a3ee73..b8590ca 100644
--- a/konq-plugins/sidebar/newsticker/nspanel.h
+++ b/konq-plugins/sidebar/newsticker/nspanel.h
@@ -30,7 +30,7 @@
 #include <tqtooltip.h>
 #include <dcopref.h>
 #include <dcopobject.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klistbox.h>
 
 
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
index ecbad6c..f6b3b7d 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
@@ -42,7 +42,7 @@
 #include <kapplication.h>
 #include <kbugreport.h>
 #include <kstdguiitem.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 #include "sidebarsettings.h"
 #include "configfeeds.h"
 #include "nsstacktabwidget.h"