summaryrefslogtreecommitdiffstats
path: root/languages/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'languages/cpp')
-rw-r--r--languages/cpp/addmethoddialog.cpp2
-rw-r--r--languages/cpp/app_templates/dcopservice/main.cpp2
-rw-r--r--languages/cpp/app_templates/kapp/app.cpp4
-rw-r--r--languages/cpp/app_templates/kapp/appview.cpp4
-rw-r--r--languages/cpp/app_templates/kapp/main.cpp2
-rw-r--r--languages/cpp/app_templates/kapp/pref.cpp2
-rw-r--r--languages/cpp/app_templates/kateplugin/plugin_app.cpp2
-rw-r--r--languages/cpp/app_templates/kateplugin/plugin_app.h2
-rw-r--r--languages/cpp/app_templates/kateplugin2/plugin_app.cpp2
-rw-r--r--languages/cpp/app_templates/kateplugin2/plugin_app.h2
-rw-r--r--languages/cpp/app_templates/kde4app/kapp4view.cpp2
-rw-r--r--languages/cpp/app_templates/kdedcop/app.cpp2
-rw-r--r--languages/cpp/app_templates/kdedcop/main.cpp2
-rw-r--r--languages/cpp/app_templates/kdevlang/kdevlang_part.cpp2
-rw-r--r--languages/cpp/app_templates/kdevpart/kdevpart_part.cpp4
-rw-r--r--languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp4
-rw-r--r--languages/cpp/app_templates/khello/app.cpp2
-rw-r--r--languages/cpp/app_templates/khello/main.cpp2
-rw-r--r--languages/cpp/app_templates/khello2/app.cpp2
-rw-r--r--languages/cpp/app_templates/khello2/main.cpp2
-rw-r--r--languages/cpp/app_templates/kicker/applet.cpp6
-rw-r--r--languages/cpp/app_templates/kmake/app.cpp2
-rw-r--r--languages/cpp/app_templates/kmake/mainviewimp.cpp2
-rw-r--r--languages/cpp/app_templates/kofficepart/kopart_aboutdata.h2
-rw-r--r--languages/cpp/app_templates/kofficepart/kopart_factory.cpp4
-rw-r--r--languages/cpp/app_templates/kofficepart/kopart_view.cpp2
-rw-r--r--languages/cpp/app_templates/kofficepart/main.cpp2
-rw-r--r--languages/cpp/app_templates/kpartapp/app.cpp4
-rw-r--r--languages/cpp/app_templates/kpartapp/app_part.cpp6
-rw-r--r--languages/cpp/app_templates/kpartapp/main.cpp2
-rw-r--r--languages/cpp/app_templates/kpartplugin/plugin_app.cpp6
-rw-r--r--languages/cpp/app_templates/kscons_kxt/app.cpp6
-rw-r--r--languages/cpp/app_templates/kscons_kxt/appview.cpp2
-rw-r--r--languages/cpp/app_templates/kscons_kxt/main.cpp2
-rw-r--r--languages/cpp/app_templates/kscons_tdemdi/app_part.cpp4
-rw-r--r--languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp10
-rw-r--r--languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp4
-rw-r--r--languages/cpp/app_templates/kscons_tdemdi/main.cpp2
-rw-r--r--languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp2
-rw-r--r--languages/cpp/app_templates/kxt/app.cpp6
-rw-r--r--languages/cpp/app_templates/kxt/appview.cpp2
-rw-r--r--languages/cpp/app_templates/kxt/main.cpp2
-rw-r--r--languages/cpp/app_templates/noatunui/plugin_app.cpp4
-rw-r--r--languages/cpp/app_templates/noatunui/plugin_impl.cpp4
-rw-r--r--languages/cpp/app_templates/noatunvisual/plugin_app.cpp4
-rw-r--r--languages/cpp/app_templates/tdecmodule/module.cpp4
-rw-r--r--languages/cpp/app_templates/tdeconfig35/app.cpp4
-rw-r--r--languages/cpp/app_templates/tdeconfig35/appview.cpp2
-rw-r--r--languages/cpp/app_templates/tdeconfig35/main.cpp2
-rw-r--r--languages/cpp/app_templates/tdeioslave/slave.cpp6
-rw-r--r--languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp4
-rw-r--r--languages/cpp/ast_utils.cpp2
-rw-r--r--languages/cpp/ccconfigwidget.cpp4
-rw-r--r--languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp2
-rw-r--r--languages/cpp/configproblemreporter.ui.h2
-rw-r--r--languages/cpp/cppcodecompletion.cpp4
-rw-r--r--languages/cpp/cppimplementationwidget.cpp4
-rw-r--r--languages/cpp/cppnewclassdlg.cpp4
-rw-r--r--languages/cpp/cppsupportpart.cpp6
-rw-r--r--languages/cpp/creategettersetterconfiguration.cpp2
-rw-r--r--languages/cpp/createpcsdialog.cpp2
-rw-r--r--languages/cpp/debugger/breakpoint.cpp2
-rw-r--r--languages/cpp/debugger/breakpoint.h2
-rw-r--r--languages/cpp/debugger/dbgpsdlg.cpp6
-rw-r--r--languages/cpp/debugger/dbgtoolbar.cpp2
-rw-r--r--languages/cpp/debugger/debuggerpart.cpp4
-rw-r--r--languages/cpp/debugger/debuggertracingdialog.cpp2
-rw-r--r--languages/cpp/debugger/disassemblewidget.cpp2
-rw-r--r--languages/cpp/debugger/framestackwidget.cpp4
-rw-r--r--languages/cpp/debugger/gdbbreakpointwidget.cpp4
-rw-r--r--languages/cpp/debugger/gdbcontroller.cpp6
-rw-r--r--languages/cpp/debugger/gdboutputwidget.cpp2
-rw-r--r--languages/cpp/debugger/memviewdlg.cpp6
-rw-r--r--languages/cpp/debugger/stty.cpp2
-rw-r--r--languages/cpp/debugger/variablewidget.cpp4
-rw-r--r--languages/cpp/doc/gnome1.toc2
-rw-r--r--languages/cpp/includepathresolver.cpp2
-rw-r--r--languages/cpp/kdevdriver.cpp2
-rw-r--r--languages/cpp/pcsimporter/customimporter/settingsdialog.cpp4
-rw-r--r--languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp2
-rw-r--r--languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp4
-rw-r--r--languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp4
-rw-r--r--languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp4
-rw-r--r--languages/cpp/problemreporter.cpp2
-rw-r--r--languages/cpp/qtdesignercppintegration.cpp4
-rw-r--r--languages/cpp/setuphelper.cpp2
-rw-r--r--languages/cpp/simpletype.cpp2
-rw-r--r--languages/cpp/subclassingdlg.cpp2
-rw-r--r--languages/cpp/typedesc.cpp2
89 files changed, 140 insertions, 140 deletions
diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp
index 3faf0e97..e004d0f3 100644
--- a/languages/cpp/addmethoddialog.cpp
+++ b/languages/cpp/addmethoddialog.cpp
@@ -27,7 +27,7 @@
#include <kdevpartcontroller.h>
#include <kdevcreatefile.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
#include <tdeparts/part.h>
#include <tdetexteditor/editinterface.h>
diff --git a/languages/cpp/app_templates/dcopservice/main.cpp b/languages/cpp/app_templates/dcopservice/main.cpp
index 5bdeec39..cf1d3ae6 100644
--- a/languages/cpp/app_templates/dcopservice/main.cpp
+++ b/languages/cpp/app_templates/dcopservice/main.cpp
@@ -4,7 +4,7 @@
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <dcopclient.h>
#include "%{APPNAMELC}.h"
diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp
index 9daebf13..774efe8e 100644
--- a/languages/cpp/app_templates/kapp/app.cpp
+++ b/languages/cpp/app_templates/kapp/app.cpp
@@ -8,8 +8,8 @@
#include <tqpainter.h>
#include <tqpaintdevicemetrics.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdeversion.h>
#include <kstatusbar.h>
diff --git a/languages/cpp/app_templates/kapp/appview.cpp b/languages/cpp/app_templates/kapp/appview.cpp
index c700800b..16c05a3f 100644
--- a/languages/cpp/app_templates/kapp/appview.cpp
+++ b/languages/cpp/app_templates/kapp/appview.cpp
@@ -9,9 +9,9 @@
#include <ktrader.h>
#include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <krun.h>
-#include <klocale.h>
+#include <tdelocale.h>
%{APPNAME}View::%{APPNAME}View(TQWidget *parent)
: TQWidget(parent),
diff --git a/languages/cpp/app_templates/kapp/main.cpp b/languages/cpp/app_templates/kapp/main.cpp
index 294a7490..8c2cc07f 100644
--- a/languages/cpp/app_templates/kapp/main.cpp
+++ b/languages/cpp/app_templates/kapp/main.cpp
@@ -5,7 +5,7 @@
#include <dcopclient.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const char description[] =
I18N_NOOP("A TDE Application");
diff --git a/languages/cpp/app_templates/kapp/pref.cpp b/languages/cpp/app_templates/kapp/pref.cpp
index ff83190f..669f591c 100644
--- a/languages/cpp/app_templates/kapp/pref.cpp
+++ b/languages/cpp/app_templates/kapp/pref.cpp
@@ -2,7 +2,7 @@
#include "pref.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqlabel.h>
diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.cpp b/languages/cpp/app_templates/kateplugin/plugin_app.cpp
index a1cb79d7..4d80a74c 100644
--- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp
+++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp
@@ -3,7 +3,7 @@
#include "plugin_%{APPNAMELC}.h"
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
class PluginView : public KXMLGUIClient
diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.h b/languages/cpp/app_templates/kateplugin/plugin_app.h
index 2e715e4e..847e6175 100644
--- a/languages/cpp/app_templates/kateplugin/plugin_app.h
+++ b/languages/cpp/app_templates/kateplugin/plugin_app.h
@@ -12,7 +12,7 @@
#include <kate/viewmanager.h>
#include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
class KatePluginFactory : public KLibFactory
{
diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
index 888e76ab..8845fae3 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
+++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
@@ -3,7 +3,7 @@
#include "plugin_%{APPNAMELC}.h"
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tdefiledialog.h>
diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.h b/languages/cpp/app_templates/kateplugin2/plugin_app.h
index f47140bf..80fb0103 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin_app.h
+++ b/languages/cpp/app_templates/kateplugin2/plugin_app.h
@@ -14,7 +14,7 @@
#include <kate/pluginconfiginterfaceextension.h>
#include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
class %{APPNAME}ConfigPage;
diff --git a/languages/cpp/app_templates/kde4app/kapp4view.cpp b/languages/cpp/app_templates/kde4app/kapp4view.cpp
index 9d9e482a..af95aa15 100644
--- a/languages/cpp/app_templates/kde4app/kapp4view.cpp
+++ b/languages/cpp/app_templates/kde4app/kapp4view.cpp
@@ -2,7 +2,7 @@
#include "%{APPNAMELC}view.h"
#include "settings.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <TQtGui/TQLabel>
%{APPNAME}View::%{APPNAME}View(TQWidget *)
diff --git a/languages/cpp/app_templates/kdedcop/app.cpp b/languages/cpp/app_templates/kdedcop/app.cpp
index d6508e90..5c2fa627 100644
--- a/languages/cpp/app_templates/kdedcop/app.cpp
+++ b/languages/cpp/app_templates/kdedcop/app.cpp
@@ -5,7 +5,7 @@
#include <tqlabel.h>
#include <tdemainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
%{APPNAME}::%{APPNAME}()
: TDEMainWindow( 0, "%{APPNAME}" )
diff --git a/languages/cpp/app_templates/kdedcop/main.cpp b/languages/cpp/app_templates/kdedcop/main.cpp
index aed5e904..283ab5cf 100644
--- a/languages/cpp/app_templates/kdedcop/main.cpp
+++ b/languages/cpp/app_templates/kdedcop/main.cpp
@@ -4,7 +4,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const char description[] =
I18N_NOOP("A TDE KPart Application");
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
index 0d6a5775..559a931b 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
+++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
@@ -4,7 +4,7 @@
#include <tqtimer.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
#include <kdevcore.h>
#include <kdevpartcontroller.h>
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
index e9843bd8..aa950c8a 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
+++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
@@ -5,11 +5,11 @@
#include <tqpopupmenu.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <kdialogbase.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdevplugininfo.h>
#include <kdevgenericfactory.h>
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
index e9843bd8..aa950c8a 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
+++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
@@ -5,11 +5,11 @@
#include <tqpopupmenu.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <kdialogbase.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdevplugininfo.h>
#include <kdevgenericfactory.h>
diff --git a/languages/cpp/app_templates/khello/app.cpp b/languages/cpp/app_templates/khello/app.cpp
index 01373881..3a9f51ef 100644
--- a/languages/cpp/app_templates/khello/app.cpp
+++ b/languages/cpp/app_templates/khello/app.cpp
@@ -5,7 +5,7 @@
#include <tqlabel.h>
#include <tdemainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
%{APPNAME}::%{APPNAME}()
: TDEMainWindow( 0, "%{APPNAME}" )
diff --git a/languages/cpp/app_templates/khello/main.cpp b/languages/cpp/app_templates/khello/main.cpp
index f141c87f..45936529 100644
--- a/languages/cpp/app_templates/khello/main.cpp
+++ b/languages/cpp/app_templates/khello/main.cpp
@@ -4,7 +4,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const char description[] =
I18N_NOOP("A TDE KPart Application");
diff --git a/languages/cpp/app_templates/khello2/app.cpp b/languages/cpp/app_templates/khello2/app.cpp
index a952bfb6..b5f24d3e 100644
--- a/languages/cpp/app_templates/khello2/app.cpp
+++ b/languages/cpp/app_templates/khello2/app.cpp
@@ -1,7 +1,7 @@
%{CPP_TEMPLATE}
#include <tdemainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "%{APPNAMELC}.h"
#include "%{APPNAMELC}widget.h"
diff --git a/languages/cpp/app_templates/khello2/main.cpp b/languages/cpp/app_templates/khello2/main.cpp
index f9e68a34..ba30a9dd 100644
--- a/languages/cpp/app_templates/khello2/main.cpp
+++ b/languages/cpp/app_templates/khello2/main.cpp
@@ -4,7 +4,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const char description[] =
I18N_NOOP("A TDE KPart Application");
diff --git a/languages/cpp/app_templates/kicker/applet.cpp b/languages/cpp/app_templates/kicker/applet.cpp
index cb7b4ecd..f0b6fc1b 100644
--- a/languages/cpp/app_templates/kicker/applet.cpp
+++ b/languages/cpp/app_templates/kicker/applet.cpp
@@ -1,11 +1,11 @@
%{CPP_TEMPLATE}
#include <tqlcdnumber.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "%{APPNAMELC}.h"
diff --git a/languages/cpp/app_templates/kmake/app.cpp b/languages/cpp/app_templates/kmake/app.cpp
index 5c0d534f..f62a1c23 100644
--- a/languages/cpp/app_templates/kmake/app.cpp
+++ b/languages/cpp/app_templates/kmake/app.cpp
@@ -2,7 +2,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "mainviewimp.h"
static const char description[] = I18N_NOOP("A TDE Application");
diff --git a/languages/cpp/app_templates/kmake/mainviewimp.cpp b/languages/cpp/app_templates/kmake/mainviewimp.cpp
index 8a0de706..02a4682f 100644
--- a/languages/cpp/app_templates/kmake/mainviewimp.cpp
+++ b/languages/cpp/app_templates/kmake/mainviewimp.cpp
@@ -1,7 +1,7 @@
#include "mainviewimp.h"
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
MainViewImp::MainViewImp(TQWidget* parent, const char* name, WFlags fl)
: MainView(parent,name,fl)
diff --git a/languages/cpp/app_templates/kofficepart/kopart_aboutdata.h b/languages/cpp/app_templates/kofficepart/kopart_aboutdata.h
index 8a141a5e..b1ac0f5a 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_aboutdata.h
+++ b/languages/cpp/app_templates/kofficepart/kopart_aboutdata.h
@@ -7,7 +7,7 @@
#define %{APPNAME}_ABOUTDATA
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const char description[] = I18N_NOOP("%{APPNAME} KOffice Program");
static const char version[] = "%{VERSION}";
diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp
index f0173476..db665500 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp
+++ b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp
@@ -7,9 +7,9 @@
#include <%{APPNAMELC}_aboutdata.h>
#include <kinstance.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
extern "C"
{
diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.cpp b/languages/cpp/app_templates/kofficepart/kopart_view.cpp
index 50633e04..6e2c943c 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_view.cpp
+++ b/languages/cpp/app_templates/kofficepart/kopart_view.cpp
@@ -10,7 +10,7 @@
#include <tqiconset.h>
#include <tdeaction.h>
#include <kstdaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
%{APPNAME}View::%{APPNAME}View( %{APPNAME}Part* part, TQWidget* parent, const char* name )
diff --git a/languages/cpp/app_templates/kofficepart/main.cpp b/languages/cpp/app_templates/kofficepart/main.cpp
index 98369dde..52bd02ff 100644
--- a/languages/cpp/app_templates/kofficepart/main.cpp
+++ b/languages/cpp/app_templates/kofficepart/main.cpp
@@ -7,7 +7,7 @@
#include <koDocument.h>
#include <koMainWindow.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <dcopclient.h>
#include "%{APPNAMELC}_aboutdata.h"
diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp
index 7c5154a6..759cbf5a 100644
--- a/languages/cpp/app_templates/kpartapp/app.cpp
+++ b/languages/cpp/app_templates/kpartapp/app.cpp
@@ -12,9 +12,9 @@
#include <kstdaction.h>
#include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
%{APPNAME}::%{APPNAME}()
: KParts::MainWindow( 0L, "%{APPNAME}" )
diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp
index 937a7702..adf210b3 100644
--- a/languages/cpp/app_templates/kpartapp/app_part.cpp
+++ b/languages/cpp/app_templates/kpartapp/app_part.cpp
@@ -5,8 +5,8 @@
#include <tdeaction.h>
#include <kstdaction.h>
#include <tdefiledialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tqfile.h>
#include <tqtextstream.h>
@@ -146,7 +146,7 @@ void %{APPNAME}Part::fileSaveAs()
// It's usually safe to leave the factory code alone.. with the
// notable exception of the TDEAboutData data
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
TDEInstance* %{APPNAME}PartFactory::s_instance = 0L;
TDEAboutData* %{APPNAME}PartFactory::s_about = 0L;
diff --git a/languages/cpp/app_templates/kpartapp/main.cpp b/languages/cpp/app_templates/kpartapp/main.cpp
index 755813f0..83266630 100644
--- a/languages/cpp/app_templates/kpartapp/main.cpp
+++ b/languages/cpp/app_templates/kpartapp/main.cpp
@@ -3,7 +3,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const char description[] =
I18N_NOOP("A TDE KPart Application");
diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
index 25e8861a..c395d983 100644
--- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
+++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
@@ -4,9 +4,9 @@
#include <tdehtml_part.h>
#include <tdeaction.h>
#include <kinstance.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* parent, const char* name )
: Plugin( parent, name )
diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp
index dfd6024d..00e1adea 100644
--- a/languages/cpp/app_templates/kscons_kxt/app.cpp
+++ b/languages/cpp/app_templates/kscons_kxt/app.cpp
@@ -10,11 +10,11 @@
#include <tqpaintdevicemetrics.h>
#include <tdeconfigdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdeversion.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kstatusbar.h>
#include <kkeydialog.h>
#include <ktip.h>
diff --git a/languages/cpp/app_templates/kscons_kxt/appview.cpp b/languages/cpp/app_templates/kscons_kxt/appview.cpp
index 2bcc9c6a..ba4d91d6 100644
--- a/languages/cpp/app_templates/kscons_kxt/appview.cpp
+++ b/languages/cpp/app_templates/kscons_kxt/appview.cpp
@@ -3,7 +3,7 @@
#include "%{APPNAMELC}view.h"
#include "settings.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
%{APPNAME}View::%{APPNAME}View(TQWidget *parent)
diff --git a/languages/cpp/app_templates/kscons_kxt/main.cpp b/languages/cpp/app_templates/kscons_kxt/main.cpp
index b257c85f..34ccd79e 100644
--- a/languages/cpp/app_templates/kscons_kxt/main.cpp
+++ b/languages/cpp/app_templates/kscons_kxt/main.cpp
@@ -4,7 +4,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const char description[] =
I18N_NOOP("A TDE Application");
diff --git a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
index 73e1492d..cde31592 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
@@ -7,8 +7,8 @@
#include <tdeaction.h>
#include <kstdaction.h>
#include <tdefiledialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tqfile.h>
#include <tqtextstream.h>
diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
index 20f5f3fb..c63cb223 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
@@ -8,7 +8,7 @@
#include <tqtoolbutton.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <ktip.h>
#include <tdeparts/part.h>
#include <tdeparts/partmanager.h>
@@ -23,14 +23,14 @@
#include <tdeaboutdata.h>
#include <tdefiledialog.h>
#include <tdeactionclasses.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdeversion.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kstatusbar.h>
#include <kkeydialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <ktabwidget.h>
#include <kedittoolbar.h>
#include <tdeversion.h>
diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp
index a9b9845e..1feb1b8b 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp
@@ -4,11 +4,11 @@
#include <tqlayout.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdemdichildview.h>
#include <kdebug.h>
#include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "%{APPNAMELC}tdemdiView.h"
diff --git a/languages/cpp/app_templates/kscons_tdemdi/main.cpp b/languages/cpp/app_templates/kscons_tdemdi/main.cpp
index 253f45dc..32a00043 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/main.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/main.cpp
@@ -4,7 +4,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "%{APPNAMELC}tdemdi.h"
diff --git a/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp
index 0eab6525..229c28a8 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp
@@ -6,7 +6,7 @@
#include <tdeparts/part.h>
#include <kate/document.h>
#include <kate/view.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klibloader.h>
#include <kurl.h>
diff --git a/languages/cpp/app_templates/kxt/app.cpp b/languages/cpp/app_templates/kxt/app.cpp
index 85df8854..ecdd5127 100644
--- a/languages/cpp/app_templates/kxt/app.cpp
+++ b/languages/cpp/app_templates/kxt/app.cpp
@@ -10,11 +10,11 @@
#include <tqpaintdevicemetrics.h>
#include <tdeconfigdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdeversion.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kstatusbar.h>
#include <kkeydialog.h>
diff --git a/languages/cpp/app_templates/kxt/appview.cpp b/languages/cpp/app_templates/kxt/appview.cpp
index 30d627fe..dd770ad0 100644
--- a/languages/cpp/app_templates/kxt/appview.cpp
+++ b/languages/cpp/app_templates/kxt/appview.cpp
@@ -3,7 +3,7 @@
#include "%{APPNAMELC}view.h"
#include "settings.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *parent)
diff --git a/languages/cpp/app_templates/kxt/main.cpp b/languages/cpp/app_templates/kxt/main.cpp
index 928ddc33..4fc87301 100644
--- a/languages/cpp/app_templates/kxt/main.cpp
+++ b/languages/cpp/app_templates/kxt/main.cpp
@@ -4,7 +4,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const char description[] =
I18N_NOOP("A TDE Application");
diff --git a/languages/cpp/app_templates/noatunui/plugin_app.cpp b/languages/cpp/app_templates/noatunui/plugin_app.cpp
index a98ab7a6..5f46e83e 100644
--- a/languages/cpp/app_templates/noatunui/plugin_app.cpp
+++ b/languages/cpp/app_templates/noatunui/plugin_app.cpp
@@ -1,8 +1,8 @@
#include "plugin_%{APPNAMELC}_impl.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
extern "C"
{
diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.cpp b/languages/cpp/app_templates/noatunui/plugin_impl.cpp
index 7bb93d70..150e829d 100644
--- a/languages/cpp/app_templates/noatunui/plugin_impl.cpp
+++ b/languages/cpp/app_templates/noatunui/plugin_impl.cpp
@@ -18,8 +18,8 @@
#include <tdepopupmenu.h>
#include <kstatusbar.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kurldrag.h>
//#include <tdefiledialog.h>
diff --git a/languages/cpp/app_templates/noatunvisual/plugin_app.cpp b/languages/cpp/app_templates/noatunvisual/plugin_app.cpp
index ae60d277..cb98499c 100644
--- a/languages/cpp/app_templates/noatunvisual/plugin_app.cpp
+++ b/languages/cpp/app_templates/noatunvisual/plugin_app.cpp
@@ -5,8 +5,8 @@
#include "plugin_%{APPNAMELC}.h"
#include "plugin_%{APPNAMELC}_impl.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
extern "C"
{
diff --git a/languages/cpp/app_templates/tdecmodule/module.cpp b/languages/cpp/app_templates/tdecmodule/module.cpp
index 52203d1a..00426cad 100644
--- a/languages/cpp/app_templates/tdecmodule/module.cpp
+++ b/languages/cpp/app_templates/tdecmodule/module.cpp
@@ -2,8 +2,8 @@
#include <tqlayout.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tdeparts/genericfactory.h>
#include "%{APPNAMELC}.h"
diff --git a/languages/cpp/app_templates/tdeconfig35/app.cpp b/languages/cpp/app_templates/tdeconfig35/app.cpp
index d9313146..1aab14b5 100644
--- a/languages/cpp/app_templates/tdeconfig35/app.cpp
+++ b/languages/cpp/app_templates/tdeconfig35/app.cpp
@@ -8,8 +8,8 @@
#include <tdeaction.h>
#include <tdeconfigdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kprinter.h>
#include <kstatusbar.h>
diff --git a/languages/cpp/app_templates/tdeconfig35/appview.cpp b/languages/cpp/app_templates/tdeconfig35/appview.cpp
index 30d627fe..dd770ad0 100644
--- a/languages/cpp/app_templates/tdeconfig35/appview.cpp
+++ b/languages/cpp/app_templates/tdeconfig35/appview.cpp
@@ -3,7 +3,7 @@
#include "%{APPNAMELC}view.h"
#include "settings.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *parent)
diff --git a/languages/cpp/app_templates/tdeconfig35/main.cpp b/languages/cpp/app_templates/tdeconfig35/main.cpp
index 928ddc33..4fc87301 100644
--- a/languages/cpp/app_templates/tdeconfig35/main.cpp
+++ b/languages/cpp/app_templates/tdeconfig35/main.cpp
@@ -4,7 +4,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const char description[] =
I18N_NOOP("A TDE Application");
diff --git a/languages/cpp/app_templates/tdeioslave/slave.cpp b/languages/cpp/app_templates/tdeioslave/slave.cpp
index d8c7fcb4..8bf85fee 100644
--- a/languages/cpp/app_templates/tdeioslave/slave.cpp
+++ b/languages/cpp/app_templates/tdeioslave/slave.cpp
@@ -13,11 +13,11 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
#include <ksock.h>
diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp
index f1e4fb3e..0d2bf1ff 100644
--- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp
+++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp
@@ -4,10 +4,10 @@
#include <tqcheckbox.h>
#include <tqcolor.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpushbutton.h>
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "%{APPNAMELC}.h"
#include "%{APPNAMELC}ui.h"
diff --git a/languages/cpp/ast_utils.cpp b/languages/cpp/ast_utils.cpp
index 8bfc3bba..caa167f4 100644
--- a/languages/cpp/ast_utils.cpp
+++ b/languages/cpp/ast_utils.cpp
@@ -15,7 +15,7 @@
#include <tqstringlist.h>
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeapplication.h>
diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp
index 31e06204..99a6db12 100644
--- a/languages/cpp/ccconfigwidget.cpp
+++ b/languages/cpp/ccconfigwidget.cpp
@@ -27,8 +27,8 @@
// kde includes
#include <kdevproject.h>
#include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <kstandarddirs.h>
#include <tdefileitem.h>
diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
index cf090adf..23e8a551 100644
--- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
+++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp
@@ -18,7 +18,7 @@
#include <tqlayout.h>
#include <tqvbox.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
#include "flagboxes.h"
diff --git a/languages/cpp/configproblemreporter.ui.h b/languages/cpp/configproblemreporter.ui.h
index 2b42ce89..97cc66e1 100644
--- a/languages/cpp/configproblemreporter.ui.h
+++ b/languages/cpp/configproblemreporter.ui.h
@@ -12,7 +12,7 @@
#include <tdeconfig.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqfile.h>
diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp
index 3b867dc8..09ad4bd8 100644
--- a/languages/cpp/cppcodecompletion.cpp
+++ b/languages/cpp/cppcodecompletion.cpp
@@ -41,9 +41,9 @@ email : david.nolden.tdevelop@art-master.de
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeparts/part.h>
#include <kstatusbar.h>
#include <tdetexteditor/document.h>
diff --git a/languages/cpp/cppimplementationwidget.cpp b/languages/cpp/cppimplementationwidget.cpp
index f0986c2b..de747571 100644
--- a/languages/cpp/cppimplementationwidget.cpp
+++ b/languages/cpp/cppimplementationwidget.cpp
@@ -26,8 +26,8 @@
#include <tqregexp.h>
#include <tqdom.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdelistview.h>
#include <klineedit.h>
diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp
index 8cd37938..e22d1d66 100644
--- a/languages/cpp/cppnewclassdlg.cpp
+++ b/languages/cpp/cppnewclassdlg.cpp
@@ -29,8 +29,8 @@
#include <tqstyle.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqcombobox.h>
#include <tqlistview.h>
#include <tqpopupmenu.h>
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp
index 3d435843..7c126fc2 100644
--- a/languages/cpp/cppsupportpart.cpp
+++ b/languages/cpp/cppsupportpart.cpp
@@ -70,14 +70,14 @@
#include <tqregexp.h>
#include <tqlabel.h>
#include <tqvbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeaction.h>
#include <tdeapplication.h>
#include <kdebug.h>
#include <kdialogbase.h>
#include <kgenericfactory.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdemainwindow.h>
#include <kstatusbar.h>
#include <tdeconfig.h>
diff --git a/languages/cpp/creategettersetterconfiguration.cpp b/languages/cpp/creategettersetterconfiguration.cpp
index 7190e796..ace72d14 100644
--- a/languages/cpp/creategettersetterconfiguration.cpp
+++ b/languages/cpp/creategettersetterconfiguration.cpp
@@ -16,7 +16,7 @@
#include <domutil.h>
#include <tqdom.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
TQString CreateGetterSetterConfiguration::defaultPath = TQString::fromLatin1( "/kdevcppsupport/creategettersetter" );
CreateGetterSetterConfiguration::CreateGetterSetterConfiguration( CppSupportPart * part )
diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp
index 6349971c..6cebf32d 100644
--- a/languages/cpp/createpcsdialog.cpp
+++ b/languages/cpp/createpcsdialog.cpp
@@ -31,7 +31,7 @@
#include <tdeapplication.h>
#include <kinstance.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstringhandler.h>
#include <klineedit.h>
diff --git a/languages/cpp/debugger/breakpoint.cpp b/languages/cpp/debugger/breakpoint.cpp
index 1b6efdaf..f0bfb48d 100644
--- a/languages/cpp/debugger/breakpoint.cpp
+++ b/languages/cpp/debugger/breakpoint.cpp
@@ -17,7 +17,7 @@
#include "gdbcontroller.h"
#include "gdbcommand.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqfileinfo.h>
diff --git a/languages/cpp/debugger/breakpoint.h b/languages/cpp/debugger/breakpoint.h
index 4927d9b9..32ba84a2 100644
--- a/languages/cpp/debugger/breakpoint.h
+++ b/languages/cpp/debugger/breakpoint.h
@@ -16,7 +16,7 @@
#ifndef _BREAKPOINT_H_
#define _BREAKPOINT_H_
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqobject.h>
#include <tqstring.h>
diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp
index fd85999f..385b0c39 100644
--- a/languages/cpp/debugger/dbgpsdlg.cpp
+++ b/languages/cpp/debugger/dbgpsdlg.cpp
@@ -17,14 +17,14 @@
#include <kbuttonbox.h>
#include <kdialog.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
#include <kprocess.h>
#include <kstdguiitem.h>
#include <tdeversion.h>
#include <tdelistview.h>
#include <tdelistviewsearchline.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqframe.h>
#include <tqlabel.h>
diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp
index cee864c1..42c1857f 100644
--- a/languages/cpp/debugger/dbgtoolbar.cpp
+++ b/languages/cpp/debugger/dbgtoolbar.cpp
@@ -19,7 +19,7 @@
#include <kdockwindow.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <kstandarddirs.h>
#include <twin.h>
diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp
index 3ff54246..d57b6d6f 100644
--- a/languages/cpp/debugger/debuggerpart.cpp
+++ b/languages/cpp/debugger/debuggerpart.cpp
@@ -25,12 +25,12 @@
#include <tdefiledialog.h>
#include <kdevgenericfactory.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdemainwindow.h>
#include <kstatusbar.h>
#include <tdeparts/part.h>
#include <tdetexteditor/viewcursorinterface.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <dcopclient.h>
#include <tqtimer.h>
diff --git a/languages/cpp/debugger/debuggertracingdialog.cpp b/languages/cpp/debugger/debuggertracingdialog.cpp
index 6bf70f3b..90657b29 100644
--- a/languages/cpp/debugger/debuggertracingdialog.cpp
+++ b/languages/cpp/debugger/debuggertracingdialog.cpp
@@ -7,7 +7,7 @@
#include <tqcheckbox.h>
#include <klineedit.h>
#include <keditlistbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
namespace GDBDebugger
{
diff --git a/languages/cpp/debugger/disassemblewidget.cpp b/languages/cpp/debugger/disassemblewidget.cpp
index 9f6bc185..83dd9cb5 100644
--- a/languages/cpp/debugger/disassemblewidget.cpp
+++ b/languages/cpp/debugger/disassemblewidget.cpp
@@ -20,7 +20,7 @@
#include <kdebug.h>
#include <tdeversion.h>
#include <ktextedit.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tqdict.h>
#include <tqheader.h>
diff --git a/languages/cpp/debugger/framestackwidget.cpp b/languages/cpp/debugger/framestackwidget.cpp
index 773e6a4a..ea0fa552 100644
--- a/languages/cpp/debugger/framestackwidget.cpp
+++ b/languages/cpp/debugger/framestackwidget.cpp
@@ -17,9 +17,9 @@
#include "gdbparser.h"
#include "gdbcommand.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tqheader.h>
#include <tqlistbox.h>
diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp
index ab54deb0..2e002a7a 100644
--- a/languages/cpp/debugger/gdbbreakpointwidget.cpp
+++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp
@@ -24,10 +24,10 @@
#include <kdebug.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqvbuttongroup.h>
#include <tqfileinfo.h>
diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp
index 2588892c..d5207a24 100644
--- a/languages/cpp/debugger/gdbcontroller.cpp
+++ b/languages/cpp/debugger/gdbcontroller.cpp
@@ -27,9 +27,9 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
#include <twin.h>
diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp
index 4a8b30d3..9bfc96dd 100644
--- a/languages/cpp/debugger/gdboutputwidget.cpp
+++ b/languages/cpp/debugger/gdboutputwidget.cpp
@@ -21,7 +21,7 @@
#include <kcombobox.h>
#include <kdebug.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <tqlabel.h>
diff --git a/languages/cpp/debugger/memviewdlg.cpp b/languages/cpp/debugger/memviewdlg.cpp
index 81340ea5..e76d2820 100644
--- a/languages/cpp/debugger/memviewdlg.cpp
+++ b/languages/cpp/debugger/memviewdlg.cpp
@@ -19,8 +19,8 @@
#include <kbuttonbox.h>
#include <klineedit.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
#include <kstdguiitem.h>
#include <tdeversion.h>
#include <kdebug.h>
@@ -36,7 +36,7 @@
#include <tqtoolbox.h>
#include <tqtextedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <khexedit/byteseditinterface.h>
diff --git a/languages/cpp/debugger/stty.cpp b/languages/cpp/debugger/stty.cpp
index bc36f191..23635bdd 100644
--- a/languages/cpp/debugger/stty.cpp
+++ b/languages/cpp/debugger/stty.cpp
@@ -64,7 +64,7 @@
#include <tqstring.h>
#include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tdeapplication.h>
diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp
index 7df6b64c..7906ceb5 100644
--- a/languages/cpp/debugger/variablewidget.cpp
+++ b/languages/cpp/debugger/variablewidget.cpp
@@ -33,12 +33,12 @@
#include <tqregexp.h>
#include <tqcursor.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqpoint.h>
#include <tqclipboard.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <cctype>
#include <set>
diff --git a/languages/cpp/doc/gnome1.toc b/languages/cpp/doc/gnome1.toc
index 79a119df..10a289de 100644
--- a/languages/cpp/doc/gnome1.toc
+++ b/languages/cpp/doc/gnome1.toc
@@ -182,7 +182,7 @@
<tocsect3 name="GtkList" url="gtk/gttdelist.html"/>
<tocsect3 name="GtkListItem" url="gtk/gttdelistitem.html"/>
<tocsect3 name="GtkMenu" url="gtk/gtkmenu.html"/>
- <tocsect3 name="GtkMenuBar" url="gtk/gtkmenubar.html"/>
+ <tocsect3 name="GtkMenuBar" url="gtk/gttdemenubar.html"/>
<tocsect3 name="GtkMenuItem" url="gtk/gtkmenuitem.html"/>
<tocsect3 name="GtkMenuShell" url="gtk/gtkmenushell.html"/>
<tocsect3 name="GtkMisc" url="gtk/gtkmisc.html"/>
diff --git a/languages/cpp/includepathresolver.cpp b/languages/cpp/includepathresolver.cpp
index fd29416c..089b57ec 100644
--- a/languages/cpp/includepathresolver.cpp
+++ b/languages/cpp/includepathresolver.cpp
@@ -30,7 +30,7 @@
#include "kurl.h" /* defines KURL */
#include "tqdir.h" /* defines TQDir */
#include "tqregexp.h" /* defines TQRegExp */
-#include "klocale.h" /* defines [function] i18n */
+#include "tdelocale.h" /* defines [function] i18n */
#include "blockingkprocess.h" /* defines BlockingTDEProcess */
#include "includepathresolver.h"
#include <sys/stat.h>
diff --git a/languages/cpp/kdevdriver.cpp b/languages/cpp/kdevdriver.cpp
index 4ea75fca..4a6c45ec 100644
--- a/languages/cpp/kdevdriver.cpp
+++ b/languages/cpp/kdevdriver.cpp
@@ -1,4 +1,4 @@
-#include "klocale.h" /* defines [function] i18n */
+#include "tdelocale.h" /* defines [function] i18n */
#include <lexer.h>
#include "kdevdriver.h"
diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
index 84583e81..68f0678e 100644
--- a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp
@@ -18,8 +18,8 @@
#include <kcombobox.h>
#include <kurlrequester.h>
#include <tdeversion.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <klineedit.h>
#include <keditlistbox.h>
diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
index 97066fcc..7880b8e4 100644
--- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
+++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp
@@ -14,7 +14,7 @@
#include "settingsdialog.h"
#include <kgenericfactory.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kprocess.h>
#include <kdebug.h>
diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp
index 1aa90dc0..ff786557 100644
--- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp
@@ -17,8 +17,8 @@
#include <kurlrequester.h>
#include <kdebug.h>
#include <klineedit.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <tqfile.h>
#include <tqdir.h>
diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
index 1c05d5e8..6839c93b 100644
--- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp
@@ -17,8 +17,8 @@
#include <kurlrequester.h>
#include <kdebug.h>
#include <klineedit.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <tqfile.h>
#include <tqdir.h>
diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp
index 7ce54167..b1d84440 100644
--- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp
+++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp
@@ -19,8 +19,8 @@
#include <kurlrequester.h>
#include <kdebug.h>
#include <klineedit.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <tqfile.h>
#include <tqdir.h>
diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp
index bc26f64a..8696f891 100644
--- a/languages/cpp/problemreporter.cpp
+++ b/languages/cpp/problemreporter.cpp
@@ -35,7 +35,7 @@
#include <tdetexteditor/view.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstatusbar.h>
#include <kurl.h>
#include <tdeapplication.h>
diff --git a/languages/cpp/qtdesignercppintegration.cpp b/languages/cpp/qtdesignercppintegration.cpp
index c87d0266..2354b67d 100644
--- a/languages/cpp/qtdesignercppintegration.cpp
+++ b/languages/cpp/qtdesignercppintegration.cpp
@@ -23,9 +23,9 @@
#include <tqpair.h>
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kurl.h>
#include <tdetexteditor/editinterface.h>
#include <tdetexteditor/view.h>
diff --git a/languages/cpp/setuphelper.cpp b/languages/cpp/setuphelper.cpp
index d91c508f..3d868c61 100644
--- a/languages/cpp/setuphelper.cpp
+++ b/languages/cpp/setuphelper.cpp
@@ -14,7 +14,7 @@
#include "blockingkprocess.h"
#include "driver.h"
#include <kdebug.h>
-#include "ktempfile.h" /* defines [function] KTempDir */
+#include "tdetempfile.h" /* defines [function] KTempDir */
#include "kstandarddirs.h" /* defines [function] locateLocal */
#include "tqdir.h" /* defines TQDir */
#include <stdio.h>
diff --git a/languages/cpp/simpletype.cpp b/languages/cpp/simpletype.cpp
index b1d9087c..db3f9c79 100644
--- a/languages/cpp/simpletype.cpp
+++ b/languages/cpp/simpletype.cpp
@@ -15,7 +15,7 @@
#include "simpletype.h"
#include "safetycounter.h"
#include "simpletypefunction.h"
-#include <klocale.h>
+#include <tdelocale.h>
TQMap<TQString, TQString> BuiltinTypes::m_types;
BuiltinTypes builtin; //Needed so BuiltinTypes::BuiltinTypes is called and the types are initialized
diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp
index 5d3ed2be..0982226c 100644
--- a/languages/cpp/subclassingdlg.cpp
+++ b/languages/cpp/subclassingdlg.cpp
@@ -33,7 +33,7 @@
#include <tqdom.h>
#include <kstandarddirs.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqfile.h>
#include <tqregexp.h>
#include <tdeconfig.h>
diff --git a/languages/cpp/typedesc.cpp b/languages/cpp/typedesc.cpp
index 146beb08..c4b90f51 100644
--- a/languages/cpp/typedesc.cpp
+++ b/languages/cpp/typedesc.cpp
@@ -23,7 +23,7 @@
#include "parser.h"
#include <tqtextstream.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
const char* TypeDesc::functionMark = "[function] ";