Additional k => tde renaming and fixes

36 files changed, 46 insertions, 46 deletions

diff --git a/atlantikdesigner/Makefile.am b/atlantikdesigner/Makefile.am
index 6b18880..5e5e41c 100644
--- a/atlantikdesigner/Makefile.am
+++ b/atlantikdesigner/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = $(all_includes)
-LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-LDADD = $(LIB_KSYCOCA) $(LIB_TDEFILE)
+LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+LDADD = $(LIB_TDESYCOCA) $(LIB_TDEFILE)
 
 SUBDIRS = designer pics
 
diff --git a/atlantikdesigner/designer/Makefile.am b/atlantikdesigner/designer/Makefile.am
index edd407b..7ae5822 100644
--- a/atlantikdesigner/designer/Makefile.am
+++ b/atlantikdesigner/designer/Makefile.am
@@ -1,7 +1,7 @@
 bin_PROGRAMS = atlantikdesigner
 INCLUDES = -I$(kde_includes)/atlantic $(all_includes) -I$(kde_includes)/tde
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -latlantic
-LDADD = -latlantikui -ltdegames $(LIB_KIO) 
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -latlantic
+LDADD = -latlantikui -ltdegames $(LIB_TDEIO) 
 
 SUBDIRS = 
 
diff --git a/kicker-applets/ktimemon/Makefile.am b/kicker-applets/ktimemon/Makefile.am
index 78e8443..6874509 100644
--- a/kicker-applets/ktimemon/Makefile.am
+++ b/kicker-applets/ktimemon/Makefile.am
@@ -8,7 +8,7 @@ noinst_HEADERS = confdlg.h sample.h timemon.h
 INCLUDES= $(all_includes)
 
 ktimemon_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-ktimemon_panelapplet_la_LIBADD   = $(LIB_TDEUI) $(LIBKSTAT) $(LIB_KIO)
+ktimemon_panelapplet_la_LIBADD   = $(LIB_TDEUI) $(LIBKSTAT) $(LIB_TDEIO)
 
 KDE_ICON = ktimemon
 
diff --git a/kicker-applets/math/Makefile.am b/kicker-applets/math/Makefile.am
index 3fed8ac..5bb9418 100644
--- a/kicker-applets/math/Makefile.am
+++ b/kicker-applets/math/Makefile.am
@@ -13,7 +13,7 @@ lnk_DATA = mathapplet.desktop
 EXTRA_DIST = $(lnk_DATA)
 
 math_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-math_panelapplet_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI)
+math_panelapplet_la_LIBADD = $(LIB_TDESYCOCA) $(LIB_TDEUI)
 
 messages:
 	$(XGETTEXT) *.cpp *.h -o $(podir)/kmathapplet.pot
diff --git a/kicker-applets/mediacontrol/kscdInterface.cpp b/kicker-applets/mediacontrol/kscdInterface.cpp
index 3d48204..710674d 100644
--- a/kicker-applets/mediacontrol/kscdInterface.cpp
+++ b/kicker-applets/mediacontrol/kscdInterface.cpp
@@ -131,7 +131,7 @@ void KsCDInterface::updateSlider()
 
 // Drag-n-Drop stuff =================================================================
 // As far as I know there is currently no way to drag an AudioCD track to KsCD,
-// or even no application to drag AudioCD track from (not the KIO-wrapped track
+// or even no application to drag AudioCD track from (not the TDEIO-wrapped track
 // path (audiocd:/...) like from Konqueror)
 
 void KsCDInterface::dragEnterEvent(TQDragEnterEvent* event)
diff --git a/konq-plugins/babelfish/Makefile.am b/konq-plugins/babelfish/Makefile.am
index 82cf1e0..ed4dade 100644
--- a/konq-plugins/babelfish/Makefile.am
+++ b/konq-plugins/babelfish/Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = libbabelfishplugin.la
 
 libbabelfishplugin_la_SOURCES = plugin_babelfish.cpp
-libbabelfishplugin_la_LIBADD  = $(LIB_KPARTS) $(LIB_TDEHTML)
+libbabelfishplugin_la_LIBADD  = $(LIB_TDEPARTS) $(LIB_TDEHTML)
 libbabelfishplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -no-undefined
 
 pluginsdir   = $(kde_datadir)/tdehtml/kpartplugins
diff --git a/konq-plugins/domtreeviewer/Makefile.am b/konq-plugins/domtreeviewer/Makefile.am
index 2d5c781..d24fdbf 100644
--- a/konq-plugins/domtreeviewer/Makefile.am
+++ b/konq-plugins/domtreeviewer/Makefile.am
@@ -20,7 +20,7 @@ libdomtreeviewerplugin_la_SOURCES = 	plugin_domtreeviewer.cpp \
 					messagedialog.ui
 #					tdelistview.cpp \
 #
-libdomtreeviewerplugin_la_LIBADD  = $(LIB_KPARTS) $(LIB_TDEHTML)
+libdomtreeviewerplugin_la_LIBADD  = $(LIB_TDEPARTS) $(LIB_TDEHTML)
 libdomtreeviewerplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
 pluginsdir   = $(kde_datadir)/tdehtml/kpartplugins
diff --git a/konq-plugins/fsview/Makefile.am b/konq-plugins/fsview/Makefile.am
index 4798bef..ce4c68b 100644
--- a/konq-plugins/fsview/Makefile.am
+++ b/konq-plugins/fsview/Makefile.am
@@ -24,22 +24,22 @@ libfsview_la_SOURCES = treemap.cpp fsview.cpp scan.cpp inode.cpp
 
 bin_PROGRAMS = fsview
 
-fsview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+fsview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 fsview_SOURCES = main.cpp
-fsview_LDADD   = libfsview.la $(LIB_KIO) $(LIB_TDECORE) $(LIB_QT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+fsview_LDADD   = libfsview.la $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_QT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 check_PROGRAMS = scantest
 
-scantest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+scantest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 scantest_SOURCES = scantest.cpp
-scantest_LDADD   = libfsview.la $(LIB_KIO) $(LIB_TDECORE) $(LIB_QT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+scantest_LDADD   = libfsview.la $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_QT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 # The KPart
 
 kde_module_LTLIBRARIES = libfsviewpart.la
 libfsviewpart_la_SOURCES = fsview_part.cpp
-libfsviewpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-libfsviewpart_la_LIBADD  = libfsview.la $(LIB_KPARTS) $(LIB_KIO) -lkonq
+libfsviewpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+libfsviewpart_la_LIBADD  = libfsview.la $(LIB_TDEPARTS) $(LIB_TDEIO) -lkonq
 
 partdesktopdir   = $(kde_servicesdir)
 partdesktop_DATA = fsview_part.desktop
diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp
index bbfe98a..4f7b592 100644
--- a/konq-plugins/fsview/fsview_part.cpp
+++ b/konq-plugins/fsview/fsview_part.cpp
@@ -355,7 +355,7 @@ void FSViewBrowserExtension::editMimeType()
 }
 
 
-// refresh treemap at end of KIO jobs
+// refresh treemap at end of TDEIO jobs
 void FSViewBrowserExtension::refresh()
 {
   // only need to refresh common ancestor for all selected items
diff --git a/konq-plugins/kuick/kcmkuick/Makefile.am b/konq-plugins/kuick/kcmkuick/Makefile.am
index 2ee4a0c..cc7e030 100644
--- a/konq-plugins/kuick/kcmkuick/Makefile.am
+++ b/konq-plugins/kuick/kcmkuick/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kcm_kuick.la
 kcm_kuick_la_SOURCES =  kcmkuick.cpp kcmkuickdialog.ui
 
 kcm_kuick_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
-kcm_kuick_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO)
+kcm_kuick_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO)
 kcm_kuick_la_METASOURCES = AUTO
 
 noinst_HEADERS = kcmkuick.h kcmkuickdialog.h
diff --git a/konq-plugins/kuick/kimcontactmenu.cpp b/konq-plugins/kuick/kimcontactmenu.cpp
index 93008a6..9b3c1df 100644
--- a/konq-plugins/kuick/kimcontactmenu.cpp
+++ b/konq-plugins/kuick/kimcontactmenu.cpp
@@ -22,7 +22,7 @@
 
 #include <tqstringlist.h>
 
-// The following enables kabc for contact name lookups instead of using Kopete's idea of their name.
+// The following enables tdeabc for contact name lookups instead of using Kopete's idea of their name.
 //#define KIMCONTACTS_USE_KABC
 
 #include <tdeimproxy.h>
diff --git a/konq-plugins/rellinks/Makefile.am b/konq-plugins/rellinks/Makefile.am
index cb2540d..1e3cf65 100644
--- a/konq-plugins/rellinks/Makefile.am
+++ b/konq-plugins/rellinks/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = $(all_includes)
 METASOURCES = AUTO
 kde_module_LTLIBRARIES = librellinksplugin.la
 librellinksplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-librellinksplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEHTML)
+librellinksplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEHTML)
 librellinksplugin_la_SOURCES = plugin_rellinks.cpp
 plugins_DATA = plugin_rellinks.rc plugin_rellinks.desktop
 pluginsdir = $(kde_datadir)/tdehtml/kpartplugins
diff --git a/konq-plugins/sidebar/delicious/Makefile.am b/konq-plugins/sidebar/delicious/Makefile.am
index 35939eb..05b09d7 100644
--- a/konq-plugins/sidebar/delicious/Makefile.am
+++ b/konq-plugins/sidebar/delicious/Makefile.am
@@ -13,7 +13,7 @@ kde_module_LTLIBRARIES = konqsidebar_delicious.la
 konqsidebar_delicious_la_SOURCES = plugin.cpp widget.ui mainWidget.cpp plugin.skel tagListItem.cpp \
 	bookmarkListItem.cpp
 konqsidebar_delicious_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-konqsidebar_delicious_la_LIBADD  = $(LIB_KPARTS) $(LIB_KIO) -lkonqsidebarplugin
+konqsidebar_delicious_la_LIBADD  = $(LIB_TDEPARTS) $(LIB_TDEIO) -lkonqsidebarplugin
 
 globaladddir   = $(kde_datadir)/konqsidebartng/add
 globaladd_DATA = delicious_add.desktop
diff --git a/konq-plugins/sidebar/mediaplayer/Makefile.am b/konq-plugins/sidebar/mediaplayer/Makefile.am
index fb5e13f..39d2da0 100644
--- a/konq-plugins/sidebar/mediaplayer/Makefile.am
+++ b/konq-plugins/sidebar/mediaplayer/Makefile.am
@@ -15,7 +15,7 @@ kde_module_LTLIBRARIES = konqsidebar_mediaplayer.la
 # the Part's source, library search path, and link libraries
 konqsidebar_mediaplayer_la_SOURCES = mediawidget_skel.ui engine.cpp player.cpp mediawidget.cpp mediaplayer.cpp controls.cpp
 konqsidebar_mediaplayer_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-konqsidebar_mediaplayer_la_LIBADD  = $(LIB_KPARTS) $(LIB_TDEFILE) -lkonqsidebarplugin -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde 
+konqsidebar_mediaplayer_la_LIBADD  = $(LIB_TDEPARTS) $(LIB_TDEFILE) -lkonqsidebarplugin -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde 
 
 globaladddir   = $(kde_datadir)/konqsidebartng/add
 globaladd_DATA = mplayer_add.desktop
diff --git a/konq-plugins/sidebar/metabar/src/Makefile.am b/konq-plugins/sidebar/metabar/src/Makefile.am
index 78fd97b..b206e82 100644
--- a/konq-plugins/sidebar/metabar/src/Makefile.am
+++ b/konq-plugins/sidebar/metabar/src/Makefile.am
@@ -9,7 +9,7 @@ konqsidebar_metabar_la_SOURCES = metabar.cpp metabarwidget.cpp configdialog.cpp
 		serviceloader.cpp defaultplugin.cpp protocolplugin.cpp settingsplugin.cpp \
 		remoteplugin.cpp httpplugin.cpp metabarfunctions.cpp
 konqsidebar_metabar_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkonqsidebarplugin
-konqsidebar_metabar_la_LIBADD = $(LIB_KIO) $(LIB_TDEHTML) $(LIB_KPARTS)
+konqsidebar_metabar_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEHTML) $(LIB_TDEPARTS)
 
 metabar_entrydir = $(kde_datadir)/konqsidebartng/entries
 metabar_entry_DATA = metabar.desktop
diff --git a/konq-plugins/sidebar/newsticker/Makefile.am b/konq-plugins/sidebar/newsticker/Makefile.am
index 3b6ad90..41c0350 100644
--- a/konq-plugins/sidebar/newsticker/Makefile.am
+++ b/konq-plugins/sidebar/newsticker/Makefile.am
@@ -17,7 +17,7 @@ konq_sidebarnews_la_SOURCES = sidebar_news.cpp sidebar_news.skel nsstacktabwidge
                               sidebarsettings.kcfgc \
 			      configfeedsbase.ui configfeeds.cpp
 konq_sidebarnews_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-konq_sidebarnews_la_LIBADD  = $(LIB_KPARTS) $(LIB_TDEFILE) -lkonqsidebarplugin
+konq_sidebarnews_la_LIBADD  = $(LIB_TDEPARTS) $(LIB_TDEFILE) -lkonqsidebarplugin
 
 
 globaladddir   = $(kde_datadir)/konqsidebartng/add
diff --git a/konq-plugins/uachanger/Makefile.am b/konq-plugins/uachanger/Makefile.am
index 169a700..81617d5 100644
--- a/konq-plugins/uachanger/Makefile.am
+++ b/konq-plugins/uachanger/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = $(all_includes)
 METASOURCES = AUTO
 
 libuachangerplugin_la_SOURCES = uachangerplugin.cpp
-libuachangerplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEHTML)
+libuachangerplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEHTML)
 libuachangerplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
 pluginsdir = $(kde_datadir)/tdehtml/kpartplugins
diff --git a/konq-plugins/validators/Makefile.am b/konq-plugins/validators/Makefile.am
index e3b386f..e2199b5 100644
--- a/konq-plugins/validators/Makefile.am
+++ b/konq-plugins/validators/Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = libvalidatorsplugin.la
 
 libvalidatorsplugin_la_SOURCES = plugin_validators.cpp validatorsdialog.cpp
-libvalidatorsplugin_la_LIBADD  = $(LIB_KPARTS) $(LIB_TDEHTML)
+libvalidatorsplugin_la_LIBADD  = $(LIB_TDEPARTS) $(LIB_TDEHTML)
 libvalidatorsplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
 pluginsdir   = $(kde_datadir)/tdehtml/kpartplugins
diff --git a/konq-plugins/webarchiver/Makefile.am b/konq-plugins/webarchiver/Makefile.am
index 43dbfb0..ba541c5 100644
--- a/konq-plugins/webarchiver/Makefile.am
+++ b/konq-plugins/webarchiver/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = libwebarchiverplugin.la webarchivethumbnail.la
 
 libwebarchiverplugin_la_SOURCES = plugin_webarchiver.cpp archiveviewbase.ui archivedialog.cpp
-libwebarchiverplugin_la_LIBADD  = $(LIB_KPARTS) $(LIB_TDEHTML)
+libwebarchiverplugin_la_LIBADD  = $(LIB_TDEPARTS) $(LIB_TDEHTML)
 libwebarchiverplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
 pluginsdir = $(kde_datadir)/tdehtml/kpartplugins
diff --git a/ksig/Makefile.am b/ksig/Makefile.am
index b8813f3..48efcd7 100644
--- a/ksig/Makefile.am
+++ b/ksig/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = $(all_includes)
 METASOURCES = AUTO
 KDE_ICON = AUTO
 
-ksig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+ksig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 ksig_LDADD   =  $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
 
 rcdir = $(kde_datadir)/ksig
diff --git a/noatun-plugins/dub/dub/Makefile.am b/noatun-plugins/dub/dub/Makefile.am
index 5c6e029..6aff1f7 100644
--- a/noatun-plugins/dub/dub/Makefile.am
+++ b/noatun-plugins/dub/dub/Makefile.am
@@ -9,7 +9,7 @@ EXTRA_DIST = dubui.rc dub.plugin BUGS \
  dub.h dubdoc.h dubview.h fileselectorwidget.h dubplaylist.h dubplaylistitem.h 
 
 noatundub_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-noatundub_la_LIBADD = $(LIB_KIO) -lnoatun
+noatundub_la_LIBADD = $(LIB_TDEIO) -lnoatun
 
 noatun_DATA = dub.plugin
 noatundir = $(kde_datadir)/noatun
diff --git a/noatun-plugins/dub/dub/fileselectorwidget.h b/noatun-plugins/dub/dub/fileselectorwidget.h
index 2bfc489..e84534b 100644
--- a/noatun-plugins/dub/dub/fileselectorwidget.h
+++ b/noatun-plugins/dub/dub/fileselectorwidget.h
@@ -1,5 +1,5 @@
 /*-*-c++-*-*****************************************************************
- *   Copyright (C) 2001 by Bernd Gehrmann bernd@tdevelop.org               *
+ *   Copyright (C) 2001 by Bernd Gehrmann bernd@kdevelop.org               *
  *   Copyright (C) 2002 by Eray Ozkural erayo@cs.bilkent.edu.tr            *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
diff --git a/noatun-plugins/oblique/Makefile.am b/noatun-plugins/oblique/Makefile.am
index b605665..9b9742a 100644
--- a/noatun-plugins/oblique/Makefile.am
+++ b/noatun-plugins/oblique/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = noatun_oblique.la
 noatun_oblique_la_SOURCES = base.cpp kbuffer.cpp query.cpp oblique.cpp tree.cpp file.cpp selector.cpp menu.cpp cmodule.cpp kdatacollection.cpp view.cpp
 
 noatun_oblique_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-noatun_oblique_la_LIBADD = $(LIB_KIO) -lnoatun $(BERKELEY_DB_LIBS)
+noatun_oblique_la_LIBADD = $(LIB_TDEIO) -lnoatun $(BERKELEY_DB_LIBS)
 
 noatun_oblique_la_METASOURCES = AUTO
 
diff --git a/noatun-plugins/synaescope/Makefile.am b/noatun-plugins/synaescope/Makefile.am
index 3978433..6108736 100644
--- a/noatun-plugins/synaescope/Makefile.am
+++ b/noatun-plugins/synaescope/Makefile.am
@@ -11,7 +11,7 @@ noatunsynaescope_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lm
 bin_PROGRAMS = noatunsynaescope.bin
 
 noatunsynaescope_bin_SOURCES = core.cpp main.cpp sdlwrap.cpp ui.cpp
-noatunsynaescope_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+noatunsynaescope_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 noatunsynaescope_bin_LDADD = $(LIB_TDEUI) -lnoatun $(SDL_LIBS)
 
 noatun_DATA = synaescope.plugin
diff --git a/noatun-plugins/tippercanoe/Makefile.am b/noatun-plugins/tippercanoe/Makefile.am
index a325e1a..4be7a80 100644
--- a/noatun-plugins/tippercanoe/Makefile.am
+++ b/noatun-plugins/tippercanoe/Makefile.am
@@ -11,7 +11,7 @@ noatuntippecanoe_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lm
 bin_PROGRAMS = noatuntippecanoe.bin
 
 noatuntippecanoe_bin_SOURCES = core.cpp main.cpp ui.cpp sdlwrap.cpp
-noatuntippecanoe_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+noatuntippecanoe_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 noatuntippecanoe_bin_LDADD = $(LIB_TDEUI) -lm $(SDL_LIBS)
 
 noatun_DATA = tippecanoe.plugin
diff --git a/noatun-plugins/tyler/Makefile.am b/noatun-plugins/tyler/Makefile.am
index 7f24717..985df78 100644
--- a/noatun-plugins/tyler/Makefile.am
+++ b/noatun-plugins/tyler/Makefile.am
@@ -11,7 +11,7 @@ noatuntyler_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lm
 bin_PROGRAMS = noatuntyler.bin
 
 noatuntyler_bin_SOURCES = main.cpp file.cpp compute.c display.c renderer.c
-noatuntyler_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+noatuntyler_bin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 noatuntyler_bin_LDADD = $(LIB_TDECORE) -lm $(SDL_LIBS)
 
 noatun_DATA = tyler.plugin tylerstates
diff --git a/renamedlgplugins/audio/Makefile.am b/renamedlgplugins/audio/Makefile.am
index db559ae..664e714 100644
--- a/renamedlgplugins/audio/Makefile.am
+++ b/renamedlgplugins/audio/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = librenaudioplugin.la
 
 librenaudioplugin_la_SOURCES = audiopreview.cpp audio_plugin.cpp
-librenaudioplugin_la_LIBADD = $(LIB_KIO) -ltdemediaplayer
+librenaudioplugin_la_LIBADD = $(LIB_TDEIO) -ltdemediaplayer
 librenaudioplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
 pluginsdir   = $(kde_servicesdir)
diff --git a/renamedlgplugins/images/Makefile.am b/renamedlgplugins/images/Makefile.am
index 26dd0c7..bb4c936 100644
--- a/renamedlgplugins/images/Makefile.am
+++ b/renamedlgplugins/images/Makefile.am
@@ -8,7 +8,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = librenimageplugin.la
 
 librenimageplugin_la_SOURCES = imagevisualizer.cpp image_plugin.cpp
-librenimageplugin_la_LIBADD = $(LIB_KIO)
+librenimageplugin_la_LIBADD = $(LIB_TDEIO)
 librenimageplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
 
 pluginsdir   = $(kde_servicesdir)
diff --git a/tdefile-plugins/cert/Makefile.am b/tdefile-plugins/cert/Makefile.am
index ff679f5..4a386b3 100644
--- a/tdefile-plugins/cert/Makefile.am
+++ b/tdefile-plugins/cert/Makefile.am
@@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_cert.la
 
 tdefile_cert_la_SOURCES = tdefile_cert.cpp
 tdefile_cert_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_cert_la_LIBADD = $(LIB_KSYCOCA)
+tdefile_cert_la_LIBADD = $(LIB_TDESYCOCA)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/desktop/Makefile.am b/tdefile-plugins/desktop/Makefile.am
index e8315ad..132edda 100644
--- a/tdefile-plugins/desktop/Makefile.am
+++ b/tdefile-plugins/desktop/Makefile.am
@@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_desktop.la
 
 tdefile_desktop_la_SOURCES = tdefile_desktop.cpp
 tdefile_desktop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_desktop_la_LIBADD = $(LIB_KIO)
+tdefile_desktop_la_LIBADD = $(LIB_TDEIO)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/folder/Makefile.am b/tdefile-plugins/folder/Makefile.am
index a6917c1..284d9c8 100644
--- a/tdefile-plugins/folder/Makefile.am
+++ b/tdefile-plugins/folder/Makefile.am
@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = tdefile_folder.la
 
 tdefile_folder_la_SOURCES = tdefile_folder.cpp
 tdefile_folder_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_folder_la_LIBADD = $(LIB_KIO)
+tdefile_folder_la_LIBADD = $(LIB_TDEIO)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/html/Makefile.am b/tdefile-plugins/html/Makefile.am
index 6097b26..c53ecae 100644
--- a/tdefile-plugins/html/Makefile.am
+++ b/tdefile-plugins/html/Makefile.am
@@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_html.la
 
 tdefile_html_la_SOURCES = tdefile_html.cpp
 tdefile_html_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_html_la_LIBADD = $(LIB_KSYCOCA)
+tdefile_html_la_LIBADD = $(LIB_TDESYCOCA)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/html/tdefile_html.h b/tdefile-plugins/html/tdefile_html.h
index 858d6a1..5625fe7 100644
--- a/tdefile-plugins/html/tdefile_html.h
+++ b/tdefile-plugins/html/tdefile_html.h
@@ -18,8 +18,8 @@
  *  $Id$
  */
 
-#ifndef __KMIME_HTML_H__
-#define __KMIME_HTML_H__
+#ifndef __TDEFILE_HTML_H__
+#define __TDEFILE_HTML_H__
 
 #include <tdefilemetainfo.h>
 #include <kurl.h>
diff --git a/tdefile-plugins/lnk/Makefile.am b/tdefile-plugins/lnk/Makefile.am
index 083f9a0..8801441 100644
--- a/tdefile-plugins/lnk/Makefile.am
+++ b/tdefile-plugins/lnk/Makefile.am
@@ -5,8 +5,8 @@ INCLUDES         = $(all_includes)
 bin_PROGRAMS = lnkforward
 
 lnkforward_SOURCES = lnkforward.cpp
-lnkforward_LDADD = $(LIB_TDECORE) $(LIB_KIO)
-lnkforward_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+lnkforward_LDADD = $(LIB_TDECORE) $(LIB_TDEIO)
+lnkforward_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 lnkforward_METASOURCES = lnkforward.moc
 
 lnkforward_DATA = lnkforward.desktop
@@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = tdefile_lnk.la
 
 tdefile_lnk_la_SOURCES = tdefile_lnk.cpp read_lnk.cpp
 tdefile_lnk_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_lnk_la_LIBADD = $(LIB_KIO)
+tdefile_lnk_la_LIBADD = $(LIB_TDEIO)
 tdefile_lnk_la_METASOURCES = tdefile_lnk.moc
 
 # let automoc handle all of the meta source files (moc)
diff --git a/tdefile-plugins/mhtml/Makefile.am b/tdefile-plugins/mhtml/Makefile.am
index 3d0b98f..73c9328 100644
--- a/tdefile-plugins/mhtml/Makefile.am
+++ b/tdefile-plugins/mhtml/Makefile.am
@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = tdefile_mhtml.la
 
 tdefile_mhtml_la_SOURCES = tdefile_mhtml.cpp
 tdefile_mhtml_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_mhtml_la_LIBADD = $(LIB_KIO)
+tdefile_mhtml_la_LIBADD = $(LIB_TDEIO)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tdefile-plugins/txt/Makefile.am b/tdefile-plugins/txt/Makefile.am
index 71c0333..132a7fb 100644
--- a/tdefile-plugins/txt/Makefile.am
+++ b/tdefile-plugins/txt/Makefile.am
@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = tdefile_txt.la
 
 tdefile_txt_la_SOURCES = tdefile_txt.cpp
 tdefile_txt_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-tdefile_txt_la_LIBADD = $(LIB_KIO)
+tdefile_txt_la_LIBADD = $(LIB_TDEIO)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO