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

10 files changed, 12 insertions, 12 deletions

diff --git a/konqueror/keditbookmarks/CMakeLists.txt b/konqueror/keditbookmarks/CMakeLists.txt
index e5954898b..90583b734 100644
--- a/konqueror/keditbookmarks/CMakeLists.txt
+++ b/konqueror/keditbookmarks/CMakeLists.txt
@@ -37,7 +37,7 @@ set( target kbookmarkmerger )
 
 tde_add_executable( ${target}
   SOURCES kbookmarkmerger.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/konqueror/keditbookmarks/DESIGN b/konqueror/keditbookmarks/DESIGN
index 723a279d7..4ebe5e9c5 100644
--- a/konqueror/keditbookmarks/DESIGN
+++ b/konqueror/keditbookmarks/DESIGN
@@ -7,11 +7,11 @@ four main layers:
 various other thingies:
    search           : incremental search implementation
    favicons         : iterating action implementation using bookmarkiterator
-   importers        : forwarders to kio/bookmarks code
-   exporters        : forwarders to kio/bookmarks code, and html export code
+   importers        : forwarders to tdeio/bookmarks code
+   exporters        : forwarders to tdeio/bookmarks code, and html export code
    dcop             : dcop handling, internal interface
    bookmarkiterator : is a baseclass for iterating actions, of sorts...
-   updater          : favicon updating base stuff - kio/tdehtml crap
+   updater          : favicon updating base stuff - tdeio/tdehtml crap
    testlink         : link testing stuff
 
 3 different selection styles:
diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp
index 4bcd50735..23e6fe16d 100644
--- a/konqueror/keditbookmarks/actionsimpl.cpp
+++ b/konqueror/keditbookmarks/actionsimpl.cpp
@@ -45,7 +45,7 @@
 #include <kaction.h>
 #include <kstdaction.h>
 #include <kedittoolbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kkeydialog.h>
 #include <kmessagebox.h>
 #include <kinputdialog.h>
diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp
index edc4a66bb..7780196ca 100644
--- a/konqueror/keditbookmarks/bookmarkinfo.cpp
+++ b/konqueror/keditbookmarks/bookmarkinfo.cpp
@@ -42,7 +42,7 @@
 #include <kedittoolbar.h>
 #include <kmessagebox.h>
 #include <klineedit.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <kbookmarkdrag.h>
 #include <kbookmarkmanager.h>
diff --git a/konqueror/keditbookmarks/importers.cpp b/konqueror/keditbookmarks/importers.cpp
index 3a9a613c1..4c96765e2 100644
--- a/konqueror/keditbookmarks/importers.cpp
+++ b/konqueror/keditbookmarks/importers.cpp
@@ -30,7 +30,7 @@
 #include <klocale.h>
 
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <kbookmarkmanager.h>
 
diff --git a/konqueror/keditbookmarks/importers.h b/konqueror/keditbookmarks/importers.h
index ef23f5527..eee00823a 100644
--- a/konqueror/keditbookmarks/importers.h
+++ b/konqueror/keditbookmarks/importers.h
@@ -24,7 +24,7 @@
 
 #include "commands.h"
 #include <klocale.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <kcommand.h>
 #include <kbookmark.h>
diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp
index 1fa31e967..3a2b14d5e 100644
--- a/konqueror/keditbookmarks/listview.cpp
+++ b/konqueror/keditbookmarks/listview.cpp
@@ -43,7 +43,7 @@
 #include <kaction.h>
 #include <kstdaction.h>
 #include <kedittoolbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kkeydialog.h>
 #include <kmessagebox.h>
 #include <klineedit.h>
diff --git a/konqueror/keditbookmarks/testlink.h b/konqueror/keditbookmarks/testlink.h
index a808202e1..a224279df 100644
--- a/konqueror/keditbookmarks/testlink.h
+++ b/konqueror/keditbookmarks/testlink.h
@@ -22,7 +22,7 @@
 
 #include <tqobject.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kbookmark.h>
 
 #include "listview.h"
diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp
index 8ae218611..eea4d8c58 100644
--- a/konqueror/keditbookmarks/toplevel.cpp
+++ b/konqueror/keditbookmarks/toplevel.cpp
@@ -49,7 +49,7 @@
 #include <kedittoolbar.h>
 #include <kmessagebox.h>
 #include <klineedit.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <kdebug.h>
 
diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp
index 4060b08a8..6d14d89ae 100644
--- a/konqueror/keditbookmarks/updater.cpp
+++ b/konqueror/keditbookmarks/updater.cpp
@@ -30,7 +30,7 @@
 #include <klocale.h>
 #include <kapplication.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <tdeparts/part.h>
 #include <tdeparts/componentfactory.h>