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

15 files changed, 22 insertions, 22 deletions

diff --git a/akregator/src/CMakeLists.txt b/akregator/src/CMakeLists.txt
index 621880eb..b1bb367d 100644
--- a/akregator/src/CMakeLists.txt
+++ b/akregator/src/CMakeLists.txt
@@ -83,7 +83,7 @@ tde_add_library( akregatorprivate SHARED AUTOMOC
     tagset.cpp trayicon.cpp treenode.cpp treenodevisitor.cpp
     utils.cpp
   VERSION 0.0.0
-  LINK rsslocal-static kio-shared
+  LINK rsslocal-static tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index 3ea4e798..3ff787ea 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -28,9 +28,9 @@
 #include <kactionclasses.h>
 #include <kactioncollection.h>
 #include <kapplication.h>
-#include <kconfig.h>
-#include <kconfigdialog.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdeconfigdialog.h>
+#include <tdefiledialog.h>
 #include <kglobalsettings.h>
 #include <tdehtmldefaults.h>
 #include <kinstance.h>
@@ -44,7 +44,7 @@
 #include <kstdaction.h>
 #include <ktempfile.h>
 #include <ktrader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tdeparts/browserinterface.h>
 #include <tdeparts/genericfactory.h>
 #include <tdeparts/partmanager.h>
diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp
index 3066760a..d9f39710 100644
--- a/akregator/src/akregator_view.cpp
+++ b/akregator/src/akregator_view.cpp
@@ -62,11 +62,11 @@
 #include <kapplication.h>
 #include <kcharsets.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
-#include <kfileitem.h>
+#include <tdefiledialog.h>
+#include <tdefileitem.h>
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
 #include <kiconloader.h>
diff --git a/akregator/src/akregatorconfig.kcfgc b/akregator/src/akregatorconfig.kcfgc
index 5602bc56..66183471 100644
--- a/akregator/src/akregatorconfig.kcfgc
+++ b/akregator/src/akregatorconfig.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=akregator.kcfg
 ClassName=Settings
 NameSpace=Akregator
diff --git a/akregator/src/articlefilter.cpp b/akregator/src/articlefilter.cpp
index 27ecd64e..1bb5646a 100644
--- a/akregator/src/articlefilter.cpp
+++ b/akregator/src/articlefilter.cpp
@@ -29,7 +29,7 @@
 #include "shared.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kurl.h>
 
diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp
index dfd48ffe..68af3860 100644
--- a/akregator/src/articleviewer.cpp
+++ b/akregator/src/articleviewer.cpp
@@ -38,8 +38,8 @@
 #include <kstandarddirs.h>
 #include <kshell.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
-#include <libtdepim/kfileio.h>
+#include <tdeio/netaccess.h>
+#include <libtdepim/tdefileio.h>
 
 #include "aboutdata.h"
 #include "akregator_run.h"
diff --git a/akregator/src/configdialog.h b/akregator/src/configdialog.h
index db2161cb..3fd7c8f2 100644
--- a/akregator/src/configdialog.h
+++ b/akregator/src/configdialog.h
@@ -25,7 +25,7 @@
 #ifndef AKREGATOR_CONFIGDIALOG_H
 #define AKREGATOR_CONFIGDIALOG_H
 
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 namespace Akregator {
 
diff --git a/akregator/src/librss/image.cpp b/akregator/src/librss/image.cpp
index 4dff9822..383d76b9 100644
--- a/akregator/src/librss/image.cpp
+++ b/akregator/src/librss/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/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp
index 12036ec9..ea0134e6 100644
--- a/akregator/src/librss/loader.cpp
+++ b/akregator/src/librss/loader.cpp
@@ -12,7 +12,7 @@
 #include "document.h"
 #include "feeddetector.h"
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kprocess.h>
 #include <kstaticdeleter.h>
 #include <kurl.h>
diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h
index a0c9f29d..0d5ec596 100644
--- a/akregator/src/librss/loader.h
+++ b/akregator/src/librss/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/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp
index f6e5ec18..293d60ad 100644
--- a/akregator/src/mainwindow.cpp
+++ b/akregator/src/mainwindow.cpp
@@ -32,10 +32,10 @@
 
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kkeydialog.h>
 #include <klibloader.h>
diff --git a/akregator/src/mainwindow.h b/akregator/src/mainwindow.h
index bb3ca733..6f0374b6 100644
--- a/akregator/src/mainwindow.h
+++ b/akregator/src/mainwindow.h
@@ -33,7 +33,7 @@
 #include <tdeparts/mainwindow.h>
 #include <tdeparts/browserinterface.h>
 #include <tdeparts/browserextension.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 class KActionCollection;
 class KToggleAction;
diff --git a/akregator/src/mk4storage/CMakeLists.txt b/akregator/src/mk4storage/CMakeLists.txt
index 99ff7a2a..c229d6ec 100644
--- a/akregator/src/mk4storage/CMakeLists.txt
+++ b/akregator/src/mk4storage/CMakeLists.txt
@@ -39,6 +39,6 @@ tde_add_kpart( libakregator_mk4storage_plugin AUTOMOC
     storagefactorymk4impl.cpp
   LINK
     rsslocal-static metakitlocal-static
-    akregatorprivate-shared kio-shared
+    akregatorprivate-shared tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp
index d80cccfb..19523722 100644
--- a/akregator/src/pageviewer.cpp
+++ b/akregator/src/pageviewer.cpp
@@ -33,7 +33,7 @@
 #include <kapplication.h>
 #include <kbookmark.h>
 #include <kbookmarkmanager.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include <tdehtml_settings.h>
 #include <tdehtmlview.h>
diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp
index 299cedd1..74f2ca2a 100644
--- a/akregator/src/viewer.cpp
+++ b/akregator/src/viewer.cpp
@@ -25,7 +25,7 @@
 
 #include <kaction.h>
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tdehtmlview.h>
 #include <kiconloader.h>
 #include <klocale.h>