Rename common header files for consistency with class renaming

69 files changed, 93 insertions, 93 deletions

diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp
index 4c035cb2..a215a89b 100644
--- a/languages/ada/adasupportpart.cpp
+++ b/languages/ada/adasupportpart.cpp
@@ -8,7 +8,7 @@
 #include <tqwhatsthis.h>
 
 #include <kgenericfactory.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstatusbar.h>
diff --git a/languages/ada/configproblemreporter.ui.h b/languages/ada/configproblemreporter.ui.h
index 546c160f..cd22ba1f 100644
--- a/languages/ada/configproblemreporter.ui.h
+++ b/languages/ada/configproblemreporter.ui.h
@@ -7,7 +7,7 @@
 *****************************************************************************/
 
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 void ConfigureProblemReporter::init()
 {
diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp
index f95b9e2c..15a87ef3 100644
--- a/languages/ada/problemreporter.cpp
+++ b/languages/ada/problemreporter.cpp
@@ -38,7 +38,7 @@
 #include <klocale.h>
 #include <kstatusbar.h>
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 
 #include <tdeconfig.h>
diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp
index 29cd5c80..848623c8 100644
--- a/languages/bash/bashsupport_part.cpp
+++ b/languages/bash/bashsupport_part.cpp
@@ -9,7 +9,7 @@
 #include <tqstringlist.h>
 #include <tqtextstream.h>
 #include <tqtimer.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqregexp.h>
 
 #include <kiconloader.h>
diff --git a/languages/cpp/app_templates/dcopservice/dcopservice.cpp b/languages/cpp/app_templates/dcopservice/dcopservice.cpp
index 32f32c65..a631186c 100644
--- a/languages/cpp/app_templates/dcopservice/dcopservice.cpp
+++ b/languages/cpp/app_templates/dcopservice/dcopservice.cpp
@@ -2,7 +2,7 @@
 
 #include "%{APPNAMELC}.h"
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 %{APPNAME}::%{APPNAME}() : DCOPObject("serviceInterface")
 {
diff --git a/languages/cpp/app_templates/dcopservice/main.cpp b/languages/cpp/app_templates/dcopservice/main.cpp
index 78aac7c8..5bdeec39 100644
--- a/languages/cpp/app_templates/dcopservice/main.cpp
+++ b/languages/cpp/app_templates/dcopservice/main.cpp
@@ -1,8 +1,8 @@
 %{CPP_TEMPLATE}
 
 #include <kuniqueapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <dcopclient.h>
diff --git a/languages/cpp/app_templates/kapp/app.h b/languages/cpp/app_templates/kapp/app.h
index 9f281120..5f39dd11 100644
--- a/languages/cpp/app_templates/kapp/app.h
+++ b/languages/cpp/app_templates/kapp/app.h
@@ -7,7 +7,7 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 
 #include "%{APPNAMELC}view.h"
diff --git a/languages/cpp/app_templates/kapp/app_client.cpp b/languages/cpp/app_templates/kapp/app_client.cpp
index 4098f8a8..ce92c875 100644
--- a/languages/cpp/app_templates/kapp/app_client.cpp
+++ b/languages/cpp/app_templates/kapp/app_client.cpp
@@ -1,6 +1,6 @@
 %{CPP_TEMPLATE}
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tqdatastream.h>
 #include <tqstring.h>
diff --git a/languages/cpp/app_templates/kapp/main.cpp b/languages/cpp/app_templates/kapp/main.cpp
index ba2e08fa..294a7490 100644
--- a/languages/cpp/app_templates/kapp/main.cpp
+++ b/languages/cpp/app_templates/kapp/main.cpp
@@ -1,10 +1,10 @@
 %{CPP_TEMPLATE}
 
 #include "%{APPNAMELC}.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static const char description[] =
diff --git a/languages/cpp/app_templates/kde4app/main.cpp b/languages/cpp/app_templates/kde4app/main.cpp
index f376b31f..5c83921b 100644
--- a/languages/cpp/app_templates/kde4app/main.cpp
+++ b/languages/cpp/app_templates/kde4app/main.cpp
@@ -1,9 +1,9 @@
 %{CPP_TEMPLATE}
 
 #include "%{APPNAMELC}.h"
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <KDE/TDELocale>
 
 static const char description[] =
diff --git a/languages/cpp/app_templates/kdedcop/main.cpp b/languages/cpp/app_templates/kdedcop/main.cpp
index 7164b7bb..aed5e904 100644
--- a/languages/cpp/app_templates/kdedcop/main.cpp
+++ b/languages/cpp/app_templates/kdedcop/main.cpp
@@ -1,9 +1,9 @@
 %{CPP_TEMPLATE}
 
 #include "%{APPNAMELC}.h"
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static const char description[] =
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
index b0a33d94..0d6a5775 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
+++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
@@ -12,7 +12,7 @@
 #include <kdevproject.h>
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 //#include "%{APPNAMELC}_widget.h"
 #include "%{APPNAMELC}_part.h"
diff --git a/languages/cpp/app_templates/khello/main.cpp b/languages/cpp/app_templates/khello/main.cpp
index 8722d845..f141c87f 100644
--- a/languages/cpp/app_templates/khello/main.cpp
+++ b/languages/cpp/app_templates/khello/main.cpp
@@ -1,9 +1,9 @@
 %{CPP_TEMPLATE}
 
 #include "%{APPNAMELC}.h"
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static const char description[] =
diff --git a/languages/cpp/app_templates/khello2/main.cpp b/languages/cpp/app_templates/khello2/main.cpp
index 354de69f..f9e68a34 100644
--- a/languages/cpp/app_templates/khello2/main.cpp
+++ b/languages/cpp/app_templates/khello2/main.cpp
@@ -1,9 +1,9 @@
 %{CPP_TEMPLATE}
 
 #include "%{APPNAMELC}.h"
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static const char description[] =
diff --git a/languages/cpp/app_templates/kicker/applet.cpp b/languages/cpp/app_templates/kicker/applet.cpp
index 78558f78..cb7b4ecd 100644
--- a/languages/cpp/app_templates/kicker/applet.cpp
+++ b/languages/cpp/app_templates/kicker/applet.cpp
@@ -4,7 +4,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 
 #include "%{APPNAMELC}.h"
diff --git a/languages/cpp/app_templates/kmake/app.cpp b/languages/cpp/app_templates/kmake/app.cpp
index e057db20..5c0d534f 100644
--- a/languages/cpp/app_templates/kmake/app.cpp
+++ b/languages/cpp/app_templates/kmake/app.cpp
@@ -1,7 +1,7 @@
 
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include "mainviewimp.h"
 
diff --git a/languages/cpp/app_templates/kofficepart/kopart_aboutdata.h b/languages/cpp/app_templates/kofficepart/kopart_aboutdata.h
index 20893271..8a141a5e 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_aboutdata.h
+++ b/languages/cpp/app_templates/kofficepart/kopart_aboutdata.h
@@ -6,7 +6,7 @@
 #ifndef %{APPNAME}_ABOUTDATA
 #define %{APPNAME}_ABOUTDATA
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 
 static const char description[] = I18N_NOOP("%{APPNAME} KOffice Program");
diff --git a/languages/cpp/app_templates/kofficepart/main.cpp b/languages/cpp/app_templates/kofficepart/main.cpp
index b2621a03..98369dde 100644
--- a/languages/cpp/app_templates/kofficepart/main.cpp
+++ b/languages/cpp/app_templates/kofficepart/main.cpp
@@ -6,7 +6,7 @@
 #include <koApplication.h>
 #include <koDocument.h>
 #include <koMainWindow.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <dcopclient.h>
 #include "%{APPNAMELC}_aboutdata.h"
diff --git a/languages/cpp/app_templates/kpartapp/app.h b/languages/cpp/app_templates/kpartapp/app.h
index c64525c6..b9101033 100644
--- a/languages/cpp/app_templates/kpartapp/app.h
+++ b/languages/cpp/app_templates/kpartapp/app.h
@@ -6,7 +6,7 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeparts/mainwindow.h>
 
 class TDEToggleAction;
diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp
index 9fb19b18..937a7702 100644
--- a/languages/cpp/app_templates/kpartapp/app_part.cpp
+++ b/languages/cpp/app_templates/kpartapp/app_part.cpp
@@ -145,7 +145,7 @@ void %{APPNAME}Part::fileSaveAs()
 
 // It's usually safe to leave the factory code alone.. with the
 // notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 
 TDEInstance*  %{APPNAME}PartFactory::s_instance = 0L;
diff --git a/languages/cpp/app_templates/kpartapp/main.cpp b/languages/cpp/app_templates/kpartapp/main.cpp
index d951ad29..755813f0 100644
--- a/languages/cpp/app_templates/kpartapp/main.cpp
+++ b/languages/cpp/app_templates/kpartapp/main.cpp
@@ -1,8 +1,8 @@
 
 #include "%{APPNAMELC}.h"
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static const char description[] =
diff --git a/languages/cpp/app_templates/kscons_kxt/app.h b/languages/cpp/app_templates/kscons_kxt/app.h
index f66896e9..8fb9d688 100644
--- a/languages/cpp/app_templates/kscons_kxt/app.h
+++ b/languages/cpp/app_templates/kscons_kxt/app.h
@@ -8,7 +8,7 @@
 #endif
 
 #include <dcopobject.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 
 #include "%{APPNAMELC}view.h"
diff --git a/languages/cpp/app_templates/kscons_kxt/main.cpp b/languages/cpp/app_templates/kscons_kxt/main.cpp
index 510803cd..b257c85f 100644
--- a/languages/cpp/app_templates/kscons_kxt/main.cpp
+++ b/languages/cpp/app_templates/kscons_kxt/main.cpp
@@ -1,9 +1,9 @@
 %{CPP_TEMPLATE}
 
 #include "%{APPNAMELC}.h"
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static const char description[] =
diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
index 4dcd8df5..20f5f3fb 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
@@ -20,7 +20,7 @@
 #include <tdeconfig.h>
 #include <tdeconfigdialog.h>
 #include <klibloader.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdefiledialog.h>
 #include <tdeactionclasses.h>
 #include <kglobal.h>
diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h
index 6819937d..288395db 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h
@@ -5,7 +5,7 @@
 
 #include <tqvaluelist.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemdimainfrm.h>
 #include <kurl.h>
 
diff --git a/languages/cpp/app_templates/kscons_tdemdi/main.cpp b/languages/cpp/app_templates/kscons_tdemdi/main.cpp
index d3e49880..253f45dc 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/main.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/main.cpp
@@ -1,9 +1,9 @@
 %{CPP_TEMPLATE}
 
 #include <kurl.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 #include "%{APPNAMELC}tdemdi.h"
diff --git a/languages/cpp/app_templates/kxt/app.h b/languages/cpp/app_templates/kxt/app.h
index 049e8ecb..7b6305ea 100644
--- a/languages/cpp/app_templates/kxt/app.h
+++ b/languages/cpp/app_templates/kxt/app.h
@@ -7,7 +7,7 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 
 #include "%{APPNAMELC}view.h"
diff --git a/languages/cpp/app_templates/kxt/main.cpp b/languages/cpp/app_templates/kxt/main.cpp
index 7174b8ac..928ddc33 100644
--- a/languages/cpp/app_templates/kxt/main.cpp
+++ b/languages/cpp/app_templates/kxt/main.cpp
@@ -1,9 +1,9 @@
 %{CPP_TEMPLATE}
 
 #include "%{APPNAMELC}.h"
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static const char description[] =
diff --git a/languages/cpp/app_templates/tdecmodule/module.h b/languages/cpp/app_templates/tdecmodule/module.h
index 0e07a6e1..44ed3540 100644
--- a/languages/cpp/app_templates/tdecmodule/module.h
+++ b/languages/cpp/app_templates/tdecmodule/module.h
@@ -4,7 +4,7 @@
 #define _%{APPNAMEUC}_H_
 
 #include <tdecmodule.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 class %{APPNAME}: public TDECModule
 {
diff --git a/languages/cpp/app_templates/tdeconfig35/app.h b/languages/cpp/app_templates/tdeconfig35/app.h
index cdcce5a5..b090428f 100644
--- a/languages/cpp/app_templates/tdeconfig35/app.h
+++ b/languages/cpp/app_templates/tdeconfig35/app.h
@@ -7,7 +7,7 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 
 #include "%{APPNAMELC}view.h"
diff --git a/languages/cpp/app_templates/tdeconfig35/main.cpp b/languages/cpp/app_templates/tdeconfig35/main.cpp
index 7174b8ac..928ddc33 100644
--- a/languages/cpp/app_templates/tdeconfig35/main.cpp
+++ b/languages/cpp/app_templates/tdeconfig35/main.cpp
@@ -1,9 +1,9 @@
 %{CPP_TEMPLATE}
 
 #include "%{APPNAMELC}.h"
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static const char description[] =
diff --git a/languages/cpp/app_templates/tdeioslave/slave.cpp b/languages/cpp/app_templates/tdeioslave/slave.cpp
index 683d959e..d8c7fcb4 100644
--- a/languages/cpp/app_templates/tdeioslave/slave.cpp
+++ b/languages/cpp/app_templates/tdeioslave/slave.cpp
@@ -11,7 +11,7 @@
 #include <netinet/in.h>
 #include <netdb.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kinstance.h>
diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp
index 21d6db32..f1e4fb3e 100644
--- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <tqcheckbox.h>
 #include <tqcolor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <tdeconfig.h>
diff --git a/languages/cpp/ast_utils.cpp b/languages/cpp/ast_utils.cpp
index 48eb7bb9..8bfc3bba 100644
--- a/languages/cpp/ast_utils.cpp
+++ b/languages/cpp/ast_utils.cpp
@@ -17,7 +17,7 @@
 
 #include <klocale.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tdetexteditor/editinterface.h>
 
diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp
index a19d3289..8ea05cb8 100644
--- a/languages/cpp/backgroundparser.cpp
+++ b/languages/cpp/backgroundparser.cpp
@@ -30,7 +30,7 @@
 
 #include <kurl.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
diff --git a/languages/cpp/configproblemreporter.ui.h b/languages/cpp/configproblemreporter.ui.h
index c9e23652..2b42ce89 100644
--- a/languages/cpp/configproblemreporter.ui.h
+++ b/languages/cpp/configproblemreporter.ui.h
@@ -11,7 +11,7 @@
 #include <kdevproject.h>
 
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
 
diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp
index df89a03c..3b867dc8 100644
--- a/languages/cpp/cppcodecompletion.cpp
+++ b/languages/cpp/cppcodecompletion.cpp
@@ -39,7 +39,7 @@ email                : david.nolden.tdevelop@art-master.de
 
 #include <tqpopupmenu.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <tdemainwindow.h>
diff --git a/languages/cpp/cppsupport_utils.cpp b/languages/cpp/cppsupport_utils.cpp
index c8ffb1de..10ec75bc 100644
--- a/languages/cpp/cppsupport_utils.cpp
+++ b/languages/cpp/cppsupport_utils.cpp
@@ -1,6 +1,6 @@
 #include <tqdir.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index a1ef51e6..3d435843 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -72,7 +72,7 @@
 #include <tqvbox.h>
 #include <kmessagebox.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kgenericfactory.h>
diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp
index 08fbf15e..6349971c 100644
--- a/languages/cpp/createpcsdialog.cpp
+++ b/languages/cpp/createpcsdialog.cpp
@@ -28,7 +28,7 @@
 #include <tdelistbox.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp
index e0fafa95..3ff54246 100644
--- a/languages/cpp/debugger/debuggerpart.cpp
+++ b/languages/cpp/debugger/debuggerpart.cpp
@@ -31,7 +31,7 @@
 #include <tdeparts/part.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tqtimer.h>
 #include <kstringhandler.h>
diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp
index e5081fbd..2588892c 100644
--- a/languages/cpp/debugger/gdbcontroller.cpp
+++ b/languages/cpp/debugger/gdbcontroller.cpp
@@ -24,7 +24,7 @@
 #include "settings.h"
 #include "mi/miparser.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/languages/cpp/debugger/stty.cpp b/languages/cpp/debugger/stty.cpp
index 5ae42d54..bc36f191 100644
--- a/languages/cpp/debugger/stty.cpp
+++ b/languages/cpp/debugger/stty.cpp
@@ -66,7 +66,7 @@
 
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "stty.h"
 
diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp
index 5dab0174..7df6b64c 100644
--- a/languages/cpp/debugger/variablewidget.cpp
+++ b/languages/cpp/debugger/variablewidget.cpp
@@ -37,7 +37,7 @@
 
 #include <tqpoint.h>
 #include <tqclipboard.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 
 #include <cctype>
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp
index bc46d5b7..7ce54167 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp
@@ -14,7 +14,7 @@
 
 #include <tdelistbox.h>
 #include <kcombobox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
 #include <kdebug.h>
@@ -66,7 +66,7 @@ void SettingsDialog::slotSelectionChanged( TQListBoxItem* )
 
 bool SettingsDialog::isValidKDELibsDir( const TQString & path ) const
 {
-	return TQFile::exists( path + "/kapplication.h" );
+	return TQFile::exists( path + "/tdeapplication.h" );
 }
 
 TQString SettingsDialog::kdeDir( ) const
diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp
index 349fc2ab..bc26f64a 100644
--- a/languages/cpp/problemreporter.cpp
+++ b/languages/cpp/problemreporter.cpp
@@ -38,7 +38,7 @@
 #include <klocale.h>
 #include <kstatusbar.h>
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kdialogbase.h>
 
diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp
index 3b229744..110d8005 100644
--- a/languages/csharp/csharpsupportpart.cpp
+++ b/languages/csharp/csharpsupportpart.cpp
@@ -17,7 +17,7 @@
 #include <tqtextstream.h>
 #include <tqtimer.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdevgenericfactory.h>
 #include <kinputdialog.h>
diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp
index dbd05de9..66774f06 100644
--- a/languages/fortran/fortransupportpart.cpp
+++ b/languages/fortran/fortransupportpart.cpp
@@ -24,7 +24,7 @@
 #include <tqtextstream.h>
 #include <tqtimer.h>
 #include <tqvbox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klocale.h>
diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp
index 29173e45..707ec24d 100644
--- a/languages/java/backgroundparser.cpp
+++ b/languages/java/backgroundparser.cpp
@@ -28,7 +28,7 @@
 
 #include <kurl.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
diff --git a/languages/java/configproblemreporter.ui.h b/languages/java/configproblemreporter.ui.h
index b03bb05e..dd2325d1 100644
--- a/languages/java/configproblemreporter.ui.h
+++ b/languages/java/configproblemreporter.ui.h
@@ -6,7 +6,7 @@
 ** a constructor, and a destroy() slot in place of a destructor.
 *****************************************************************************/
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 void ConfigureProblemReporter::init()
diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp
index b4919837..7217e3fd 100644
--- a/languages/java/javasupportpart.cpp
+++ b/languages/java/javasupportpart.cpp
@@ -42,7 +42,7 @@
 #include <tqvbox.h>
 #include <kmessagebox.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kgenericfactory.h>
diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp
index 4570efc7..42a044ff 100644
--- a/languages/java/problemreporter.cpp
+++ b/languages/java/problemreporter.cpp
@@ -37,7 +37,7 @@
 #include <klocale.h>
 #include <kstatusbar.h>
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kdialogbase.h>
 
diff --git a/languages/kjssupport/jscodecompletion.cpp b/languages/kjssupport/jscodecompletion.cpp
index 1780a04e..c2314350 100644
--- a/languages/kjssupport/jscodecompletion.cpp
+++ b/languages/kjssupport/jscodecompletion.cpp
@@ -16,7 +16,7 @@
 #include <tqstringlist.h>
 #include <tqtextstream.h>
 #include <tqtimer.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqregexp.h>
 
 #include <kiconloader.h>
diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp
index 300991d8..a6f3f916 100644
--- a/languages/kjssupport/kjssupport_part.cpp
+++ b/languages/kjssupport/kjssupport_part.cpp
@@ -37,7 +37,7 @@
 #include <kdevproject.h>
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <kjsembed/kjsembedpart.h>
 #include <kjsembed/jsconsolewidget.h>
diff --git a/languages/pascal/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp
index 0d8c049b..14f58b35 100644
--- a/languages/pascal/pascalsupport_part.cpp
+++ b/languages/pascal/pascalsupport_part.cpp
@@ -17,7 +17,7 @@
 #include <klocale.h>
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstatusbar.h>
 
 #include <antlr/ASTFactory.hpp>
diff --git a/languages/pascal/problemreporter.cpp b/languages/pascal/problemreporter.cpp
index 5ddc8dc4..c3feb684 100644
--- a/languages/pascal/problemreporter.cpp
+++ b/languages/pascal/problemreporter.cpp
@@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <kstatusbar.h>
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 
 #include <tdeconfig.h>
diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp
index 4da9949f..4b670d81 100644
--- a/languages/perl/perlsupportpart.cpp
+++ b/languages/perl/perlsupportpart.cpp
@@ -17,7 +17,7 @@
 #include <tqtextstream.h>
 #include <tqtimer.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdevgenericfactory.h>
 #include <kinputdialog.h>
diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp
index 0703ff3c..704afb0d 100644
--- a/languages/php/phperrorview.cpp
+++ b/languages/php/phperrorview.cpp
@@ -37,7 +37,7 @@
 #include <klocale.h>
 #include <kstatusbar.h>
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kdialogbase.h>
 
diff --git a/languages/php/phpfile.cpp b/languages/php/phpfile.cpp
index 7a95bc98..92d2fc4c 100644
--- a/languages/php/phpfile.cpp
+++ b/languages/php/phpfile.cpp
@@ -16,7 +16,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqstring.h>
 #include <tqfileinfo.h>
 #include <tqregexp.h>
diff --git a/languages/php/phpfile.h b/languages/php/phpfile.h
index 3cc571fa..ac5a4525 100644
--- a/languages/php/phpfile.h
+++ b/languages/php/phpfile.h
@@ -19,7 +19,7 @@
 #ifndef PHPFILE_H
 #define PHPFILE_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqfileinfo.h>
diff --git a/languages/php/phpparser.cpp b/languages/php/phpparser.cpp
index a0f1179e..6b725dc8 100644
--- a/languages/php/phpparser.cpp
+++ b/languages/php/phpparser.cpp
@@ -20,7 +20,7 @@
 #include "phpsupportpart.h"
 #include <urlutil.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdevcore.h>
 #include <kdevproject.h>
 #include <codemodel.h>
diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp
index e240a813..48d9e5f2 100644
--- a/languages/php/phpsupportpart.cpp
+++ b/languages/php/phpsupportpart.cpp
@@ -33,7 +33,7 @@
 #include <tqthread.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdehtmlview.h>
 #include <klocale.h>
diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp
index afdf16ca..9cb0257a 100644
--- a/languages/python/pythonsupportpart.cpp
+++ b/languages/python/pythonsupportpart.cpp
@@ -26,7 +26,7 @@
 #include <tqtimer.h>
 #include <tqvbox.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kdevgenericfactory.h>
diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp
index 6293aaf0..2994387a 100644
--- a/languages/ruby/debugger/debuggerpart.cpp
+++ b/languages/ruby/debugger/debuggerpart.cpp
@@ -34,7 +34,7 @@
 #include <tdeparts/part.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tqtimer.h>
 #include <kstringhandler.h>
diff --git a/languages/ruby/debugger/rdbcontroller.cpp b/languages/ruby/debugger/rdbcontroller.cpp
index 5f1aacfe..3bb6392b 100644
--- a/languages/ruby/debugger/rdbcontroller.cpp
+++ b/languages/ruby/debugger/rdbcontroller.cpp
@@ -37,7 +37,7 @@
 #include "domutil.h"
 #include "settings.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/languages/ruby/debugger/stty.cpp b/languages/ruby/debugger/stty.cpp
index 6027e9a2..28fc9b95 100644
--- a/languages/ruby/debugger/stty.cpp
+++ b/languages/ruby/debugger/stty.cpp
@@ -65,7 +65,7 @@
 
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "stty.h"
 
diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp
index 044614b6..83945d3e 100644
--- a/languages/ruby/debugger/variablewidget.cpp
+++ b/languages/ruby/debugger/variablewidget.cpp
@@ -40,7 +40,7 @@
 
 #include <tqpoint.h>
 #include <tqclipboard.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // **************************************************************************
 // **************************************************************************
diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp
index 35358313..c3bfff85 100644
--- a/languages/ruby/rubysupport_part.cpp
+++ b/languages/ruby/rubysupport_part.cpp
@@ -30,7 +30,7 @@
 #include <tdeaction.h>
 #include <tdeparts/part.h>
 #include <kdialogbase.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klibloader.h>
 
 #include <tdetexteditor/viewcursorinterface.h>
diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp
index 5b0d6d20..087aedba 100644
--- a/languages/sql/sqlsupport_part.cpp
+++ b/languages/sql/sqlsupport_part.cpp
@@ -5,7 +5,7 @@
 #include <tqsqldatabase.h>
 #include <tqsqlrecord.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kdevgenericfactory.h>