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

101 files changed, 181 insertions, 181 deletions

diff --git a/languages/cpp/addattributedialog.cpp b/languages/cpp/addattributedialog.cpp
index 885aad6d..78c9dc84 100644
--- a/languages/cpp/addattributedialog.cpp
+++ b/languages/cpp/addattributedialog.cpp
@@ -27,7 +27,7 @@
 
 #include <codemodel.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/editinterface.h>
 #include <klineedit.h>
diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp
index ae4b5a61..3faf0e97 100644
--- a/languages/cpp/addmethoddialog.cpp
+++ b/languages/cpp/addmethoddialog.cpp
@@ -28,7 +28,7 @@
 #include <kdevcreatefile.h>
 
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/editinterface.h>
 #include <kdebug.h>
diff --git a/languages/cpp/app_templates/CMakeLists.txt b/languages/cpp/app_templates/CMakeLists.txt
index 94a914ac..52229fc6 100644
--- a/languages/cpp/app_templates/CMakeLists.txt
+++ b/languages/cpp/app_templates/CMakeLists.txt
@@ -14,7 +14,7 @@ add_subdirectory( kpartapp )
 add_subdirectory( kpartplugin )
 add_subdirectory( tdecmodule )
 add_subdirectory( kicker )
-add_subdirectory( kioslave )
+add_subdirectory( tdeioslave )
 add_subdirectory( kdevpart )
 add_subdirectory( kdevpart2 )
 add_subdirectory( chello )
@@ -35,12 +35,12 @@ add_subdirectory( qtopiaapp )
 add_subdirectory( kdedcop )
 add_subdirectory( wxhello )
 add_subdirectory( cppsdlhello )
-add_subdirectory( kconfig35 )
+add_subdirectory( tdeconfig35 )
 add_subdirectory( kdevlang )
 add_subdirectory( noatunvisual )
 add_subdirectory( noatunui )
 add_subdirectory( kmod )
-add_subdirectory( kfileplugin )
+add_subdirectory( tdefileplugin )
 add_subdirectory( clanlib )
 add_subdirectory( opieapp )
 add_subdirectory( opieapplet )
diff --git a/languages/cpp/app_templates/Makefile.am b/languages/cpp/app_templates/Makefile.am
index 09e63e1a..8350118d 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 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
+SUBDIRS = kapp kpartapp kpartplugin tdecmodule kicker tdeioslave kdevpart kdevpart2 chello cpphello tdescreensaver kofficepart chello_gba dcopservice konqnavpanel qmakesimple qmakeapp qt4makeapp khello khello2 kateplugin kateplugin2 qtopiaapp kdedcop wxhello cppsdlhello tdeconfig35 kdevlang noatunvisual noatunui kmod tdefileplugin 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/dcopservice/dcopservice.tdevelop b/languages/cpp/app_templates/dcopservice/dcopservice.tdevelop
index ab65a7a0..59569583 100644
--- a/languages/cpp/app_templates/dcopservice/dcopservice.tdevelop
+++ b/languages/cpp/app_templates/dcopservice/dcopservice.tdevelop
@@ -11,7 +11,7 @@
    <keyword>Code</keyword>
    <keyword>Qt</keyword>
    <keyword>TDE</keyword>
-   <keyword>kioslave</keyword>
+   <keyword>tdeioslave</keyword>
   </keywords>
  </general>
  <kdevcppsupport>
diff --git a/languages/cpp/app_templates/kapp/README b/languages/cpp/app_templates/kapp/README
index 1ddb40a1..7720e6b4 100644
--- a/languages/cpp/app_templates/kapp/README
+++ b/languages/cpp/app_templates/kapp/README
@@ -46,7 +46,7 @@ http://developer.kde.org/documentation/tutorials/xmlui/preface.html
 them more maintainable.
 
 For more details, consult :
-http://developer.kde.org/documentation/tutorials/kconfigxt/kconfigxt.html
+http://developer.kde.org/documentation/tutorials/tdeconfigxt/tdeconfigxt.html
 
 * With KParts, you can embed other kde components in your program, or make your program
 embeddable in other apps. For example, the kmplayer kpart can be called to play videos
diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp
index cc77371d..cefcc605 100644
--- a/languages/cpp/app_templates/kapp/app.cpp
+++ b/languages/cpp/app_templates/kapp/app.cpp
@@ -14,9 +14,9 @@
 #include <tdeversion.h>
 #include <kstatusbar.h>
 #include <kaccel.h>
-#include <kio/netaccess.h>
-#include <kfiledialog.h>
-#include <kconfig.h>
+#include <tdeio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <kurldrag.h>
 #include <kurlrequesterdlg.h>
diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
index c74deda0..008db5a8 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
+++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
@@ -5,7 +5,7 @@
 #include <kaction.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/languages/cpp/app_templates/kde4app/kapp4.cpp b/languages/cpp/app_templates/kde4app/kapp4.cpp
index d2e09025..5320898d 100644
--- a/languages/cpp/app_templates/kde4app/kapp4.cpp
+++ b/languages/cpp/app_templates/kde4app/kapp4.cpp
@@ -7,7 +7,7 @@
 #include <TQtGui/TQDropEvent>
 #include <TQtGui/TQPainter>
 
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 #include <kstatusbar.h>
 
 #include <kaction.h>
diff --git a/languages/cpp/app_templates/kde4app/settings.kcfgc b/languages/cpp/app_templates/kde4app/settings.kcfgc
index 384510cd..402fad09 100644
--- a/languages/cpp/app_templates/kde4app/settings.kcfgc
+++ b/languages/cpp/app_templates/kde4app/settings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=%{APPNAMELC}.kcfg
 ClassName=Settings
 Singleton=true
diff --git a/languages/cpp/app_templates/kdecpp.appwizard b/languages/cpp/app_templates/kdecpp.appwizard
index 1823e891..14bcbeaa 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,tdescreensaver,kscons_kxt,kscons_tdemdi
+List=kdedcop,tdeioslave,kxt,kdevlang,kmake,kapp,tdeconfig35,kdevlang,kdevpart,kateplugin,kdevpart2,kopart,noatunui,kateplugin2,tdefileplugin,konqnavpanel,noatunvisual,dcopservice,khello,kpartapp,khello2,kpartplugin,tdecmodule,kicker,tdescreensaver,kscons_kxt,kscons_tdemdi
diff --git a/languages/cpp/app_templates/kfileplugin/src-Makefile.am b/languages/cpp/app_templates/kfileplugin/src-Makefile.am
deleted file mode 100644
index 6d6bb859..00000000
--- a/languages/cpp/app_templates/kfileplugin/src-Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-## Makefile.am for folder file meta info plugin
-
-INCLUDES         = $(all_includes)
-
-# these are the headers for your project
-noinst_HEADERS   = kfile_%{APPNAMELC}.h
-
-kde_module_LTLIBRARIES = kfile_%{APPNAMELC}.la
-
-kfile_%{APPNAMELC}_la_SOURCES = kfile_%{APPNAMELC}.cpp
-kfile_%{APPNAMELC}_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KIO)
-kfile_%{APPNAMELC}_la_LIBADD = $(LIB_KIO)
-
-# let automoc handle all of the meta source files ((moc))
-METASOURCES = AUTO
-
-services_DATA = kfile_%{APPNAMELC}.desktop
-servicesdir = $(kde_servicesdir)
-
-messages: rc.cpp
-	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kfile_%{APPNAMELC}.pot
diff --git a/languages/cpp/app_templates/kicker/applet.cpp b/languages/cpp/app_templates/kicker/applet.cpp
index 8db1939e..78558f78 100644
--- a/languages/cpp/app_templates/kicker/applet.cpp
+++ b/languages/cpp/app_templates/kicker/applet.cpp
@@ -3,7 +3,7 @@
 #include <tqlcdnumber.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
 
diff --git a/languages/cpp/app_templates/kicker/applet.h b/languages/cpp/app_templates/kicker/applet.h
index ba7157a3..7d272743 100644
--- a/languages/cpp/app_templates/kicker/applet.h
+++ b/languages/cpp/app_templates/kicker/applet.h
@@ -9,7 +9,7 @@
 
 #include <kpanelapplet.h>
 #include <tqstring.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 class %{APPNAME} : public KPanelApplet
diff --git a/languages/cpp/app_templates/kioslave/slave.protocol b/languages/cpp/app_templates/kioslave/slave.protocol
deleted file mode 100644
index 2e2cc076..00000000
--- a/languages/cpp/app_templates/kioslave/slave.protocol
+++ /dev/null
@@ -1,39 +0,0 @@
-[Protocol]
-exec=kio_%{APPNAMELC}
-protocol=%{APPNAMELC}
-input=none
-output=stream
-reading=true
-defaultMimetype=text/plain
-Icon=remote
-Description=A kioslave for %{APPNAMELC}
-Description[br]=Ur c'hioslave evit %{APPNAMELC}
-Description[ca]=Un kioslave per a %{APPNAMELC}
-Description[da]=En kioslave til %{APPNAMELC}
-Description[de]=Ein Ein-/Ausgabemodul für %{APPNAMELC}
-Description[el]=Ένα υπηρέτης kio για %{APPNAMELC}
-Description[es]=Un kioslave para %{APPNAMELC}
-Description[et]=%{APPNAMELC} IO-moodul
-Description[eu]=kioslave bat honentzat: %{APPNAMELC}
-Description[fa]=یک kioslave برای %{APPNAMELC}
-Description[fr]=Un esclave d'E/S (kioslave) pour %{APPNAMELC}
-Description[ga]=kioslave le haghaidh %{APPNAMELC}
-Description[gl]=Un kioslave para %{APPNAMELC}
-Description[hu]=%{APPNAMELC}-támogató KIOslave
-Description[it]=Un kioslave per %{APPNAMELC}
-Description[ja]=%{APPNAMELC} のための kioslave
-Description[nds]=En In-/Utgaavmoduul för %{APPNAMELC}
-Description[ne]= %{APPNAMELC} का लागि किवस्लेभ
-Description[nl]=Kioslave voor %{APPNAMELC}
-Description[pl]=kioslave dla %{APPNAMELC}
-Description[pt]=Um 'kioslave' para %{APPNAMELC}
-Description[pt_BR]=Um kioslave para %{APPNAMELC}
-Description[ru]=Канал kioslave для %{APPNAMELC}
-Description[sk]=kioslave pre %{APPNAMELC}
-Description[sl]=kioslave za %{APPNAMELC}
-Description[sr]=KIOSlave за %{APPNAMELC}
-Description[sr@Latn]=KIOSlave za %{APPNAMELC}
-Description[sv]=En I/O-slav för %{APPNAMELC}
-Description[tr]=%{APPNAMELC} için bir kioslave
-Description[zh_CN]=%{APPNAMELC} 的 kioslave
-Description[zh_TW]=%{APPNAMELC} 的 kioslave
diff --git a/languages/cpp/app_templates/kofficepart/kopart.tdevelop b/languages/cpp/app_templates/kofficepart/kopart.tdevelop
index e3b6cc3f..194157d7 100644
--- a/languages/cpp/app_templates/kofficepart/kopart.tdevelop
+++ b/languages/cpp/app_templates/kofficepart/kopart.tdevelop
@@ -11,7 +11,7 @@
    <keyword>Code</keyword>
    <keyword>Qt</keyword>
    <keyword>TDE</keyword>
-   <keyword>kioslave</keyword>
+   <keyword>tdeioslave</keyword>
   </keywords>
  </general>
   <kdevcppsupport>
diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h
index c54c096a..527be77e 100644
--- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h
+++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h
@@ -8,7 +8,7 @@
 
 #include <konqsidebarplugin.h>
 #include <tqstring.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 class %{APPNAME} : public KonqSidebarPlugin
diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp
index c5d30f14..7e7dc64d 100644
--- a/languages/cpp/app_templates/kpartapp/app.cpp
+++ b/languages/cpp/app_templates/kpartapp/app.cpp
@@ -2,8 +2,8 @@
 #include "%{APPNAMELC}.h"
 
 #include <kkeydialog.h>
-#include <kfiledialog.h>
-#include <kconfig.h>
+#include <tdefiledialog.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 
 #include <kedittoolbar.h>
diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp
index e46d21ca..518d4514 100644
--- a/languages/cpp/app_templates/kpartapp/app_part.cpp
+++ b/languages/cpp/app_templates/kpartapp/app_part.cpp
@@ -4,7 +4,7 @@
 #include <kinstance.h>
 #include <kaction.h>
 #include <kstdaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <klocale.h>
 
diff --git a/languages/cpp/app_templates/kscons_kxt/README b/languages/cpp/app_templates/kscons_kxt/README
index e7aa2647..10859289 100644
--- a/languages/cpp/app_templates/kscons_kxt/README
+++ b/languages/cpp/app_templates/kscons_kxt/README
@@ -76,7 +76,7 @@ The configure.in.in will need to be modified : change the line #MIN_CONFIG(3.0.0
 into #MIN_CONFIG(3.2.0)
 
 Take an example on the many apps found in the tdegames source package and consult :
-http://developer.kde.org/documentation/tutorials/kconfigxt/kconfigxt.html
+http://developer.kde.org/documentation/tutorials/tdeconfigxt/tdeconfigxt.html
 
 * With KParts, you can embed other kde components in your program, or make your program
 embeddable in other apps. For example, the kmplayer kpart can be called to play videos
diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp
index bbf648ea..2895fb0a 100644
--- a/languages/cpp/app_templates/kscons_kxt/app.cpp
+++ b/languages/cpp/app_templates/kscons_kxt/app.cpp
@@ -9,7 +9,7 @@
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
 
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/languages/cpp/app_templates/kscons_kxt/messages.sh b/languages/cpp/app_templates/kscons_kxt/messages.sh
index a0ce678a..5c497f99 100755
--- a/languages/cpp/app_templates/kscons_kxt/messages.sh
+++ b/languages/cpp/app_templates/kscons_kxt/messages.sh
@@ -14,7 +14,7 @@
 # for yourself and help me to improve this script, thanks
 # (tnagyemail-mail tat yahoo d0tt fr)
 
-SRCDIR=../test1-kconfigxt # srcdir is the directory containing the source code
+SRCDIR=../test1-tdeconfigxt # srcdir is the directory containing the source code
 TIPSDIR=$SRCDIR # tipsdir is the directory containing the tips
 
 TDEDIR=`tde-config --prefix`
diff --git a/languages/cpp/app_templates/kscons_kxt/settings.kcfgc b/languages/cpp/app_templates/kscons_kxt/settings.kcfgc
index 384510cd..402fad09 100644
--- a/languages/cpp/app_templates/kscons_kxt/settings.kcfgc
+++ b/languages/cpp/app_templates/kscons_kxt/settings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=%{APPNAMELC}.kcfg
 ClassName=Settings
 Singleton=true
diff --git a/languages/cpp/app_templates/kscons_tdemdi/README b/languages/cpp/app_templates/kscons_tdemdi/README
index e7aa2647..10859289 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/README
+++ b/languages/cpp/app_templates/kscons_tdemdi/README
@@ -76,7 +76,7 @@ The configure.in.in will need to be modified : change the line #MIN_CONFIG(3.0.0
 into #MIN_CONFIG(3.2.0)
 
 Take an example on the many apps found in the tdegames source package and consult :
-http://developer.kde.org/documentation/tutorials/kconfigxt/kconfigxt.html
+http://developer.kde.org/documentation/tutorials/tdeconfigxt/tdeconfigxt.html
 
 * With KParts, you can embed other kde components in your program, or make your program
 embeddable in other apps. For example, the kmplayer kpart can be called to play videos
diff --git a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
index 2bdb725d..5ea5d069 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
@@ -6,7 +6,7 @@
 #include <kinstance.h>
 #include <kaction.h>
 #include <kstdaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <klocale.h>
 
diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
index 0ef16672..7ea17587 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
@@ -13,15 +13,15 @@
 #include <tdeparts/part.h>
 #include <tdeparts/partmanager.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kurl.h>
 #include <kurldrag.h>
 #include <kurlrequesterdlg.h>
-#include <kconfig.h>
-#include <kconfigdialog.h>
+#include <tdeconfig.h>
+#include <tdeconfigdialog.h>
 #include <klibloader.h>
 #include <kaboutdata.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kactionclasses.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/languages/cpp/app_templates/kscons_tdemdi/messages.sh b/languages/cpp/app_templates/kscons_tdemdi/messages.sh
index a0ce678a..5c497f99 100755
--- a/languages/cpp/app_templates/kscons_tdemdi/messages.sh
+++ b/languages/cpp/app_templates/kscons_tdemdi/messages.sh
@@ -14,7 +14,7 @@
 # for yourself and help me to improve this script, thanks
 # (tnagyemail-mail tat yahoo d0tt fr)
 
-SRCDIR=../test1-kconfigxt # srcdir is the directory containing the source code
+SRCDIR=../test1-tdeconfigxt # srcdir is the directory containing the source code
 TIPSDIR=$SRCDIR # tipsdir is the directory containing the tips
 
 TDEDIR=`tde-config --prefix`
diff --git a/languages/cpp/app_templates/kscons_tdemdi/settings.kcfgc b/languages/cpp/app_templates/kscons_tdemdi/settings.kcfgc
index 384510cd..402fad09 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/settings.kcfgc
+++ b/languages/cpp/app_templates/kscons_tdemdi/settings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=%{APPNAMELC}.kcfg
 ClassName=Settings
 Singleton=true
diff --git a/languages/cpp/app_templates/kxt/README b/languages/cpp/app_templates/kxt/README
index a24ad60a..d8bc639b 100644
--- a/languages/cpp/app_templates/kxt/README
+++ b/languages/cpp/app_templates/kxt/README
@@ -51,7 +51,7 @@ The configure.in.in will need to be modified : change the line #MIN_CONFIG(3.0.0
 into #MIN_CONFIG(3.2.0)
 
 Take an example on the many apps found in the tdegames source package and consult :
-http://developer.kde.org/documentation/tutorials/kconfigxt/kconfigxt.html
+http://developer.kde.org/documentation/tutorials/tdeconfigxt/tdeconfigxt.html
 
 * With KParts, you can embed other kde components in your program, or make your program
 embeddable in other apps. For example, the kmplayer kpart can be called to play videos
diff --git a/languages/cpp/app_templates/kxt/app.cpp b/languages/cpp/app_templates/kxt/app.cpp
index ef50718c..6f3e19fb 100644
--- a/languages/cpp/app_templates/kxt/app.cpp
+++ b/languages/cpp/app_templates/kxt/app.cpp
@@ -9,7 +9,7 @@
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
 
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/languages/cpp/app_templates/kxt/settings.kcfgc b/languages/cpp/app_templates/kxt/settings.kcfgc
index 384510cd..402fad09 100644
--- a/languages/cpp/app_templates/kxt/settings.kcfgc
+++ b/languages/cpp/app_templates/kxt/settings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=%{APPNAMELC}.kcfg
 ClassName=Settings
 Singleton=true
diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.cpp b/languages/cpp/app_templates/noatunui/plugin_impl.cpp
index 8608ba88..849f332a 100644
--- a/languages/cpp/app_templates/noatunui/plugin_impl.cpp
+++ b/languages/cpp/app_templates/noatunui/plugin_impl.cpp
@@ -22,8 +22,8 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kurldrag.h>
-//#include <kfiledialog.h>
-//#include <kconfig.h>
+//#include <tdefiledialog.h>
+//#include <tdeconfig.h>
 
 %{APPNAME}UI::%{APPNAME}UI() : TQWidget(0,"%{APPNAME}UI"), UserInterface()
 {
diff --git a/languages/cpp/app_templates/opieapp/app.pro b/languages/cpp/app_templates/opieapp/app.pro
index f4111696..541721e6 100644
--- a/languages/cpp/app_templates/opieapp/app.pro
+++ b/languages/cpp/app_templates/opieapp/app.pro
@@ -13,7 +13,7 @@ contains( TEMPLATE, quick-template ){
 	contains( QUICK_SPEC_FOO, quick-app-lib ){
 		message( "foo" )
 	        system( rm $$TARGET )
-                system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET)
+                system( ln -s $$(OPIEDIR)/bin/quictdelauncher $$TARGET)
 		DEFINES += OPIE_APP_INTERFACE
                 TEMPLATE = lib
                 CONFIG += dll
diff --git a/languages/cpp/app_templates/opieapplet/app.pro b/languages/cpp/app_templates/opieapplet/app.pro
index e1cc1e3b..7794dfc4 100644
--- a/languages/cpp/app_templates/opieapplet/app.pro
+++ b/languages/cpp/app_templates/opieapplet/app.pro
@@ -10,7 +10,7 @@ contains( TEMPLATE, quick-template ){
         contains( QUICK_SPEC_FOO, quick-app-lib ){
                 message( "foo" )
                 system( rm $$TARGET )
-                system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET)
+                system( ln -s $$(OPIEDIR)/bin/quictdelauncher $$TARGET)
 		DEFINES += OPIE_APP_INTERFACE
                 TEMPLATE = lib
                 CONFIG += dll
diff --git a/languages/cpp/app_templates/opieinput/app.pro b/languages/cpp/app_templates/opieinput/app.pro
index 1711c78f..4419e74e 100644
--- a/languages/cpp/app_templates/opieinput/app.pro
+++ b/languages/cpp/app_templates/opieinput/app.pro
@@ -10,7 +10,7 @@ contains( TEMPLATE, quick-template ){
         contains( QUICK_SPEC_FOO, quick-app-lib ){
                 message( "foo" )
                 system( rm $$TARGET )
-                system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET)
+                system( ln -s $$(OPIEDIR)/bin/quictdelauncher $$TARGET)
 		DEFINES += OPIE_APP_INTERFACE
                 TEMPLATE = lib
                 CONFIG += dll
diff --git a/languages/cpp/app_templates/opiemenu/app.pro b/languages/cpp/app_templates/opiemenu/app.pro
index 71bc208c..9488b244 100644
--- a/languages/cpp/app_templates/opiemenu/app.pro
+++ b/languages/cpp/app_templates/opiemenu/app.pro
@@ -10,7 +10,7 @@ contains( TEMPLATE, quick-template ){
         contains( QUICK_SPEC_FOO, quick-app-lib ){
                 message( "foo" )
                 system( rm $$TARGET )
-                system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET)
+                system( ln -s $$(OPIEDIR)/bin/quictdelauncher $$TARGET)
 		DEFINES += OPIE_APP_INTERFACE
                 TEMPLATE = lib
                 CONFIG += dll
diff --git a/languages/cpp/app_templates/opienet/app.pro b/languages/cpp/app_templates/opienet/app.pro
index 53fb6eea..30b811fe 100644
--- a/languages/cpp/app_templates/opienet/app.pro
+++ b/languages/cpp/app_templates/opienet/app.pro
@@ -11,7 +11,7 @@ contains( TEMPLATE, quick-template ){
         contains( QUICK_SPEC_FOO, quick-app-lib ){
                 message( "foo" )
                 system( rm $$TARGET )
-                system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET)
+                system( ln -s $$(OPIEDIR)/bin/quictdelauncher $$TARGET)
 		DEFINES += OPIE_APP_INTERFACE
                 TEMPLATE = lib
                 CONFIG += dll
diff --git a/languages/cpp/app_templates/opienet/opienet.kdevtemplate b/languages/cpp/app_templates/opienet/opienet.kdevtemplate
index 23223d28..c5b22cd4 100644
--- a/languages/cpp/app_templates/opienet/opienet.kdevtemplate
+++ b/languages/cpp/app_templates/opienet/opienet.kdevtemplate
@@ -48,7 +48,7 @@ Comment[it]=Genera un plugin di configurazione di rete Opie.
 Comment[ja]=Opie ネットワーク設定プラグインを作成
 Comment[nds]=Stellt en Moduul för Opie-Nettwarkinstellen op.
 Comment[ne]=ओपिइ सञ्जाल कन्फिग प्लगइन उत्पन्न गर्नुहोस्
-Comment[nl]=Genereert een Opie netwerkconfiguratieplugin.
+Comment[nl]=Genereert een Opie netwertdeconfiguratieplugin.
 Comment[pl]=Generuje wtyczkę do ustawień sieciowych Opie
 Comment[pt]=Gera um 'plugin' de configuração da rede do Opie.
 Comment[pt_BR]=Gera um 'plugin' de configuração da rede do Opie.
@@ -127,7 +127,7 @@ Comment[it]=È stato creato un plugin per le impostazioni di rete di Opie in %{d
 Comment[ja]=Opie ネットワーク設定プラグインを %{dest} に作成しました
 Comment[nds]=In %{dest} wöör en Nettwarkinstellenmoduul för Opie opstellt
 Comment[ne]=ओपिइ सञ्जाल सेटिङ प्लगइन %{dest} मा सिर्जना गरियो
-Comment[nl]=Een Opie netwerkconfiguratieplugin is aangemaakt in  %{dest}
+Comment[nl]=Een Opie netwertdeconfiguratieplugin is aangemaakt in  %{dest}
 Comment[pl]=Wtyczka ustawień sieciowych Opie została utworzona w %{dest}
 Comment[pt]=Foi criado um 'plugin' de configuração da rede do Opie em %{dest}
 Comment[pt_BR]=Foi criado um 'plugin' de configuração da rede do Opie em %{dest}
diff --git a/languages/cpp/app_templates/opietoday/app.pro b/languages/cpp/app_templates/opietoday/app.pro
index 152dc6f6..c8009e24 100644
--- a/languages/cpp/app_templates/opietoday/app.pro
+++ b/languages/cpp/app_templates/opietoday/app.pro
@@ -10,7 +10,7 @@ contains( TEMPLATE, quick-template ){
         contains( QUICK_SPEC_FOO, quick-app-lib ){
                 message( "foo" )
                 system( rm $$TARGET )
-                system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET)
+                system( ln -s $$(OPIEDIR)/bin/quictdelauncher $$TARGET)
 		DEFINES += OPIE_APP_INTERFACE
                 TEMPLATE = lib
                 CONFIG += dll
diff --git a/languages/cpp/app_templates/tdecmodule/module.desktop b/languages/cpp/app_templates/tdecmodule/module.desktop
index 3a316965..447e8df1 100644
--- a/languages/cpp/app_templates/tdecmodule/module.desktop
+++ b/languages/cpp/app_templates/tdecmodule/module.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell %{APPNAMELC}
+Exec=tdecmshell %{APPNAMELC}
 Icon=misc
 Type=Application
 
diff --git a/languages/cpp/app_templates/kconfig35/CMakeLists.txt b/languages/cpp/app_templates/tdeconfig35/CMakeLists.txt
index 412cabdf..32dd830c 100644
--- a/languages/cpp/app_templates/kconfig35/CMakeLists.txt
+++ b/languages/cpp/app_templates/tdeconfig35/CMakeLists.txt
@@ -9,8 +9,8 @@
 #
 #################################################
 
-add_custom_target( kconfig35.tar.gz ALL
-  COMMAND tar zcf kconfig35.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
+add_custom_target( tdeconfig35.tar.gz ALL
+  COMMAND tar zcf tdeconfig35.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     src-Makefile.am app.cpp app.h main.cpp appui.rc
     app.tdevelop subdirs app.desktop kxt35.png appview.h
     appview.cpp appview_base.ui prefs-base.ui prefs.cpp prefs.h
@@ -19,10 +19,10 @@ add_custom_target( kconfig35.tar.gz ALL
 
 
 install( FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/kconfig35.tar.gz kconfig35.png
+    ${CMAKE_CURRENT_BINARY_DIR}/tdeconfig35.tar.gz tdeconfig35.png
   DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
 
 
 install( FILES
-    kconfig35.kdevtemplate
+    tdeconfig35.kdevtemplate
   DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kconfig35/Makefile.am b/languages/cpp/app_templates/tdeconfig35/Makefile.am
index e6695775..a172f05f 100644
--- a/languages/cpp/app_templates/kconfig35/Makefile.am
+++ b/languages/cpp/app_templates/tdeconfig35/Makefile.am
@@ -2,7 +2,7 @@ dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.tdevelop \
 	subdirs app.desktop kxt35.png appview.h appview.cpp appview_base.ui \
 	prefs-base.ui prefs.cpp prefs.h app.kcfg settings.kcfgc README \
 	src-configure.in.in
-templateName= kconfig35
+templateName= tdeconfig35
 
 ### no need to change below:
 template_DATA = $(templateName).kdevtemplate
diff --git a/languages/cpp/app_templates/kconfig35/README b/languages/cpp/app_templates/tdeconfig35/README
index a27cdb29..e35da710 100644
--- a/languages/cpp/app_templates/kconfig35/README
+++ b/languages/cpp/app_templates/tdeconfig35/README
@@ -55,7 +55,7 @@ The configure.in.in will need to be modified : change the line #MIN_CONFIG(3.0.0
 into #MIN_CONFIG(3.2.0)
 
 Take an example on the many apps found in the tdegames source package and consult :
-http://developer.kde.org/documentation/tutorials/kconfigxt/kconfigxt.html
+http://developer.kde.org/documentation/tutorials/tdeconfigxt/tdeconfigxt.html
 
 * With KParts, you can embed other kde components in your program, or make your program
 embeddable in other apps. For example, the kmplayer kpart can be called to play videos
diff --git a/languages/cpp/app_templates/kconfig35/app.cpp b/languages/cpp/app_templates/tdeconfig35/app.cpp
index 0fb99ee1..d158e45f 100644
--- a/languages/cpp/app_templates/kconfig35/app.cpp
+++ b/languages/cpp/app_templates/tdeconfig35/app.cpp
@@ -7,7 +7,7 @@
 #include <tqdragobject.h>
 
 #include <kaction.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kprinter.h>
diff --git a/languages/cpp/app_templates/kconfig35/app.desktop b/languages/cpp/app_templates/tdeconfig35/app.desktop
index 5beccc5d..5beccc5d 100644
--- a/languages/cpp/app_templates/kconfig35/app.desktop
+++ b/languages/cpp/app_templates/tdeconfig35/app.desktop
diff --git a/languages/cpp/app_templates/kconfig35/app.h b/languages/cpp/app_templates/tdeconfig35/app.h
index c1aac7e4..c1aac7e4 100644
--- a/languages/cpp/app_templates/kconfig35/app.h
+++ b/languages/cpp/app_templates/tdeconfig35/app.h
diff --git a/languages/cpp/app_templates/kconfig35/app.kcfg b/languages/cpp/app_templates/tdeconfig35/app.kcfg
index 686f25f2..686f25f2 100644
--- a/languages/cpp/app_templates/kconfig35/app.kcfg
+++ b/languages/cpp/app_templates/tdeconfig35/app.kcfg
diff --git a/languages/cpp/app_templates/kconfig35/app.tdevelop b/languages/cpp/app_templates/tdeconfig35/app.tdevelop
index 6a53f237..6a53f237 100644
--- a/languages/cpp/app_templates/kconfig35/app.tdevelop
+++ b/languages/cpp/app_templates/tdeconfig35/app.tdevelop
diff --git a/languages/cpp/app_templates/kconfig35/appui.rc b/languages/cpp/app_templates/tdeconfig35/appui.rc
index 06549878..06549878 100644
--- a/languages/cpp/app_templates/kconfig35/appui.rc
+++ b/languages/cpp/app_templates/tdeconfig35/appui.rc
diff --git a/languages/cpp/app_templates/kconfig35/appview.cpp b/languages/cpp/app_templates/tdeconfig35/appview.cpp
index 30d627fe..30d627fe 100644
--- a/languages/cpp/app_templates/kconfig35/appview.cpp
+++ b/languages/cpp/app_templates/tdeconfig35/appview.cpp
diff --git a/languages/cpp/app_templates/kconfig35/appview.h b/languages/cpp/app_templates/tdeconfig35/appview.h
index a486ec43..a486ec43 100644
--- a/languages/cpp/app_templates/kconfig35/appview.h
+++ b/languages/cpp/app_templates/tdeconfig35/appview.h
diff --git a/languages/cpp/app_templates/kconfig35/appview_base.ui b/languages/cpp/app_templates/tdeconfig35/appview_base.ui
index 3ee8d513..3ee8d513 100644
--- a/languages/cpp/app_templates/kconfig35/appview_base.ui
+++ b/languages/cpp/app_templates/tdeconfig35/appview_base.ui
diff --git a/languages/cpp/app_templates/kconfig35/kxt35.png b/languages/cpp/app_templates/tdeconfig35/kxt35.png
index a3866883..a3866883 100644
--- a/languages/cpp/app_templates/kconfig35/kxt35.png
+++ b/languages/cpp/app_templates/tdeconfig35/kxt35.png
diff --git a/languages/cpp/app_templates/kconfig35/main.cpp b/languages/cpp/app_templates/tdeconfig35/main.cpp
index 3c912936..3c912936 100644
--- a/languages/cpp/app_templates/kconfig35/main.cpp
+++ b/languages/cpp/app_templates/tdeconfig35/main.cpp
diff --git a/languages/cpp/app_templates/kconfig35/prefs-base.ui b/languages/cpp/app_templates/tdeconfig35/prefs-base.ui
index 03af967a..03af967a 100644
--- a/languages/cpp/app_templates/kconfig35/prefs-base.ui
+++ b/languages/cpp/app_templates/tdeconfig35/prefs-base.ui
diff --git a/languages/cpp/app_templates/kconfig35/prefs.cpp b/languages/cpp/app_templates/tdeconfig35/prefs.cpp
index e7a46ddf..e7a46ddf 100644
--- a/languages/cpp/app_templates/kconfig35/prefs.cpp
+++ b/languages/cpp/app_templates/tdeconfig35/prefs.cpp
diff --git a/languages/cpp/app_templates/kconfig35/prefs.h b/languages/cpp/app_templates/tdeconfig35/prefs.h
index 9106fe59..9106fe59 100644
--- a/languages/cpp/app_templates/kconfig35/prefs.h
+++ b/languages/cpp/app_templates/tdeconfig35/prefs.h
diff --git a/languages/cpp/app_templates/kconfig35/settings.kcfgc b/languages/cpp/app_templates/tdeconfig35/settings.kcfgc
index 384510cd..402fad09 100644
--- a/languages/cpp/app_templates/kconfig35/settings.kcfgc
+++ b/languages/cpp/app_templates/tdeconfig35/settings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=%{APPNAMELC}.kcfg
 ClassName=Settings
 Singleton=true
diff --git a/languages/cpp/app_templates/kconfig35/src-Makefile.am b/languages/cpp/app_templates/tdeconfig35/src-Makefile.am
index 53cf2c75..53cf2c75 100644
--- a/languages/cpp/app_templates/kconfig35/src-Makefile.am
+++ b/languages/cpp/app_templates/tdeconfig35/src-Makefile.am
diff --git a/languages/cpp/app_templates/kconfig35/src-configure.in.in b/languages/cpp/app_templates/tdeconfig35/src-configure.in.in
index 1f29bc08..1f29bc08 100644
--- a/languages/cpp/app_templates/kconfig35/src-configure.in.in
+++ b/languages/cpp/app_templates/tdeconfig35/src-configure.in.in
diff --git a/languages/cpp/app_templates/kconfig35/subdirs b/languages/cpp/app_templates/tdeconfig35/subdirs
index 0e678106..0e678106 100644
--- a/languages/cpp/app_templates/kconfig35/subdirs
+++ b/languages/cpp/app_templates/tdeconfig35/subdirs
diff --git a/languages/cpp/app_templates/kconfig35/kconfig35.kdevtemplate b/languages/cpp/app_templates/tdeconfig35/tdeconfig35.kdevtemplate
index 3f5a2a81..60cb5238 100644
--- a/languages/cpp/app_templates/kconfig35/kconfig35.kdevtemplate
+++ b/languages/cpp/app_templates/tdeconfig35/tdeconfig35.kdevtemplate
@@ -48,7 +48,7 @@ Comment[sv]=Skapar ett enkelt TDE-program med en grafisk komponent och en instä
 Comment[zh_TW]=產生一個簡單的 TDE 3.5 上的應用程式，內含一個元件與一個設定對話框。
 FileTemplates=h,CStyle,cpp,CStyle
 ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}.cpp,%{dest}/README
-Archive=kconfig35.tar.gz
+Archive=tdeconfig35.tar.gz
 
 [ADMIN]
 Type=include
diff --git a/languages/cpp/app_templates/kconfig35/kconfig35.png b/languages/cpp/app_templates/tdeconfig35/tdeconfig35.png
index a3866883..a3866883 100644
--- a/languages/cpp/app_templates/kconfig35/kconfig35.png
+++ b/languages/cpp/app_templates/tdeconfig35/tdeconfig35.png
diff --git a/languages/cpp/app_templates/kfileplugin/.kdev_ignore b/languages/cpp/app_templates/tdefileplugin/.kdev_ignore
index e69de29b..e69de29b 100644
--- a/languages/cpp/app_templates/kfileplugin/.kdev_ignore
+++ b/languages/cpp/app_templates/tdefileplugin/.kdev_ignore
diff --git a/languages/cpp/app_templates/kfileplugin/CMakeLists.txt b/languages/cpp/app_templates/tdefileplugin/CMakeLists.txt
index fb3aab6b..5462742c 100644
--- a/languages/cpp/app_templates/kfileplugin/CMakeLists.txt
+++ b/languages/cpp/app_templates/tdefileplugin/CMakeLists.txt
@@ -9,19 +9,19 @@
 #
 #################################################
 
-add_custom_target( kfileplugin.tar.gz ALL
-  COMMAND tar zcf kfileplugin.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    README.devel kfile_plugin.cpp kfile_plugin.desktop
-    kfile_plugin.h plugin.tdevelop kfileplugin kfileplugin.png
+add_custom_target( tdefileplugin.tar.gz ALL
+  COMMAND tar zcf tdefileplugin.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
+    README.devel tdefile_plugin.cpp tdefile_plugin.desktop
+    tdefile_plugin.h plugin.tdevelop tdefileplugin tdefileplugin.png
     src-Makefile.am subdirs
 )
 
 
 install( FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/kfileplugin.tar.gz kfileplugin.png
+    ${CMAKE_CURRENT_BINARY_DIR}/tdefileplugin.tar.gz tdefileplugin.png
   DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
 
 
 install( FILES
-    kfileplugin.kdevtemplate
+    tdefileplugin.kdevtemplate
   DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kfileplugin/Makefile.am b/languages/cpp/app_templates/tdefileplugin/Makefile.am
index 97f8a748..019d2d7c 100644
--- a/languages/cpp/app_templates/kfileplugin/Makefile.am
+++ b/languages/cpp/app_templates/tdefileplugin/Makefile.am
@@ -1,7 +1,7 @@
-dataFiles = README.devel kfile_plugin.cpp kfile_plugin.desktop \
-	kfile_plugin.h plugin.tdevelop kfileplugin kfileplugin.png \
+dataFiles = README.devel tdefile_plugin.cpp tdefile_plugin.desktop \
+	tdefile_plugin.h plugin.tdevelop tdefileplugin tdefileplugin.png \
 	src-Makefile.am subdirs
-templateName = kfileplugin
+templateName = tdefileplugin
 
 ### no need to change below:
 template_DATA = $(templateName).kdevtemplate
diff --git a/languages/cpp/app_templates/kfileplugin/README.devel b/languages/cpp/app_templates/tdefileplugin/README.devel
index 21ee67c7..4417fa74 100644
--- a/languages/cpp/app_templates/kfileplugin/README.devel
+++ b/languages/cpp/app_templates/tdefileplugin/README.devel
@@ -1,6 +1,6 @@
 @todo:
 
-1. add information to src/kfile_%{APPNAMELC}.desktop
+1. add information to src/tdefile_%{APPNAMELC}.desktop
 MimeType=
 PreferredGroups=
 PreferredItems=
diff --git a/languages/cpp/app_templates/kfileplugin/plugin.tdevelop b/languages/cpp/app_templates/tdefileplugin/plugin.tdevelop
index 2414a429..f09030c1 100644
--- a/languages/cpp/app_templates/kfileplugin/plugin.tdevelop
+++ b/languages/cpp/app_templates/tdefileplugin/plugin.tdevelop
@@ -24,7 +24,7 @@
 
 <kdevautoproject>
   <general>
-   <activetarget>src/kfile_%{APPNAMELC}.la</activetarget>
+   <activetarget>src/tdefile_%{APPNAMELC}.la</activetarget>
    <useconfiguration>debug</useconfiguration>
   </general>
     <configurations>
diff --git a/languages/cpp/app_templates/tdefileplugin/src-Makefile.am b/languages/cpp/app_templates/tdefileplugin/src-Makefile.am
new file mode 100644
index 00000000..c96817d5
--- /dev/null
+++ b/languages/cpp/app_templates/tdefileplugin/src-Makefile.am
@@ -0,0 +1,22 @@
+## Makefile.am for folder file meta info plugin
+
+INCLUDES         = $(all_includes)
+
+# these are the headers for your project
+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)
+
+# let automoc handle all of the meta source files ((moc))
+METASOURCES = AUTO
+
+services_DATA = tdefile_%{APPNAMELC}.desktop
+servicesdir = $(kde_servicesdir)
+
+messages: rc.cpp
+	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(XGETTEXT) *.cpp -o $(podir)/tdefile_%{APPNAMELC}.pot
diff --git a/languages/cpp/app_templates/kfileplugin/subdirs b/languages/cpp/app_templates/tdefileplugin/subdirs
index 0e678106..0e678106 100644
--- a/languages/cpp/app_templates/kfileplugin/subdirs
+++ b/languages/cpp/app_templates/tdefileplugin/subdirs
diff --git a/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp b/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.cpp
index db259cb3..1d590f97 100644
--- a/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp
+++ b/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.cpp
@@ -1,17 +1,17 @@
 %{CPP_TEMPLATE}
 
 #include <config.h>
-#include "kfile_%{APPNAMELC}.h"
+#include "tdefile_%{APPNAMELC}.h"
 
 #include <kgenericfactory.h>
-//#include <kio/global.h>
+//#include <tdeio/global.h>
 
 //#include <tqfileinfo.h>
 //#include <tqdir.h>
 
 typedef KGenericFactory<%{APPNAME}Plugin> %{APPNAME}Factory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_%{APPNAME}, %{APPNAME}Factory( "kfile_%{APPNAMELC}" ))
+K_EXPORT_COMPONENT_FACTORY(tdefile_%{APPNAME}, %{APPNAME}Factory( "tdefile_%{APPNAMELC}" ))
 
 %{APPNAME}Plugin::%{APPNAME}Plugin(TQObject *parent, const char *name,
                        const TQStringList &args)
@@ -51,5 +51,5 @@ bool %{APPNAME}Plugin::readInfo( KFileMetaInfo& info, uint /*what*/)
     return true;
 }
 
-#include "kfile_%{APPNAMELC}.moc"
+#include "tdefile_%{APPNAMELC}.moc"
 
diff --git a/languages/cpp/app_templates/kfileplugin/kfile_plugin.desktop b/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.desktop
index 8a2f40ee..42f19e60 100644
--- a/languages/cpp/app_templates/kfileplugin/kfile_plugin.desktop
+++ b/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.desktop
@@ -30,7 +30,7 @@ Name[tg]=Маълумот дар бораи %{APPNAME}
 Name[zh_CN]=%{APPNAME}的信息
 Name[zh_TW]=%{APPNAME} 資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_%{APPNAMELC}
+X-TDE-Library=tdefile_%{APPNAMELC}
 # change MimeType here! (example: inode/directory)
 MimeType=
 # change PreferredGroups here! (example: FolderInfo)
diff --git a/languages/cpp/app_templates/kfileplugin/kfile_plugin.h b/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.h
index 50db1252..96fcaf0d 100644
--- a/languages/cpp/app_templates/kfileplugin/kfile_plugin.h
+++ b/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.h
@@ -4,9 +4,9 @@
 #define __KFILE_%{APPNAMEUC}_H__
 
 /**
- * Note: For further information look into <$TDEDIR/include/kfilemetainfo.h>
+ * Note: For further information look into <$TDEDIR/include/tdefilemetainfo.h>
  */
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQStringList;
 
diff --git a/languages/cpp/app_templates/kfileplugin/kfileplugin b/languages/cpp/app_templates/tdefileplugin/tdefileplugin
index a17a7af0..b902179d 100644
--- a/languages/cpp/app_templates/kfileplugin/kfileplugin
+++ b/languages/cpp/app_templates/tdefileplugin/tdefileplugin
@@ -1,8 +1,8 @@
 # TDE Config File
 [General]
 Name=KFile plugin
-Icon=kfileplugin.png
+Icon=tdefileplugin.png
 Category=C++/TDE
 Comment=Generates a KFile plugin for konqueror to display meta information.
 FileTemplates=h,CStyle,cpp,CStyle
-ShowFilesAfterGeneration=README.devel,src/kfile_APPNAMELC.cpp
+ShowFilesAfterGeneration=README.devel,src/tdefile_APPNAMELC.cpp
diff --git a/languages/cpp/app_templates/kfileplugin/kfileplugin.kdevtemplate b/languages/cpp/app_templates/tdefileplugin/tdefileplugin.kdevtemplate
index 762ca3b8..52afe804 100644
--- a/languages/cpp/app_templates/kfileplugin/kfileplugin.kdevtemplate
+++ b/languages/cpp/app_templates/tdefileplugin/tdefileplugin.kdevtemplate
@@ -30,7 +30,7 @@ Name[sv]=KFile-insticksprogram
 Name[tr]=KFile Eklentisi
 Name[zh_CN]=KFile 插件
 Name[zh_TW]=KFile 外掛程式
-Icon=kfileplugin.png
+Icon=tdefileplugin.png
 Category=C++/TDE
 Comment=Generates a KFile plugin for konqueror to display meta information.
 Comment[ca]=Genera un connector KFile per al konqueror per a mostrar meta informació.
@@ -60,8 +60,8 @@ Comment[tr]=Meta bilgisini göstermesi için Konqueror'a bir KFile eklentisi yar
 Comment[zh_CN]=生成一个可显示元信息的 Konqueror KFile 插件。
 Comment[zh_TW]=產生一個 Konqueror 的 KFile 外掛程式，顯示中繼資訊
 FileTemplates=h,CStyle,cpp,CStyle
-ShowFilesAfterGeneration=${dest}/README.devel,%{dest}/src/kfile_%{APPNAMELC}.cpp
-Archive=kfileplugin.tar.gz
+ShowFilesAfterGeneration=${dest}/README.devel,%{dest}/src/tdefile_%{APPNAMELC}.cpp
+Archive=tdefileplugin.tar.gz
 
 [ADMIN]
 Type=include
@@ -146,18 +146,18 @@ Dest=%{dest}/src/Makefile.am
 
 [FILE12]
 Type=install
-Source=%{src}/kfile_plugin.desktop
-Dest=%{dest}/src/kfile_%{APPNAMELC}.desktop
+Source=%{src}/tdefile_plugin.desktop
+Dest=%{dest}/src/tdefile_%{APPNAMELC}.desktop
 
 [FILE13]
 Type=install
-Source=%{src}/kfile_plugin.cpp
-Dest=%{dest}/src/kfile_%{APPNAMELC}.cpp
+Source=%{src}/tdefile_plugin.cpp
+Dest=%{dest}/src/tdefile_%{APPNAMELC}.cpp
 
 [FILE14]
 Type=install
-Source=%{src}/kfile_plugin.h
-Dest=%{dest}/src/kfile_%{APPNAMELC}.h
+Source=%{src}/tdefile_plugin.h
+Dest=%{dest}/src/tdefile_%{APPNAMELC}.h
 
 [FILE15]
 Type=install
diff --git a/languages/cpp/app_templates/kfileplugin/kfileplugin.png b/languages/cpp/app_templates/tdefileplugin/tdefileplugin.png
index d2a56245..d2a56245 100644
--- a/languages/cpp/app_templates/kfileplugin/kfileplugin.png
+++ b/languages/cpp/app_templates/tdefileplugin/tdefileplugin.png
diff --git a/languages/cpp/app_templates/kioslave/.kdev_ignore b/languages/cpp/app_templates/tdeioslave/.kdev_ignore
index e69de29b..e69de29b 100644
--- a/languages/cpp/app_templates/kioslave/.kdev_ignore
+++ b/languages/cpp/app_templates/tdeioslave/.kdev_ignore
diff --git a/languages/cpp/app_templates/kioslave/CMakeLists.txt b/languages/cpp/app_templates/tdeioslave/CMakeLists.txt
index c0f70115..584bdc19 100644
--- a/languages/cpp/app_templates/kioslave/CMakeLists.txt
+++ b/languages/cpp/app_templates/tdeioslave/CMakeLists.txt
@@ -9,18 +9,18 @@
 #
 #################################################
 
-add_custom_target( kioslave.tar.gz ALL
-  COMMAND tar zcf kioslave.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
+add_custom_target( tdeioslave.tar.gz ALL
+  COMMAND tar zcf tdeioslave.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     slave.cpp slave.h slave.protocol slave.tdevelop
-    src-Makefile.am kioslave.png subdirs
+    src-Makefile.am tdeioslave.png subdirs
 )
 
 
 install( FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/kioslave.tar.gz kioslave.png
+    ${CMAKE_CURRENT_BINARY_DIR}/tdeioslave.tar.gz tdeioslave.png
   DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
 
 
 install( FILES
-    kioslave.kdevtemplate
+    tdeioslave.kdevtemplate
   DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/cpp/app_templates/kioslave/Makefile.am b/languages/cpp/app_templates/tdeioslave/Makefile.am
index 1d9a8224..bee7ddb6 100644
--- a/languages/cpp/app_templates/kioslave/Makefile.am
+++ b/languages/cpp/app_templates/tdeioslave/Makefile.am
@@ -1,6 +1,6 @@
 dataFiles = slave.cpp slave.h slave.protocol slave.tdevelop \
-	src-Makefile.am  kioslave.png subdirs
-templateName = kioslave
+	src-Makefile.am  tdeioslave.png subdirs
+templateName = tdeioslave
 
 ### no need to change below:
 template_DATA = $(templateName).kdevtemplate
diff --git a/languages/cpp/app_templates/kioslave/slave.cpp b/languages/cpp/app_templates/tdeioslave/slave.cpp
index 3c780e7f..3c780e7f 100644
--- a/languages/cpp/app_templates/kioslave/slave.cpp
+++ b/languages/cpp/app_templates/tdeioslave/slave.cpp
diff --git a/languages/cpp/app_templates/kioslave/slave.h b/languages/cpp/app_templates/tdeioslave/slave.h
index 07bf9c6e..672e6121 100644
--- a/languages/cpp/app_templates/kioslave/slave.h
+++ b/languages/cpp/app_templates/tdeioslave/slave.h
@@ -6,8 +6,8 @@
 #include <tqcstring.h>
 
 #include <kurl.h>
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 
 class TQCString;
 
diff --git a/languages/cpp/app_templates/tdeioslave/slave.protocol b/languages/cpp/app_templates/tdeioslave/slave.protocol
new file mode 100644
index 00000000..5a1f6445
--- /dev/null
+++ b/languages/cpp/app_templates/tdeioslave/slave.protocol
@@ -0,0 +1,39 @@
+[Protocol]
+exec=kio_%{APPNAMELC}
+protocol=%{APPNAMELC}
+input=none
+output=stream
+reading=true
+defaultMimetype=text/plain
+Icon=remote
+Description=A tdeioslave for %{APPNAMELC}
+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[es]=Un tdeioslave para %{APPNAMELC}
+Description[et]=%{APPNAMELC} IO-moodul
+Description[eu]=tdeioslave bat honentzat: %{APPNAMELC}
+Description[fa]=یک tdeioslave برای %{APPNAMELC}
+Description[fr]=Un esclave d'E/S (tdeioslave) pour %{APPNAMELC}
+Description[ga]=tdeioslave le haghaidh %{APPNAMELC}
+Description[gl]=Un tdeioslave para %{APPNAMELC}
+Description[hu]=%{APPNAMELC}-támogató KIOslave
+Description[it]=Un tdeioslave per %{APPNAMELC}
+Description[ja]=%{APPNAMELC} のための tdeioslave
+Description[nds]=En In-/Utgaavmoduul för %{APPNAMELC}
+Description[ne]= %{APPNAMELC} का लागि किवस्लेभ
+Description[nl]=Kioslave voor %{APPNAMELC}
+Description[pl]=tdeioslave dla %{APPNAMELC}
+Description[pt]=Um 'tdeioslave' para %{APPNAMELC}
+Description[pt_BR]=Um tdeioslave para %{APPNAMELC}
+Description[ru]=Канал tdeioslave для %{APPNAMELC}
+Description[sk]=tdeioslave pre %{APPNAMELC}
+Description[sl]=tdeioslave za %{APPNAMELC}
+Description[sr]=KIOSlave за %{APPNAMELC}
+Description[sr@Latn]=KIOSlave za %{APPNAMELC}
+Description[sv]=En I/O-slav för %{APPNAMELC}
+Description[tr]=%{APPNAMELC} için bir tdeioslave
+Description[zh_CN]=%{APPNAMELC} 的 tdeioslave
+Description[zh_TW]=%{APPNAMELC} 的 tdeioslave
diff --git a/languages/cpp/app_templates/kioslave/slave.tdevelop b/languages/cpp/app_templates/tdeioslave/slave.tdevelop
index 4c7c2d2e..cb257385 100644
--- a/languages/cpp/app_templates/kioslave/slave.tdevelop
+++ b/languages/cpp/app_templates/tdeioslave/slave.tdevelop
@@ -11,7 +11,7 @@
    <keyword>Code</keyword>
    <keyword>Qt</keyword>
    <keyword>TDE</keyword>
-   <keyword>kioslave</keyword>
+   <keyword>tdeioslave</keyword>
   </keywords>
  </general>
   <kdevcppsupport>
diff --git a/languages/cpp/app_templates/kioslave/src-Makefile.am b/languages/cpp/app_templates/tdeioslave/src-Makefile.am
index 7aedfa33..b160d973 100644
--- a/languages/cpp/app_templates/kioslave/src-Makefile.am
+++ b/languages/cpp/app_templates/tdeioslave/src-Makefile.am
@@ -11,4 +11,4 @@ protocoldir = $(kde_servicesdir)
 
 messages: rc.cpp
 	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kio_%{APPNAMELC}.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_%{APPNAMELC}.pot
diff --git a/languages/cpp/app_templates/kioslave/subdirs b/languages/cpp/app_templates/tdeioslave/subdirs
index 0e678106..0e678106 100644
--- a/languages/cpp/app_templates/kioslave/subdirs
+++ b/languages/cpp/app_templates/tdeioslave/subdirs
diff --git a/languages/cpp/app_templates/kioslave/kioslave.kdevtemplate b/languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate
index a49c36f8..27279fd2 100644
--- a/languages/cpp/app_templates/kioslave/kioslave.kdevtemplate
+++ b/languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate
@@ -20,7 +20,7 @@ Name[nl]=KIO-slave
 Name[pt]=KIO Slave
 Name[sk]=KIO otrok
 Name[sv]=I/O-slav
-Icon=kioslave.png
+Icon=tdeioslave.png
 Category=C++/TDE
 Comment=Generates a framework for an IO slave
 Comment[ca]=Genera una infraestructura per a un esclau IO
@@ -52,7 +52,7 @@ Comment[zh_CN]=生成一个 IO slave 的框架
 Comment[zh_TW]=產生一個 IO slave 的框架
 FileTemplates=h,CStyle,cpp,CStyle
 ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}.cpp
-Archive=kioslave.tar.gz
+Archive=tdeioslave.tar.gz
 
 [ADMIN]
 Type=include
diff --git a/languages/cpp/app_templates/kioslave/kioslave.png b/languages/cpp/app_templates/tdeioslave/tdeioslave.png
index f0cd89a8..f0cd89a8 100644
--- a/languages/cpp/app_templates/kioslave/kioslave.png
+++ b/languages/cpp/app_templates/tdeioslave/tdeioslave.png
diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp
index f8e88db8..21d6db32 100644
--- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp
@@ -6,7 +6,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kpushbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include "%{APPNAMELC}.h"
 #include "%{APPNAMELC}ui.h"
diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop
index 38429f89..28e0a678 100644
--- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop
@@ -11,7 +11,7 @@
    <keyword>Code</keyword>
    <keyword>Qt</keyword>
    <keyword>TDE</keyword>
-   <keyword>kioslave</keyword>
+   <keyword>tdeioslave</keyword>
   </keywords>
  </general>
   <kdevcppsupport>
diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp
index 140bb46b..e1d2940a 100644
--- a/languages/cpp/ccconfigwidget.cpp
+++ b/languages/cpp/ccconfigwidget.cpp
@@ -26,12 +26,12 @@
 
 // kde includes
 #include <kdevproject.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kurlrequester.h>
 #include <keditlistbox.h>
 #include <klistview.h>
diff --git a/languages/cpp/classgeneratorconfig.cpp b/languages/cpp/classgeneratorconfig.cpp
index 2ed3ba0a..f3dba7fb 100644
--- a/languages/cpp/classgeneratorconfig.cpp
+++ b/languages/cpp/classgeneratorconfig.cpp
@@ -16,7 +16,7 @@
 #include <tqfileinfo.h>
 
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "cppsupportfactory.h"
 #include "classgeneratorconfig.h"
diff --git a/languages/cpp/configproblemreporter.ui.h b/languages/cpp/configproblemreporter.ui.h
index 9b9b59fb..c9e23652 100644
--- a/languages/cpp/configproblemreporter.ui.h
+++ b/languages/cpp/configproblemreporter.ui.h
@@ -10,7 +10,7 @@
 
 #include <kdevproject.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/languages/cpp/cppsupport_utils.cpp b/languages/cpp/cppsupport_utils.cpp
index 85148c30..c8ffb1de 100644
--- a/languages/cpp/cppsupport_utils.cpp
+++ b/languages/cpp/cppsupport_utils.cpp
@@ -1,7 +1,7 @@
 #include <tqdir.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <codemodel.h>
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index f0ec6fa9..8f66283d 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -80,7 +80,7 @@
 #include <kmessagebox.h>
 #include <kmainwindow.h>
 #include <kstatusbar.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp
index 9c2ade95..c18d581d 100644
--- a/languages/cpp/debugger/debuggerpart.cpp
+++ b/languages/cpp/debugger/debuggerpart.cpp
@@ -22,7 +22,7 @@
 
 #include <kaction.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp
index a46b6d6a..e5081fbd 100644
--- a/languages/cpp/debugger/gdbcontroller.cpp
+++ b/languages/cpp/debugger/gdbcontroller.cpp
@@ -25,7 +25,7 @@
 #include "mi/miparser.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/languages/cpp/doc/gnome1.toc b/languages/cpp/doc/gnome1.toc
index 74d0872f..2295f820 100644
--- a/languages/cpp/doc/gnome1.toc
+++ b/languages/cpp/doc/gnome1.toc
@@ -158,7 +158,7 @@
     <tocsect3 name="GtkEditable" url="gtk/gtkeditable.html"/>
     <tocsect3 name="GtkEntry" url="gtk/gtkentry.html"/>
     <tocsect3 name="GtkEventBox" url="gtk/gtkeventbox.html"/>
-    <tocsect3 name="GtkFileSelection" url="gtk/gtkfileselection.html"/>
+    <tocsect3 name="GtkFileSelection" url="gtk/gttdefileselection.html"/>
     <tocsect3 name="GtkFixed" url="gtk/gtkfixed.html"/>
     <tocsect3 name="GtkFontSelection" url="gtk/gtkfontselection.html"/>
     <tocsect3 name="GtkFontSelectionDialog" url="gtk/gtkfontselectiondialog.html"/>
diff --git a/languages/cpp/doc/kde2book.toc b/languages/cpp/doc/kde2book.toc
index 1156df06..ec22d851 100644
--- a/languages/cpp/doc/kde2book.toc
+++ b/languages/cpp/doc/kde2book.toc
@@ -1284,10 +1284,10 @@
 <entry name="KChildren sample widget (child widget), kchildren.h class declaration" url="ch04lev1sec3.html"/>
 <entry name="KChildren sample widget (child widget), main() method" url="ch04lev1sec3.html"/>
 <entry name="KChildren sample widget (child widget)" url="ch04lev1sec3.html"/>
-<entry name="kconfigdemo.cpp file (TDEConfigDemo widget)" url="ch07lev1sec2.html"/>
-<entry name="kconfigdemo.h file (TDEConfigDemo widget)" url="ch07lev1sec2.html"/>
-<entry name="TDEConfigDemo widget, kconfigdemo.cpp class definition" url="ch07lev1sec2.html"/>
-<entry name="TDEConfigDemo widget, kconfigdemo.h class declaration" url="ch07lev1sec2.html"/>
+<entry name="tdeconfigdemo.cpp file (TDEConfigDemo widget)" url="ch07lev1sec2.html"/>
+<entry name="tdeconfigdemo.h file (TDEConfigDemo widget)" url="ch07lev1sec2.html"/>
+<entry name="TDEConfigDemo widget, tdeconfigdemo.cpp class definition" url="ch07lev1sec2.html"/>
+<entry name="TDEConfigDemo widget, tdeconfigdemo.h class declaration" url="ch07lev1sec2.html"/>
 <entry name="TDEConfigDemo widget, main() function" url="ch07lev1sec2.html"/>
 <entry name="kcustomactions.cpp file (KCustomActions widget)" url="ch05.html"/>
 <entry name="kcustomactions.h file (KCustomActions widget)" url="ch05.html"/>
@@ -1675,8 +1675,8 @@
 <entry name="listings, KChildren widget, kchildren.cpp class definition" url="ch04lev1sec3.html"/>
 <entry name="listings, KChildren widget, kchildren.h class declaration" url="ch04lev1sec3.html"/>
 <entry name="listings, KChildren widget, main() method" url="ch04lev1sec3.html"/>
-<entry name="listings, TDEConfigDemo widget, kconfigdemo.cpp class definition" url="ch07lev1sec2.html"/>
-<entry name="listings, TDEConfigDemo widget, kconfigdemo.h class declaration" url="ch07lev1sec2.html"/>
+<entry name="listings, TDEConfigDemo widget, tdeconfigdemo.cpp class definition" url="ch07lev1sec2.html"/>
+<entry name="listings, TDEConfigDemo widget, tdeconfigdemo.h class declaration" url="ch07lev1sec2.html"/>
 <entry name="listings, TDEConfigDemo widget, main() function" url="ch07lev1sec2.html"/>
 <entry name="listings, KCustomActions widget, kcustomactions.cpp class definition" url="ch05.html"/>
 <entry name="listings, KCustomActions widget, kcustomactions.h class declaration" url="ch05.html"/>
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp
index 174219a3..0dc82191 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp
+++ b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp
@@ -60,7 +60,7 @@ TQStringList KDevKDELibsImporter::fileList()
 		files += fileList( m_settings->kdeDir() + "/kabc" );
 		files += fileList( m_settings->kdeDir() + "/tdeprint" );
 		files += fileList( m_settings->kdeDir() + "/tdesu" );
-		files += fileList( m_settings->kdeDir() + "/kio" );
+		files += fileList( m_settings->kdeDir() + "/tdeio" );
 		files += fileList( m_settings->kdeDir() + "/kjs" );
 		files += fileList( m_settings->kdeDir() + "/tdeparts" );
 		files += fileList( m_settings->kdeDir() + "/tdetexteditor" );
diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp
index 6f87771f..baea54d7 100644
--- a/languages/cpp/problemreporter.cpp
+++ b/languages/cpp/problemreporter.cpp
@@ -42,7 +42,7 @@
 #include <kiconloader.h>
 #include <kdialogbase.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqtimer.h>
 #include <tqregexp.h>
diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp
index 0db80fa8..5d3ed2be 100644
--- a/languages/cpp/subclassingdlg.cpp
+++ b/languages/cpp/subclassingdlg.cpp
@@ -26,7 +26,7 @@
 #include <tqstringlist.h>
 #include <tqcheckbox.h>
 #include <tqmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineedit.h>
 #include <tqpushbutton.h>
 #include <domutil.h>
@@ -36,7 +36,7 @@
 #include <klocale.h>
 #include <tqfile.h>
 #include <tqregexp.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 #define WIDGET_CAPTION_NAME "widget/property|name=caption/string"