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

8 files changed, 11 insertions, 11 deletions

diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt
index b2e462853..b9751944b 100644
--- a/kdesktop/CMakeLists.txt
+++ b/kdesktop/CMakeLists.txt
@@ -69,7 +69,7 @@ tde_add_executable( kcheckrunning
 
 tde_add_executable( kxdglauncher
   SOURCES kxdglauncher.cpp
-  LINK kutils-shared
+  LINK tdeutils-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
@@ -92,7 +92,7 @@ tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
   LINK
     kdesktopsettings-static bgnd-static dmctl-static
-    konq-shared kutils-shared
+    konq-shared tdeutils-shared
     ${XRENDER_LIBRARIES} ${XCURSOR_LIBRARIES} Xext dl
     ${XSS_LIBRARIES}
 )
diff --git a/kdesktop/ConfigureChecks.cmake b/kdesktop/ConfigureChecks.cmake
index da78021ff..87e2213ce 100644
--- a/kdesktop/ConfigureChecks.cmake
+++ b/kdesktop/ConfigureChecks.cmake
@@ -9,7 +9,7 @@
 #
 #################################################
 
-# FIXME: KSCREENSAVER_PAM_SERVICE should be "kde" or "kscreensaver"?
+# FIXME: KSCREENSAVER_PAM_SERVICE should be "kde" or "tdescreensaver"?
 
 if( WITH_PAM AND (NOT DEFINED KSCREENSAVER_PAM_SERVICE) )
   set( KSCREENSAVER_PAM_SERVICE "kde" CACHE INTERNAL "" )
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc
index 6c5c97eaf..073a69a5a 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cc
@@ -51,7 +51,7 @@
 #include <klocale.h>
 #include <kio/netaccess.h>
 #include <kprocess.h>
-#include <ksycoca.h>
+#include <tdesycoca.h>
 #include <ktempfile.h>
 #include <kmessagebox.h>
 #include <kglobalaccel.h>
diff --git a/kdesktop/kwebdesktop/CMakeLists.txt b/kdesktop/kwebdesktop/CMakeLists.txt
index 3df328c0c..741b8df34 100644
--- a/kdesktop/kwebdesktop/CMakeLists.txt
+++ b/kdesktop/kwebdesktop/CMakeLists.txt
@@ -37,6 +37,6 @@ set( ${target}_SRCS
 
 tde_add_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK khtml-shared
+  LINK tdehtml-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kdesktop/kwebdesktop/Makefile.am b/kdesktop/kwebdesktop/Makefile.am
index 45634b174..2d0d21bdb 100644
--- a/kdesktop/kwebdesktop/Makefile.am
+++ b/kdesktop/kwebdesktop/Makefile.am
@@ -7,7 +7,7 @@ bin_PROGRAMS = 	kwebdesktop
 METASOURCES = AUTO
 
 kwebdesktop_SOURCES = kwebdesktop.cpp kwebdesktopsettings.kcfgc 
-kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 kdesktop_kwebdesktop_data_DATA = kwebdesktop.desktop
 kdesktop_kwebdesktop_datadir = $(kde_datadir)/kdesktop/programs
diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp
index 58fd0b7b8..ff60d0fd6 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.cpp
+++ b/kdesktop/kwebdesktop/kwebdesktop.cpp
@@ -33,7 +33,7 @@
 #include <tqscrollview.h>
 #include "kwebdesktop.h"
 #include <kmimetype.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include "kwebdesktopsettings.h"
 
 #include "kwebdesktop.moc"
@@ -129,7 +129,7 @@ int main( int argc, char **argv )
     TDEIO::SimpleJob::removeOnHold(); // Kill any slave that was put on hold.
     delete webDesktop;
     delete run;
-    //khtml::Cache::clear();
+    //tdehtml::Cache::clear();
 
     return ret;
 }
diff --git a/kdesktop/kwebdesktop/kwebdesktop.h b/kdesktop/kwebdesktop/kwebdesktop.h
index 089a25673..2641378cf 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.h
+++ b/kdesktop/kwebdesktop/kwebdesktop.h
@@ -21,8 +21,8 @@
 
 #include <tqobject.h>
 #include <tqcstring.h>
-#include <kparts/browserextension.h>
-#include <khtml_part.h>
+#include <tdeparts/browserextension.h>
+#include <tdehtml_part.h>
 
 namespace TDEIO { class Job; }
 
diff --git a/kdesktop/lock/Makefile.am b/kdesktop/lock/Makefile.am
index 158541a6f..5b6ccfd21 100644
--- a/kdesktop/lock/Makefile.am
+++ b/kdesktop/lock/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am of tdebase/kdesktop/lock
 
 INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/tdmlib $(GLINC) $(all_includes)
-kdesktop_lock_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kdesktop_lock_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kdesktop_lock_LDADD    = ../libkdesktopsettings.la ../../tdmlib/libdmctl.la $(LIB_KIO) $(LIB_XF86MISC) $(GLLIB)
 
 ####### Files