Additional k => tde renaming and fixes

14 files changed, 19 insertions, 19 deletions

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