Rename a number of libraries and executables to avoid conflicts with KDE4

74 files changed, 228 insertions, 228 deletions

diff --git a/languages/cpp/addattributedialog.cpp b/languages/cpp/addattributedialog.cpp
index 8d12b40f..885aad6d 100644
--- a/languages/cpp/addattributedialog.cpp
+++ b/languages/cpp/addattributedialog.cpp
@@ -28,8 +28,8 @@
 #include <codemodel.h>
 
 #include <kfiledialog.h>
-#include <kparts/part.h>
-#include <ktexteditor/editinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/editinterface.h>
 #include <klineedit.h>
 
 #include <tqfileinfo.h>
diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp
index 07ecde2b..ae4b5a61 100644
--- a/languages/cpp/addmethoddialog.cpp
+++ b/languages/cpp/addmethoddialog.cpp
@@ -29,8 +29,8 @@
 
 #include <klocale.h>
 #include <kfiledialog.h>
-#include <kparts/part.h>
-#include <ktexteditor/editinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/editinterface.h>
 #include <kdebug.h>
 #include <klineedit.h>
 
diff --git a/languages/cpp/app_templates/CMakeLists.txt b/languages/cpp/app_templates/CMakeLists.txt
index c8c21605..94a914ac 100644
--- a/languages/cpp/app_templates/CMakeLists.txt
+++ b/languages/cpp/app_templates/CMakeLists.txt
@@ -19,7 +19,7 @@ add_subdirectory( kdevpart )
 add_subdirectory( kdevpart2 )
 add_subdirectory( chello )
 add_subdirectory( cpphello )
-add_subdirectory( kscreensaver )
+add_subdirectory( tdescreensaver )
 add_subdirectory( kofficepart )
 add_subdirectory( chello_gba )
 add_subdirectory( dcopservice )
@@ -58,7 +58,7 @@ add_subdirectory( cmakesimplec )
 add_subdirectory( cmakelibcpp )
 add_subdirectory( cmakelibc )
 add_subdirectory( kscons_kxt )
-add_subdirectory( kscons_kmdi )
+add_subdirectory( kscons_tdemdi )
 add_subdirectory( qt4hello )
 add_subdirectory( qmakeempty )
 add_subdirectory( automakeempty )
diff --git a/languages/cpp/app_templates/Makefile.am b/languages/cpp/app_templates/Makefile.am
index d77ef765..09e63e1a 100644
--- a/languages/cpp/app_templates/Makefile.am
+++ b/languages/cpp/app_templates/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = kapp kpartapp kpartplugin tdecmodule kicker kioslave kdevpart kdevpart2 chello cpphello kscreensaver kofficepart chello_gba dcopservice konqnavpanel qmakesimple qmakeapp qt4makeapp khello khello2 kateplugin kateplugin2 qtopiaapp kdedcop wxhello cppsdlhello kconfig35 kdevlang noatunvisual noatunui kmod kfileplugin clanlib opieapp opieapplet opieinput opiemenu opienet opietoday kxt gtk2mmapp cppcurseshello win32hello win32gui cmakesimple cmakesimplec cmakelibcpp cmakelibc kscons_kxt kscons_kmdi qt4hello qmakeempty automakeempty makefileempty qtopia4app kde4app
+SUBDIRS = kapp kpartapp kpartplugin tdecmodule kicker kioslave kdevpart kdevpart2 chello cpphello tdescreensaver kofficepart chello_gba dcopservice konqnavpanel qmakesimple qmakeapp qt4makeapp khello khello2 kateplugin kateplugin2 qtopiaapp kdedcop wxhello cppsdlhello kconfig35 kdevlang noatunvisual noatunui kmod kfileplugin clanlib opieapp opieapplet opieinput opiemenu opienet opietoday kxt gtk2mmapp cppcurseshello win32hello win32gui cmakesimple cmakesimplec cmakelibcpp cmakelibc kscons_kxt kscons_tdemdi qt4hello qmakeempty automakeempty makefileempty qtopia4app kde4app
 
 profilescdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CIDE
 profilesc_DATA = c.appwizard
diff --git a/languages/cpp/app_templates/chello_gba/app.tdevelop b/languages/cpp/app_templates/chello_gba/app.tdevelop
index 2f59c978..88e5395f 100644
--- a/languages/cpp/app_templates/chello_gba/app.tdevelop
+++ b/languages/cpp/app_templates/chello_gba/app.tdevelop
@@ -24,7 +24,7 @@
   <configurations>
    <default>
     <configargs>--host=arm-gcc-elf --build=i386</configargs>
-    <ldflags>-T lnkscript crt0.o</ldflags>
+    <ldflags>-T lntdescript crt0.o</ldflags>
     <ccompiler>kdevgccoptions</ccompiler>
     <cxxcompiler>kdevgppoptions</cxxcompiler>
     <f77compiler>kdevg77options</f77compiler>
diff --git a/languages/cpp/app_templates/kapp/README b/languages/cpp/app_templates/kapp/README
index 1db7896b..1ddb40a1 100644
--- a/languages/cpp/app_templates/kapp/README
+++ b/languages/cpp/app_templates/kapp/README
@@ -53,7 +53,7 @@ embeddable in other apps. For example, the kmplayer kpart can be called to play
 in your app.
 
 For more details, consult :
-http://www-106.ibm.com/developerworks/library/l-kparts/
+http://www-106.ibm.com/developerworks/library/l-tdeparts/
 http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html
 http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html
 
diff --git a/languages/cpp/app_templates/kapp/appview.h b/languages/cpp/app_templates/kapp/appview.h
index be484fec..79513a9d 100644
--- a/languages/cpp/app_templates/kapp/appview.h
+++ b/languages/cpp/app_templates/kapp/appview.h
@@ -4,7 +4,7 @@
 #define _%{APPNAMEUC}VIEW_H_
 
 #include <tqwidget.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <%{APPNAMELC}iface.h>
 
 class TQPainter;
diff --git a/languages/cpp/app_templates/kconfig35/README b/languages/cpp/app_templates/kconfig35/README
index 6f91629b..a27cdb29 100644
--- a/languages/cpp/app_templates/kconfig35/README
+++ b/languages/cpp/app_templates/kconfig35/README
@@ -62,7 +62,7 @@ embeddable in other apps. For example, the kmplayer kpart can be called to play
 in your app.
 
 For more details, consult :
-http://www-106.ibm.com/developerworks/library/l-kparts/
+http://www-106.ibm.com/developerworks/library/l-tdeparts/
 http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html
 http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html
 
diff --git a/languages/cpp/app_templates/kdecpp.appwizard b/languages/cpp/app_templates/kdecpp.appwizard
index ad9bb0d2..1823e891 100644
--- a/languages/cpp/app_templates/kdecpp.appwizard
+++ b/languages/cpp/app_templates/kdecpp.appwizard
@@ -1,2 +1,2 @@
 [General]
-List=kdedcop,kioslave,kxt,kdevlang,kmake,kapp,kconfig35,kdevlang,kdevpart,kateplugin,kdevpart2,kopart,noatunui,kateplugin2,kfileplugin,konqnavpanel,noatunvisual,dcopservice,khello,kpartapp,khello2,kpartplugin,tdecmodule,kicker,kscreensaver,kscons_kxt,kscons_kmdi
+List=kdedcop,kioslave,kxt,kdevlang,kmake,kapp,kconfig35,kdevlang,kdevpart,kateplugin,kdevpart2,kopart,noatunui,kateplugin2,kfileplugin,konqnavpanel,noatunvisual,dcopservice,khello,kpartapp,khello2,kpartplugin,tdecmodule,kicker,tdescreensaver,kscons_kxt,kscons_tdemdi
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp
index 1fe3558c..65bb996e 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp
+++ b/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp
@@ -3,7 +3,7 @@
 
 #include <kurl.h>
 #include <klibloader.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 #include <kdevcore.h>
 
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp
index 1fe3558c..65bb996e 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp
+++ b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp
@@ -3,7 +3,7 @@
 
 #include <kurl.h>
 #include <klibloader.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 #include <kdevcore.h>
 
diff --git a/languages/cpp/app_templates/kpartapp/app.h b/languages/cpp/app_templates/kpartapp/app.h
index 91207694..6b470b92 100644
--- a/languages/cpp/app_templates/kpartapp/app.h
+++ b/languages/cpp/app_templates/kpartapp/app.h
@@ -7,7 +7,7 @@
 #endif
 
 #include <kapplication.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
 class KToggleAction;
 
diff --git a/languages/cpp/app_templates/kpartapp/app_part.h b/languages/cpp/app_templates/kpartapp/app_part.h
index 418d7327..6ea44663 100644
--- a/languages/cpp/app_templates/kpartapp/app_part.h
+++ b/languages/cpp/app_templates/kpartapp/app_part.h
@@ -2,8 +2,8 @@
 #ifndef _%{APPNAMEUC}PART_H_
 #define _%{APPNAMEUC}PART_H_
 
-#include <kparts/part.h>
-#include <kparts/factory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/factory.h>
 
 class TQWidget;
 class TQPainter;
diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
index c5bdb434..c9717c29 100644
--- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
+++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
@@ -1,7 +1,7 @@
 
 #include "plugin_%{APPNAMELC}.h"
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 #include <kaction.h>
 #include <kinstance.h>
 #include <kmessagebox.h>
diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.h b/languages/cpp/app_templates/kpartplugin/plugin_app.h
index 132ce724..16142b33 100644
--- a/languages/cpp/app_templates/kpartplugin/plugin_app.h
+++ b/languages/cpp/app_templates/kpartplugin/plugin_app.h
@@ -2,8 +2,8 @@
 #ifndef _PLUGIN_%{APPNAMEUC}_H_
 #define _PLUGIN_%{APPNAMEUC}_H_
 
-#include <kparts/plugin.h>
-#include <kparts/factory.h>
+#include <tdeparts/plugin.h>
+#include <tdeparts/factory.h>
 
 class Plugin%{APPNAME} : public KParts::Plugin
 {
diff --git a/languages/cpp/app_templates/kpartplugin/src-Makefile.am b/languages/cpp/app_templates/kpartplugin/src-Makefile.am
index 633ca883..a0da7254 100644
--- a/languages/cpp/app_templates/kpartplugin/src-Makefile.am
+++ b/languages/cpp/app_templates/kpartplugin/src-Makefile.am
@@ -14,7 +14,7 @@ lib%{APPNAMELC}plugin_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_PL
 
 # Install the .rc file in the Part's directory (in this case, the part
 # is KHTMLPart)
-pluginsdir = $(kde_datadir)/khtml/kpartplugins
+pluginsdir = $(kde_datadir)/tdehtml/kpartplugins
 plugins_DATA = plugin_%{APPNAMELC}.rc
 
 messages: rc.cpp
diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h
deleted file mode 100644
index d0fde2f8..00000000
--- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h
+++ /dev/null
@@ -1,30 +0,0 @@
-%{H_TEMPLATE}
-
-#ifndef _%{APPNAMEUC}KMDIVIEW_H
-#define _%{APPNAMEUC}KMDIVIEW_H
-
-#include <kparts/part.h>
-#include <kmdichildview.h>
-#include <kmdichildfrm.h>
-
-/**
- * This class serves as the %{APPNAMELC}kmdi view.
- *
- * @short main view class
- */
-class %{APPNAMELC}kmdiView : public KMdiChildView 
-{
-	Q_OBJECT
-  
-	public:
-		%{APPNAMELC}kmdiView( TQWidget *parentWidget=0L, const char *name=0L );
-		virtual ~%{APPNAMELC}kmdiView();
-
-		KParts::ReadWritePart *part() { return m_part; }
-
-	private:
-		KParts::ReadWritePart *m_part;
-};
-
-#endif // _%{APPNAMEUC}KMDIVIEW_H
-
diff --git a/languages/cpp/app_templates/kscons_kxt/README b/languages/cpp/app_templates/kscons_kxt/README
index bf4edf71..e7aa2647 100644
--- a/languages/cpp/app_templates/kscons_kxt/README
+++ b/languages/cpp/app_templates/kscons_kxt/README
@@ -83,7 +83,7 @@ embeddable in other apps. For example, the kmplayer kpart can be called to play
 in your app.
 
 For more details, consult :
-http://www-106.ibm.com/developerworks/library/l-kparts/
+http://www-106.ibm.com/developerworks/library/l-tdeparts/
 http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html
 http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html
 
diff --git a/languages/cpp/app_templates/kscons_kmdi/CMakeLists.txt b/languages/cpp/app_templates/kscons_tdemdi/CMakeLists.txt
index c42fac4f..c05f1bb1 100644
--- a/languages/cpp/app_templates/kscons_kmdi/CMakeLists.txt
+++ b/languages/cpp/app_templates/kscons_tdemdi/CMakeLists.txt
@@ -9,10 +9,10 @@
 #
 #################################################
 
-add_custom_target( kscons_kmdi.tar.gz ALL
-  COMMAND tar zcf kscons_kmdi.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    app.kcfg app.tdevelop appkmdi.cpp appkmdi.h appkmdiView.cpp
-    appkmdiView.h INSTALL kmdikonsole.cpp kmdikonsole.h
+add_custom_target( kscons_tdemdi.tar.gz ALL
+  COMMAND tar zcf kscons_tdemdi.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
+    app.kcfg app.tdevelop apptdemdi.cpp apptdemdi.h apptdemdiView.cpp
+    apptdemdiView.h INSTALL tdemdikonsole.cpp tdemdikonsole.h
     main.cpp messages.sh prefs.ui QUICKSTART README
     SConscript-doc SConscript-src SConstruct settings.kcfgc
     tips VERSION app_part.cpp app_part.h app_part.rc
@@ -21,10 +21,10 @@ add_custom_target( kscons_kmdi.tar.gz ALL
 
 
 install( FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/kscons_kmdi.tar.gz kscons_kmdi.png
+    ${CMAKE_CURRENT_BINARY_DIR}/kscons_tdemdi.tar.gz kscons_tdemdi.png
   DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
 
 
 install( FILES
-    kscons_kmdi.kdevtemplate
+    kscons_tdemdi.kdevtemplate
   DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kscons_kmdi/INSTALL b/languages/cpp/app_templates/kscons_tdemdi/INSTALL
index e61a3acc..e61a3acc 100644
--- a/languages/cpp/app_templates/kscons_kmdi/INSTALL
+++ b/languages/cpp/app_templates/kscons_tdemdi/INSTALL
diff --git a/languages/cpp/app_templates/kscons_kmdi/Makefile.am b/languages/cpp/app_templates/kscons_tdemdi/Makefile.am
index e349e104..191ea8ee 100644
--- a/languages/cpp/app_templates/kscons_kmdi/Makefile.am
+++ b/languages/cpp/app_templates/kscons_tdemdi/Makefile.am
@@ -1,10 +1,10 @@
-dataFiles = app.kcfg app.tdevelop appkmdi.cpp appkmdi.h appkmdiView.cpp \
-appkmdiView.h INSTALL kmdikonsole.cpp kmdikonsole.h main.cpp \
+dataFiles = app.kcfg app.tdevelop apptdemdi.cpp apptdemdi.h apptdemdiView.cpp \
+apptdemdiView.h INSTALL tdemdikonsole.cpp tdemdikonsole.h main.cpp \
 messages.sh prefs.ui QUICKSTART README SConscript-doc SConscript-src \
 SConstruct settings.kcfgc tips VERSION \
 app_part.cpp app_part.h app_part.rc app_shell.rc
 
-templateName= kscons_kmdi
+templateName= kscons_tdemdi
 
 ### no need to change below:
 template_DATA = $(templateName).kdevtemplate
diff --git a/languages/cpp/app_templates/kscons_kmdi/QUICKSTART b/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART
index a5fbba33..a5fbba33 100644
--- a/languages/cpp/app_templates/kscons_kmdi/QUICKSTART
+++ b/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART
diff --git a/languages/cpp/app_templates/kscons_kmdi/README b/languages/cpp/app_templates/kscons_tdemdi/README
index bf4edf71..e7aa2647 100644
--- a/languages/cpp/app_templates/kscons_kmdi/README
+++ b/languages/cpp/app_templates/kscons_tdemdi/README
@@ -83,7 +83,7 @@ embeddable in other apps. For example, the kmplayer kpart can be called to play
 in your app.
 
 For more details, consult :
-http://www-106.ibm.com/developerworks/library/l-kparts/
+http://www-106.ibm.com/developerworks/library/l-tdeparts/
 http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html
 http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html
 
diff --git a/languages/cpp/app_templates/kscons_kmdi/SConscript-doc b/languages/cpp/app_templates/kscons_tdemdi/SConscript-doc
index 0c3e07e7..0c3e07e7 100644
--- a/languages/cpp/app_templates/kscons_kmdi/SConscript-doc
+++ b/languages/cpp/app_templates/kscons_tdemdi/SConscript-doc
diff --git a/languages/cpp/app_templates/kscons_kmdi/SConscript-src b/languages/cpp/app_templates/kscons_tdemdi/SConscript-src
index c1f9742d..97f5140c 100644
--- a/languages/cpp/app_templates/kscons_kmdi/SConscript-src
+++ b/languages/cpp/app_templates/kscons_tdemdi/SConscript-src
@@ -13,16 +13,16 @@ myenv=env.Copy()
 
 %{APPNAMELC}_sources="""
 main.cpp
-%{APPNAMELC}kmdi.cpp
-%{APPNAMELC}kmdiView.cpp
-kmdikonsole.cpp
+%{APPNAMELC}tdemdi.cpp
+%{APPNAMELC}tdemdiView.cpp
+tdemdikonsole.cpp
 settings.kcfgc
 prefs.ui
 """
 # Now that we have our list of sources we can build the program
 myenv.TDEprogram( '%{APPNAMELC}', %{APPNAMELC}_sources ) # main program
 myenv.TDEaddpaths_includes( './ ../' ) # additional paths
-myenv.TDEaddlibs( 'qt-mt tdecore kio kparts kmdi' ) # additional libraries
+myenv.TDEaddlibs( 'qt-mt tdecore kio tdeparts tdemdi' ) # additional libraries
 
 ## Next, the kpart library
 ## using TDEshlib, the .so and .la are installed automatically when needed
@@ -31,7 +31,7 @@ myenv2=env.Copy()
 %{APPNAMELC}part_sources = '%{APPNAMELC}_part.cpp'
 myenv2.TDEshlib( 'lib%{APPNAMELC}part', %{APPNAMELC}part_sources)
 myenv2.TDEaddpaths_includes( './ #/' ) # the '#' means the top-level directory
-myenv2.TDEaddlibs( 'qt-mt kio tdecore tdeprint kparts' )
+myenv2.TDEaddlibs( 'qt-mt kio tdecore tdeprint tdeparts' )
 # myenv2.TDEaddflags_link( '-DQT_THREAD_SUPPORT' )
 
 #############################
diff --git a/languages/cpp/app_templates/kscons_kmdi/SConstruct b/languages/cpp/app_templates/kscons_tdemdi/SConstruct
index 3954247c..3954247c 100644
--- a/languages/cpp/app_templates/kscons_kmdi/SConstruct
+++ b/languages/cpp/app_templates/kscons_tdemdi/SConstruct
diff --git a/languages/cpp/app_templates/kscons_kmdi/VERSION b/languages/cpp/app_templates/kscons_tdemdi/VERSION
index 2e293c30..2e293c30 100644
--- a/languages/cpp/app_templates/kscons_kmdi/VERSION
+++ b/languages/cpp/app_templates/kscons_tdemdi/VERSION
diff --git a/languages/cpp/app_templates/kscons_kmdi/app.kcfg b/languages/cpp/app_templates/kscons_tdemdi/app.kcfg
index f2c46b64..f2c46b64 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app.kcfg
+++ b/languages/cpp/app_templates/kscons_tdemdi/app.kcfg
diff --git a/languages/cpp/app_templates/kscons_kmdi/app.tdevelop b/languages/cpp/app_templates/kscons_tdemdi/app.tdevelop
index 317a4cbc..317a4cbc 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app.tdevelop
+++ b/languages/cpp/app_templates/kscons_tdemdi/app.tdevelop
diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
index 70f13d98..2bdb725d 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
@@ -2,7 +2,7 @@
 
 #include "%{APPNAMELC}_part.h"
 
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
 #include <kinstance.h>
 #include <kaction.h>
 #include <kstdaction.h>
diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.h b/languages/cpp/app_templates/kscons_tdemdi/app_part.h
index 42d1b22c..13f773a1 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app_part.h
+++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.h
@@ -3,8 +3,8 @@
 #ifndef _%{APPNAMEUC}PART_H_
 #define _%{APPNAMEUC}PART_H_
 
-#include <kparts/part.h>
-#include <kparts/factory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/factory.h>
 
 class TQMultiLineEdit;
 class TQWidget;
diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.rc b/languages/cpp/app_templates/kscons_tdemdi/app_part.rc
index cec8ec5c..cec8ec5c 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app_part.rc
+++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.rc
diff --git a/languages/cpp/app_templates/kscons_kmdi/app_shell.rc b/languages/cpp/app_templates/kscons_tdemdi/app_shell.rc
index c8b2bb98..c8b2bb98 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app_shell.rc
+++ b/languages/cpp/app_templates/kscons_tdemdi/app_shell.rc
diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
index 30e6647c..0ef16672 100644
--- a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
@@ -10,8 +10,8 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <ktip.h>
-#include <kparts/part.h>
-#include <kparts/partmanager.h>
+#include <tdeparts/part.h>
+#include <tdeparts/partmanager.h>
 
 #include <kio/netaccess.h>
 #include <kurl.h>
@@ -40,11 +40,11 @@
 
 #include "settings.h"
 #include "prefs.h"
-#include "%{APPNAMELC}kmdiView.h"
-#include "kmdikonsole.h"
-#include "%{APPNAMELC}kmdi.h"
+#include "%{APPNAMELC}tdemdiView.h"
+#include "tdemdikonsole.h"
+#include "%{APPNAMELC}tdemdi.h"
 
-%{APPNAMELC}kmdi::%{APPNAMELC}kmdi(KMdi::MdiMode mode)
+%{APPNAMELC}tdemdi::%{APPNAMELC}tdemdi(KMdi::MdiMode mode)
 	: KMdiMainFrm( 0, "%{APPNAMELC}", mode )
 {
 	resize( 800, 600 ); // start at 800x600 the first time
@@ -79,7 +79,7 @@
 
 	connect( this, TQT_SIGNAL( viewActivated( KMdiChildView * ) ), this, TQT_SLOT( currentChanged( KMdiChildView * ) ) );
 
-	m_console = new kmdikonsole(this, "konsole");
+	m_console = new tdemdikonsole(this, "konsole");
 	m_console->setIcon( SmallIcon("konsole") );
 	m_console->setCaption( i18n("Terminal") );
 	addToolWindow( m_console, KDockWidget::DockBottom, getMainDockWidget(), 20 );
@@ -102,7 +102,7 @@
 	// position, icon size, etc.
 	setAutoSaveSettings();
 
-	// Read the dock config only if the app was started at least only once - kmdi is tricky
+	// Read the dock config only if the app was started at least only once - tdemdi is tricky
         TDEConfig *cfg = new TDEConfig("%{APPNAMELC}_dockposrc");
         if (cfg->readNumEntry("%{APPNAMELC}_main_dock_settings", 0) == 1) manager()->readConfig(cfg);
         cfg->writeEntry("%{APPNAMELC}_main_dock_settings", 1);
@@ -111,7 +111,7 @@
 	showTipOnStart();
 }
 
-%{APPNAMELC}kmdi::~%{APPNAMELC}kmdi()
+%{APPNAMELC}tdemdi::~%{APPNAMELC}tdemdi()
 {
 	// Write the dock config on exit
         TDEConfig *cfg = new TDEConfig("%{APPNAMELC}_dockposrc");
@@ -120,7 +120,7 @@
 	delete m_console;
 }
 
-void %{APPNAMELC}kmdi::setupActions()
+void %{APPNAMELC}tdemdi::setupActions()
 {
 	setXMLFile("%{APPNAMELC}_shell.rc");
 
@@ -144,19 +144,19 @@ void %{APPNAMELC}kmdi::setupActions()
 	createGUI( NULL );
 }
 
-void %{APPNAMELC}kmdi::showTip() 
+void %{APPNAMELC}tdemdi::showTip() 
 {
 	KTipDialog::showTip(this,TQString(),true);
 }
 
-void %{APPNAMELC}kmdi::showTipOnStart()
+void %{APPNAMELC}tdemdi::showTipOnStart()
 {
 	KTipDialog::showTip(this);
 }
 
-void %{APPNAMELC}kmdi::slotFileNew()
+void %{APPNAMELC}tdemdi::slotFileNew()
 {
-	%{APPNAMELC}kmdiView *view = new %{APPNAMELC}kmdiView(this);
+	%{APPNAMELC}tdemdiView *view = new %{APPNAMELC}tdemdiView(this);
 	m_manager->addPart( view->part() );
 
 	addWindow( view );
@@ -167,14 +167,14 @@ void %{APPNAMELC}kmdi::slotFileNew()
 	currentChanged( view );
 }
 
-void %{APPNAMELC}kmdi::openURL(const KURL & url)
+void %{APPNAMELC}tdemdi::openURL(const KURL & url)
 {
 	// check if the url is not already opened first
-	TQValueList<%{APPNAMELC}kmdiView*>::iterator it  = m_views.begin();
-	TQValueList<%{APPNAMELC}kmdiView*>::iterator end = m_views.end();
+	TQValueList<%{APPNAMELC}tdemdiView*>::iterator it  = m_views.begin();
+	TQValueList<%{APPNAMELC}tdemdiView*>::iterator end = m_views.end();
 	for (; it != end; ++it)
 	{
-		%{APPNAMELC}kmdiView *view = *it;
+		%{APPNAMELC}tdemdiView *view = *it;
 		if (view->part()->url() == url)
 		{
 			activateView(view);
@@ -182,7 +182,7 @@ void %{APPNAMELC}kmdi::openURL(const KURL & url)
 		}
 	}
 
-	%{APPNAMELC}kmdiView *view = new %{APPNAMELC}kmdiView(this);
+	%{APPNAMELC}tdemdiView *view = new %{APPNAMELC}tdemdiView(this);
 	m_manager->addPart( view->part() );
 
 	addWindow( view );
@@ -193,7 +193,7 @@ void %{APPNAMELC}kmdi::openURL(const KURL & url)
 	currentChanged( view );
 }
 
-void %{APPNAMELC}kmdi::currentChanged( KMdiChildView *current )
+void %{APPNAMELC}tdemdi::currentChanged( KMdiChildView *current )
 {
 	//kdWarning()<<"current view changed"<<endl;
 	if (!current)
@@ -204,20 +204,20 @@ void %{APPNAMELC}kmdi::currentChanged( KMdiChildView *current )
 	}
 
 	// switch to the corresponding document
-	if ( m_views.contains( (%{APPNAMELC}kmdiView*) current ) )
+	if ( m_views.contains( (%{APPNAMELC}tdemdiView*) current ) )
 	{
-		%{APPNAMELC}kmdiView *view = (%{APPNAMELC}kmdiView*) current;
+		%{APPNAMELC}tdemdiView *view = (%{APPNAMELC}tdemdiView*) current;
 		//view->updateCaption();
 		m_manager->setActivePart( view->part() );
 	}
 }
 
-void %{APPNAMELC}kmdi::slotFileClose()
+void %{APPNAMELC}tdemdi::slotFileClose()
 {
 	requestClose( activeWindow() );
 }
 
-bool %{APPNAMELC}kmdi::requestClose(KMdiChildView* v)
+bool %{APPNAMELC}tdemdi::requestClose(KMdiChildView* v)
 {
 	//    kdWarning()<<"closing view"<<v<<endl;
 	//    if (view == NULL)
@@ -227,7 +227,7 @@ bool %{APPNAMELC}kmdi::requestClose(KMdiChildView* v)
 	{
 		if ( m_views.count() == 1)
 		{
-			%{APPNAMELC}kmdiView *view = m_views[0];
+			%{APPNAMELC}tdemdiView *view = m_views[0];
 			if (view->part()->queryClose())
 			{
 				m_manager->removePart( view->part() );
@@ -242,7 +242,7 @@ bool %{APPNAMELC}kmdi::requestClose(KMdiChildView* v)
 		return true;
 	}
 
-	%{APPNAMELC}kmdiView *view = (%{APPNAMELC}kmdiView*) v;
+	%{APPNAMELC}tdemdiView *view = (%{APPNAMELC}tdemdiView*) v;
 	if ( m_views.contains( view ) )
 	{
 		m_views.remove( view );
@@ -258,12 +258,12 @@ bool %{APPNAMELC}kmdi::requestClose(KMdiChildView* v)
 	return true;
 }
 
-void %{APPNAMELC}kmdi::slotFileQuit()
+void %{APPNAMELC}tdemdi::slotFileQuit()
 {
 	close();
 }
 
-void %{APPNAMELC}kmdi::optionsShowToolbar()
+void %{APPNAMELC}tdemdi::optionsShowToolbar()
 {
 	if (m_toolbarAction->isChecked())
 		toolBar()->show();
@@ -271,7 +271,7 @@ void %{APPNAMELC}kmdi::optionsShowToolbar()
 		toolBar()->hide();
 }
 
-void %{APPNAMELC}kmdi::optionsShowStatusbar()
+void %{APPNAMELC}tdemdi::optionsShowStatusbar()
 {
 	if (m_statusbarAction->isChecked())
 		statusBar()->show();
@@ -279,7 +279,7 @@ void %{APPNAMELC}kmdi::optionsShowStatusbar()
 		statusBar()->hide();
 }
 
-void %{APPNAMELC}kmdi::optionsConfigureKeys()
+void %{APPNAMELC}tdemdi::optionsConfigureKeys()
 {
 	//KKeyDialog::configure(actionCollection());
 	KKeyDialog dlg( false, this );
@@ -296,12 +296,12 @@ void %{APPNAMELC}kmdi::optionsConfigureKeys()
 	}
 }
 
-void %{APPNAMELC}kmdi::optionsConfigureToolbars()
+void %{APPNAMELC}tdemdi::optionsConfigureToolbars()
 {
 	//saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
 }
 
-void %{APPNAMELC}kmdi::newToolbarConfig()
+void %{APPNAMELC}tdemdi::newToolbarConfig()
 {
 	// This slot is called when user clicks "Ok" or "Apply" in the toolbar editor.
 	// recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.)
@@ -309,7 +309,7 @@ void %{APPNAMELC}kmdi::newToolbarConfig()
 	//applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
 }
 
-void %{APPNAMELC}kmdi::optionsPreferences()
+void %{APPNAMELC}tdemdi::optionsPreferences()
 {
 	// The preference dialog is derived from prefs-base.ui which is subclassed into Prefs
 	//
@@ -324,31 +324,31 @@ void %{APPNAMELC}kmdi::optionsPreferences()
 	dialog->show();
 }
 
-void %{APPNAMELC}kmdi::settingsChanged()
+void %{APPNAMELC}tdemdi::settingsChanged()
 {
 	// propagate the changes to our views
-	/*TQValueList<%{APPNAMELC}kmdiView*>::iterator it  = m_views.begin();
-	  TQValueList<%{APPNAMELC}kmdiView*>::iterator end = m_views.end();
+	/*TQValueList<%{APPNAMELC}tdemdiView*>::iterator it  = m_views.begin();
+	  TQValueList<%{APPNAMELC}tdemdiView*>::iterator end = m_views.end();
 	  for (; it != end; ++it)
 	  {
-	  %{APPNAMELC}kmdiView *view = *it;
+	  %{APPNAMELC}tdemdiView *view = *it;
 	  view->settingsChanged();
 	  }*/
 }
 
-void %{APPNAMELC}kmdi::changeStatusbar(const TQString& text)
+void %{APPNAMELC}tdemdi::changeStatusbar(const TQString& text)
 {
 	// display the text on the statusbar
 	statusBar()->message(text, 2000);
 }
 
-void %{APPNAMELC}kmdi::dragEnterEvent(TQDragEnterEvent *event)
+void %{APPNAMELC}tdemdi::dragEnterEvent(TQDragEnterEvent *event)
 {
 	// accept uri drops only
 	event->accept(KURLDrag::canDecode(event));
 }
 
-void %{APPNAMELC}kmdi::dropEvent(TQDropEvent *event)
+void %{APPNAMELC}tdemdi::dropEvent(TQDropEvent *event)
 {
 	KURL::List urls;
 
@@ -363,15 +363,15 @@ void %{APPNAMELC}kmdi::dropEvent(TQDropEvent *event)
 	}
 }
 
-bool %{APPNAMELC}kmdi::queryClose()
+bool %{APPNAMELC}tdemdi::queryClose()
 {
-	TQValueList<%{APPNAMELC}kmdiView*>::iterator it;
+	TQValueList<%{APPNAMELC}tdemdiView*>::iterator it;
 
 	// check if we can close all documents
 	for (it = m_views.begin(); it != m_views.end(); ++it)
 	{
 		// kdWarning()<<"searching for the part"<<endl;
-		%{APPNAMELC}kmdiView *view = *it;
+		%{APPNAMELC}tdemdiView *view = *it;
 		if (!view->part()->queryClose())
 		{
 			return false;
@@ -382,7 +382,7 @@ bool %{APPNAMELC}kmdi::queryClose()
 	for (it = m_views.begin(); it != m_views.end(); ++it)
 	{
 		// now close all views
-		%{APPNAMELC}kmdiView *view = *it;
+		%{APPNAMELC}tdemdiView *view = *it;
 
 		m_manager->removePart( view->part() );
 		closeWindow( view );
@@ -391,4 +391,4 @@ bool %{APPNAMELC}kmdi::queryClose()
 	return true;
 }
 
-#include "%{APPNAMELC}kmdi.moc"
+#include "%{APPNAMELC}tdemdi.moc"
diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdi.h b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h
index fc4d73aa..02d26d0c 100644
--- a/languages/cpp/app_templates/kscons_kmdi/appkmdi.h
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h
@@ -6,32 +6,32 @@
 #include <tqvaluelist.h>
 
 #include <kapplication.h>
-#include <kmdimainfrm.h>
+#include <tdemdimainfrm.h>
 #include <kurl.h>
 
 class KToggleAction;
 class KRecentFilesAction;
 
-class kmdikonsole;
+class tdemdikonsole;
 class KMdiChildView;
 class TQWidgetStack;
-class %{APPNAMELC}kmdiView;
+class %{APPNAMELC}tdemdiView;
 class TextProperties;
 class MiscProperties;
 
 /**
- * This class serves as the main window for %{APPNAMELC}kmdi.  It handles the
+ * This class serves as the main window for %{APPNAMELC}tdemdi.  It handles the
  * menus, toolbars, and status bars.
  *
  * @short Main window class
  */
-class %{APPNAMELC}kmdi : public KMdiMainFrm
+class %{APPNAMELC}tdemdi : public KMdiMainFrm
 {
 	Q_OBJECT
   
 	public:
-		%{APPNAMELC}kmdi( KMdi::MdiMode mode );
-		virtual ~%{APPNAMELC}kmdi();
+		%{APPNAMELC}tdemdi( KMdi::MdiMode mode );
+		virtual ~%{APPNAMELC}tdemdi();
 		void showTipOnStart();
 
 	public slots:
@@ -69,14 +69,14 @@ class %{APPNAMELC}kmdi : public KMdiMainFrm
 		void setupAccel();
 		void setupActions();
 
-		TQValueList<%{APPNAMELC}kmdiView*> m_views;
+		TQValueList<%{APPNAMELC}tdemdiView*> m_views;
 
 		KToggleAction *m_toolbarAction;
 		KToggleAction *m_statusbarAction;
 
 		KParts::PartManager *m_manager;
 
-		kmdikonsole *m_console;
+		tdemdikonsole *m_console;
 };
 
 #endif // _%{APPNAMEUC}KMDI_H
diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp
index d7c00001..a9b9845e 100644
--- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp
@@ -5,15 +5,15 @@
 
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kmdichildview.h>
+#include <tdemdichildview.h>
 #include <kdebug.h>
 #include <klibloader.h>
 #include <kmessagebox.h>
 
-#include "%{APPNAMELC}kmdiView.h"
+#include "%{APPNAMELC}tdemdiView.h"
 
 
-	%{APPNAMELC}kmdiView::%{APPNAMELC}kmdiView( TQWidget *parentWidget, const char *name )
+	%{APPNAMELC}tdemdiView::%{APPNAMELC}tdemdiView( TQWidget *parentWidget, const char *name )
 : KMdiChildView( parentWidget, name )
 {
 	m_part = NULL;
@@ -55,9 +55,9 @@
 	}
 }
 
-%{APPNAMELC}kmdiView::~%{APPNAMELC}kmdiView()
+%{APPNAMELC}tdemdiView::~%{APPNAMELC}tdemdiView()
 {
 	delete m_part->widget();
 }
 
-#include "%{APPNAMELC}kmdiView.moc"
+#include "%{APPNAMELC}tdemdiView.moc"
diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.h b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.h
new file mode 100644
index 00000000..00109fdb
--- /dev/null
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.h
@@ -0,0 +1,30 @@
+%{H_TEMPLATE}
+
+#ifndef _%{APPNAMEUC}KMDIVIEW_H
+#define _%{APPNAMEUC}KMDIVIEW_H
+
+#include <tdeparts/part.h>
+#include <tdemdichildview.h>
+#include <tdemdichildfrm.h>
+
+/**
+ * This class serves as the %{APPNAMELC}tdemdi view.
+ *
+ * @short main view class
+ */
+class %{APPNAMELC}tdemdiView : public KMdiChildView 
+{
+	Q_OBJECT
+  
+	public:
+		%{APPNAMELC}tdemdiView( TQWidget *parentWidget=0L, const char *name=0L );
+		virtual ~%{APPNAMELC}tdemdiView();
+
+		KParts::ReadWritePart *part() { return m_part; }
+
+	private:
+		KParts::ReadWritePart *m_part;
+};
+
+#endif // _%{APPNAMEUC}KMDIVIEW_H
+
diff --git a/languages/cpp/app_templates/kscons_kmdi/kscons_kmdi.kdevtemplate b/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.kdevtemplate
index 8f8fb599..635d40d8 100644
--- a/languages/cpp/app_templates/kscons_kmdi/kscons_kmdi.kdevtemplate
+++ b/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.kdevtemplate
@@ -30,7 +30,7 @@ Name[tr]=Scons tabanlı KMDI uygulaması
 Name[zh_CN]=基于 Scons 的 KMDI 应用程序
 Name[zh_TW]=Scons 為基礎的 KMDI 應用程式
 Category=C++/TDE
-Icon=kscons_kmdi.png
+Icon=kscons_tdemdi.png
 Comment=Generates a complex KMDI application. Scons scripts are provided for compiling and installing the application.
 Comment[ca]=Genera una complexa aplicació per a KMDI. Els scripts en Scons són proveïts per a compilar i instal·lar l'aplicació.
 Comment[da]=Genererer et komplekst TDE-program. Der sørges for scons-scripter til at kompilere og installere programmet.
@@ -60,7 +60,7 @@ Comment[zh_CN]=生成一个复杂的 KMDI 应用程序。此时会提供 Scons �
 Comment[zh_TW]=產生一個複雜的 KMDI 應用程式。Scons 文稿是用於編譯與安裝應用程式。
 FileTemplates=h,CStyle,cpp,CStyle
 ShowFilesAfterGeneration=%{dest}/QUICKSTART
-Archive=kscons_kmdi.tar.gz
+Archive=kscons_tdemdi.tar.gz
 
 [SCONS]
 Type=include
@@ -128,13 +128,13 @@ Dest=%{dest}/src/SConscript
 
 [FILE11]
 Type=install
-Source=%{src}/appkmdi.cpp
-Dest=%{dest}/src/%{APPNAMELC}kmdi.cpp
+Source=%{src}/apptdemdi.cpp
+Dest=%{dest}/src/%{APPNAMELC}tdemdi.cpp
 
 [FILE12]
 Type=install
-Source=%{src}/appkmdi.h
-Dest=%{dest}/src/%{APPNAMELC}kmdi.h
+Source=%{src}/apptdemdi.h
+Dest=%{dest}/src/%{APPNAMELC}tdemdi.h
 
 [FILE13]
 Type=install
@@ -144,13 +144,13 @@ Dest=%{dest}/src/prefs.ui
 
 [FILE14]
 Type=install
-Source=%{src}/appkmdiView.cpp
-Dest=%{dest}/src/%{APPNAMELC}kmdiView.cpp
+Source=%{src}/apptdemdiView.cpp
+Dest=%{dest}/src/%{APPNAMELC}tdemdiView.cpp
 
 [FILE15]
 Type=install
-Source=%{src}/appkmdiView.h
-Dest=%{dest}/src/%{APPNAMELC}kmdiView.h
+Source=%{src}/apptdemdiView.h
+Dest=%{dest}/src/%{APPNAMELC}tdemdiView.h
 
 [FILE19]
 Type=install
@@ -205,13 +205,13 @@ Dest=%{dest}/po/messages.sh
 
 [FILE31]
 Type=install
-Source=%{src}/kmdikonsole.cpp
-Dest=%{dest}/src/kmdikonsole.cpp
+Source=%{src}/tdemdikonsole.cpp
+Dest=%{dest}/src/tdemdikonsole.cpp
 
 [FILE32]
 Type=install
-Source=%{src}/kmdikonsole.h
-Dest=%{dest}/src/kmdikonsole.h
+Source=%{src}/tdemdikonsole.h
+Dest=%{dest}/src/tdemdikonsole.h
 
 [FILE34]
 Type=install
diff --git a/languages/cpp/app_templates/kscons_kmdi/kscons_kmdi.png b/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.png
index 72a347ee..72a347ee 100644
--- a/languages/cpp/app_templates/kscons_kmdi/kscons_kmdi.png
+++ b/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.png
diff --git a/languages/cpp/app_templates/kscons_kmdi/main.cpp b/languages/cpp/app_templates/kscons_tdemdi/main.cpp
index dca1e7a6..ccfc4fac 100644
--- a/languages/cpp/app_templates/kscons_kmdi/main.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/main.cpp
@@ -6,10 +6,10 @@
 #include <kcmdlineargs.h>
 #include <klocale.h>
 
-#include "%{APPNAMELC}kmdi.h"
+#include "%{APPNAMELC}tdemdi.h"
 
 static const char description[] =
-I18N_NOOP("A simple kmdi app");
+I18N_NOOP("A simple tdemdi app");
 
 static const char version[] = "0.0.1";
 
@@ -42,7 +42,7 @@ int main(int argc, char **argv)
 		// no session.. just start up normally
 		TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
-		%{APPNAMELC}kmdi *widget = new %{APPNAMELC}kmdi( KMdi::IDEAlMode );
+		%{APPNAMELC}tdemdi *widget = new %{APPNAMELC}tdemdi( KMdi::IDEAlMode );
 
 		if (args->count() != 0)
 		{
diff --git a/languages/cpp/app_templates/kscons_kmdi/messages.sh b/languages/cpp/app_templates/kscons_tdemdi/messages.sh
index a0ce678a..a0ce678a 100755
--- a/languages/cpp/app_templates/kscons_kmdi/messages.sh
+++ b/languages/cpp/app_templates/kscons_tdemdi/messages.sh
diff --git a/languages/cpp/app_templates/kscons_kmdi/prefs.ui b/languages/cpp/app_templates/kscons_tdemdi/prefs.ui
index 7830280b..7830280b 100644
--- a/languages/cpp/app_templates/kscons_kmdi/prefs.ui
+++ b/languages/cpp/app_templates/kscons_tdemdi/prefs.ui
diff --git a/languages/cpp/app_templates/kscons_kmdi/settings.kcfgc b/languages/cpp/app_templates/kscons_tdemdi/settings.kcfgc
index 384510cd..384510cd 100644
--- a/languages/cpp/app_templates/kscons_kmdi/settings.kcfgc
+++ b/languages/cpp/app_templates/kscons_tdemdi/settings.kcfgc
diff --git a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp
index 5bd6b949..0eab6525 100644
--- a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp
@@ -3,26 +3,26 @@
 #include <tqfileinfo.h>
 #include <tqframe.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kate/document.h>
 #include <kate/view.h>
 #include <klocale.h>
 #include <klibloader.h>
 #include <kurl.h>
 
-#include "kmdikonsole.h"
+#include "tdemdikonsole.h"
 
-kmdikonsole::kmdikonsole(TQWidget *parent, const char *name) : TQVBox(parent, name)
+tdemdikonsole::tdemdikonsole(TQWidget *parent, const char *name) : TQVBox(parent, name)
 {
 	m_haskonsole = false;
 	respawn();
 }
 
-kmdikonsole::~kmdikonsole()
+tdemdikonsole::~tdemdikonsole()
 {
 }
 
-void kmdikonsole::respawn()
+void tdemdikonsole::respawn()
 {
 	KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart");
 
@@ -41,7 +41,7 @@ void kmdikonsole::respawn()
 	show();
 }
 
-void kmdikonsole::setDirectory(const TQString &dirname)
+void tdemdikonsole::setDirectory(const TQString &dirname)
 {
 	if (m_haskonsole)
 	{
@@ -51,13 +51,13 @@ void kmdikonsole::setDirectory(const TQString &dirname)
 	}
 }
 
-void kmdikonsole::showEvent(TQShowEvent *ev)
+void tdemdikonsole::showEvent(TQShowEvent *ev)
 {
 	TQWidget::showEvent(ev);
 	activate();
 }
 
-void kmdikonsole::activate()
+void tdemdikonsole::activate()
 {
 	if (m_haskonsole)
 	{
@@ -67,10 +67,10 @@ void kmdikonsole::activate()
 	}
 }
 
-void kmdikonsole::slotDestroyed()
+void tdemdikonsole::slotDestroyed()
 {
 	m_haskonsole=false;
 	respawn();
 }
 
-#include "kmdikonsole.moc"
+#include "tdemdikonsole.moc"
diff --git a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.h
index df3a1526..db4a4323 100644
--- a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h
+++ b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.h
@@ -5,14 +5,14 @@
 
 #include <tqvbox.h>
 
-class kmdikonsole : public TQVBox
+class tdemdikonsole : public TQVBox
 {
 	Q_OBJECT
   
 
 	public:
-		kmdikonsole( TQWidget* parent, const char* name=0);
-		~kmdikonsole();
+		tdemdikonsole( TQWidget* parent, const char* name=0);
+		~tdemdikonsole();
 
 	public slots:
 		void setDirectory(const TQString & dir);
diff --git a/languages/cpp/app_templates/kscons_kmdi/tips b/languages/cpp/app_templates/kscons_tdemdi/tips
index b9618b42..b9618b42 100644
--- a/languages/cpp/app_templates/kscons_kmdi/tips
+++ b/languages/cpp/app_templates/kscons_tdemdi/tips
diff --git a/languages/cpp/app_templates/kxt/README b/languages/cpp/app_templates/kxt/README
index a7775d6a..a24ad60a 100644
--- a/languages/cpp/app_templates/kxt/README
+++ b/languages/cpp/app_templates/kxt/README
@@ -58,7 +58,7 @@ embeddable in other apps. For example, the kmplayer kpart can be called to play
 in your app.
 
 For more details, consult :
-http://www-106.ibm.com/developerworks/library/l-kparts/
+http://www-106.ibm.com/developerworks/library/l-tdeparts/
 http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html
 http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html
 
diff --git a/languages/cpp/app_templates/tdecmodule/module.cpp b/languages/cpp/app_templates/tdecmodule/module.cpp
index 2c8d9271..52203d1a 100644
--- a/languages/cpp/app_templates/tdecmodule/module.cpp
+++ b/languages/cpp/app_templates/tdecmodule/module.cpp
@@ -4,7 +4,7 @@
 
 #include <klocale.h>
 #include <kglobal.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
 
 #include "%{APPNAMELC}.h"
 
diff --git a/languages/cpp/app_templates/kscreensaver/.kdev_ignore b/languages/cpp/app_templates/tdescreensaver/.kdev_ignore
index e69de29b..e69de29b 100644
--- a/languages/cpp/app_templates/kscreensaver/.kdev_ignore
+++ b/languages/cpp/app_templates/tdescreensaver/.kdev_ignore
diff --git a/languages/cpp/app_templates/kscreensaver/CMakeLists.txt b/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt
index a74c003c..b1149d88 100644
--- a/languages/cpp/app_templates/kscreensaver/CMakeLists.txt
+++ b/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt
@@ -9,19 +9,19 @@
 #
 #################################################
 
-add_custom_target( kscreensaver.tar.gz ALL
-  COMMAND tar zcf kscreensaver.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    kscreensaver.desktop kscreensaver.png kscreensaver.h
-    kscreensaverui.ui src-Makefile.am kscreensaver.cpp
-    kscreensaver.tdevelop subdirs
+add_custom_target( tdescreensaver.tar.gz ALL
+  COMMAND tar zcf tdescreensaver.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
+    tdescreensaver.desktop tdescreensaver.png tdescreensaver.h
+    tdescreensaverui.ui src-Makefile.am tdescreensaver.cpp
+    tdescreensaver.tdevelop subdirs
 )
 
 
 install( FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/kscreensaver.tar.gz kscreensaver.png
+    ${CMAKE_CURRENT_BINARY_DIR}/tdescreensaver.tar.gz tdescreensaver.png
   DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
 
 
 install( FILES
-    kscreensaver.kdevtemplate
+    tdescreensaver.kdevtemplate
   DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kscreensaver/Makefile.am b/languages/cpp/app_templates/tdescreensaver/Makefile.am
index a304c27a..bee93bbc 100644
--- a/languages/cpp/app_templates/kscreensaver/Makefile.am
+++ b/languages/cpp/app_templates/tdescreensaver/Makefile.am
@@ -1,8 +1,8 @@
-dataFiles = kscreensaver.desktop kscreensaver.png kscreensaver.h \
-	kscreensaverui.ui src-Makefile.am kscreensaver.cpp \
-	kscreensaver.tdevelop subdirs
+dataFiles = tdescreensaver.desktop tdescreensaver.png tdescreensaver.h \
+	tdescreensaverui.ui src-Makefile.am tdescreensaver.cpp \
+	tdescreensaver.tdevelop subdirs
 
-templateName= kscreensaver
+templateName= tdescreensaver
 
 ### no need to change below:
 template_DATA = $(templateName).kdevtemplate
diff --git a/languages/cpp/app_templates/kscreensaver/src-Makefile.am b/languages/cpp/app_templates/tdescreensaver/src-Makefile.am
index 83c32868..5e2caf20 100644
--- a/languages/cpp/app_templates/kscreensaver/src-Makefile.am
+++ b/languages/cpp/app_templates/tdescreensaver/src-Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 
 INCLUDES = $(all_includes)
 LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
-LDADD = $(LIB_TDEUI) -lkscreensaver -lm
+LDADD = $(LIB_TDEUI) -ltdescreensaver -lm
 bin_PROGRAMS = %{APPNAMELC}.kss
 
 %{APPNAMELC}_kss_SOURCES = %{APPNAMELC}ui.ui %{APPNAMELC}.cpp
diff --git a/languages/cpp/app_templates/kscreensaver/subdirs b/languages/cpp/app_templates/tdescreensaver/subdirs
index 0e678106..0e678106 100644
--- a/languages/cpp/app_templates/kscreensaver/subdirs
+++ b/languages/cpp/app_templates/tdescreensaver/subdirs
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp
index 12699c32..f8e88db8 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp
@@ -11,7 +11,7 @@
 #include "%{APPNAMELC}.h"
 #include "%{APPNAMELC}ui.h"
 
-//! libkscreensaver interface
+//! libtdescreensaver interface
 extern "C"
 {
     const char *kss_applicationName = "%{APPNAMELC}.kss";
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.desktop b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop
index 046eb9a2..b4ec0186 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaver.desktop
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=%{APPNAMELC}.kss
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=Setup;InWindow;Root;
 X-TDE-Category=Miscellaneous
@@ -43,7 +43,7 @@ Name[sv]=Inställning...
 Name[tr]=Kurulum...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=%{APPNAMELC}.kss -window-id %w
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.h b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.h
index 881137c5..e066852a 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaver.h
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.h
@@ -3,7 +3,7 @@
 #ifndef %{APPNAME}_H__
 #define %{APPNAME}_H__
 
-#include "kscreensaver.h"
+#include "tdescreensaver.h"
 #include "%{APPNAMELC}ui.h"
 
 class %{APPNAME} : public KScreenSaver
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.kdevtemplate b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate
index 24b96770..df27d577 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaver.kdevtemplate
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate
@@ -31,7 +31,7 @@ Name[sv]=TDE-skärmsläckare
 Name[tr]=TDE Ekran Koruyucusu
 Name[zh_CN]= TDE 屏幕保护程序
 Name[zh_TW]=TDE 螢幕保護程式
-Icon=kscreensaver.png
+Icon=tdescreensaver.png
 Category=C++/TDE
 Comment=Generates a framework for a TDE screensaver.
 Comment[ca]=Genera una infraestructura per a un salvapantalles de TDE.
@@ -64,7 +64,7 @@ Comment[zh_CN]=生成 TDE 屏幕保护程序框架。
 Comment[zh_TW]=產生一個 TDE 螢幕保護程式的框架
 FileTemplates=h,CStyle,cpp,CStyle
 ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}.cpp
-Archive=kscreensaver.tar.gz
+Archive=tdescreensaver.tar.gz
 
 [ADMIN]
 Type=include
@@ -102,7 +102,7 @@ Dest=%{dest}/doc/en/index.docbook
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/kscreensaver.tdevelop
+Source=%{src}/tdescreensaver.tdevelop
 Dest=%{dest}/%{APPNAMELC}.tdevelop
 
 [MkDir3]
@@ -150,23 +150,23 @@ Dest=%{dest}/src/Makefile.am
 
 [FILE12]
 Type=install
-Source=%{src}/kscreensaver.cpp
+Source=%{src}/tdescreensaver.cpp
 Dest=%{dest}/src/%{APPNAMELC}.cpp
 
 [FILE13]
 Type=install
-Source=%{src}/kscreensaver.h
+Source=%{src}/tdescreensaver.h
 Dest=%{dest}/src/%{APPNAMELC}.h
 
 [FILE14]
 Type=install
-Source=%{src}/kscreensaver.desktop
+Source=%{src}/tdescreensaver.desktop
 Dest=%{dest}/src/%{APPNAMELC}.desktop
 
 [FILE15]
 Type=install
 EscapeXML=true
-Source=%{src}/kscreensaverui.ui
+Source=%{src}/tdescreensaverui.ui
 Dest=%{dest}/src/%{APPNAMELC}ui.ui
 
 [MSG]
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.png b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.png
index e91ec2e2..e91ec2e2 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaver.png
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.png
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.tdevelop b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop
index 38429f89..38429f89 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaver.tdevelop
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui b/languages/cpp/app_templates/tdescreensaver/tdescreensaverui.ui
index e83bcda9..e83bcda9 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaverui.ui
diff --git a/languages/cpp/ast_utils.cpp b/languages/cpp/ast_utils.cpp
index f6d19c2a..48eb7bb9 100644
--- a/languages/cpp/ast_utils.cpp
+++ b/languages/cpp/ast_utils.cpp
@@ -19,7 +19,7 @@
 #include <kdebug.h>
 #include <kapplication.h>
 
-#include <ktexteditor/editinterface.h>
+#include <tdetexteditor/editinterface.h>
 
 #include "cppsupport_utils.h"
 
diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp
index ab89713f..a19d3289 100644
--- a/languages/cpp/backgroundparser.cpp
+++ b/languages/cpp/backgroundparser.cpp
@@ -20,10 +20,10 @@
 
 #include <tqmutex.h>
 
-#include <kparts/part.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/view.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/view.h>
 
 #include <kdevpartcontroller.h>
 #include <kdevproject.h>
diff --git a/languages/cpp/codecompletionentry.h b/languages/cpp/codecompletionentry.h
index e510b765..a219fe7a 100644
--- a/languages/cpp/codecompletionentry.h
+++ b/languages/cpp/codecompletionentry.h
@@ -24,7 +24,7 @@
 #ifndef __CODECOMPLETIONENTRY_H__
 #define __CODECOMPLETIONENTRY_H__
 
-#include <ktexteditor/codecompletioninterface.h>
+#include <tdetexteditor/codecompletioninterface.h>
 
 //this is just a little helper-class to allow custom sorting, it must stay binary compatible with KTextEditor::CompletionEntry!!
 class CodeCompletionEntry : public KTextEditor::CompletionEntry
diff --git a/languages/cpp/codeinformationrepository.h b/languages/cpp/codeinformationrepository.h
index 961af5ef..07655dac 100644
--- a/languages/cpp/codeinformationrepository.h
+++ b/languages/cpp/codeinformationrepository.h
@@ -16,7 +16,7 @@
 #include "cppcodecompletion.h"
 #include <tqmap.h>
 
-#include <ktexteditor/codecompletioninterface.h>
+#include <tdetexteditor/codecompletioninterface.h>
 
 struct TypeProcessor {
     virtual TQString processType( const TQString& type ) = 0;
diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp
index 56e8a644..7ef40424 100644
--- a/languages/cpp/cppcodecompletion.cpp
+++ b/languages/cpp/cppcodecompletion.cpp
@@ -44,9 +44,9 @@ email                : [email protected]
 #include <klocale.h>
 #include <kmainwindow.h>
 #include <kmessagebox.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kstatusbar.h>
-#include <ktexteditor/document.h>
+#include <tdetexteditor/document.h>
 #include <kaction.h>
 
 #include <tqdatastream.h>
diff --git a/languages/cpp/cppcodecompletion.h b/languages/cpp/cppcodecompletion.h
index 297f2692..24877215 100644
--- a/languages/cpp/cppcodecompletion.h
+++ b/languages/cpp/cppcodecompletion.h
@@ -27,12 +27,12 @@
 #include <codemodel.h>
 #include <set>
 
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/codecompletioninterface.h>
-#include <ktexteditor/texthintinterface.h>
-#include <ktexteditor/cursorinterface.h>
-#include <ktexteditor/view.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/codecompletioninterface.h>
+#include <tdetexteditor/texthintinterface.h>
+#include <tdetexteditor/cursorinterface.h>
+#include <tdetexteditor/view.h>
 
 #include <tqobject.h>
 #include <tqmutex.h>
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index 94eab619..f0ec6fa9 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -41,7 +41,7 @@
 #include "kdevcreatefile.h"
 #include "qtbuildconfig.h"
 #include "kdeveditorutil.h"
-#include <ktexteditor/viewcursorinterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
 #include <kpopupmenu.h>
 // wizards
 #include "cppnewclassdlg.h"
@@ -85,13 +85,13 @@
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 
-#include <ktexteditor/document.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/selectioninterface.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/clipboardinterface.h>
-#include <ktexteditor/texthintinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/selectioninterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/clipboardinterface.h>
+#include <tdetexteditor/texthintinterface.h>
 
 #include <kdevcore.h>
 #include <kdevproject.h>
diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp
index 35331654..5c747144 100644
--- a/languages/cpp/createpcsdialog.cpp
+++ b/languages/cpp/createpcsdialog.cpp
@@ -20,7 +20,7 @@
 #include <kdevpcsimporter.h>
 #include <kdevcoderepository.h>
 
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #include <ktrader.h>
 #include <kdebug.h>
diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp
index 699b28dd..9c2ade95 100644
--- a/languages/cpp/debugger/debuggerpart.cpp
+++ b/languages/cpp/debugger/debuggerpart.cpp
@@ -28,8 +28,8 @@
 #include <klocale.h>
 #include <kmainwindow.h>
 #include <kstatusbar.h>
-#include <kparts/part.h>
-#include <ktexteditor/viewcursorinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/viewcursorinterface.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
 #include <dcopclient.h>
diff --git a/languages/cpp/doc/kde2book.toc b/languages/cpp/doc/kde2book.toc
index e0b4db61..1156df06 100644
--- a/languages/cpp/doc/kde2book.toc
+++ b/languages/cpp/doc/kde2book.toc
@@ -1534,10 +1534,10 @@
 <entry name="ksimplebrowser.cpp class definition (simple browser application)" url="ch10.html"/>
 <entry name="ksimplebrowser.h class declaration (simple browser application)" url="ch10.html"/>
 <entry name="KSpellConfig configuration dialog box" url="ch10lev1sec3.html"/>
-<entry name="kspelldemo.cpp class declaration (KSpellDemo)" url="ch10lev1sec3.html"/>
-<entry name="kspelldemo.h class definition (KSpellDemo)" url="ch10lev1sec3.html"/>
-<entry name="KSpellDemo (spell-checking application), kspelldemo.cpp class declaration" url="ch10lev1sec3.html"/>
-<entry name="KSpellDemo (spell-checking application), kspelldemo.h class definition" url="ch10lev1sec3.html"/>
+<entry name="tdespelldemo.cpp class declaration (KSpellDemo)" url="ch10lev1sec3.html"/>
+<entry name="tdespelldemo.h class definition (KSpellDemo)" url="ch10lev1sec3.html"/>
+<entry name="KSpellDemo (spell-checking application), tdespelldemo.cpp class declaration" url="ch10lev1sec3.html"/>
+<entry name="KSpellDemo (spell-checking application), tdespelldemo.h class definition" url="ch10lev1sec3.html"/>
 <entry name="KSpellDemo (spell-checking application), main() method" url="ch10lev1sec3.html"/>
 <entry name="KSpell (spell-checking), configuring" url="ch10lev1sec3.html"/>
 <entry name="KSpell (spell-checking), methods" url="ch10lev1sec3.html"/>
@@ -1725,8 +1725,8 @@
 <entry name="listings, KSimpleBrowser, ksimplebrowser.cpp class definition" url="ch10.html"/>
 <entry name="listings, KSimpleBrowser, ksimplebrowser.h class declaration" url="ch10.html"/>
 <entry name="listings, KSimpleBrowser, main() method" url="ch10.html"/>
-<entry name="listings, KSpellDemo (spell-checking application), kspelldemo.cpp class declaration" url="ch10lev1sec3.html"/>
-<entry name="listings, KSpellDemo (spell-checking application), kspelldemo.h class definition" url="ch10lev1sec3.html"/>
+<entry name="listings, KSpellDemo (spell-checking application), tdespelldemo.cpp class declaration" url="ch10lev1sec3.html"/>
+<entry name="listings, KSpellDemo (spell-checking application), tdespelldemo.h class definition" url="ch10lev1sec3.html"/>
 <entry name="listings, KSpellDemo (spell-checking application), main() method" url="ch10lev1sec3.html"/>
 <entry name="listings, KStandardDialogs main.cpp" url="ch05lev1sec3.html"/>
 <entry name="listings, KStatusBarDemo widget, kstatusbardemo.cpp class definition" url="ch05.html"/>
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp
index c3e7ca0c..174219a3 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp
+++ b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp
@@ -62,8 +62,8 @@ TQStringList KDevKDELibsImporter::fileList()
 		files += fileList( m_settings->kdeDir() + "/tdesu" );
 		files += fileList( m_settings->kdeDir() + "/kio" );
 		files += fileList( m_settings->kdeDir() + "/kjs" );
-		files += fileList( m_settings->kdeDir() + "/kparts" );
-		files += fileList( m_settings->kdeDir() + "/ktexteditor" );
+		files += fileList( m_settings->kdeDir() + "/tdeparts" );
+		files += fileList( m_settings->kdeDir() + "/tdetexteditor" );
 	}
 	else if ( scope == 1 )
 	{
diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp
index 27b139f0..6f87771f 100644
--- a/languages/cpp/problemreporter.cpp
+++ b/languages/cpp/problemreporter.cpp
@@ -26,13 +26,13 @@
 #include <kdevproject.h>
 
 #include <tdeversion.h>
-#include <kparts/part.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/document.h>
-#include <ktexteditor/markinterface.h>
+#include <tdeparts/part.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/markinterface.h>
 
-#include <ktexteditor/markinterfaceextension.h>
-#include <ktexteditor/view.h>
+#include <tdetexteditor/markinterfaceextension.h>
+#include <tdetexteditor/view.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/languages/cpp/qtdesignercppintegration.cpp b/languages/cpp/qtdesignercppintegration.cpp
index 32d407a4..c87d0266 100644
--- a/languages/cpp/qtdesignercppintegration.cpp
+++ b/languages/cpp/qtdesignercppintegration.cpp
@@ -27,9 +27,9 @@
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kurl.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/viewcursorinterface.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/viewcursorinterface.h>
 
 #include <domutil.h>
 #include <kdevpartcontroller.h>
diff --git a/languages/cpp/typedesc.h b/languages/cpp/typedesc.h
index de2417a1..0229c781 100644
--- a/languages/cpp/typedesc.h
+++ b/languages/cpp/typedesc.h
@@ -15,7 +15,7 @@
 #ifndef __TYPEDESC_H__
 #define __TYPEDESC_H__
 
-#include <ktexteditor/codecompletioninterface.h>
+#include <tdetexteditor/codecompletioninterface.h>
 #include <ksharedptr.h>
 
 #include "includefiles.h"