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

28 files changed, 36 insertions, 36 deletions

diff --git a/plugins/infowidget/infowidgetpluginsettings.kcfgc b/plugins/infowidget/infowidgetpluginsettings.kcfgc
index 39b3109..a6d8cb9 100644
--- a/plugins/infowidget/infowidgetpluginsettings.kcfgc
+++ b/plugins/infowidget/infowidgetpluginsettings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=ktinfowidgetplugin.kcfg
 ClassName=InfoWidgetPluginSettings
 Namespace=kt
diff --git a/plugins/ipfilter/convertdialog.cpp b/plugins/ipfilter/convertdialog.cpp
index a6cf3c7..3cd627a 100644
--- a/plugins/ipfilter/convertdialog.cpp
+++ b/plugins/ipfilter/convertdialog.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kurl.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kprogress.h>
 #include <kmimetype.h>
 
diff --git a/plugins/ipfilter/ipblockingprefpage.cpp b/plugins/ipfilter/ipblockingprefpage.cpp
index fb1cd9d..9bcbe3d 100644
--- a/plugins/ipfilter/ipblockingprefpage.cpp
+++ b/plugins/ipfilter/ipblockingprefpage.cpp
@@ -32,7 +32,7 @@
 #include <kurlrequester.h>
 #include <kurl.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kprogress.h>
 #include <kmimetype.h>
 
diff --git a/plugins/ipfilter/ipfilterpluginsettings.kcfgc b/plugins/ipfilter/ipfilterpluginsettings.kcfgc
index b9aeaeb..29f74c4 100644
--- a/plugins/ipfilter/ipfilterpluginsettings.kcfgc
+++ b/plugins/ipfilter/ipfilterpluginsettings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=ktipfilterplugin.kcfg
 ClassName=IPBlockingPluginSettings
 Namespace=kt
diff --git a/plugins/logviewer/logviewer.cpp b/plugins/logviewer/logviewer.cpp
index 4ab3ab1..343080f 100644
--- a/plugins/logviewer/logviewer.cpp
+++ b/plugins/logviewer/logviewer.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqapplication.h>
 #include "logviewer.h"
 #include "logflags.h"
diff --git a/plugins/logviewer/logviewerpluginsettings.kcfgc b/plugins/logviewer/logviewerpluginsettings.kcfgc
index c10fa1c..dfd7768 100644
--- a/plugins/logviewer/logviewerpluginsettings.kcfgc
+++ b/plugins/logviewer/logviewerpluginsettings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=ktlogviewerplugin.kcfg
 ClassName=LogViewerPluginSettings
 Namespace=kt
diff --git a/plugins/partfileimport/importdialog.cpp b/plugins/partfileimport/importdialog.cpp
index 23b383f..6c227f7 100644
--- a/plugins/partfileimport/importdialog.cpp
+++ b/plugins/partfileimport/importdialog.cpp
@@ -23,8 +23,8 @@
 #include <kurlrequester.h>
 #include <kpushbutton.h>
 #include <kmessagebox.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <util/log.h>
 #include <util/error.h>
 #include <util/file.h>
diff --git a/plugins/rssfeed/rss/image.cpp b/plugins/rssfeed/rss/image.cpp
index 4dff982..383d76b 100644
--- a/plugins/rssfeed/rss/image.cpp
+++ b/plugins/rssfeed/rss/image.cpp
@@ -11,7 +11,7 @@
 #include "image.h"
 #include "tools_p.h"
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 
 #include <tqbuffer.h>
diff --git a/plugins/rssfeed/rss/loader.cpp b/plugins/rssfeed/rss/loader.cpp
index d9766d4..97ae2a5 100644
--- a/plugins/rssfeed/rss/loader.cpp
+++ b/plugins/rssfeed/rss/loader.cpp
@@ -11,7 +11,7 @@
 #include "loader.h"
 #include "document.h"
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kprocess.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/plugins/rssfeed/rss/loader.h b/plugins/rssfeed/rss/loader.h
index f563782..2e2ccbb 100644
--- a/plugins/rssfeed/rss/loader.h
+++ b/plugins/rssfeed/rss/loader.h
@@ -114,7 +114,7 @@ namespace RSS
 			/**
 			 * @return The error code for the last process of retrieving data.
 			 * The returned numbers correspond directly to the error codes
-			 * <a href="http://developer.kde.org/documentation/library/cvs-api/classref/kio/KIO.html#Error">as
+			 * <a href="http://developer.kde.org/documentation/library/cvs-api/classref/tdeio/KIO.html#Error">as
 			 * defined by KIO</a>.
 			 */
 			virtual int errorCode() const;
diff --git a/plugins/rssfeed/rssfeed.cpp b/plugins/rssfeed/rssfeed.cpp
index dea28b3..22289f1 100644
--- a/plugins/rssfeed/rssfeed.cpp
+++ b/plugins/rssfeed/rssfeed.cpp
@@ -22,7 +22,7 @@
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <krfcdate.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tqfile.h>
 #include <tqapplication.h>
 #include <tqdir.h>
diff --git a/plugins/rssfeed/rssfeedmanager.cpp b/plugins/rssfeed/rssfeedmanager.cpp
index 65d1d6b..97c5b9c 100644
--- a/plugins/rssfeed/rssfeedmanager.cpp
+++ b/plugins/rssfeed/rssfeedmanager.cpp
@@ -20,9 +20,9 @@
 #include "rssfeedmanager.h"
 
 #include <kdirlister.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
 #include <keditlistbox.h>
 // #include <kmimetype.h>
diff --git a/plugins/rssfeed/rssfeedmanager.h b/plugins/rssfeed/rssfeedmanager.h
index 67ac436..939c460 100644
--- a/plugins/rssfeed/rssfeedmanager.h
+++ b/plugins/rssfeed/rssfeedmanager.h
@@ -21,7 +21,7 @@
 #define RSSFEEDMANAGER_H
 
 #include <kdirlister.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <tqstring.h>
 #include <tqobject.h>
 #include <tqdir.h>
diff --git a/plugins/rssfeed/rsslinkdownloader.h b/plugins/rssfeed/rsslinkdownloader.h
index 7fb6d85..6badd61 100644
--- a/plugins/rssfeed/rsslinkdownloader.h
+++ b/plugins/rssfeed/rsslinkdownloader.h
@@ -20,7 +20,7 @@
 #ifndef RSSLINKDOWNLOADER_H
 #define RSSLINKDOWNLOADER_H
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <ktempfile.h>
 
 #include <interfaces/coreinterface.h>
diff --git a/plugins/scanfolder/scanfolder.cpp b/plugins/scanfolder/scanfolder.cpp
index b5872f1..1180f4b 100644
--- a/plugins/scanfolder/scanfolder.cpp
+++ b/plugins/scanfolder/scanfolder.cpp
@@ -20,9 +20,9 @@
 #include "scanfolder.h"
 
 #include <kdirlister.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <klocale.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <tqstring.h>
 #include <tqobject.h>
diff --git a/plugins/scanfolder/scanfolder.h b/plugins/scanfolder/scanfolder.h
index f5b54b7..680f74c 100644
--- a/plugins/scanfolder/scanfolder.h
+++ b/plugins/scanfolder/scanfolder.h
@@ -21,7 +21,7 @@
 #define SCANFOLDER_H
 
 #include <kdirlister.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <tqstring.h>
 #include <tqobject.h>
 #include <tqdir.h>
diff --git a/plugins/scanfolder/scanfolderpluginsettings.kcfgc b/plugins/scanfolder/scanfolderpluginsettings.kcfgc
index af1ebbc..7550c9d 100644
--- a/plugins/scanfolder/scanfolderpluginsettings.kcfgc
+++ b/plugins/scanfolder/scanfolderpluginsettings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=ktscanfolderplugin.kcfg
 ClassName=ScanFolderPluginSettings
 Namespace=kt
diff --git a/plugins/scheduler/bwsprefpagewidget.cpp b/plugins/scheduler/bwsprefpagewidget.cpp
index 648afe7..f0e68e8 100644
--- a/plugins/scheduler/bwsprefpagewidget.cpp
+++ b/plugins/scheduler/bwsprefpagewidget.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <kstdguiitem.h>
diff --git a/plugins/scheduler/schedulerpluginsettings.kcfgc b/plugins/scheduler/schedulerpluginsettings.kcfgc
index f38f816..5c66442 100644
--- a/plugins/scheduler/schedulerpluginsettings.kcfgc
+++ b/plugins/scheduler/schedulerpluginsettings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=ktschedulerplugin.kcfg
 ClassName=SchedulerPluginSettings
 Namespace=kt
diff --git a/plugins/search/htmlpart.cpp b/plugins/search/htmlpart.cpp
index 2b63048..1ce0d5d 100644
--- a/plugins/search/htmlpart.cpp
+++ b/plugins/search/htmlpart.cpp
@@ -18,14 +18,14 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <kmessagebox.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 //#include <tqfile.h>
 #include <tqclipboard.h>
 #include <tqapplication.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tdeparts/browserextension.h>
 #include <util/constants.h>
 #include <tdehtmlview.h>
diff --git a/plugins/search/searchpluginsettings.kcfgc b/plugins/search/searchpluginsettings.kcfgc
index 8b3488b..09cfd64 100644
--- a/plugins/search/searchpluginsettings.kcfgc
+++ b/plugins/search/searchpluginsettings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=ktsearchplugin.kcfg
 ClassName=SearchPluginSettings
 Namespace=kt
diff --git a/plugins/search/searchprefpage.cpp b/plugins/search/searchprefpage.cpp
index d31a037..8eea5ba 100644
--- a/plugins/search/searchprefpage.cpp
+++ b/plugins/search/searchprefpage.cpp
@@ -30,7 +30,7 @@
 #include <klistview.h>
 #include <klineedit.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klineedit.h>
 
 #include <tqlabel.h>
diff --git a/plugins/search/searchwidget.cpp b/plugins/search/searchwidget.cpp
index b5008b8..6ae19a9 100644
--- a/plugins/search/searchwidget.cpp
+++ b/plugins/search/searchwidget.cpp
@@ -35,9 +35,9 @@
 #include <kcombobox.h>
 #include <kpopupmenu.h>
 #include <tdeparts/partmanager.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kprogress.h>
 #include <util/log.h>
 #include <torrent/globals.h>
diff --git a/plugins/stats/statspluginsettings.kcfgc b/plugins/stats/statspluginsettings.kcfgc
index d809d30..034322e 100644
--- a/plugins/stats/statspluginsettings.kcfgc
+++ b/plugins/stats/statspluginsettings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=ktstatsplugin.kcfg
 ClassName=StatsPluginSettings
 Namespace=kt
diff --git a/plugins/upnp/upnppluginsettings.kcfgc b/plugins/upnp/upnppluginsettings.kcfgc
index 6cab465..8917f80 100644
--- a/plugins/upnp/upnppluginsettings.kcfgc
+++ b/plugins/upnp/upnppluginsettings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=ktupnpplugin.kcfg
 ClassName=UPnPPluginSettings
 Namespace=kt
diff --git a/plugins/upnp/upnprouter.cpp b/plugins/upnp/upnprouter.cpp
index d924526..d88995a 100644
--- a/plugins/upnp/upnprouter.cpp
+++ b/plugins/upnp/upnprouter.cpp
@@ -22,8 +22,8 @@
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <tqstringlist.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 #include <torrent/globals.h>
 #include <util/log.h>
 #include <util/array.h>
diff --git a/plugins/webinterface/php_interface.cpp b/plugins/webinterface/php_interface.cpp
index 4df085d..bffc1fc 100644
--- a/plugins/webinterface/php_interface.cpp
+++ b/plugins/webinterface/php_interface.cpp
@@ -18,7 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kglobal.h>
 #include <klocale.h>
 
diff --git a/plugins/webinterface/webinterfacepluginsettings.kcfgc b/plugins/webinterface/webinterfacepluginsettings.kcfgc
index fd5aebf..1306161 100644
--- a/plugins/webinterface/webinterfacepluginsettings.kcfgc
+++ b/plugins/webinterface/webinterfacepluginsettings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=ktwebinterfaceplugin.kcfg
 ClassName=WebInterfacePluginSettings
 Namespace=kt