Additional k => tde renaming and fixes

20 files changed, 46 insertions, 46 deletions

diff --git a/kopete/plugins/addbookmarks/Makefile.am b/kopete/plugins/addbookmarks/Makefile.am
index 006ed524..409535f6 100644
--- a/kopete/plugins/addbookmarks/Makefile.am
+++ b/kopete/plugins/addbookmarks/Makefile.am
@@ -6,12 +6,12 @@ noinst_HEADERS = addbookmarksplugin.h addbookmarkspreferences.h \
 
 kde_module_LTLIBRARIES = kopete_addbookmarks.la kcm_kopete_addbookmarks.la
 
-kopete_addbookmarks_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_addbookmarks_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_addbookmarks_la_LIBADD = ../../libkopete/libkopete.la
 kopete_addbookmarks_la_SOURCES = addbookmarksplugin.cpp addbookmarksprefssettings.cpp
 
-kcm_kopete_addbookmarks_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kcm_kopete_addbookmarks_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KUTILS)
+kcm_kopete_addbookmarks_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_addbookmarks_la_LIBADD = ../../libkopete/libkopete.la $(LIB_TDEUTILS)
 kcm_kopete_addbookmarks_la_SOURCES = addbookmarkspreferences.cpp addbookmarksprefsui.ui \
                                      addbookmarksprefssettings.cpp
 
diff --git a/kopete/plugins/alias/Makefile.am b/kopete/plugins/alias/Makefile.am
index ee84eb0c..e5de8be3 100644
--- a/kopete/plugins/alias/Makefile.am
+++ b/kopete/plugins/alias/Makefile.am
@@ -4,12 +4,12 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kopete_alias.la kcm_kopete_alias.la
 
 kopete_alias_la_SOURCES     = aliasplugin.cpp
-kopete_alias_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_alias_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_alias_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_alias_la_SOURCES     = aliaspreferences.cpp aliasdialogbase.ui aliasdialog.ui editaliasdialog.cpp
-kcm_kopete_alias_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kcm_kopete_alias_la_LIBADD      = $(LIB_KOPETECOMPAT) $(LIB_KUTILS) ../../libkopete/libkopete.la
+kcm_kopete_alias_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_alias_la_LIBADD      = $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS) ../../libkopete/libkopete.la
 
 service_DATA = kopete_alias.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/plugins/autoreplace/Makefile.am b/kopete/plugins/autoreplace/Makefile.am
index 3a0d6440..5ac7bcd8 100644
--- a/kopete/plugins/autoreplace/Makefile.am
+++ b/kopete/plugins/autoreplace/Makefile.am
@@ -6,12 +6,12 @@ SUBDIRS = icons
 kde_module_LTLIBRARIES = kopete_autoreplace.la kcm_kopete_autoreplace.la
 
 kopete_autoreplace_la_SOURCES     = autoreplaceplugin.cpp autoreplaceconfig.cpp
-kopete_autoreplace_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_autoreplace_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_autoreplace_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_autoreplace_la_SOURCES     = autoreplacepreferences.cpp autoreplaceconfig.cpp autoreplaceprefs.ui
-kcm_kopete_autoreplace_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kcm_kopete_autoreplace_la_LIBADD      = ../../libkopete/libkopete.la $(LIB_KUTILS)
+kcm_kopete_autoreplace_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_autoreplace_la_LIBADD      = ../../libkopete/libkopete.la $(LIB_TDEUTILS)
 
 service_DATA = kopete_autoreplace.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/plugins/connectionstatus/Makefile.am b/kopete/plugins/connectionstatus/Makefile.am
index 11e3aee9..e341af6d 100644
--- a/kopete/plugins/connectionstatus/Makefile.am
+++ b/kopete/plugins/connectionstatus/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kopete_connectionstatus.la
 
 kopete_connectionstatus_la_SOURCES     = connectionstatusplugin.cpp
-kopete_connectionstatus_la_LDFLAGS     = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_connectionstatus_la_LDFLAGS     = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_connectionstatus_la_LIBADD      = ../../libkopete/libkopete.la
 
 service_DATA = kopete_connectionstatus.desktop
diff --git a/kopete/plugins/contactnotes/Makefile.am b/kopete/plugins/contactnotes/Makefile.am
index 95a1e6b7..555f351b 100644
--- a/kopete/plugins/contactnotes/Makefile.am
+++ b/kopete/plugins/contactnotes/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kopete_contactnotes.la
 
 kopete_contactnotes_la_SOURCES     = contactnotesplugin.cpp contactnotesedit.cpp
-kopete_contactnotes_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_contactnotes_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_contactnotes_la_LIBADD      = ../../libkopete/libkopete.la -ltdeio
 
 service_DATA = kopete_contactnotes.desktop
diff --git a/kopete/plugins/cryptography/Makefile.am b/kopete/plugins/cryptography/Makefile.am
index 8e90bbfc..ff3e4ba7 100644
--- a/kopete/plugins/cryptography/Makefile.am
+++ b/kopete/plugins/cryptography/Makefile.am
@@ -7,12 +7,12 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kopete_cryptography.la kcm_kopete_cryptography.la
 
 kopete_cryptography_la_SOURCES     = cryptographyplugin.cpp kgpginterface.cpp cryptographyguiclient.cpp cryptographyselectuserkey.cpp cryptographyuserkey_ui.ui popuppublic.cpp kgpgselkey.cpp
-kopete_cryptography_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_cryptography_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_cryptography_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_cryptography_la_SOURCES = cryptographypreferences.cpp cryptographyprefsbase.ui  kgpgselkey.cpp
-kcm_kopete_cryptography_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kcm_kopete_cryptography_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_KUTILS)
+kcm_kopete_cryptography_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_cryptography_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_TDEUTILS)
 
 service_DATA = kopete_cryptography.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/plugins/highlight/Makefile.am b/kopete/plugins/highlight/Makefile.am
index 0340c2f5..c05b9698 100644
--- a/kopete/plugins/highlight/Makefile.am
+++ b/kopete/plugins/highlight/Makefile.am
@@ -7,12 +7,12 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kopete_highlight.la kcm_kopete_highlight.la
 
 kopete_highlight_la_SOURCES = highlightplugin.cpp highlightconfig.cpp filter.cpp
-kopete_highlight_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_highlight_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_highlight_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_highlight_la_SOURCES = highlightprefsbase.ui highlightpreferences.cpp filter.cpp highlightconfig.cpp
-kcm_kopete_highlight_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kcm_kopete_highlight_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
+kcm_kopete_highlight_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_highlight_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS)
 
 service_DATA = kopete_highlight.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/plugins/history/Makefile.am b/kopete/plugins/history/Makefile.am
index c0066373..ec87074d 100644
--- a/kopete/plugins/history/Makefile.am
+++ b/kopete/plugins/history/Makefile.am
@@ -7,12 +7,12 @@ kde_module_LTLIBRARIES = kopete_history.la kcm_kopete_history.la
 kopete_history_la_SOURCES = historyplugin.cpp historydialog.cpp historyviewer.ui\
 	historylogger.cpp converter.cpp historyguiclient.cpp historyconfig.kcfgc
 
-kopete_history_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_TDEHTML) $(LIB_KUTILS)
+kopete_history_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEHTML) $(LIB_TDEUTILS)
 kopete_history_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_history_la_SOURCES = historyprefsui.ui historypreferences.cpp  historyconfig.kcfgc
-kcm_kopete_history_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_TDEHTML) $(LIB_KUTILS)
-kcm_kopete_history_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_KUTILS)
+kcm_kopete_history_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEHTML) $(LIB_TDEUTILS)
+kcm_kopete_history_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_TDEUTILS)
 
 service_DATA = kopete_history.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/plugins/latex/Makefile.am b/kopete/plugins/latex/Makefile.am
index 74b977df..32198ae9 100644
--- a/kopete/plugins/latex/Makefile.am
+++ b/kopete/plugins/latex/Makefile.am
@@ -7,12 +7,12 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kopete_latex.la kcm_kopete_latex.la
 
 kopete_latex_la_SOURCES = latexplugin.cpp latexconfig.kcfgc latexguiclient.cpp
-kopete_latex_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_latex_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_latex_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_latex_la_SOURCES = latexprefsbase.ui latexpreferences.cpp latexconfig.kcfgc
-kcm_kopete_latex_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kcm_kopete_latex_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
+kcm_kopete_latex_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_latex_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS)
 
 service_DATA = kopete_latex.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/plugins/motionautoaway/Makefile.am b/kopete/plugins/motionautoaway/Makefile.am
index 8f8bbaa3..2b349ca4 100644
--- a/kopete/plugins/motionautoaway/Makefile.am
+++ b/kopete/plugins/motionautoaway/Makefile.am
@@ -10,7 +10,7 @@ kopete_motionaway_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_motionaway_la_SOURCES = motionawayprefs.ui motionawaypreferences.cpp motionawayconfig.kcfgc
 kcm_kopete_motionaway_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
-kcm_kopete_motionaway_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
+kcm_kopete_motionaway_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS)
 
 
 
diff --git a/kopete/plugins/netmeeting/Makefile.am b/kopete/plugins/netmeeting/Makefile.am
index 27c5b0cb..54b08a5b 100644
--- a/kopete/plugins/netmeeting/Makefile.am
+++ b/kopete/plugins/netmeeting/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/protocols/msn $(all_incl
 kde_module_LTLIBRARIES = kopete_netmeeting.la kcm_kopete_netmeeting.la
 
 kopete_netmeeting_la_SOURCES     = netmeetingplugin.cpp netmeetinginvitation.cpp netmeetingguiclient.cpp
-kopete_netmeeting_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_netmeeting_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_netmeeting_la_LIBADD      = $(top_builddir)/kopete/libkopete/libkopete.la $(top_builddir)/kopete/protocols/msn/libkopete_msn_shared.la
 
 service_DATA = kopete_netmeeting.desktop
@@ -15,8 +15,8 @@ mydatadir = $(kde_datadir)/kopete_netmeeting
 mydata_DATA = netmeetingchatui.rc
 
 kcm_kopete_netmeeting_la_SOURCES = netmeetingprefs_ui.ui netmeetingpreferences.cpp
-kcm_kopete_netmeeting_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kcm_kopete_netmeeting_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
+kcm_kopete_netmeeting_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_netmeeting_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS)
 
 
 kcm_DATA = kopete_netmeeting_config.desktop
diff --git a/kopete/plugins/nowlistening/Makefile.am b/kopete/plugins/nowlistening/Makefile.am
index 69dbb38e..ac968eab 100644
--- a/kopete/plugins/nowlistening/Makefile.am
+++ b/kopete/plugins/nowlistening/Makefile.am
@@ -5,12 +5,12 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(XMMS_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kopete_nowlistening.la kcm_kopete_nowlistening.la
 
 kopete_nowlistening_la_SOURCES = nowlisteningconfig.kcfgc nowlisteningplugin.cpp nlkscd.cpp nlnoatun.cpp nlxmms.cpp nowlisteningguiclient.cpp nljuk.cpp nlamarok.cpp nlkaffeine.cpp
-kopete_nowlistening_la_LDFLAGS     = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_nowlistening_la_LDFLAGS     = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_nowlistening_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_nowlistening_la_SOURCES = nowlisteningprefs.ui nowlisteningpreferences.cpp nowlisteningconfig.kcfgc
-kcm_kopete_nowlistening_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kcm_kopete_nowlistening_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_KUTILS)
+kcm_kopete_nowlistening_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_nowlistening_la_LIBADD  = $(LIB_KOPETECOMPAT) $(LIB_TDEUTILS)
 
 service_DATA = kopete_nowlistening.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/plugins/smpppdcs/Makefile.am b/kopete/plugins/smpppdcs/Makefile.am
index fe8792fc..54544d78 100644
--- a/kopete/plugins/smpppdcs/Makefile.am
+++ b/kopete/plugins/smpppdcs/Makefile.am
@@ -20,7 +20,7 @@ kcm_kopete_smpppdcs_la_SOURCES = smpppdcsprefs.ui smpppdcspreferences.cpp \
 	smpppdcsconfig.kcfgc
 kcm_kopete_smpppdcs_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
 kcm_kopete_smpppdcs_la_LIBADD  = libsmpppdclient/libsmpppdclient.la \
-	../../libkopete/libkopete.la $(LIB_KUTILS)
+	../../libkopete/libkopete.la $(LIB_TDEUTILS)
 
 service_DATA = kopete_smpppdcs.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/plugins/smpppdcs/unittest/Makefile.am b/kopete/plugins/smpppdcs/unittest/Makefile.am
index 3fc4fcee..b17fca53 100644
--- a/kopete/plugins/smpppdcs/unittest/Makefile.am
+++ b/kopete/plugins/smpppdcs/unittest/Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
 check_PROGRAMS = smpppdcstests
 
 smpppdcstests_SOURCES = main.cpp clienttest.cpp
-smpppdcstests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+smpppdcstests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 smpppdcstests_LDADD = ../libsmpppdclient/libsmpppdclient.la -ltdeunittestgui
 
 noinst_HEADERS = clienttest.h
diff --git a/kopete/plugins/statistics/Makefile.am b/kopete/plugins/statistics/Makefile.am
index e7cb9c25..1a27e4f3 100644
--- a/kopete/plugins/statistics/Makefile.am
+++ b/kopete/plugins/statistics/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kopete_statistics.la
 
 kopete_statistics_la_SOURCES = statisticsplugin.cpp statisticsdb.cpp statisticsdialog.cpp statisticswidget.ui statisticscontact.cpp statisticsdcopiface.skel
 
-kopete_statistics_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) -lsqlite3 $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_TDEHTML)
+kopete_statistics_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) -lsqlite3 $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEHTML)
 kopete_statistics_la_LIBADD      = ../../libkopete/libkopete.la -lsqlite3
 
 service_DATA = kopete_statistics.desktop
diff --git a/kopete/plugins/texteffect/Makefile.am b/kopete/plugins/texteffect/Makefile.am
index 7f721dee..7f4c7d2e 100644
--- a/kopete/plugins/texteffect/Makefile.am
+++ b/kopete/plugins/texteffect/Makefile.am
@@ -6,12 +6,12 @@ INCLUDES = $(KOPETE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = kopete_texteffect.la kcm_kopete_texteffect.la
 
 kopete_texteffect_la_SOURCES     = texteffectplugin.cpp texteffectconfig.cpp
-kopete_texteffect_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_texteffect_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_texteffect_la_LIBADD      = ../../libkopete/libkopete.la
 
 kcm_kopete_texteffect_la_SOURCES = texteffectconfig.cpp texteffectprefs.ui texteffectpreferences.cpp
-kcm_kopete_texteffect_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kcm_kopete_texteffect_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_KUTILS)
+kcm_kopete_texteffect_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_texteffect_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_TDEUTILS)
 
 service_DATA = kopete_texteffect.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/plugins/translator/Makefile.am b/kopete/plugins/translator/Makefile.am
index fd58d26f..8c8be5bc 100644
--- a/kopete/plugins/translator/Makefile.am
+++ b/kopete/plugins/translator/Makefile.am
@@ -6,12 +6,12 @@ kde_module_LTLIBRARIES = kopete_translator.la kcm_kopete_translator.la
 
 kopete_translator_la_SOURCES     = translatorplugin.cpp  \
     translatordialog.cpp translatorguiclient.cpp translatorlanguages.cpp
-kopete_translator_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kopete_translator_la_LIBADD      = ../../libkopete/libkopete.la $(LIB_KIO)
+kopete_translator_la_LDFLAGS     = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kopete_translator_la_LIBADD      = ../../libkopete/libkopete.la $(LIB_TDEIO)
 
 kcm_kopete_translator_la_SOURCES = translatorprefsbase.ui translatorprefs.cpp translatorlanguages.cpp
-kcm_kopete_translator_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kcm_kopete_translator_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_KUTILS)
+kcm_kopete_translator_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_translator_la_LIBADD  = ../../libkopete/libkopete.la $(LIB_TDEUTILS)
 
 service_DATA = kopete_translator.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp
index 223d1d70..d5102bb9 100644
--- a/kopete/plugins/translator/translatorplugin.cpp
+++ b/kopete/plugins/translator/translatorplugin.cpp
@@ -278,7 +278,7 @@ TQString TranslatorPlugin::googleTranslateMessage( const TQString &msg, const TQ
 	TQObject::connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( TDEIO::Job *, const TQByteArray & ) ) );
 	TQObject::connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobDone( TDEIO::Job * ) ) );
 
-	// KIO is async and we use a sync API, so use the processEvents hack to work around that
+	// TDEIO is async and we use a sync API, so use the processEvents hack to work around that
 	// FIXME: We need to make the libkopete API async to get rid of this processEvents.
 	//        It often causes crashes in the code. - Martijn
 	while ( !m_completed[ job ] )
@@ -314,7 +314,7 @@ TQString TranslatorPlugin::babelTranslateMessage( const TQString &msg, const TQS
 	TQObject::connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( TDEIO::Job *, const TQByteArray & ) ) );
 	TQObject::connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobDone( TDEIO::Job * ) ) );
 
-	// KIO is async and we use a sync API, so use the processEvents hack to work around that
+	// TDEIO is async and we use a sync API, so use the processEvents hack to work around that
 	// FIXME: We need to make the libkopete API async to get rid of this processEvents.
 	//        It often causes crashes in the code. - Martijn
 	while ( !m_completed[ job ] )
diff --git a/kopete/plugins/webpresence/DESIGN b/kopete/plugins/webpresence/DESIGN
index e84fca85..a13b17f4 100644
--- a/kopete/plugins/webpresence/DESIGN
+++ b/kopete/plugins/webpresence/DESIGN
@@ -4,7 +4,7 @@ What It Does
 Provides a view of the current state of your contact list as a webpage.
 
 How It Does It
-Every so often, it writes a file containing a snapshot of who is online and who is not in your contactlist to a location you specify.  This can be a local file, an FTP server, a HTTP server, or anywhere else that KIO can access.
+Every so often, it writes a file containing a snapshot of who is online and who is not in your contactlist to a location you specify.  This can be a local file, an FTP server, a HTTP server, or anywhere else that TDEIO can access.
 
 Use TDEIO::NetAccess to upload the files!
 
diff --git a/kopete/plugins/webpresence/Makefile.am b/kopete/plugins/webpresence/Makefile.am
index eb91a345..ff55a95f 100644
--- a/kopete/plugins/webpresence/Makefile.am
+++ b/kopete/plugins/webpresence/Makefile.am
@@ -6,12 +6,12 @@ kde_module_LTLIBRARIES = kopete_webpresence.la kcm_kopete_webpresence.la
 
 kopete_webpresence_la_SOURCES     = webpresenceplugin.cpp
 
-kopete_webpresence_la_LDFLAGS     = -module  -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kopete_webpresence_la_LDFLAGS     = -module  -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kopete_webpresence_la_LIBADD      = ../../libkopete/libkopete.la $(LIBXML_LIBS) $(LIBXSLT_LIBS)
 
 kcm_kopete_webpresence_la_SOURCES = webpresencepreferences.cpp webpresenceprefs.ui
-kcm_kopete_webpresence_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kcm_kopete_webpresence_la_LIBADD  = ../../libkopete/libkopete.la  $(LIB_KUTILS)
+kcm_kopete_webpresence_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kcm_kopete_webpresence_la_LIBADD  = ../../libkopete/libkopete.la  $(LIB_TDEUTILS)
 
 service_DATA = kopete_webpresence.desktop
 servicedir = $(kde_servicesdir)