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

7 files changed, 7 insertions, 7 deletions

diff --git a/kopete/kopete/config/accounts/Makefile.am b/kopete/kopete/config/accounts/Makefile.am
index 772b771e..139d9b2e 100644
--- a/kopete/kopete/config/accounts/Makefile.am
+++ b/kopete/kopete/config/accounts/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(KOPETE_COMPAT_INCLUDES) $(all_includes) -I$(k
 kde_module_LTLIBRARIES = kcm_kopete_accountconfig.la
 
 kcm_kopete_accountconfig_la_SOURCES = kopeteaccountconfigbase.ui kopeteaccountconfig.cpp
-kcm_kopete_accountconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kcm_kopete_accountconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kcm_kopete_accountconfig_la_LIBADD  = ../../../libkopete/libkopete.la ../../addaccountwizard/libkopeteaddaccountwizard.la $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
 
 service_DATA = kopete_accountconfig.desktop
diff --git a/kopete/kopete/config/appearance/CMakeLists.txt b/kopete/kopete/config/appearance/CMakeLists.txt
index f24d022b..a0bdcb54 100644
--- a/kopete/kopete/config/appearance/CMakeLists.txt
+++ b/kopete/kopete/config/appearance/CMakeLists.txt
@@ -38,6 +38,6 @@ tde_add_kpart( kcm_kopete_appearanceconfig AUTOMOC
     appearanceconfig_emoticons.ui emoticonseditdialog.cpp
     emoticonseditwidget.ui tooltipeditdialog.cpp
     tooltipeditwidget.ui
-  LINK kopetechatwindow-static kopete-shared khtml-shared knewstuff-shared
+  LINK kopetechatwindow-static kopete-shared tdehtml-shared knewstuff-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kopete/kopete/config/appearance/Makefile.am b/kopete/kopete/config/appearance/Makefile.am
index f349297c..a555ef57 100644
--- a/kopete/kopete/config/appearance/Makefile.am
+++ b/kopete/kopete/config/appearance/Makefile.am
@@ -13,7 +13,7 @@ kcm_kopete_appearanceconfig_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) \
 	$(all_libraries)
 kcm_kopete_appearanceconfig_la_LIBADD = ../../../libkopete/libkopete.la  \
 	../../../kopete/chatwindow/libkopetechatwindow.la \
-	-lktexteditor $(LIB_KOPETECOMPAT) $(LIB_KUTILS) $(LIB_KNEWSTUFF)
+	-ltdetexteditor $(LIB_KOPETECOMPAT) $(LIB_KUTILS) $(LIB_KNEWSTUFF)
 
 service_DATA = kopete_appearanceconfig.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp
index 106622c9..63c51b89 100644
--- a/kopete/kopete/config/appearance/appearanceconfig.cpp
+++ b/kopete/kopete/config/appearance/appearanceconfig.cpp
@@ -48,7 +48,7 @@
 #include <kfontrequester.h>
 #include <kgenericfactory.h>
 #include <kio/netaccess.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kopete/kopete/config/avdevice/Makefile.am b/kopete/kopete/config/avdevice/Makefile.am
index a2542902..24ace923 100644
--- a/kopete/kopete/config/avdevice/Makefile.am
+++ b/kopete/kopete/config/avdevice/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kcm_kopete_avdeviceconfig.la
 kcm_kopete_avdeviceconfig_la_SOURCES = avdeviceconfig.cpp \
 	avdeviceconfig_videoconfig.ui
 
-kcm_kopete_avdeviceconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kcm_kopete_avdeviceconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 kcm_kopete_avdeviceconfig_la_LIBADD  = ../../../libkopete/libkopete.la \
 	../../../libkopete/avdevice/libkopete_videodevice.la \
diff --git a/kopete/kopete/config/behavior/Makefile.am b/kopete/kopete/config/behavior/Makefile.am
index 6c504186..ef04b4ff 100644
--- a/kopete/kopete/config/behavior/Makefile.am
+++ b/kopete/kopete/config/behavior/Makefile.am
@@ -7,7 +7,7 @@ kcm_kopete_behaviorconfig_la_SOURCES = \
 	kopeteawayconfigbase.ui  \
 	behaviorconfig_chat.ui behaviorconfig_general.ui behaviorconfig_events.ui behaviorconfig.cpp
 
-kcm_kopete_behaviorconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kcm_kopete_behaviorconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 kcm_kopete_behaviorconfig_la_LIBADD  = ../../../libkopete/libkopete.la \
 	$(LIB_KOPETECOMPAT) $(LIB_KUTILS)
diff --git a/kopete/kopete/config/identity/Makefile.am b/kopete/kopete/config/identity/Makefile.am
index fc3a876e..1aa6721d 100644
--- a/kopete/kopete/config/identity/Makefile.am
+++ b/kopete/kopete/config/identity/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_kopete_identityconfig.la
 kcm_kopete_identityconfig_la_SOURCES = kopeteidentityconfigbase.ui \
 		kopeteidentityconfig.cpp globalidentitiesmanager.cpp kopeteidentityconfigpreferences.kcfgc
 kcm_kopete_identityconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
-kcm_kopete_identityconfig_la_LIBADD  = -lkabc ../../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kcm_kopete_identityconfig_la_LIBADD  = -lkabc ../../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 service_DATA = kopete_identityconfig.desktop
 servicedir = $(kde_servicesdir)