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

17 files changed, 19 insertions, 19 deletions

diff --git a/kicker/applets/launcher/CMakeLists.txt b/kicker/applets/launcher/CMakeLists.txt
index dab1a8c95..bf5111658 100644
--- a/kicker/applets/launcher/CMakeLists.txt
+++ b/kicker/applets/launcher/CMakeLists.txt
@@ -44,7 +44,7 @@ tde_add_kpart( launcher_panelapplet AUTOMOC
     -Wl,--start-group
       kicker_core-static kicker_buttons-static kicker_ui-static
     -Wl,--end-group
-    kickermain-shared kutils-shared kabc-shared
+    kickermain-shared tdeutils-shared kabc-shared
   DEPENDENCIES libkicker-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kicker/applets/launcher/quickaddappsmenu.cpp b/kicker/applets/launcher/quickaddappsmenu.cpp
index 0eebec315..5b1ff44ca 100644
--- a/kicker/applets/launcher/quickaddappsmenu.cpp
+++ b/kicker/applets/launcher/quickaddappsmenu.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kstandarddirs.h>
 #include <kdesktopfile.h>
 #include <kglobalsettings.h>
-#include <ksycocaentry.h>
+#include <tdesycocaentry.h>
 #include <kservice.h>
 #include <kservicegroup.h>
 
diff --git a/kicker/extensions/kasbar/Makefile.am b/kicker/extensions/kasbar/Makefile.am
index 314f71ff1..e186aad17 100644
--- a/kicker/extensions/kasbar/Makefile.am
+++ b/kicker/extensions/kasbar/Makefile.am
@@ -37,7 +37,7 @@ EXTRA_DIST = $(lnk_DATA)
 
 bin_PROGRAMS = kasbar
 kasbar_SOURCES = kasbarapp.cpp
-kasbar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kasbar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kasbar_LDADD = 	libkasbar.la \
 		$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
 
diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp
index fe5acd1bb..1bbb7d99a 100644
--- a/kicker/extensions/sidebar/sidebarextension.cpp
+++ b/kicker/extensions/sidebar/sidebarextension.cpp
@@ -20,8 +20,8 @@
 #include <kmessagebox.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kparts/part.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/componentfactory.h>
 #include <tqlayout.h>
 #include <konq_historymgr.h>
 #include <krun.h>
diff --git a/kicker/extensions/sidebar/sidebarextension.h b/kicker/extensions/sidebar/sidebarextension.h
index 4d0d1646b..5a117b1ee 100644
--- a/kicker/extensions/sidebar/sidebarextension.h
+++ b/kicker/extensions/sidebar/sidebarextension.h
@@ -19,7 +19,7 @@
 
 #include <kpanelextension.h>
 #include <kurl.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 class TQHBoxLayout;
 class TQVBox;
diff --git a/kicker/kicker/CMakeLists.txt b/kicker/kicker/CMakeLists.txt
index 5ec37ac53..313187cee 100644
--- a/kicker/kicker/CMakeLists.txt
+++ b/kicker/kicker/CMakeLists.txt
@@ -54,5 +54,5 @@ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy
 tde_add_tdeinit_executable( kicker
   SOURCES dummy.cpp
   EMBED kicker_core-static
-  LINK kicker_buttons-static kicker_ui-static kickermain-shared kabc-shared kutils-shared
+  LINK kicker_buttons-static kicker_ui-static kickermain-shared kabc-shared tdeutils-shared
 )
diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp
index 0ec70bc93..30c31401d 100644
--- a/kicker/kicker/core/container_button.cpp
+++ b/kicker/kicker/core/container_button.cpp
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
 #include <kpanelapplet.h>
 #include <kurldrag.h>
 
diff --git a/kicker/kicker/ui/addbutton_mnu.cpp b/kicker/kicker/ui/addbutton_mnu.cpp
index 02c4718d4..a544d0f74 100644
--- a/kicker/kicker/ui/addbutton_mnu.cpp
+++ b/kicker/kicker/ui/addbutton_mnu.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqdragobject.h>
 
-#include <ksycocaentry.h>
+#include <tdesycocaentry.h>
 #include <kservice.h>
 #include <kservicegroup.h>
 #include <kstandarddirs.h>
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp
index 431b62e6c..3d33a825a 100644
--- a/kicker/kicker/ui/itemview.cpp
+++ b/kicker/kicker/ui/itemview.cpp
@@ -62,7 +62,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <twin.h>
 #include <kdebug.h>
 #include <kmimetype.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
 
 #include "client_mnu.h"
 #include "container_base.h"
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index eba68ed1c..6f2c4eacb 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -75,7 +75,7 @@
 #include <dcopref.h>
 #include <konq_popupmenu.h>
 #include <konqbookmarkmanager.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #include "client_mnu.h"
 #include "container_base.h"
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index 6432cf032..1e77a1731 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -40,8 +40,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kprocess.h>
 #include <krun.h>
 #include <kservicegroup.h>
-#include <ksycoca.h>
-#include <ksycocaentry.h>
+#include <tdesycoca.h>
+#include <tdesycocaentry.h>
 #include <kservice.h>
 #include <kurldrag.h>
 #include <kio/job.h>
diff --git a/kicker/kicker/ui/service_mnu.h b/kicker/kicker/ui/service_mnu.h
index 44e35a6c2..dbc8f496c 100644
--- a/kicker/kicker/ui/service_mnu.h
+++ b/kicker/kicker/ui/service_mnu.h
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <set>
 #include <tqvaluevector.h>
 
-#include <ksycocaentry.h>
+#include <tdesycocaentry.h>
 #include <kservice.h>
 #include <kpanelmenu.h>
 #include <kservicegroup.h>
diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp
index fd7bf1952..fdcbacf8f 100644
--- a/kicker/libkicker/menuinfo.cpp
+++ b/kicker/libkicker/menuinfo.cpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <klibloader.h>
 #include <kstandarddirs.h>
 #include <kpanelmenu.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 MenuInfo::MenuInfo(const TQString& desktopFile)
 {
diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp
index 827b0e40c..03e53682b 100644
--- a/kicker/menuext/prefmenu/prefmenu.cpp
+++ b/kicker/menuext/prefmenu/prefmenu.cpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kservice.h>
 #include <kservicegroup.h>
 #include <kstandarddirs.h>
-#include <ksycoca.h>
+#include <tdesycoca.h>
 #include <kurl.h>
 #include <kurldrag.h>
 
diff --git a/kicker/menuext/prefmenu/prefmenu.h b/kicker/menuext/prefmenu/prefmenu.h
index d673fceef..10befe6b2 100644
--- a/kicker/menuext/prefmenu/prefmenu.h
+++ b/kicker/menuext/prefmenu/prefmenu.h
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqmap.h>
 
 #include <kpanelmenu.h>
-#include <ksycocaentry.h>
+#include <tdesycocaentry.h>
 
 typedef TQMap<int, KSycocaEntry::Ptr> EntryMap;
 typedef TQPtrList<TQPopupMenu> PopupMenuList;
diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc
index 19ff376f4..100045339 100644
--- a/kicker/menuext/tom/tom.cc
+++ b/kicker/menuext/tom/tom.cc
@@ -49,7 +49,7 @@ using namespace std;
 #include <kservicegroup.h>
 #include <kstandarddirs.h>
 #include <kstdaction.h>
-#include <ksycocaentry.h>
+#include <tdesycocaentry.h>
 
 #include "menuinfo.h"
 #include "service_mnu.h"
diff --git a/kicker/proxy/Makefile.am b/kicker/proxy/Makefile.am
index 4a7cf1e4c..4dacc51f8 100644
--- a/kicker/proxy/Makefile.am
+++ b/kicker/proxy/Makefile.am
@@ -17,7 +17,7 @@ extensionproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
 
 extensiondebugger_SOURCES = extensiondebugger.cpp
 extensiondebugger_LDADD = ../libkicker/libkickermain.la
-extensiondebugger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+extensiondebugger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 messages:
 	$(XGETTEXT) appletproxy.cpp -o $(podir)/appletproxy.pot