Additional k => tde renaming and fixes

13 files changed, 17 insertions, 17 deletions

diff --git a/kontact/Thoughts b/kontact/Thoughts
index f34164844..c43324258 100644
--- a/kontact/Thoughts
+++ b/kontact/Thoughts
@@ -257,7 +257,7 @@ z last used part on startup. Make sure its loading finishes and then
 z load the rest once the user can already interact with the last used
 z loaded part.
 
-g why do we always need the addressbook? Is libkabc not sufficient?
+g why do we always need the addressbook? Is libtdeabc not sufficient?
 
 Don: I guess my machine is too fast, starting parts is pretty quick here :-)
 
diff --git a/kontact/interfaces/Makefile.am b/kontact/interfaces/Makefile.am
index d7c9f3402..1677b2a36 100644
--- a/kontact/interfaces/Makefile.am
+++ b/kontact/interfaces/Makefile.am
@@ -4,7 +4,7 @@ lib_LTLIBRARIES = libkpinterfaces.la
 
 libkpinterfaces_la_SOURCES = core.cpp plugin.cpp summary.cpp uniqueapphandler.cpp
 libkpinterfaces_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0
-libkpinterfaces_la_LIBADD = ../../libtdepim/libtdepim.la $(LIB_KPARTS)
+libkpinterfaces_la_LIBADD = ../../libtdepim/libtdepim.la $(LIB_TDEPARTS)
 
 kpincludedir = $(includedir)/kontact
 kpinclude_HEADERS = core.h plugin.h summary.h
diff --git a/kontact/plugins/akregator/Makefile.am b/kontact/plugins/akregator/Makefile.am
index d97f14341..a41148c6c 100644
--- a/kontact/plugins/akregator/Makefile.am
+++ b/kontact/plugins/akregator/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/akregator/src -I$(
 
 kde_module_LTLIBRARIES = libkontact_akregator.la
 libkontact_akregator_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkontact_akregator_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS)
+libkontact_akregator_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS)
 libkontact_akregator_la_SOURCES = akregator_plugin.cpp akregator_partiface.stub
 
 METASOURCES = AUTO
diff --git a/kontact/plugins/kmail/Makefile.am b/kontact/plugins/kmail/Makefile.am
index 823025482..2bab941ca 100644
--- a/kontact/plugins/kmail/Makefile.am
+++ b/kontact/plugins/kmail/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/kmail -I$(top_buil
 kde_module_LTLIBRARIES = libkontact_kmailplugin.la kcm_kmailsummary.la
 
 libkontact_kmailplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkontact_kmailplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(top_builddir)/libkcal/libkcal.la $(LIB_KPARTS)
+libkontact_kmailplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(top_builddir)/libkcal/libkcal.la $(LIB_TDEPARTS)
 
 libkontact_kmailplugin_la_SOURCES = kmail_plugin.cpp kmailIface.stub \
                                     summarywidget.cpp summarywidget.skel
diff --git a/kontact/plugins/knode/Makefile.am b/kontact/plugins/knode/Makefile.am
index bf4ba753a..76b72ec9a 100644
--- a/kontact/plugins/knode/Makefile.am
+++ b/kontact/plugins/knode/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/knode -I$(top_srcd
 
 kde_module_LTLIBRARIES = libkontact_knodeplugin.la
 libkontact_knodeplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkontact_knodeplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS)
+libkontact_knodeplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS)
 
 libkontact_knodeplugin_la_SOURCES = knode_plugin.cpp knodeiface.stub
 
diff --git a/kontact/plugins/knotes/Makefile.am b/kontact/plugins/knotes/Makefile.am
index 2b2dc9ed0..00147c8ca 100644
--- a/kontact/plugins/knotes/Makefile.am
+++ b/kontact/plugins/knotes/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir) $(all_includes)
 kde_module_LTLIBRARIES = libkontact_knotesplugin.la
 libkontact_knotesplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkontact_knotesplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la \
-                                    $(LIB_KPARTS) $(top_builddir)/libtdepim/libtdepim.la \
+                                    $(LIB_TDEPARTS) $(top_builddir)/libtdepim/libtdepim.la \
                                     $(top_builddir)/libkcal/libkcal.la -ltderesources -ltdeprint \
                                     $(top_builddir)/knotes/libknotesresources.la \
                                     $(top_builddir)/knotes/libknoteseditor.la \
diff --git a/kontact/plugins/korganizer/Makefile.am b/kontact/plugins/korganizer/Makefile.am
index fd9ac6312..48582012b 100644
--- a/kontact/plugins/korganizer/Makefile.am
+++ b/kontact/plugins/korganizer/Makefile.am
@@ -15,7 +15,7 @@ libcommon_la_SOURCES = korg_uniqueapp.cpp
 
 libkontact_korganizerplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkontact_korganizerplugin_la_LIBADD = libcommon.la \
-    $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) \
+    $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS) \
     $(top_builddir)/korganizer/libkorganizer_calendar.la
 libkontact_korganizerplugin_la_SOURCES = korganizerplugin.cpp \
                                          kcalendariface.stub \
@@ -27,7 +27,7 @@ korganizeriface_DCOPIDLNG = true
 
 libkontact_todoplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkontact_todoplugin_la_LIBADD = libcommon.la \
-    $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) \
+    $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS) \
     $(top_builddir)/korganizer/libkorganizer_calendar.la \
     $(top_builddir)/korganizer/libkorganizer.la
 libkontact_todoplugin_la_SOURCES = todoplugin.cpp \
@@ -37,7 +37,7 @@ libkontact_todoplugin_la_SOURCES = todoplugin.cpp \
 
 libkontact_journalplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkontact_journalplugin_la_LIBADD = libcommon.la \
-    $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) \
+    $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS) \
     $(top_builddir)/korganizer/libkorganizer_calendar.la
 libkontact_journalplugin_la_SOURCES = journalplugin.cpp kcalendariface.stub
 
diff --git a/kontact/plugins/kpilot/Makefile.am b/kontact/plugins/kpilot/Makefile.am
index c02ba572d..9dfe36f34 100644
--- a/kontact/plugins/kpilot/Makefile.am
+++ b/kontact/plugins/kpilot/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces \
 kde_module_LTLIBRARIES = libkontact_kpilotplugin.la
 libkontact_kpilotplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkontact_kpilotplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la \
-	$(LIB_KPARTS) \
+	$(LIB_TDEPARTS) \
 	$(top_builddir)/libtdepim/libtdepim.la \
 	$(top_builddir)/kpilot/lib/libkpilot.la
 
diff --git a/kontact/plugins/newsticker/Makefile.am b/kontact/plugins/newsticker/Makefile.am
index 5c707cf18..a889887a6 100644
--- a/kontact/plugins/newsticker/Makefile.am
+++ b/kontact/plugins/newsticker/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces \
 
 kde_module_LTLIBRARIES = libkontact_newstickerplugin.la kcm_kontactknt.la
 libkontact_newstickerplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkontact_newstickerplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEUI) \
+libkontact_newstickerplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEUI) \
                                         $(top_builddir)/libtdepim/libtdepim.la ../../interfaces/libkpinterfaces.la
 
 libkontact_newstickerplugin_la_SOURCES = newsticker_plugin.cpp \
diff --git a/kontact/plugins/summary/Makefile.am b/kontact/plugins/summary/Makefile.am
index 32fcdfc9a..056d8c82b 100644
--- a/kontact/plugins/summary/Makefile.am
+++ b/kontact/plugins/summary/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/certmanager/lib \
 kde_module_LTLIBRARIES = libkontact_summaryplugin.la kcm_kontactsummary.la
 libkontact_summaryplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkontact_summaryplugin_la_LIBADD = -ltdeutils \
-  $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) \
+  $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS) \
   $(top_builddir)/libtdepim/libtdepim.la $(top_builddir)/libkpimidentities/libkpimidentities.la
 
 libkontact_summaryplugin_la_SOURCES = summaryview_plugin.cpp summaryview_part.cpp dropwidget.cpp
@@ -13,7 +13,7 @@ libkontact_summaryplugin_la_SOURCES = summaryview_plugin.cpp summaryview_part.cp
 kcm_kontactsummary_la_SOURCES = kcmkontactsummary.cpp
 kcm_kontactsummary_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
                                 -avoid-version -no-undefined
-kcm_kontactsummary_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS)
+kcm_kontactsummary_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEUTILS)
 
 METASOURCES = AUTO
 
diff --git a/kontact/plugins/test/Makefile.am b/kontact/plugins/test/Makefile.am
index 3fbac9eb3..7b1343e7d 100644
--- a/kontact/plugins/test/Makefile.am
+++ b/kontact/plugins/test/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces $(all_includes)
 
 kde_module_LTLIBRARIES = libkptestplugin.la
 libkptestplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkptestplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS)
+libkptestplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS)
 
 libkptestplugin_la_SOURCES = test_plugin.cpp test_part.cpp kaddressbookiface.stub
 
diff --git a/kontact/plugins/weather/Makefile.am b/kontact/plugins/weather/Makefile.am
index 2bd4cfbf4..a803f12da 100644
--- a/kontact/plugins/weather/Makefile.am
+++ b/kontact/plugins/weather/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/libtdepim -I$(top_
 
 kde_module_LTLIBRARIES = libkontact_weatherplugin.la
 libkontact_weatherplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkontact_weatherplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) $(top_builddir)/libtdepim/libtdepim.la
+libkontact_weatherplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS) $(top_builddir)/libtdepim/libtdepim.la
 
 libkontact_weatherplugin_la_SOURCES = weather_plugin.cpp summarywidget.cpp \
                                       summarywidget.skel
diff --git a/kontact/src/Makefile.am b/kontact/src/Makefile.am
index 96513a5ac..46fd81ef3 100644
--- a/kontact/src/Makefile.am
+++ b/kontact/src/Makefile.am
@@ -10,10 +10,10 @@ libkontact_la_SOURCES = prefs.kcfgc
 bin_PROGRAMS = kontact
 
 kontact_METASOURCES = AUTO
-kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kontact_LDADD = $(top_builddir)/libtdepim/libtdepim.la \
   $(top_builddir)/kontact/interfaces/libkpinterfaces.la libkontact.la \
-  $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_TDEHTML)
+  $(LIB_TDEPARTS) $(LIB_TDEUTILS) $(LIB_TDEHTML)
 kontact_SOURCES = main.cpp mainwindow.cpp sidepanebase.cpp \
   iconsidepane.cpp aboutdialog.cpp profilemanager.cpp profiledialog.cpp \
   kontactiface.skel