Additional k => tde renaming and fixes

25 files changed, 76 insertions, 76 deletions

diff --git a/languages/cpp/app_templates/chello_gba/README.devel b/languages/cpp/app_templates/chello_gba/README.devel
index 8fbc0285..a7cdcc75 100644
--- a/languages/cpp/app_templates/chello_gba/README.devel
+++ b/languages/cpp/app_templates/chello_gba/README.devel
@@ -26,5 +26,5 @@ You can download the emulator from: http://vboy.emuhq.com/
 
 Have fun!
 
-Please report bugs,wishes,problems.. to smeier@tdevelop.org (Sandy Meier)
+Please report bugs,wishes,problems.. to smeier@kdevelop.org (Sandy Meier)
 
diff --git a/languages/cpp/app_templates/dcopservice/src-Makefile.am b/languages/cpp/app_templates/dcopservice/src-Makefile.am
index 63b5b8ed..14c7ca72 100644
--- a/languages/cpp/app_templates/dcopservice/src-Makefile.am
+++ b/languages/cpp/app_templates/dcopservice/src-Makefile.am
@@ -1,7 +1,7 @@
 bin_PROGRAMS = %{APPNAMELC}
 INCLUDES = $(all_includes)
 %{APPNAMELC}_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-%{APPNAMELC}_LDADD = $(LIB_KIO)
+%{APPNAMELC}_LDADD = $(LIB_TDEIO)
 %{APPNAMELC}_SOURCES = main.cpp %{APPNAMELC}.cpp %{APPNAMELC}.skel
 
 
diff --git a/languages/cpp/app_templates/kapp/src-Makefile.am b/languages/cpp/app_templates/kapp/src-Makefile.am
index 9ed90e5d..8125665b 100644
--- a/languages/cpp/app_templates/kapp/src-Makefile.am
+++ b/languages/cpp/app_templates/kapp/src-Makefile.am
@@ -8,7 +8,7 @@ bin_PROGRAMS = %{APPNAMELC} %{APPNAMELC}_client
 INCLUDES         = $(all_includes)
 
 # the library search path. 
-%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KIO)
+%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO)
 
 # the libraries to link against.
 %{APPNAMELC}_LDADD   = $(LIB_TDEFILE) $(LIB_TDEPRINT)
@@ -21,7 +21,7 @@ INCLUDES         = $(all_includes)
 noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}view.h pref.h
 
 # client stuff
-%{APPNAMELC}_client_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KIO)
+%{APPNAMELC}_client_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO)
 %{APPNAMELC}_client_LDADD   = $(LIB_TDECORE)
 %{APPNAMELC}_client_SOURCES = %{APPNAMELC}_client.cpp
 
diff --git a/languages/cpp/app_templates/kateplugin/src-Makefile.am b/languages/cpp/app_templates/kateplugin/src-Makefile.am
index d0f30fe5..ef4450c1 100644
--- a/languages/cpp/app_templates/kateplugin/src-Makefile.am
+++ b/languages/cpp/app_templates/kateplugin/src-Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = lib%{APPNAMELC}plugin.la
 
 lib%{APPNAMELC}plugin_la_SOURCES = plugin_%{APPNAMELC}.cpp
 lib%{APPNAMELC}plugin_la_LIBADD = -lkateinterfaces
-lib%{APPNAMELC}plugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
+lib%{APPNAMELC}plugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
 
 pluginsdir = $(kde_datadir)/kate/plugins/%{APPNAMELC}
 plugins_DATA = plugin_%{APPNAMELC}.rc
diff --git a/languages/cpp/app_templates/kateplugin2/src-Makefile.am b/languages/cpp/app_templates/kateplugin2/src-Makefile.am
index b0cc8f4e..1cc61110 100644
--- a/languages/cpp/app_templates/kateplugin2/src-Makefile.am
+++ b/languages/cpp/app_templates/kateplugin2/src-Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = lib%{APPNAMELC}plugin.la
 
 lib%{APPNAMELC}plugin_la_SOURCES = plugin_%{APPNAMELC}.cpp
 lib%{APPNAMELC}plugin_la_LIBADD = -lkateinterfaces
-lib%{APPNAMELC}plugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
+lib%{APPNAMELC}plugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
 
 pluginsdir = $(kde_datadir)/kate/plugins/%{APPNAMELC}
 plugins_DATA = plugin_%{APPNAMELC}.rc
diff --git a/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt b/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt
index 2544a271..db1f4bab 100644
--- a/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt
+++ b/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt
@@ -17,7 +17,7 @@ kde4_add_kcfg_files(%{APPNAMELC}_SRCS settings.kcfgc )
 
 kde4_add_executable(%{APPNAMELC} ${%{APPNAMELC}_SRCS})
 
-target_link_libraries(%{APPNAMELC} ${KDE4_KDEUI_LIBS} )
+target_link_libraries(%{APPNAMELC} ${KDE4_TDEUI_LIBS} )
 
 install(TARGETS %{APPNAMELC} DESTINATION ${BIN_INSTALL_DIR} )
 
diff --git a/languages/cpp/app_templates/kdedcop/src-Makefile.am b/languages/cpp/app_templates/kdedcop/src-Makefile.am
index 1b1bc620..19ddf2fb 100644
--- a/languages/cpp/app_templates/kdedcop/src-Makefile.am
+++ b/languages/cpp/app_templates/kdedcop/src-Makefile.am
@@ -19,5 +19,5 @@ bin_PROGRAMS = %{APPNAMELC}
 
 # the application source, library search path, and link libraries
 %{APPNAMELC}_SOURCES = main.cpp %{APPNAMELC}.cpp %{APPNAMELC}_iface.skel mainclass.cpp
-%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
+%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
 %{APPNAMELC}_LDADD = $(LIB_TDEUI)
diff --git a/languages/cpp/app_templates/kdevlang/src-Makefile.am b/languages/cpp/app_templates/kdevlang/src-Makefile.am
index b2175a02..18b7a21a 100644
--- a/languages/cpp/app_templates/kdevlang/src-Makefile.am
+++ b/languages/cpp/app_templates/kdevlang/src-Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -I$(kde_includes)/tdevelop/interfaces -I$(kde_includes)/tdevelop/util -I$(kde_includes)/kinterfacedesigner $(all_includes)
 
 kde_module_LTLIBRARIES = libkdev%{APPNAMELC}.la
-libkdev%{APPNAMELC}_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
+libkdev%{APPNAMELC}_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
 libkdev%{APPNAMELC}_la_LIBADD = -ltdevelop
 libkdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}_part.cpp
 
diff --git a/languages/cpp/app_templates/kdevpart/src-Makefile.am b/languages/cpp/app_templates/kdevpart/src-Makefile.am
index 46dd918e..5fe18f43 100644
--- a/languages/cpp/app_templates/kdevpart/src-Makefile.am
+++ b/languages/cpp/app_templates/kdevpart/src-Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
 kde_module_LTLIBRARIES = libkdev%{APPNAMELC}.la
-libkdev%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
+libkdev%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
 libkdev%{APPNAMELC}_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
 libkdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}part.cpp %{APPNAMELC}widget.cpp \
diff --git a/languages/cpp/app_templates/khello/src-Makefile.am b/languages/cpp/app_templates/khello/src-Makefile.am
index 49959e2f..5eed38b6 100644
--- a/languages/cpp/app_templates/khello/src-Makefile.am
+++ b/languages/cpp/app_templates/khello/src-Makefile.am
@@ -22,7 +22,7 @@ bin_PROGRAMS = %{APPNAMELC}
 
 # the application source, library search path, and link libraries
 %{APPNAMELC}_SOURCES = main.cpp %{APPNAMELC}.cpp
-%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
+%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
 %{APPNAMELC}_LDADD = $(LIB_TDEUI)
 
 # this is where the desktop file will go 
diff --git a/languages/cpp/app_templates/khello2/src-Makefile.am b/languages/cpp/app_templates/khello2/src-Makefile.am
index 13bc8d57..453bfd55 100644
--- a/languages/cpp/app_templates/khello2/src-Makefile.am
+++ b/languages/cpp/app_templates/khello2/src-Makefile.am
@@ -22,7 +22,7 @@ bin_PROGRAMS = %{APPNAMELC}
 
 # the application source, library search path, and link libraries
 %{APPNAMELC}_SOURCES = main.cpp %{APPNAMELC}.cpp %{APPNAMELC}widget.cpp %{APPNAMELC}widgetbase.ui
-%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
+%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
 %{APPNAMELC}_LDADD = $(LIB_TDEUI)
 
 # this is where the desktop file will go 
diff --git a/languages/cpp/app_templates/kicker/src-Makefile.am b/languages/cpp/app_templates/kicker/src-Makefile.am
index f595c26f..296282f5 100644
--- a/languages/cpp/app_templates/kicker/src-Makefile.am
+++ b/languages/cpp/app_templates/kicker/src-Makefile.am
@@ -4,7 +4,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = %{APPNAMELC}_panelapplet.la
 
 %{APPNAMELC}_panelapplet_la_SOURCES = %{APPNAMELC}.cpp
-%{APPNAMELC}_panelapplet_la_LDFLAGS = -module -avoid-version $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
+%{APPNAMELC}_panelapplet_la_LDFLAGS = -module -avoid-version $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
 %{APPNAMELC}_panelapplet_la_LIBADD = $(LIB_TDEUI) 
 
 %{APPNAMELC}_DATA = %{APPNAMELC}.desktop
diff --git a/languages/cpp/app_templates/kofficepart/src-Makefile.am b/languages/cpp/app_templates/kofficepart/src-Makefile.am
index f4405b57..dbe77db5 100644
--- a/languages/cpp/app_templates/kofficepart/src-Makefile.am
+++ b/languages/cpp/app_templates/kofficepart/src-Makefile.am
@@ -5,19 +5,19 @@ INCLUDES  = $(KOFFICE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = lib%{APPNAMELC}part.la
 lib%{APPNAMELC}part_la_SOURCES = %{APPNAMELC}_part.cpp \
 	%{APPNAMELC}_view.cpp %{APPNAMELC}_factory.cpp
-lib%{APPNAMELC}part_la_LDFLAGS = $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
+lib%{APPNAMELC}part_la_LDFLAGS = $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
 lib%{APPNAMELC}part_la_LIBADD = -lkofficeui
 
 ## The tdeinit loadable module
 lib_LTLIBRARIES = %{APPNAMELC}.la
 %{APPNAMELC}_la_SOURCES = %{APPNAMELC}.cpp
-%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
+%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
 %{APPNAMELC}_la_LIBADD = -lkofficecore
 
 ## The executable
 bin_PROGRAMS = %{APPNAMELC}
 %{APPNAMELC}_SOURCES = dummy.cpp
-%{APPNAMELC}_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
+%{APPNAMELC}_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
 %{APPNAMELC}_LDADD = %{APPNAMELC}.la
 
 dummy.cpp:
diff --git a/languages/cpp/app_templates/konqnavpanel/src-Makefile.am b/languages/cpp/app_templates/konqnavpanel/src-Makefile.am
index 2e87715e..18790bd3 100644
--- a/languages/cpp/app_templates/konqnavpanel/src-Makefile.am
+++ b/languages/cpp/app_templates/konqnavpanel/src-Makefile.am
@@ -4,8 +4,8 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES=konqsidebar_%{APPNAMELC}.la
 
 konqsidebar_%{APPNAMELC}_la_SOURCES = %{APPNAMELC}.cpp
-konqsidebar_%{APPNAMELC}_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) -lkonqsidebarplugin
-konqsidebar_%{APPNAMELC}_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEFILE)
+konqsidebar_%{APPNAMELC}_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) -lkonqsidebarplugin
+konqsidebar_%{APPNAMELC}_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEFILE)
 
 %{APPNAMELC}_entry_DATA = %{APPNAMELC}.desktop
 %{APPNAMELC}_entrydir = $(kde_datadir)/konqsidebartng/entries
diff --git a/languages/cpp/app_templates/kpartapp/src-Makefile.am b/languages/cpp/app_templates/kpartapp/src-Makefile.am
index 3864442d..3fe0f319 100644
--- a/languages/cpp/app_templates/kpartapp/src-Makefile.am
+++ b/languages/cpp/app_templates/kpartapp/src-Makefile.am
@@ -23,8 +23,8 @@ bin_PROGRAMS = %{APPNAMELC}
 
 # the application source, library search path, and link libraries
 %{APPNAMELC}_SOURCES = main.cpp %{APPNAMELC}.cpp
-%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KIO)
-%{APPNAMELC}_LDADD   = $(LIB_KPARTS)
+%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO)
+%{APPNAMELC}_LDADD   = $(LIB_TDEPARTS)
 
 # this is where the desktop file will go 
 shelldesktopdir   = $(kde_appsdir)/Utilities
@@ -41,8 +41,8 @@ kde_module_LTLIBRARIES = lib%{APPNAMELC}part.la
 
 # the Part's source, library search path, and link libraries
 lib%{APPNAMELC}part_la_SOURCES = %{APPNAMELC}_part.cpp
-lib%{APPNAMELC}part_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KIO)
-lib%{APPNAMELC}part_la_LIBADD  = $(LIB_KPARTS) $(LIB_TDEFILE)
+lib%{APPNAMELC}part_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO)
+lib%{APPNAMELC}part_la_LIBADD  = $(LIB_TDEPARTS) $(LIB_TDEFILE)
 
 # this is where the desktop file will go 
 partdesktopdir   = $(kde_servicesdir)
diff --git a/languages/cpp/app_templates/kpartplugin/src-Makefile.am b/languages/cpp/app_templates/kpartplugin/src-Makefile.am
index 6043b380..d74389bd 100644
--- a/languages/cpp/app_templates/kpartplugin/src-Makefile.am
+++ b/languages/cpp/app_templates/kpartplugin/src-Makefile.am
@@ -9,8 +9,8 @@ kde_module_LTLIBRARIES = lib%{APPNAMELC}plugin.la
 # This is all standard.  Remove the LIB_TDEHTML reference if you are not
 # using the TDEHTML Part
 lib%{APPNAMELC}plugin_la_SOURCES = plugin_%{APPNAMELC}.cpp
-lib%{APPNAMELC}plugin_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEHTML)
-lib%{APPNAMELC}plugin_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
+lib%{APPNAMELC}plugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEHTML)
+lib%{APPNAMELC}plugin_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
 
 # Install the .rc file in the Part's directory (in this case, the part
 # is TDEHTMLPart)
diff --git a/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.h b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.h
index db4a4323..d84cd961 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.h
+++ b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.h
@@ -1,7 +1,7 @@
 %{H_TEMPLATE}
 
-#ifndef KMDIKONSOLE_H
-#define KMDIKONSOLE_H
+#ifndef TDEMDIKONSOLE_H
+#define TDEMDIKONSOLE_H
 
 #include <tqvbox.h>
 
@@ -30,4 +30,4 @@ class tdemdikonsole : public TQVBox
 		bool m_haskonsole;
 };
 
-#endif // KMDIKONSOLE_H
+#endif // TDEMDIKONSOLE_H
diff --git a/languages/cpp/app_templates/kxt/src-Makefile.am b/languages/cpp/app_templates/kxt/src-Makefile.am
index 64436465..253c2517 100644
--- a/languages/cpp/app_templates/kxt/src-Makefile.am
+++ b/languages/cpp/app_templates/kxt/src-Makefile.am
@@ -11,7 +11,7 @@ INCLUDES         = $(all_includes)
 METASOURCES = AUTO
 
 # the library search path. 
-%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
+%{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
 
 # the libraries to link against.
 %{APPNAMELC}_LDADD   = $(LIB_TDEFILE) $(LIB_TDEPRINT)
diff --git a/languages/cpp/app_templates/noatunui/src-Makefile.am b/languages/cpp/app_templates/noatunui/src-Makefile.am
index 5086cbe5..6043abc5 100644
--- a/languages/cpp/app_templates/noatunui/src-Makefile.am
+++ b/languages/cpp/app_templates/noatunui/src-Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = noatun_%{APPNAMELC}plugin.la
 
 noatun_%{APPNAMELC}plugin_la_SOURCES = plugin_%{APPNAMELC}.cpp plugin_%{APPNAMELC}_impl.cpp
-noatun_%{APPNAMELC}plugin_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
+noatun_%{APPNAMELC}plugin_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
 noatun_%{APPNAMELC}plugin_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lnoatuncontrols \
                                     -lqtmcop -lkmedia2_idl -lsoundserver_idl
 
diff --git a/languages/cpp/app_templates/noatunvisual/src-Makefile.am b/languages/cpp/app_templates/noatunvisual/src-Makefile.am
index 9820cd35..023712e0 100644
--- a/languages/cpp/app_templates/noatunvisual/src-Makefile.am
+++ b/languages/cpp/app_templates/noatunvisual/src-Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = noatun_%{APPNAMELC}plugin.la
 
 noatun_%{APPNAMELC}plugin_la_SOURCES = plugin_%{APPNAMELC}.cpp plugin_%{APPNAMELC}_impl.cpp
-noatun_%{APPNAMELC}plugin_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(LIBSDL_RPATH) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
+noatun_%{APPNAMELC}plugin_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(LIBSDL_RPATH) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
 noatun_%{APPNAMELC}plugin_la_CXXFLAGS = $(LIBSDL_CFLAGS)
 noatun_%{APPNAMELC}plugin_la_LIBADD = $(LIB_TDEFILE) $(LIBSDL_LIBS) -lnoatun -lm
 
diff --git a/languages/cpp/app_templates/tdefileplugin/src-Makefile.am b/languages/cpp/app_templates/tdefileplugin/src-Makefile.am
index c96817d5..31078c93 100644
--- a/languages/cpp/app_templates/tdefileplugin/src-Makefile.am
+++ b/languages/cpp/app_templates/tdefileplugin/src-Makefile.am
@@ -8,8 +8,8 @@ noinst_HEADERS   = tdefile_%{APPNAMELC}.h
 kde_module_LTLIBRARIES = tdefile_%{APPNAMELC}.la
 
 tdefile_%{APPNAMELC}_la_SOURCES = tdefile_%{APPNAMELC}.cpp
-tdefile_%{APPNAMELC}_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KIO)
-tdefile_%{APPNAMELC}_la_LIBADD = $(LIB_KIO)
+tdefile_%{APPNAMELC}_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEIO)
+tdefile_%{APPNAMELC}_la_LIBADD = $(LIB_TDEIO)
 
 # let automoc handle all of the meta source files ((moc))
 METASOURCES = AUTO
diff --git a/languages/cpp/app_templates/tdeioslave/slave.protocol b/languages/cpp/app_templates/tdeioslave/slave.protocol
index c9347839..c0ba2fe9 100644
--- a/languages/cpp/app_templates/tdeioslave/slave.protocol
+++ b/languages/cpp/app_templates/tdeioslave/slave.protocol
@@ -11,7 +11,7 @@ Description[br]=Ur c'hioslave evit %{APPNAMELC}
 Description[ca]=Un tdeioslave per a %{APPNAMELC}
 Description[da]=En tdeioslave til %{APPNAMELC}
 Description[de]=Ein Ein-/Ausgabemodul für %{APPNAMELC}
-Description[el]=Ένα υπηρέτης kio για %{APPNAMELC}
+Description[el]=Ένα υπηρέτης tdeio για %{APPNAMELC}
 Description[es]=Un tdeioslave para %{APPNAMELC}
 Description[et]=%{APPNAMELC} IO-moodul
 Description[eu]=tdeioslave bat honentzat: %{APPNAMELC}
diff --git a/languages/cpp/app_templates/tdeioslave/src-Makefile.am b/languages/cpp/app_templates/tdeioslave/src-Makefile.am
index c7ed36ea..90e6cdfc 100644
--- a/languages/cpp/app_templates/tdeioslave/src-Makefile.am
+++ b/languages/cpp/app_templates/tdeioslave/src-Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = tdeio_%{APPNAMELC}.la
 
 tdeio_%{APPNAMELC}_la_SOURCES = %{APPNAMELC}.cpp
 tdeio_%{APPNAMELC}_la_LIBADD = -ltdeio        
-tdeio_%{APPNAMELC}_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
+tdeio_%{APPNAMELC}_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
 
 protocol_DATA = %{APPNAMELC}.protocol
 protocoldir = $(kde_servicesdir)
diff --git a/languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate b/languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate
index 27279fd2..984fb179 100644
--- a/languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate
+++ b/languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate
@@ -1,24 +1,24 @@
 # TDE Config File
 [General]
-Name=KIO slave
-Name[br]=Sklav KIO
-Name[ca]=Esclau KIO
-Name[da]=KIO-slave
+Name=TDEIO slave
+Name[br]=Sklav TDEIO
+Name[ca]=Esclau TDEIO
+Name[da]=TDEIO-slave
 Name[de]=Ein-/Ausgabemodul
-Name[el]=Υπηρέτης KIO
-Name[es]=Esclavo KIO
-Name[et]=KIO-moodul
-Name[eu]=KIO morroia
-Name[fr]=Esclave KIO
-Name[ga]=Sclábhaí KIO
-Name[gl]=Escravo KIO
+Name[el]=Υπηρέτης TDEIO
+Name[es]=Esclavo TDEIO
+Name[et]=TDEIO-moodul
+Name[eu]=TDEIO morroia
+Name[fr]=Esclave TDEIO
+Name[ga]=Sclábhaí TDEIO
+Name[gl]=Escravo TDEIO
 Name[hu]=TDE-protokoll (KIOslave)
-Name[it]=Slave KIO
+Name[it]=Slave TDEIO
 Name[nds]=In-/Utgaavmoduul
-Name[ne]=KIO स्लेभ
-Name[nl]=KIO-slave
-Name[pt]=KIO Slave
-Name[sk]=KIO otrok
+Name[ne]=TDEIO स्लेभ
+Name[nl]=TDEIO-slave
+Name[pt]=TDEIO Slave
+Name[sk]=TDEIO otrok
 Name[sv]=I/O-slav
 Icon=tdeioslave.png
 Category=C++/TDE
@@ -152,32 +152,32 @@ Dest=%{dest}/src/%{APPNAMELC}.protocol
 
 [MSG]
 Type=message
-Comment=A KIO slave was created in %{dest}
-Comment[ca]=Un esclau KIO ha estat creat en %{dest}
-Comment[da]=En KIO-slave blev oprettet i %{dest}
+Comment=A TDEIO slave was created in %{dest}
+Comment[ca]=Un esclau TDEIO ha estat creat en %{dest}
+Comment[da]=En TDEIO-slave blev oprettet i %{dest}
 Comment[de]=Ein Ein-/Ausgabemodul wurde in %{dest} erstellt.
-Comment[el]=Ένας υπηρέτης KIO δημιουργήθηκε στο %{dest}
-Comment[es]=Un esclavo KIO ha sido creado en %{dest}
-Comment[et]=KIO-moodul loodi asukohta %{dest}
-Comment[eu]=KIO morroi bat sortu da hemen: %{dest}
-Comment[fa]=یک KIO slave در %{dest} ایجاد شد
+Comment[el]=Ένας υπηρέτης TDEIO δημιουργήθηκε στο %{dest}
+Comment[es]=Un esclavo TDEIO ha sido creado en %{dest}
+Comment[et]=TDEIO-moodul loodi asukohta %{dest}
+Comment[eu]=TDEIO morroi bat sortu da hemen: %{dest}
+Comment[fa]=یک TDEIO slave در %{dest} ایجاد شد
 Comment[fr]=Un esclave d'entrée / sortie a été créé dans %{dest}
-Comment[ga]=Cruthaíodh sclábhaí KIO i %{dest}
-Comment[gl]=Creouse un escravo KIO en %{dest}
+Comment[ga]=Cruthaíodh sclábhaí TDEIO i %{dest}
+Comment[gl]=Creouse un escravo TDEIO en %{dest}
 Comment[hu]=Létrejött egy KIOslave itt: %{dest}
-Comment[it]=È stato generato un slave KIO in %{dest}
-Comment[ja]=KIO slave を %{dest} に作成しました。
+Comment[it]=È stato generato un slave TDEIO in %{dest}
+Comment[ja]=TDEIO slave を %{dest} に作成しました。
 Comment[nds]=In %{dest} wöör en In-/Utgaavmoduul opstellt
-Comment[ne]=KIO स्लेभ %{dest} मा सिर्जना गरियो
-Comment[nl]=Een KIO-slave is aangemaakt in %{dest}
-Comment[pl]=KIO slave został utworzony w %{dest}
-Comment[pt]=Foi criado um 'KIO slave' em %{dest}
-Comment[pt_BR]=Foi criado um 'KIO slave' em %{dest}
-Comment[ru]=Канал KIO slave создан в %{dest}
-Comment[sk]=KIO otrok bol vytvorený v %{dest}
-Comment[sr]=KIO slave је направљен у %{dest}
-Comment[sr@Latn]=KIO slave je napravljen u %{dest}
+Comment[ne]=TDEIO स्लेभ %{dest} मा सिर्जना गरियो
+Comment[nl]=Een TDEIO-slave is aangemaakt in %{dest}
+Comment[pl]=TDEIO slave został utworzony w %{dest}
+Comment[pt]=Foi criado um 'TDEIO slave' em %{dest}
+Comment[pt_BR]=Foi criado um 'TDEIO slave' em %{dest}
+Comment[ru]=Канал TDEIO slave создан в %{dest}
+Comment[sk]=TDEIO otrok bol vytvorený v %{dest}
+Comment[sr]=TDEIO slave је направљен у %{dest}
+Comment[sr@Latn]=TDEIO slave je napravljen u %{dest}
 Comment[sv]=En I/O-slav skapades i %{dest}
-Comment[tr]=Bir KIO slave'i %{dest} içinde yaratıldı.
-Comment[zh_CN]=在 %{dest} 中创建了一个 KIO slave
-Comment[zh_TW]=一個 KIO slave 已建立於 %{dest}
+Comment[tr]=Bir TDEIO slave'i %{dest} içinde yaratıldı.
+Comment[zh_CN]=在 %{dest} 中创建了一个 TDEIO slave
+Comment[zh_TW]=一個 TDEIO slave 已建立於 %{dest}
diff --git a/languages/cpp/app_templates/tdescreensaver/src-Makefile.am b/languages/cpp/app_templates/tdescreensaver/src-Makefile.am
index 5e2caf20..b0cc8d33 100644
--- a/languages/cpp/app_templates/tdescreensaver/src-Makefile.am
+++ b/languages/cpp/app_templates/tdescreensaver/src-Makefile.am
@@ -5,12 +5,12 @@ AM_CPPFLAGS = -UQT_NO_ASCII_CAST
 METASOURCES = AUTO
 
 INCLUDES = $(all_includes)
-LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
+LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS)
 LDADD = $(LIB_TDEUI) -ltdescreensaver -lm
 bin_PROGRAMS = %{APPNAMELC}.kss
 
 %{APPNAMELC}_kss_SOURCES = %{APPNAMELC}ui.ui %{APPNAMELC}.cpp
-%{APPNAMELC}_kss_LDADD = $(LIB_QT) $(LIB_TDECORE) $(LDADD)  $(LIB_KSYCOCA)
+%{APPNAMELC}_kss_LDADD = $(LIB_QT) $(LIB_TDECORE) $(LDADD)  $(LIB_TDESYCOCA)
 
 #datadir = $(kde_datadir)/%{APPNAMELC}