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

26 files changed, 48 insertions, 48 deletions

diff --git a/kopete/kopete/Makefile.am b/kopete/kopete/Makefile.am
index b9ee1df9..ed4305c6 100644
--- a/kopete/kopete/Makefile.am
+++ b/kopete/kopete/Makefile.am
@@ -33,7 +33,7 @@ kopete_SOURCES = main.cpp 	kopeteapplication.cpp kopeteiface.cpp \
 
 kimiface_DIR = $(kde_includes)
 
-kopete_LDFLAGS = -no-undefined $(all_libraries) $(KDE_RPATH) -lktexteditor $(LIB_QT) $(LIB_TDECORE) -ltdefx -lDCOP
+kopete_LDFLAGS = -no-undefined $(all_libraries) $(KDE_RPATH) -ltdetexteditor $(LIB_QT) $(LIB_TDECORE) -ltdefx -lDCOP
 kopete_LDADD = \
 	addcontactwizard/libkopeteaddcontactwizard.la \
 	addaccountwizard/libkopeteaddaccountwizard.la \
diff --git a/kopete/kopete/chatwindow/CMakeLists.txt b/kopete/kopete/chatwindow/CMakeLists.txt
index c88678d6..9110a19a 100644
--- a/kopete/kopete/chatwindow/CMakeLists.txt
+++ b/kopete/kopete/chatwindow/CMakeLists.txt
@@ -46,7 +46,7 @@ tde_add_kpart( libkrichtexteditpart AUTOMOC
 tde_add_kpart( kopete_chatwindow AUTOMOC
   SOURCES
     chatview.cpp kopetechatwindow.cpp chatmemberslistwidget.cpp
-  LINK kopeteui-static kopetechatwindow-static kopete-shared khtml-shared
+  LINK kopeteui-static kopetechatwindow-static kopete-shared tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -56,7 +56,7 @@ tde_add_kpart( kopete_chatwindow AUTOMOC
 tde_add_kpart( kopete_emailwindow AUTOMOC
   SOURCES
     kopeteemailwindow.cpp
-  LINK kopeteui-static kopetechatwindow-static kopete-shared khtml-shared
+  LINK kopeteui-static kopetechatwindow-static kopete-shared tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kopete/kopete/chatwindow/Makefile.am b/kopete/kopete/chatwindow/Makefile.am
index e4784c73..a70cabd3 100644
--- a/kopete/kopete/chatwindow/Makefile.am
+++ b/kopete/kopete/chatwindow/Makefile.am
@@ -6,21 +6,21 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(KOPETE_COMPAT_INCLUDES) -I$(top_srcdir)/kopet
 
 kopete_chatwindow_la_SOURCES = chatview.cpp kopetechatwindow.cpp chatmemberslistwidget.cpp
 kopete_chatwindow_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
-kopete_chatwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
+kopete_chatwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS)
 
 kopete_emailwindow_la_SOURCES = kopeteemailwindow.cpp
 kopete_emailwindow_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
-kopete_emailwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
+kopete_emailwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS)
 
 libkrichtexteditpart_la_SOURCES = krichtexteditpart.cpp
 libkrichtexteditpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH)
-libkrichtexteditpart_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KPARTS) $(LIB_KSPELL) $(LIB_TDEPRINT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+libkrichtexteditpart_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KPARTS) $(LIB_KSPELL) $(LIB_TDEPRINT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 libkopetechatwindow_la_SOURCES = chatmessagepart.cpp emoticonselector.cpp kopeteemoticonaction.cpp \
 	chattexteditpart.cpp krichtexteditpart.cpp kopetechatwindowstylemanager.cpp \
 	kopetechatwindowstyle.cpp 
 libkopetechatwindow_la_LDFLAGS = $(all_libraries) -no-undefined
-libkopetechatwindow_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
+libkopetechatwindow_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS)
 
 partdir = $(kde_datadir)/kopeterichtexteditpart
 part_DATA = kopeterichtexteditpartfull.rc
diff --git a/kopete/kopete/chatwindow/chatmemberslistwidget.cpp b/kopete/kopete/chatwindow/chatmemberslistwidget.cpp
index f7675a44..eed962f9 100644
--- a/kopete/kopete/chatwindow/chatmemberslistwidget.cpp
+++ b/kopete/kopete/chatwindow/chatmemberslistwidget.cpp
@@ -29,7 +29,7 @@
 #include <kabc/addressee.h>
 #include <kabc/vcardconverter.h>
 #include <kdebug.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
 #include <kpopupmenu.h>
 
 #include <tqheader.h>
diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp
index a8bc1c9f..01361872 100644
--- a/kopete/kopete/chatwindow/chatmessagepart.cpp
+++ b/kopete/kopete/chatwindow/chatmessagepart.cpp
@@ -51,10 +51,10 @@
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <kfiledialog.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
 #include <kpopupmenu.h>
 #include <krun.h>
 #include <kstringhandler.h>
@@ -86,7 +86,7 @@
 #include "kopetechatwindowstylemanager.h"
 
 #if !(KDE_IS_VERSION(3,3,90))
-//From  tdelibs/khtml/misc/htmltags.h
+//From  tdelibs/tdehtml/misc/htmltags.h
 //  used in ChatMessagePart::copy()
 #define ID_BLOCKQUOTE 12
 #define ID_BR 14
@@ -972,9 +972,9 @@ void ChatMessagePart::print()
 	view()->print();
 }
 
-void ChatMessagePart::khtmlDrawContentsEvent( khtml::DrawContentsEvent * event) //virtual
+void ChatMessagePart::tdehtmlDrawContentsEvent( tdehtml::DrawContentsEvent * event) //virtual
 {
-	KHTMLPart::khtmlDrawContentsEvent(event);
+	KHTMLPart::tdehtmlDrawContentsEvent(event);
 	//copy(true /*selection only*/); not needed anymore.
 }
 void ChatMessagePart::slotCloseView( bool force )
diff --git a/kopete/kopete/chatwindow/chatmessagepart.h b/kopete/kopete/chatwindow/chatmessagepart.h
index 224e7c0c..10eacd11 100644
--- a/kopete/kopete/chatwindow/chatmessagepart.h
+++ b/kopete/kopete/chatwindow/chatmessagepart.h
@@ -19,7 +19,7 @@
 #ifndef CHATMESSAGEPART_H
 #define CHATMESSAGEPART_H
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <dom/html_element.h>
 
 #include <tqvaluelist.h>
@@ -166,7 +166,7 @@ private slots:
 	void slotUpdateHeaderPhoto();
 
 protected:
-	virtual void khtmlDrawContentsEvent( khtml::DrawContentsEvent * );
+	virtual void tdehtmlDrawContentsEvent( tdehtml::DrawContentsEvent * );
 	
 private:
 	void readOverrides();
diff --git a/kopete/kopete/chatwindow/chatview.cpp b/kopete/kopete/chatwindow/chatview.cpp
index 97263b8a..34324b45 100644
--- a/kopete/kopete/chatwindow/chatview.cpp
+++ b/kopete/kopete/chatwindow/chatview.cpp
@@ -43,7 +43,7 @@
 #include <kurldrag.h>
 #include <kglobalsettings.h>
 #include <kgenericfactory.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <ksyntaxhighlighter.h>
 #include <tqscrollview.h>
 #include <tqtimer.h>
@@ -122,7 +122,7 @@ ChatView::ChatView( Kopete::ChatSession *mgr, ChatWindowPlugin *parent, const ch
 	setView(viewDock);
 
 	//It is possible to drag and drop on this widget.
-	// I had to disable the acceptDrop in the khtml widget to be able to intercept theses events.
+	// I had to disable the acceptDrop in the tdehtml widget to be able to intercept theses events.
 	setAcceptDrops(true);
 	viewDock->setAcceptDrops(false);
 
diff --git a/kopete/kopete/chatwindow/kopetechatwindow.h b/kopete/kopete/chatwindow/kopetechatwindow.h
index 4dbb3d1b..70c72b94 100644
--- a/kopete/kopete/chatwindow/kopetechatwindow.h
+++ b/kopete/kopete/chatwindow/kopetechatwindow.h
@@ -19,7 +19,7 @@
 #ifndef KOPETECHATWINDOW_H
 #define KOPETECHATWINDOW_H
 
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 #include <tqmovie.h>
 #include "kopetecontact.h"
 #include "tdeversion.h"
diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
index d3cef26e..7cb9a03f 100644
--- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp
+++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
@@ -41,7 +41,7 @@
 #include <kedittoolbar.h>
 #include <kfontdialog.h>
 #include <kglobalsettings.h>
-#include <khtmlview.h>
+#include <tdehtmlview.h>
 #include <kiconloader.h>
 #include <kkeydialog.h>
 #include <klibloader.h>
diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.h b/kopete/kopete/chatwindow/kopeteemailwindow.h
index a0f596f5..7d7991ca 100644
--- a/kopete/kopete/chatwindow/kopeteemailwindow.h
+++ b/kopete/kopete/chatwindow/kopeteemailwindow.h
@@ -23,7 +23,7 @@
 #include "kopeteview.h"
 #include "kopeteviewplugin.h"
 #include <kmainwindow.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
 namespace KParts { struct URLArgs; }
 class EmailWindowPlugin;
diff --git a/kopete/kopete/chatwindow/krichtexteditpart.cpp b/kopete/kopete/chatwindow/krichtexteditpart.cpp
index a42fd718..6f3bdf25 100644
--- a/kopete/kopete/chatwindow/krichtexteditpart.cpp
+++ b/kopete/kopete/chatwindow/krichtexteditpart.cpp
@@ -9,7 +9,7 @@
 #include <tqapplication.h>
 #include <tqclipboard.h>
 #include <tqevent.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
 #include <tqrichtext_p.h>
 
 #include "krichtexteditpart.h"
diff --git a/kopete/kopete/chatwindow/krichtexteditpart.h b/kopete/kopete/chatwindow/krichtexteditpart.h
index 32050cd6..e5159d0f 100644
--- a/kopete/kopete/chatwindow/krichtexteditpart.h
+++ b/kopete/kopete/chatwindow/krichtexteditpart.h
@@ -3,7 +3,7 @@
 #ifndef KRICHTEXTEDITPART_H
 #define KRICHTEXTEDITPART_H
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 #include <tqfont.h>
 #include <tqcolor.h>
diff --git a/kopete/kopete/chatwindow/tests/Makefile.am b/kopete/kopete/chatwindow/tests/Makefile.am
index 40a864d6..cb5b1e45 100644
--- a/kopete/kopete/chatwindow/tests/Makefile.am
+++ b/kopete/kopete/chatwindow/tests/Makefile.am
@@ -1,17 +1,17 @@
 AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_ASCII_CAST -DQT_NO_COMPAT \
 	$(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/kopete/chatwindow -I$(top_srcdir)/kopete/libkopete $(all_includes) -DSRCDIR=\"$(top_srcdir)/kopete/kopete/chatwindow/tests\"
 METASOURCES = AUTO
-check_LTLIBRARIES = kunittest_chatwindowstyle_test.la kunittest_chatwindowstylerendering_test.la
+check_LTLIBRARIES = tdeunittest_chatwindowstyle_test.la tdeunittest_chatwindowstylerendering_test.la
 
-kunittest_chatwindowstyle_test_la_SOURCES = chatwindowstyle_test.cpp
-kunittest_chatwindowstyle_test_la_LIBADD = -lkunittest ../libkopetechatwindow.la
-kunittest_chatwindowstyle_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
+tdeunittest_chatwindowstyle_test_la_SOURCES = chatwindowstyle_test.cpp
+tdeunittest_chatwindowstyle_test_la_LIBADD = -ltdeunittest ../libkopetechatwindow.la
+tdeunittest_chatwindowstyle_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
 
-kunittest_chatwindowstylerendering_test_la_SOURCES = chatwindowstylerendering_test.cpp
-kunittest_chatwindowstylerendering_test_la_LIBADD = -lkunittest ../../../libkopete/libkopete.la ../libkopetechatwindow.la
-kunittest_chatwindowstylerendering_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
+tdeunittest_chatwindowstylerendering_test_la_SOURCES = chatwindowstylerendering_test.cpp
+tdeunittest_chatwindowstylerendering_test_la_LIBADD = -ltdeunittest ../../../libkopete/libkopete.la ../libkopetechatwindow.la
+tdeunittest_chatwindowstylerendering_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
 
 check-local:
-	kunittestmodrunner
+	tdeunittestmodrunner
 guicheck:
-	kunittestmod $(PWD) 
+	tdeunittestmod $(PWD) 
diff --git a/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp
index cd44bc02..e095b458 100644
--- a/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp
+++ b/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp
@@ -15,7 +15,7 @@
     *************************************************************************
 */
 
-#include <kunittest/module.h>
+#include <tdeunittest/module.h>
 #include "chatwindowstyle_test.h"
 
 #include <stdlib.h>
@@ -25,7 +25,7 @@
 
 #include <kopetechatwindowstyle.h>
 
-KUNITTEST_MODULE( kunittest_chatwindowstyle_test, "KopeteChatWindowTestSuite");
+KUNITTEST_MODULE( tdeunittest_chatwindowstyle_test, "KopeteChatWindowTestSuite");
 KUNITTEST_MODULE_REGISTER_TESTER( ChatWindowStyle_Test );
 
 void ChatWindowStyle_Test::allTests()
diff --git a/kopete/kopete/chatwindow/tests/chatwindowstyle_test.h b/kopete/kopete/chatwindow/tests/chatwindowstyle_test.h
index 7cf2b912..4e7b9b73 100644
--- a/kopete/kopete/chatwindow/tests/chatwindowstyle_test.h
+++ b/kopete/kopete/chatwindow/tests/chatwindowstyle_test.h
@@ -17,7 +17,7 @@
 #ifndef CHATWINDOWSTYLE_TEST_H
 #define CHATWINDOWSTYLE_TEST_H
 
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 
 class ChatWindowStyle;
 
diff --git a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
index d195434d..27d54264 100644
--- a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
+++ b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp
@@ -28,7 +28,7 @@
 
 // KDE includes
 #include <kapplication.h>
-#include <kunittest/module.h>
+#include <tdeunittest/module.h>
 #include <kinstance.h>
 #include <kdebug.h>
 #include <kglobal.h>
@@ -46,7 +46,7 @@
 
 using namespace Kopete;
 
-KUNITTEST_MODULE( kunittest_chatwindowstylerendering_test, "KopeteChatWindowTestSuite");
+KUNITTEST_MODULE( tdeunittest_chatwindowstylerendering_test, "KopeteChatWindowTestSuite");
 KUNITTEST_MODULE_REGISTER_TESTER( ChatWindowStyleRendering_Test );
 
 // Reimplement Kopete::Contact and its abstract method
diff --git a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.h b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.h
index 992d00a4..3f213d40 100644
--- a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.h
+++ b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.h
@@ -17,7 +17,7 @@
 #ifndef CHATWINDOWSTYLERENDERING_TEST_H
 #define CHATWINDOWSTYLERENDERING_TEST_H
 
-#include <kunittest/tester.h>
+#include <tdeunittest/tester.h>
 
 // HACK: Needed to access private methods of ChatMessagePart.
 #define private public
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)
diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp
index 200dfaf2..e271801e 100644
--- a/kopete/kopete/contactlist/kopetecontactlistview.cpp
+++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp
@@ -42,7 +42,7 @@
 #include <kmessagebox.h>
 #include <kpopupmenu.h>
 #include <kurldrag.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
 #include <kabc/stdaddressbook.h>
 #include <kabc/vcardconverter.h>
 
diff --git a/kopete/kopete/kconf_update/Makefile.am b/kopete/kopete/kconf_update/Makefile.am
index 8d05b1a2..7ae291dd 100644
--- a/kopete/kopete/kconf_update/Makefile.am
+++ b/kopete/kopete/kconf_update/Makefile.am
@@ -17,15 +17,15 @@ kconf_PROGRAMS = kopete-account-kconf_update kopete-pluginloader2-kconf_update \
 kconfdir = $(libdir)/kconf_update_bin
 
 kopete_account_kconf_update_SOURCES = kopete-account-kconf_update.cpp
-kopete_account_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kopete_account_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kopete_account_kconf_update_LDADD = $(LIB_QT)
 
 kopete_pluginloader2_kconf_update_SOURCES = kopete-pluginloader2.cpp
-kopete_pluginloader2_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kopete_pluginloader2_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kopete_pluginloader2_kconf_update_LDADD = $(LIB_QT)
 
 kopete_nameTracking_kconf_update_SOURCES = kopete-nameTracking.cpp
-kopete_nameTracking_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kopete_nameTracking_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kopete_nameTracking_kconf_update_LDADD = $(LIB_QT) $(LIB_TDECORE)
 
 # vim: set noet: