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

13 files changed, 19 insertions, 19 deletions

diff --git a/amor/Makefile.am b/amor/Makefile.am
index 72224d4..4dba6ab 100644
--- a/amor/Makefile.am
+++ b/amor/Makefile.am
@@ -15,7 +15,7 @@ amor_SOURCES	= amordialog.cpp amor.cpp amorwidget.cpp main.cpp amoranim.cpp amor
 include_HEADERS = AmorIface.h
 
 # the library search path
-amor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+amor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 # the libraries to link against. Be aware of the order. First the libraries,
 # that depend on the following ones.
diff --git a/kodo/Makefile.am b/kodo/Makefile.am
index 939d552..83ffb06 100644
--- a/kodo/Makefile.am
+++ b/kodo/Makefile.am
@@ -7,7 +7,7 @@ kodo_SOURCES = main.cpp kodometer.cpp kimagenumber.cpp
 METASOURCES = AUTO
 
 # the library search path.
-kodo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kodo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kodo_LDADD   = $(LIB_TDEUI)
 
 messages:
diff --git a/kteatime/Makefile.am b/kteatime/Makefile.am
index a39e56a..9178d19 100644
--- a/kteatime/Makefile.am
+++ b/kteatime/Makefile.am
@@ -6,7 +6,7 @@ bin_PROGRAMS = kteatime
 kteatime_SOURCES = main.cpp toplevel.cpp tealist.cpp timeedit.cpp
 
 kteatime_METASOURCES = AUTO
-kteatime_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kteatime_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 # LIB_KIO needed for KNotifyDialog
 kteatime_LDADD = $(LIB_TDEUI) $(LIB_KIO)
diff --git a/ktux/CMakeLists.txt b/ktux/CMakeLists.txt
index 384c8d5..cd18957 100644
--- a/ktux/CMakeLists.txt
+++ b/ktux/CMakeLists.txt
@@ -29,7 +29,7 @@ link_directories(
 tde_add_executable( ktux AUTOMOC
   SOURCES spriteanim.cpp spritemisc.cpp
     spritepm.cpp sprite.cpp
-  LINK kio-shared kscreensaver-shared
+  LINK kio-shared tdescreensaver-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/ktux/Makefile.am b/ktux/Makefile.am
index f34b50a..2a32b32 100644
--- a/ktux/Makefile.am
+++ b/ktux/Makefile.am
@@ -12,10 +12,10 @@ bin_PROGRAMS = ktux
 INCLUDES         = $(all_includes)
 
 # the library search path. 
-ktux_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+ktux_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 # the libraries to link against.
-ktux_LDADD   = $(LIB_TDEUI) -lkscreensaver
+ktux_LDADD   = $(LIB_TDEUI) -ltdescreensaver
 
 # which sources should be compiled for ktux
 ktux_SOURCES =	spriteanim.cpp spritemisc.cpp spritepm.cpp sprite.cpp
diff --git a/ktux/ktux.desktop b/ktux/ktux.desktop
index 77e372f..01f71c6 100644
--- a/ktux/ktux.desktop
+++ b/ktux/ktux.desktop
@@ -86,7 +86,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=ktux -window-id %w
diff --git a/ktux/sprite.cpp b/ktux/sprite.cpp
index c87fd9c..8110396 100644
--- a/ktux/sprite.cpp
+++ b/ktux/sprite.cpp
@@ -23,7 +23,7 @@
 #include "sprite.moc"
 
 
-// libkscreensaver interface
+// libtdescreensaver interface
 extern "C"
 {
     KDE_EXPORT const char *kss_applicationName = "ktux";
diff --git a/ktux/sprite.h b/ktux/sprite.h
index 9b60abe..58c27f2 100644
--- a/ktux/sprite.h
+++ b/ktux/sprite.h
@@ -13,7 +13,7 @@
 #include <tqptrlist.h>
 #include <tqstrlist.h>
 #include <tqcanvas.h>
-#include <kscreensaver.h>
+#include <tdescreensaver.h>
 #include "spriteanim.h"
 
 //-----------------------------------------------------------------------------
diff --git a/kweather/CMakeLists.txt b/kweather/CMakeLists.txt
index a63f788..4c93de2 100644
--- a/kweather/CMakeLists.txt
+++ b/kweather/CMakeLists.txt
@@ -29,7 +29,7 @@ link_directories(
 tde_add_tdeinit_executable( kweatherreport AUTOMOC
   SOURCES reportmain.cpp weatherservice.stub
     reportview.cpp
-  LINK tdeui-shared khtml-shared
+  LINK tdeui-shared tdehtml-shared
 )
 
 
@@ -84,7 +84,7 @@ tde_add_kpart( weather_panelapplet AUTOMOC
   SOURCES reportview.cpp kweather.cpp
     dockwidget.cpp weatherIface.skel
     weatherservice.stub weatherbutton.cpp
-  LINK khtml-shared
+  LINK tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -105,7 +105,7 @@ tde_add_kpart( kcm_weatherservice AUTOMOC
   SOURCES kcmweatherservice.cpp
     serviceconfigwidget.cpp serviceconfigdata.ui
     weatherservice.stub
-  LINK tdeui-shared khtml-shared
+  LINK tdeui-shared tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kweather/Makefile.am b/kweather/Makefile.am
index 6925b27..7feacb8 100644
--- a/kweather/Makefile.am
+++ b/kweather/Makefile.am
@@ -56,7 +56,7 @@ kcm_weatherservice_la_LIBADD = $(LIB_TDEUI)
 #globaladddir   = $(kde_datadir)/konqsidebartng/add
 #globaladd_DATA = weatherbar_add.desktop
 
-kweatherservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kweatherservice_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kweatherservice_LDADD = $(LIB_KIO)
 kweatherservice_SOURCES = main.cpp metar_parser.cpp weatherlib.cpp \
                           weatherservice.cpp weatherservice.skel \
diff --git a/kweather/reportview.cpp b/kweather/reportview.cpp
index afe59b4..4825489 100644
--- a/kweather/reportview.cpp
+++ b/kweather/reportview.cpp
@@ -19,8 +19,8 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <khtml_part.h>
-#include <khtmlview.h>
+#include <tdehtml_part.h>
+#include <tdehtmlview.h>
 #include <kglobalsettings.h>
 
 #include <tqvbox.h>
diff --git a/kweather/weatherbar.h b/kweather/weatherbar.h
index a3c86f8..6938e69 100644
--- a/kweather/weatherbar.h
+++ b/kweather/weatherbar.h
@@ -23,9 +23,9 @@
 #define __KONTQSIDEBARWEATHER_H__
 
 #include <konqsidebarplugin.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 <tqdict.h>
 #include <dcopobject.h>
 #include <tqlayout.h>
diff --git a/kworldwatch/Makefile.am b/kworldwatch/Makefile.am
index 3d21570..bd4cdf0 100644
--- a/kworldwatch/Makefile.am
+++ b/kworldwatch/Makefile.am
@@ -11,7 +11,7 @@ INCLUDES = $(all_includes)
 
 kworldclock_SOURCES = main.cpp 
 kworldclock_LDADD = libww.la $(LIB_TDEUI) -ltdefx
-kworldclock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kworldclock_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 xdg_apps_DATA= kworldclock.desktop