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

8 files changed, 16 insertions, 16 deletions

diff --git a/konqueror/sidebar/CMakeLists.txt b/konqueror/sidebar/CMakeLists.txt
index ba9f677ce..fa9c3cbd5 100644
--- a/konqueror/sidebar/CMakeLists.txt
+++ b/konqueror/sidebar/CMakeLists.txt
@@ -51,7 +51,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.2.0
-  LINK kparts-shared
+  LINK tdeparts-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
@@ -66,6 +66,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK konqsidebarplugin-shared konq-shared kio-shared kutils-shared
+  LINK konqsidebarplugin-shared konq-shared kio-shared tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/konqueror/sidebar/konqsidebar.h b/konqueror/sidebar/konqsidebar.h
index 660fda9df..dfdd2e2e0 100644
--- a/konqueror/sidebar/konqsidebar.h
+++ b/konqueror/sidebar/konqsidebar.h
@@ -17,10 +17,10 @@
 #ifndef KONQSIDEBARPART_H
 #define KONQSIDEBARPART_H
 
-#include <kparts/part.h>
-#include <kparts/factory.h>
-#include <kparts/event.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/event.h>
+#include <tdeparts/browserextension.h>
 #include <tqguardedptr.h>
 #include "sidebar_widget.h"
 #include "konqsidebariface_p.h"
diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h
index b9225edfa..0433261c7 100644
--- a/konqueror/sidebar/konqsidebarplugin.h
+++ b/konqueror/sidebar/konqsidebarplugin.h
@@ -22,8 +22,8 @@
 #include <tqobject.h>
 #include <kurl.h>
 #include <tqstring.h>
-#include <kparts/part.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/part.h>
+#include <tdeparts/browserextension.h>
 #include <kio/job.h>
 #include <tqguardedptr.h>
 #include <kfileitem.h>
diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h
index da5b0888b..c5ee75a8a 100644
--- a/konqueror/sidebar/sidebar_widget.h
+++ b/konqueror/sidebar/sidebar_widget.h
@@ -25,8 +25,8 @@
 #include <kdockwidget.h>
 #include <kurl.h>
 #include <ktoolbar.h>
-#include <kparts/part.h>
-#include <kmultitabbar.h>
+#include <tdeparts/part.h>
+#include <tdemultitabbar.h>
 
 #include "konqsidebarplugin.h"
 #include "konqsidebariface_p.h"
diff --git a/konqueror/sidebar/trees/konqsidebar_tree.h b/konqueror/sidebar/trees/konqsidebar_tree.h
index b70230b9e..5a198eeca 100644
--- a/konqueror/sidebar/trees/konqsidebar_tree.h
+++ b/konqueror/sidebar/trees/konqsidebar_tree.h
@@ -3,9 +3,9 @@
 #include <konqsidebarplugin.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <kparts/part.h>
-#include <kparts/factory.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/browserextension.h>
 #include <kdialogbase.h>
 #include <tqcombobox.h>
 #include <tqstringlist.h>
diff --git a/konqueror/sidebar/web_module/CMakeLists.txt b/konqueror/sidebar/web_module/CMakeLists.txt
index a925474b4..a15866ebd 100644
--- a/konqueror/sidebar/web_module/CMakeLists.txt
+++ b/konqueror/sidebar/web_module/CMakeLists.txt
@@ -35,6 +35,6 @@ set( target konqsidebar_web )
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES web_module.cpp
-  LINK konqsidebarplugin-shared konq-shared khtml-shared
+  LINK konqsidebarplugin-shared konq-shared tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp
index a337c65c6..1386ee0a7 100644
--- a/konqueror/sidebar/web_module/web_module.cpp
+++ b/konqueror/sidebar/web_module/web_module.cpp
@@ -28,7 +28,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <konq_pixmapprovider.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <kstandarddirs.h>
 
 
diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h
index 4e0c3d6d7..b7538bff3 100644
--- a/konqueror/sidebar/web_module/web_module.h
+++ b/konqueror/sidebar/web_module/web_module.h
@@ -20,7 +20,7 @@
 #define web_module_h
 
 #include <assert.h>
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <konqsidebarplugin.h>