From 279764bab1514a051db18e14241e9bae62be14d6 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 22:00:37 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 doc/kommander/extending.docbook                            | 2 +-
 kimagemapeditor/arealistview.cpp                           | 2 +-
 kimagemapeditor/drawzone.cpp                               | 2 +-
 kimagemapeditor/imageslistview.cpp                         | 2 +-
 kimagemapeditor/kimagemapeditor.cpp                        | 6 +++---
 kimagemapeditor/kimearea.h                                 | 2 +-
 kimagemapeditor/kimecommands.cpp                           | 2 +-
 kimagemapeditor/kimedialogs.cpp                            | 4 ++--
 kimagemapeditor/kimeshell.cpp                              | 2 +-
 kimagemapeditor/main.cpp                                   | 2 +-
 kimagemapeditor/mapslistview.cpp                           | 2 +-
 kimagemapeditor/qextfileinfo.cpp                           | 2 +-
 klinkstatus/src/actionmanager.cpp                          | 2 +-
 klinkstatus/src/engine/linkchecker.cpp                     | 2 +-
 klinkstatus/src/engine/linkstatus.cpp                      | 2 +-
 klinkstatus/src/engine/linkstatus.h                        | 2 +-
 klinkstatus/src/engine/searchmanager.cpp                   | 4 ++--
 klinkstatus/src/klinkstatus.cpp                            | 4 ++--
 klinkstatus/src/klinkstatus_part.cpp                       | 4 ++--
 klinkstatus/src/main.cpp                                   | 2 +-
 klinkstatus/src/ui/documentrootdialog.cpp                  | 2 +-
 klinkstatus/src/ui/klshistorycombo.cpp                     | 2 +-
 klinkstatus/src/ui/resultssearchbar.cpp                    | 2 +-
 klinkstatus/src/ui/resultview.cpp                          | 2 +-
 klinkstatus/src/ui/sessionwidget.cpp                       | 6 +++---
 klinkstatus/src/ui/settings/configidentificationdialog.cpp | 2 +-
 klinkstatus/src/ui/tablelinkstatus.cpp                     | 4 ++--
 klinkstatus/src/ui/tabwidgetsession.cpp                    | 2 +-
 klinkstatus/src/ui/treeview.cpp                            | 4 ++--
 klinkstatus/src/utils/utils.cpp                            | 2 +-
 klinkstatus/src/utils/xsl.cpp                              | 2 +-
 kommander/editor/actiondnd.cpp                             | 2 +-
 kommander/editor/actioneditorimpl.cpp                      | 2 +-
 kommander/editor/actionlistview.cpp                        | 2 +-
 kommander/editor/assoctexteditorimpl.cpp                   | 8 ++++----
 kommander/editor/choosewidgetimpl.cpp                      | 2 +-
 kommander/editor/command.cpp                               | 2 +-
 kommander/editor/connectioneditorimpl.cpp                  | 2 +-
 kommander/editor/formfile.cpp                              | 4 ++--
 kommander/editor/formwindow.cpp                            | 4 ++--
 kommander/editor/functionsimpl.cpp                         | 4 ++--
 kommander/editor/hierarchyview.cpp                         | 2 +-
 kommander/editor/iconvieweditorimpl.cpp                    | 2 +-
 kommander/editor/listboxeditorimpl.cpp                     | 2 +-
 kommander/editor/listvieweditorimpl.cpp                    | 2 +-
 kommander/editor/main.cpp                                  | 2 +-
 kommander/editor/mainwindow.cpp                            | 6 +++---
 kommander/editor/mainwindowactions.cpp                     | 8 ++++----
 kommander/editor/messagelog.cpp                            | 2 +-
 kommander/editor/messagelog.h                              | 2 +-
 kommander/editor/multilineeditorimpl.cpp                   | 2 +-
 kommander/editor/newformimpl.cpp                           | 4 ++--
 kommander/editor/pixmapchooser.cpp                         | 2 +-
 kommander/editor/propertyeditor.cpp                        | 2 +-
 kommander/editor/resource.cpp                              | 2 +-
 kommander/editor/sizehandle.cpp                            | 2 +-
 kommander/editor/tableeditorimpl.cpp                       | 2 +-
 kommander/editor/widgetdatabase.cpp                        | 2 +-
 kommander/editor/widgetfactory.cpp                         | 2 +-
 kommander/editor/wizardeditorimpl.cpp                      | 2 +-
 kommander/editor/workspace.cpp                             | 2 +-
 kommander/examples/old/widgetgenerator.kmdr                | 2 +-
 kommander/executor/instance.cpp                            | 6 +++---
 kommander/executor/main.cpp                                | 6 +++---
 kommander/executor/register.cpp                            | 2 +-
 kommander/factory/kommanderfactory.cpp                     | 4 ++--
 kommander/plugin/specialinformation.cpp                    | 2 +-
 kommander/pluginmanager/main.cpp                           | 2 +-
 kommander/pluginmanager/mainwindow.cpp                     | 6 +++---
 kommander/widget/expression.cpp                            | 2 +-
 kommander/widget/functionlib.cpp                           | 6 +++---
 kommander/widget/kommanderfunctions.cpp                    | 4 ++--
 kommander/widget/kommanderwidget.cpp                       | 4 ++--
 kommander/widget/myprocess.cpp                             | 4 ++--
 kommander/widget/parser.cpp                                | 2 +-
 kommander/widgets/aboutdialog.cpp                          | 2 +-
 kommander/widgets/buttongroup.cpp                          | 2 +-
 kommander/widgets/closebutton.cpp                          | 4 ++--
 kommander/widgets/combobox.cpp                             | 2 +-
 kommander/widgets/dialog.cpp                               | 2 +-
 kommander/widgets/execbutton.cpp                           | 4 ++--
 kommander/widgets/fontdialog.cpp                           | 2 +-
 kommander/widgets/groupbox.cpp                             | 2 +-
 kommander/widgets/lineedit.cpp                             | 2 +-
 kommander/widgets/listbox.cpp                              | 2 +-
 kommander/widgets/pixmaplabel.cpp                          | 2 +-
 kommander/widgets/popupmenu.cpp                            | 4 ++--
 kommander/widgets/progressbar.cpp                          | 2 +-
 kommander/widgets/richtexteditor.cpp                       | 2 +-
 kommander/widgets/scriptobject.cpp                         | 4 ++--
 kommander/widgets/table.cpp                                | 6 +++---
 kommander/widgets/tabwidget.cpp                            | 2 +-
 kommander/widgets/textbrowser.cpp                          | 2 +-
 kommander/widgets/textedit.cpp                             | 2 +-
 kommander/widgets/timer.cpp                                | 4 ++--
 kommander/widgets/toolbox.cpp                              | 2 +-
 kommander/widgets/treewidget.cpp                           | 4 ++--
 kommander/working/plugintemplate/plugin.cpp                | 4 ++--
 kommander/working/plugintemplate/widget.cpp                | 4 ++--
 kxsldbg/kxsldbg.cpp                                        | 4 ++--
 kxsldbg/kxsldbgpart/kxsldbg_part.cpp                       | 2 +-
 kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp                | 2 +-
 kxsldbg/kxsldbgpart/libxsldbg/options.cpp                  | 2 +-
 kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp                   | 2 +-
 kxsldbg/kxsldbgpart/libxsldbg/xsldbg.h                     | 2 +-
 kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp           | 2 +-
 kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp              | 2 +-
 kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp                   | 2 +-
 kxsldbg/kxsldbgpart/xsldbgdebugger.cpp                     | 2 +-
 kxsldbg/kxsldbgpart/xsldbginspector.cpp                    | 2 +-
 kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp                | 2 +-
 kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp           | 2 +-
 kxsldbg/kxsldbgpart/xsldbgoutputview.cpp                   | 2 +-
 kxsldbg/main.cpp                                           | 2 +-
 kxsldbg/xsldbgmain.cpp                                     | 4 ++--
 lib/compatibility/knewstuff/downloaddialog.cpp             | 4 ++--
 lib/compatibility/knewstuff/engine.cpp                     | 4 ++--
 lib/compatibility/knewstuff/entry.cpp                      | 4 ++--
 lib/compatibility/knewstuff/knewstuff.cpp                  | 2 +-
 lib/compatibility/knewstuff/knewstuffgeneric.cpp           | 4 ++--
 lib/compatibility/knewstuff/knewstuffsecure.cpp            | 6 +++---
 lib/compatibility/knewstuff/provider.cpp                   | 6 +++---
 lib/compatibility/knewstuff/providerdialog.cpp             | 4 ++--
 lib/compatibility/knewstuff/security.cpp                   | 4 ++--
 lib/compatibility/knewstuff/uploaddialog.cpp               | 4 ++--
 lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp           | 6 +++---
 lib/compatibility/tdemdi/qextmdi/ktabbar.cpp               | 4 ++--
 lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp       | 4 ++--
 lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp        | 2 +-
 lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp | 2 +-
 lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp       | 2 +-
 lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp   | 4 ++--
 lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp       | 2 +-
 lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp         | 4 ++--
 lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h           | 2 +-
 lib/ksavealldialog.cpp                                     | 2 +-
 lib/qextfileinfo.cpp                                       | 2 +-
 quanta/components/csseditor/colorrequester.cpp             | 2 +-
 quanta/components/csseditor/colorslider.cpp                | 2 +-
 quanta/components/csseditor/csseditor.cpp                  | 2 +-
 quanta/components/csseditor/cssselector.cpp                | 4 ++--
 quanta/components/csseditor/encodingselector.cpp           | 2 +-
 quanta/components/csseditor/fontfamilychooser.cpp          | 4 ++--
 quanta/components/csseditor/propertysetter.cpp             | 2 +-
 quanta/components/csseditor/styleeditor.cpp                | 2 +-
 quanta/components/csseditor/stylesheetparser.cpp           | 2 +-
 quanta/components/csseditor/tlpeditors.cpp                 | 2 +-
 quanta/components/cvsservice/cvsservice.cpp                | 4 ++--
 quanta/components/debugger/backtracelistview.cpp           | 2 +-
 quanta/components/debugger/dbgp/dbgpnetwork.cpp            | 2 +-
 quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp     | 4 ++--
 quanta/components/debugger/debuggerbreakpointview.cpp      | 2 +-
 quanta/components/debugger/debuggermanager.cpp             | 4 ++--
 quanta/components/debugger/debuggerui.cpp                  | 2 +-
 quanta/components/debugger/debuggervariable.cpp            | 2 +-
 quanta/components/debugger/gubed/quantadebuggergubed.cpp   | 2 +-
 quanta/components/debugger/interfaces/debuggerclient.cpp   | 4 ++--
 quanta/components/debugger/pathmapper.cpp                  | 2 +-
 quanta/components/debugger/quantadebuggerinterface.cpp     | 4 ++--
 quanta/components/debugger/variableslistview.cpp           | 2 +-
 quanta/components/framewizard/fmfpeditor.cpp               | 2 +-
 quanta/components/framewizard/framewizard.cpp              | 4 ++--
 quanta/components/tableeditor/tableeditor.cpp              | 4 ++--
 quanta/dialogs/actionconfigdialog.cpp                      | 4 ++--
 quanta/dialogs/dirtydlg.cpp                                | 2 +-
 quanta/dialogs/dtepeditdlg.cpp                             | 4 ++--
 quanta/dialogs/filecombo.cpp                               | 2 +-
 quanta/dialogs/settings/abbreviation.cpp                   | 6 +++---
 quanta/dialogs/settings/parseroptions.cpp                  | 2 +-
 quanta/dialogs/settings/previewoptions.cpp                 | 4 ++--
 quanta/dialogs/specialchardialog.cpp                       | 2 +-
 quanta/dialogs/tagdialogs/colorcombo.cpp                   | 8 ++++----
 quanta/dialogs/tagdialogs/listdlg.cpp                      | 2 +-
 quanta/dialogs/tagdialogs/tagdialog.cpp                    | 2 +-
 quanta/dialogs/tagdialogs/tagimgdlg.cpp                    | 2 +-
 quanta/dialogs/tagdialogs/tagimgdlgdata.cpp                | 2 +-
 quanta/dialogs/tagdialogs/tagmaildlg.cpp                   | 6 +++---
 quanta/dialogs/tagdialogs/tagmiscdlg.cpp                   | 2 +-
 quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp          | 2 +-
 quanta/dialogs/tagdialogs/tagxml.cpp                       | 2 +-
 quanta/messages/annotationoutput.cpp                       | 4 ++--
 quanta/messages/messageitem.cpp                            | 2 +-
 quanta/messages/messageoutput.cpp                          | 4 ++--
 quanta/parsers/dtd/dtd.cpp                                 | 6 +++---
 quanta/parsers/dtd/dtdparser.cpp                           | 4 ++--
 quanta/parsers/parser.cpp                                  | 2 +-
 quanta/parsers/parsercommon.cpp                            | 2 +-
 quanta/parts/kafka/domtreeview.cpp                         | 2 +-
 quanta/parts/kafka/htmldocumentproperties.cpp              | 4 ++--
 quanta/parts/kafka/kafkahtmlpart.cpp                       | 4 ++--
 quanta/parts/kafka/wkafkapart.cpp                          | 4 ++--
 quanta/parts/preview/whtmlpart.cpp                         | 4 ++--
 quanta/plugins/quantaplugin.cpp                            | 6 +++---
 quanta/plugins/quantapluginconfig.cpp                      | 4 ++--
 quanta/plugins/quantaplugineditor.cpp                      | 4 ++--
 quanta/plugins/quantaplugininterface.cpp                   | 4 ++--
 quanta/project/eventconfigurationdlg.cpp                   | 4 ++--
 quanta/project/eventeditordlg.cpp                          | 2 +-
 quanta/project/membereditdlg.cpp                           | 6 +++---
 quanta/project/project.cpp                                 | 4 ++--
 quanta/project/projectnewgeneral.cpp                       | 4 ++--
 quanta/project/projectnewlocal.cpp                         | 2 +-
 quanta/project/projectnewweb.cpp                           | 4 ++--
 quanta/project/projectoptions.ui.h                         | 4 ++--
 quanta/project/projectprivate.cpp                          | 6 +++---
 quanta/project/projectupload.cpp                           | 6 +++---
 quanta/project/rescanprj.cpp                               | 4 ++--
 quanta/project/teammembersdlg.cpp                          | 4 ++--
 quanta/project/uploadprofiles.cpp                          | 2 +-
 quanta/src/CMakeLists.txt                                  | 2 +-
 quanta/src/document.cpp                                    | 6 +++---
 quanta/src/dtds.cpp                                        | 6 +++---
 quanta/src/kqapp.cpp                                       | 2 +-
 quanta/src/main.cpp                                        | 2 +-
 quanta/src/quanta.cpp                                      | 8 ++++----
 quanta/src/quanta_init.cpp                                 | 8 ++++----
 quanta/src/quantadoc.cpp                                   | 4 ++--
 quanta/src/quantaview.cpp                                  | 6 +++---
 quanta/src/viewmanager.cpp                                 | 2 +-
 quanta/treeviews/basetreeview.cpp                          | 6 +++---
 quanta/treeviews/doctreeview.cpp                           | 2 +-
 quanta/treeviews/filestreeview.cpp                         | 4 ++--
 quanta/treeviews/projecttreeview.cpp                       | 6 +++---
 quanta/treeviews/scripttreeview.cpp                        | 6 +++---
 quanta/treeviews/servertreeview.cpp                        | 4 ++--
 quanta/treeviews/structtreetag.cpp                         | 2 +-
 quanta/treeviews/structtreeview.cpp                        | 4 ++--
 quanta/treeviews/tagattributeitems.cpp                     | 2 +-
 quanta/treeviews/tagattributetree.cpp                      | 2 +-
 quanta/treeviews/templatestreeview.cpp                     | 6 +++---
 quanta/treeviews/uploadtreeview.cpp                        | 2 +-
 quanta/utility/newstuff.cpp                                | 6 +++---
 quanta/utility/qpevents.cpp                                | 4 ++--
 quanta/utility/quantabookmarks.cpp                         | 2 +-
 quanta/utility/quantacommon.cpp                            | 6 +++---
 quanta/utility/quantanetaccess.cpp                         | 4 ++--
 quanta/utility/tagaction.cpp                               | 6 +++---
 quanta/utility/tagactionmanager.cpp                        | 2 +-
 quanta/utility/tagactionset.cpp                            | 2 +-
 quanta/utility/toolbartabwidget.cpp                        | 6 +++---
 tdefilereplace/kaddstringdlg.cpp                           | 2 +-
 tdefilereplace/knewprojectdlg.cpp                          | 6 +++---
 tdefilereplace/koptionsdlg.cpp                             | 2 +-
 tdefilereplace/main.cpp                                    | 2 +-
 tdefilereplace/report.cpp                                  | 2 +-
 tdefilereplace/report.h                                    | 2 +-
 tdefilereplace/tdefilereplace.cpp                          | 4 ++--
 tdefilereplace/tdefilereplacelib.cpp                       | 2 +-
 tdefilereplace/tdefilereplacelib.h                         | 2 +-
 tdefilereplace/tdefilereplacepart.cpp                      | 6 +++---
 tdefilereplace/tdefilereplaceview.cpp                      | 4 ++--
 tdefilereplace/whatthis.h                                  | 2 +-
 252 files changed, 401 insertions(+), 401 deletions(-)

diff --git a/doc/kommander/extending.docbook b/doc/kommander/extending.docbook
index 039d1b48..48d62675 100644
--- a/doc/kommander/extending.docbook
+++ b/doc/kommander/extending.docbook
@@ -151,7 +151,7 @@ that this widget was updated.
 In order to add functionality to the widget, you need to register some function and add code to handle them. Here is the code to be used to register, put it in the beginning of the cpp file, above the constructor:
 </para>
 <screen>
-#include &lt;klocale.h&gt; //for i18n
+#include &lt;tdelocale.h&gt; //for i18n
 
 #include "kommanderplugin.h"
 #include "specials.h"
diff --git a/kimagemapeditor/arealistview.cpp b/kimagemapeditor/arealistview.cpp
index 4dceda41..f285999b 100644
--- a/kimagemapeditor/arealistview.cpp
+++ b/kimagemapeditor/arealistview.cpp
@@ -24,7 +24,7 @@
 
 // KDE
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // local
 #include "kimearea.h"
diff --git a/kimagemapeditor/drawzone.cpp b/kimagemapeditor/drawzone.cpp
index 21f176dc..51fdb2ac 100644
--- a/kimagemapeditor/drawzone.cpp
+++ b/kimagemapeditor/drawzone.cpp
@@ -24,7 +24,7 @@
 // KDE
 #include <kdebug.h>
 #include <kurldrag.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 #include <kmimetype.h>
diff --git a/kimagemapeditor/imageslistview.cpp b/kimagemapeditor/imageslistview.cpp
index ff14a98a..15529a45 100644
--- a/kimagemapeditor/imageslistview.cpp
+++ b/kimagemapeditor/imageslistview.cpp
@@ -20,7 +20,7 @@
  
  
 // KDE
-#include <klocale.h> 
+#include <tdelocale.h> 
 #include <kdebug.h>
 
 // locale 
diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp
index 86b0a4d0..231bf8ed 100644
--- a/kimagemapeditor/kimagemapeditor.cpp
+++ b/kimagemapeditor/kimagemapeditor.cpp
@@ -41,18 +41,18 @@
 // KDE
 #include <kcommand.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdeaccel.h>
 #include <kstdaction.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
 #include <klineeditdlg.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <kxmlguifactory.h>
diff --git a/kimagemapeditor/kimearea.h b/kimagemapeditor/kimearea.h
index 0c554754..7826aba6 100644
--- a/kimagemapeditor/kimearea.h
+++ b/kimagemapeditor/kimearea.h
@@ -21,7 +21,7 @@
 #include <tqrect.h>
 #include <tqpoint.h>
 #include <tqptrlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqmap.h>
 
 #include "tdeversion.h"
diff --git a/kimagemapeditor/kimecommands.cpp b/kimagemapeditor/kimecommands.cpp
index 975001d9..20d88303 100644
--- a/kimagemapeditor/kimecommands.cpp
+++ b/kimagemapeditor/kimecommands.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 #include <tqstring.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kimagemapeditor.h"
 #include "kimecommands.h"
diff --git a/kimagemapeditor/kimedialogs.cpp b/kimagemapeditor/kimedialogs.cpp
index 6070edc9..d541b142 100644
--- a/kimagemapeditor/kimedialogs.cpp
+++ b/kimagemapeditor/kimedialogs.cpp
@@ -35,12 +35,12 @@
 // KDE
 #include <kiconloader.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <tdehtmlview.h>
 #include <tdehtml_part.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp
index 448d3b37..0cbcd542 100644
--- a/kimagemapeditor/kimeshell.cpp
+++ b/kimagemapeditor/kimeshell.cpp
@@ -22,7 +22,7 @@
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
 #include <kstatusbar.h>
diff --git a/kimagemapeditor/main.cpp b/kimagemapeditor/main.cpp
index e19b5522..374d51ff 100644
--- a/kimagemapeditor/main.cpp
+++ b/kimagemapeditor/main.cpp
@@ -17,7 +17,7 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
 
diff --git a/kimagemapeditor/mapslistview.cpp b/kimagemapeditor/mapslistview.cpp
index fee8f147..84a77bc2 100644
--- a/kimagemapeditor/mapslistview.cpp
+++ b/kimagemapeditor/mapslistview.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 // KDE
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // locale
diff --git a/kimagemapeditor/qextfileinfo.cpp b/kimagemapeditor/qextfileinfo.cpp
index 518dc79a..031a34ab 100644
--- a/kimagemapeditor/qextfileinfo.cpp
+++ b/kimagemapeditor/qextfileinfo.cpp
@@ -26,7 +26,7 @@
 #include <tdeio/scheduler.h>
 #include <kdirlister.h>
 #include <tdefileitem.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 //app includes
diff --git a/klinkstatus/src/actionmanager.cpp b/klinkstatus/src/actionmanager.cpp
index e60f2503..f738b44d 100644
--- a/klinkstatus/src/actionmanager.cpp
+++ b/klinkstatus/src/actionmanager.cpp
@@ -21,7 +21,7 @@
 
 #include <tdeactioncollection.h>
 #include <kxmlguifactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kguiitem.h>
 
diff --git a/klinkstatus/src/engine/linkchecker.cpp b/klinkstatus/src/engine/linkchecker.cpp
index 9d2a01ee..134b9582 100644
--- a/klinkstatus/src/engine/linkchecker.cpp
+++ b/klinkstatus/src/engine/linkchecker.cpp
@@ -34,7 +34,7 @@
 #include <tdeio/slave.h>
 #include <kmimetype.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdehtml_part.h>
 #include <dom/html_misc.h>
 #include <dom/dom_node.h>
diff --git a/klinkstatus/src/engine/linkstatus.cpp b/klinkstatus/src/engine/linkstatus.cpp
index bf5986f5..adda3b2e 100644
--- a/klinkstatus/src/engine/linkstatus.cpp
+++ b/klinkstatus/src/engine/linkstatus.cpp
@@ -22,7 +22,7 @@
 #include "../parser/node.h"
 #include "../ui/treeview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
 
 #include <tqdom.h>
diff --git a/klinkstatus/src/engine/linkstatus.h b/klinkstatus/src/engine/linkstatus.h
index ac49801f..118de371 100644
--- a/klinkstatus/src/engine/linkstatus.h
+++ b/klinkstatus/src/engine/linkstatus.h
@@ -25,7 +25,7 @@
 #include "../utils/mvector.h"
 
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 class TreeView;
 class TreeViewItem;
diff --git a/klinkstatus/src/engine/searchmanager.cpp b/klinkstatus/src/engine/searchmanager.cpp
index 737645af..f04d5063 100644
--- a/klinkstatus/src/engine/searchmanager.cpp
+++ b/klinkstatus/src/engine/searchmanager.cpp
@@ -20,9 +20,9 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdehtml_part.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 
 #include <tqstring.h>
 #include <tqvaluevector.h>
diff --git a/klinkstatus/src/klinkstatus.cpp b/klinkstatus/src/klinkstatus.cpp
index cf8abf2b..a1cfe5a7 100644
--- a/klinkstatus/src/klinkstatus.cpp
+++ b/klinkstatus/src/klinkstatus.cpp
@@ -28,9 +28,9 @@
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeaccel.h>
 
diff --git a/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp
index d7732280..cf1b6122 100644
--- a/klinkstatus/src/klinkstatus_part.cpp
+++ b/klinkstatus/src/klinkstatus_part.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
@@ -30,7 +30,7 @@
 #include <tdeaboutapplication.h>
 #include <kbugreport.h>
 #include <tdeconfigdialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeshortcut.h>
 #include <tdeaccel.h>
 #include <kkeydialog.h>
diff --git a/klinkstatus/src/main.cpp b/klinkstatus/src/main.cpp
index 89fddd48..98f6d18d 100644
--- a/klinkstatus/src/main.cpp
+++ b/klinkstatus/src/main.cpp
@@ -23,7 +23,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <iostream>
diff --git a/klinkstatus/src/ui/documentrootdialog.cpp b/klinkstatus/src/ui/documentrootdialog.cpp
index b1563285..6afb9618 100644
--- a/klinkstatus/src/ui/documentrootdialog.cpp
+++ b/klinkstatus/src/ui/documentrootdialog.cpp
@@ -20,7 +20,7 @@
 #include "documentrootdialog.h"
 
 #include <kurlrequester.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 
 #include <tqstring.h>
diff --git a/klinkstatus/src/ui/klshistorycombo.cpp b/klinkstatus/src/ui/klshistorycombo.cpp
index 2733d199..3bfddd0d 100644
--- a/klinkstatus/src/ui/klshistorycombo.cpp
+++ b/klinkstatus/src/ui/klshistorycombo.cpp
@@ -18,7 +18,7 @@
 #include <kdebug.h>
 #include <tdestdaccel.h>
 #include <kurldrag.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 
 bool KLSHistoryCombo::items_saved_ = false;
diff --git a/klinkstatus/src/ui/resultssearchbar.cpp b/klinkstatus/src/ui/resultssearchbar.cpp
index d99626b4..d5e4293d 100644
--- a/klinkstatus/src/ui/resultssearchbar.cpp
+++ b/klinkstatus/src/ui/resultssearchbar.cpp
@@ -23,7 +23,7 @@
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
diff --git a/klinkstatus/src/ui/resultview.cpp b/klinkstatus/src/ui/resultview.cpp
index fdf65099..d79bffdb 100644
--- a/klinkstatus/src/ui/resultview.cpp
+++ b/klinkstatus/src/ui/resultview.cpp
@@ -15,7 +15,7 @@
 #include <tqpainter.h>
 #include <tqcolor.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kiconloader.h>
 
diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp
index a82c5527..53ee3bd5 100644
--- a/klinkstatus/src/ui/sessionwidget.cpp
+++ b/klinkstatus/src/ui/sessionwidget.cpp
@@ -23,14 +23,14 @@
 #include <kcombobox.h>
 #include <ksqueezedtextlabel.h>
 #include <kprogress.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kpushbutton.h>
 #include <tdefiledialog.h>
 #include <tdeactionclasses.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <tdeio/netaccess.h>
diff --git a/klinkstatus/src/ui/settings/configidentificationdialog.cpp b/klinkstatus/src/ui/settings/configidentificationdialog.cpp
index 3abc7e2f..d9e20145 100644
--- a/klinkstatus/src/ui/settings/configidentificationdialog.cpp
+++ b/klinkstatus/src/ui/settings/configidentificationdialog.cpp
@@ -20,7 +20,7 @@
 
 #include "configidentificationdialog.h"
 
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
 
diff --git a/klinkstatus/src/ui/tablelinkstatus.cpp b/klinkstatus/src/ui/tablelinkstatus.cpp
index 2d2ad497..af78ca0b 100644
--- a/klinkstatus/src/ui/tablelinkstatus.cpp
+++ b/klinkstatus/src/ui/tablelinkstatus.cpp
@@ -34,8 +34,8 @@
 #include <kstandarddirs.h>
 #include <krun.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 
diff --git a/klinkstatus/src/ui/tabwidgetsession.cpp b/klinkstatus/src/ui/tabwidgetsession.cpp
index 26a5e131..dead2278 100644
--- a/klinkstatus/src/ui/tabwidgetsession.cpp
+++ b/klinkstatus/src/ui/tabwidgetsession.cpp
@@ -34,7 +34,7 @@
 
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstringhandler.h> 
 #include <kcharsets.h>
 #include <kmimetype.h>
diff --git a/klinkstatus/src/ui/treeview.cpp b/klinkstatus/src/ui/treeview.cpp
index eb56abe1..7dd4df3c 100644
--- a/klinkstatus/src/ui/treeview.cpp
+++ b/klinkstatus/src/ui/treeview.cpp
@@ -18,13 +18,13 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <kurl.h>
 #include <krun.h>
 #include <dcopref.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <dcopclient.h>
 #include <kcharsets.h>
 
diff --git a/klinkstatus/src/utils/utils.cpp b/klinkstatus/src/utils/utils.cpp
index 18abc6b7..081ead99 100644
--- a/klinkstatus/src/utils/utils.cpp
+++ b/klinkstatus/src/utils/utils.cpp
@@ -24,7 +24,7 @@
 #include <tqwidget.h>
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 
diff --git a/klinkstatus/src/utils/xsl.cpp b/klinkstatus/src/utils/xsl.cpp
index 496719df..33358a14 100644
--- a/klinkstatus/src/utils/xsl.cpp
+++ b/klinkstatus/src/utils/xsl.cpp
@@ -42,7 +42,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 /**
diff --git a/kommander/editor/actiondnd.cpp b/kommander/editor/actiondnd.cpp
index ae25449c..d07bfebf 100644
--- a/kommander/editor/actiondnd.cpp
+++ b/kommander/editor/actiondnd.cpp
@@ -40,7 +40,7 @@
 #include "metadatabase.h"
 #include "widgetfactory.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 bool QDesignerAction::addTo( TQWidget *w )
 {
diff --git a/kommander/editor/actioneditorimpl.cpp b/kommander/editor/actioneditorimpl.cpp
index fdb75ea7..8dea07ad 100644
--- a/kommander/editor/actioneditorimpl.cpp
+++ b/kommander/editor/actioneditorimpl.cpp
@@ -34,7 +34,7 @@
 #include <tqpopupmenu.h>
 #include <tqobjectlist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ActionEditor::ActionEditor( TQWidget* parent,  const char* name, WFlags fl )
     : ActionEditorBase( parent, name, fl ), currentAction( 0 ), formWindow( 0 )
diff --git a/kommander/editor/actionlistview.cpp b/kommander/editor/actionlistview.cpp
index 3193d24c..80d4d94c 100644
--- a/kommander/editor/actionlistview.cpp
+++ b/kommander/editor/actionlistview.cpp
@@ -22,7 +22,7 @@
 #include <tqdragobject.h>
 #include <tqheader.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ActionListView::ActionListView( TQWidget *parent, const char *name )
     : TQListView( parent, name )
diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp
index f034f4a7..4652c400 100644
--- a/kommander/editor/assoctexteditorimpl.cpp
+++ b/kommander/editor/assoctexteditorimpl.cpp
@@ -15,11 +15,11 @@
  *                                                                         *
  ***************************************************************************/
 /* KDE INCLUDES */
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <ktextedit.h>
diff --git a/kommander/editor/choosewidgetimpl.cpp b/kommander/editor/choosewidgetimpl.cpp
index 3debb9ba..05738567 100644
--- a/kommander/editor/choosewidgetimpl.cpp
+++ b/kommander/editor/choosewidgetimpl.cpp
@@ -16,7 +16,7 @@
 
  /** KDE INCLUDES */ 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /** QT INCLUDES */
 #include <tqptrstack.h>
diff --git a/kommander/editor/command.cpp b/kommander/editor/command.cpp
index 02da2f52..63343b35 100644
--- a/kommander/editor/command.cpp
+++ b/kommander/editor/command.cpp
@@ -48,7 +48,7 @@
 #endif
 #include <tqaction.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 CommandHistory::CommandHistory( int s )
diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp
index 78560f8f..6ff3ef01 100644
--- a/kommander/editor/connectioneditorimpl.cpp
+++ b/kommander/editor/connectioneditorimpl.cpp
@@ -31,7 +31,7 @@
 #include <tdelistview.h>
 #include <kpushbutton.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char *const ignore_slots[] = {
   "destroyed()",
diff --git a/kommander/editor/formfile.cpp b/kommander/editor/formfile.cpp
index 97a636ef..1efb1fca 100644
--- a/kommander/editor/formfile.cpp
+++ b/kommander/editor/formfile.cpp
@@ -35,8 +35,8 @@
 // KDE includes
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
 #include <kstdguiitem.h>
 
diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp
index e88dccd0..4e14134c 100644
--- a/kommander/editor/formwindow.cpp
+++ b/kommander/editor/formwindow.cpp
@@ -42,8 +42,8 @@
 #include <tqwhatsthis.h>
 
 // KDE includes
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
 
 // Other includes
diff --git a/kommander/editor/functionsimpl.cpp b/kommander/editor/functionsimpl.cpp
index ab56089a..9bdb03c5 100644
--- a/kommander/editor/functionsimpl.cpp
+++ b/kommander/editor/functionsimpl.cpp
@@ -22,11 +22,11 @@
 
 /* KDE INCLUDES */
 #include <kcombobox.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdelistbox.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <ktextedit.h>
 #include <ktextbrowser.h>
diff --git a/kommander/editor/hierarchyview.cpp b/kommander/editor/hierarchyview.cpp
index 89aed9fb..df8beeb5 100644
--- a/kommander/editor/hierarchyview.cpp
+++ b/kommander/editor/hierarchyview.cpp
@@ -43,7 +43,7 @@
 #include <tqworkspace.h>
 #include <tqaccel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <stdlib.h>
 
diff --git a/kommander/editor/iconvieweditorimpl.cpp b/kommander/editor/iconvieweditorimpl.cpp
index 7ca5b989..2fe8eed4 100644
--- a/kommander/editor/iconvieweditorimpl.cpp
+++ b/kommander/editor/iconvieweditorimpl.cpp
@@ -29,7 +29,7 @@
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 IconViewEditor::IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw )
     : IconViewEditorBase( parent, 0, true ), formwindow( fw )
diff --git a/kommander/editor/listboxeditorimpl.cpp b/kommander/editor/listboxeditorimpl.cpp
index 22c07cea..047bc4f8 100644
--- a/kommander/editor/listboxeditorimpl.cpp
+++ b/kommander/editor/listboxeditorimpl.cpp
@@ -30,7 +30,7 @@
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw )
     : ListBoxEditorBase( parent, 0, true ), formwindow( fw )
diff --git a/kommander/editor/listvieweditorimpl.cpp b/kommander/editor/listvieweditorimpl.cpp
index c07e8334..83422997 100644
--- a/kommander/editor/listvieweditorimpl.cpp
+++ b/kommander/editor/listvieweditorimpl.cpp
@@ -35,7 +35,7 @@
 #include <tqpushbutton.h>
 #include <tqptrstack.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw )
     : ListViewEditorBase( parent, 0, true ), listview( lv ), formwindow( fw )
diff --git a/kommander/editor/main.cpp b/kommander/editor/main.cpp
index 62db8930..e5dc2739 100644
--- a/kommander/editor/main.cpp
+++ b/kommander/editor/main.cpp
@@ -19,7 +19,7 @@
 #include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksplashscreen.h>
 
 // Other includes
diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp
index 05a0e1c1..de578537 100644
--- a/kommander/editor/mainwindow.cpp
+++ b/kommander/editor/mainwindow.cpp
@@ -76,9 +76,9 @@
 #include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
 #include <kommanderversion.h>
 #include <kommanderwidget.h>
 #include <kprocess.h>
diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp
index b7fb6b72..4b5c99cd 100644
--- a/kommander/editor/mainwindowactions.cpp
+++ b/kommander/editor/mainwindowactions.cpp
@@ -61,12 +61,12 @@
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kkeydialog.h>
-#include <klocale.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
diff --git a/kommander/editor/messagelog.cpp b/kommander/editor/messagelog.cpp
index 9c3b3c1b..3163016a 100644
--- a/kommander/editor/messagelog.cpp
+++ b/kommander/editor/messagelog.cpp
@@ -20,7 +20,7 @@
 #include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <tdelistbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kprocess.h>
 
diff --git a/kommander/editor/messagelog.h b/kommander/editor/messagelog.h
index f0c1edbc..ea1c2aa0 100644
--- a/kommander/editor/messagelog.h
+++ b/kommander/editor/messagelog.h
@@ -19,7 +19,7 @@
 
 #include <tqtabwidget.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 class TDEListBox;
 class TDEProcess;
diff --git a/kommander/editor/multilineeditorimpl.cpp b/kommander/editor/multilineeditorimpl.cpp
index 5a9c4f1b..2dab19a1 100644
--- a/kommander/editor/multilineeditorimpl.cpp
+++ b/kommander/editor/multilineeditorimpl.cpp
@@ -26,7 +26,7 @@
 #include <tqmultilineedit.h>
 #include <tqpushbutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 MultiLineEditor::MultiLineEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw )
     : MultiLineEditorBase( parent, 0, true ), formwindow( fw )
diff --git a/kommander/editor/newformimpl.cpp b/kommander/editor/newformimpl.cpp
index 810bdf62..832257f9 100644
--- a/kommander/editor/newformimpl.cpp
+++ b/kommander/editor/newformimpl.cpp
@@ -39,8 +39,8 @@
 #include <tqworkspace.h>
 #include <tqmessagebox.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include "dialog.h"
diff --git a/kommander/editor/pixmapchooser.cpp b/kommander/editor/pixmapchooser.cpp
index 04a60857..224bbe72 100644
--- a/kommander/editor/pixmapchooser.cpp
+++ b/kommander/editor/pixmapchooser.cpp
@@ -45,7 +45,7 @@
 #include <tqpushbutton.h>
 #include <tqiconview.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #if defined(DESIGNER)
 #include "pics/images.h"
diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp
index 8e4df0ca..6bdbb12e 100644
--- a/kommander/editor/propertyeditor.cpp
+++ b/kommander/editor/propertyeditor.cpp
@@ -88,7 +88,7 @@
 #include "pics/hand.xbm"
 #include "pics/no.xbm"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static TQFontDatabase *fontDataBase = 0;
 TQString assistantPath();
diff --git a/kommander/editor/resource.cpp b/kommander/editor/resource.cpp
index e9e67a08..d9d3fa7d 100644
--- a/kommander/editor/resource.cpp
+++ b/kommander/editor/resource.cpp
@@ -72,7 +72,7 @@
 #include <tqtable.h>
 #endif
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static TQString makeIndent( int indent )
 {
diff --git a/kommander/editor/sizehandle.cpp b/kommander/editor/sizehandle.cpp
index 7b0d4a97..8aa6fdc7 100644
--- a/kommander/editor/sizehandle.cpp
+++ b/kommander/editor/sizehandle.cpp
@@ -28,7 +28,7 @@
 #include <tqapplication.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 SizeHandle::SizeHandle( FormWindow *parent, Direction d, WidgetSelection *s )
     : TQWidget( parent )
diff --git a/kommander/editor/tableeditorimpl.cpp b/kommander/editor/tableeditorimpl.cpp
index f54094b3..25883793 100644
--- a/kommander/editor/tableeditorimpl.cpp
+++ b/kommander/editor/tableeditorimpl.cpp
@@ -19,7 +19,7 @@
 #include "metadatabase.h"
 #include "mainwindow.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 TableEditor::TableEditor( TQWidget* parent,  TQWidget *editWidget, FormWindow *fw, const char* name, bool modal, WFlags fl )
     : TableEditorBase( parent, name, modal, fl ),
diff --git a/kommander/editor/widgetdatabase.cpp b/kommander/editor/widgetdatabase.cpp
index 7dbe2704..e3ab6de0 100644
--- a/kommander/editor/widgetdatabase.cpp
+++ b/kommander/editor/widgetdatabase.cpp
@@ -40,7 +40,7 @@
 #include <stdlib.h>
 
 #include <kommanderfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 const int dbsize = 300;
 const int dbcustom = 200;
diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp
index f5243910..15f9ad1d 100644
--- a/kommander/editor/widgetfactory.cpp
+++ b/kommander/editor/widgetfactory.cpp
@@ -18,7 +18,7 @@
 **
 **********************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kommanderfactory.h>
 
 #include "kmdrmainwindow.h"
diff --git a/kommander/editor/wizardeditorimpl.cpp b/kommander/editor/wizardeditorimpl.cpp
index 129760d1..3dbdec9b 100644
--- a/kommander/editor/wizardeditorimpl.cpp
+++ b/kommander/editor/wizardeditorimpl.cpp
@@ -29,7 +29,7 @@
 #include <tqpushbutton.h>
 #include <kinputdialog.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw )
     : WizardEditorBase( parent, 0 ), formwindow( fw ), wizard( w )
diff --git a/kommander/editor/workspace.cpp b/kommander/editor/workspace.cpp
index 506b603e..b7e2943a 100644
--- a/kommander/editor/workspace.cpp
+++ b/kommander/editor/workspace.cpp
@@ -46,7 +46,7 @@
 #include "qcompletionedit.h"
 
 #include <kurldrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char * const folderxpm[]={
     "16 16 6 1",
diff --git a/kommander/examples/old/widgetgenerator.kmdr b/kommander/examples/old/widgetgenerator.kmdr
index ba719405..45f441fa 100644
--- a/kommander/examples/old/widgetgenerator.kmdr
+++ b/kommander/examples/old/widgetgenerator.kmdr
@@ -156,7 +156,7 @@ cppContent="/*******************************************************************
  ***************************************************************************/
 
 /* KDE INCLUDES */
-#include &lt;klocale.h&gt;
+#include &lt;tdelocale.h&gt;
 
 /* QT INCLUDES */
 #include &lt;qstring.h&gt;
diff --git a/kommander/executor/instance.cpp b/kommander/executor/instance.cpp
index fbf275a1..bd3ea25d 100644
--- a/kommander/executor/instance.cpp
+++ b/kommander/executor/instance.cpp
@@ -18,9 +18,9 @@
 
  /* KDE INCLUDES */
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 /* QT INCLUDES */
diff --git a/kommander/executor/main.cpp b/kommander/executor/main.cpp
index 12f2ab01..a82479b3 100644
--- a/kommander/executor/main.cpp
+++ b/kommander/executor/main.cpp
@@ -19,10 +19,10 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 /* QT INCLUDES */
 #include <tqapplication.h>
diff --git a/kommander/executor/register.cpp b/kommander/executor/register.cpp
index 3cacdbd9..b4a8c259 100644
--- a/kommander/executor/register.cpp
+++ b/kommander/executor/register.cpp
@@ -17,7 +17,7 @@
 #include <dcopinformation.h>
 #include <specialinformation.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 void Instance::registerDCOP()
 {
diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp
index 76da35f1..3f7b91c3 100644
--- a/kommander/factory/kommanderfactory.cpp
+++ b/kommander/factory/kommanderfactory.cpp
@@ -96,8 +96,8 @@
 #include <tqtoolbox.h>
 
 #include <stdlib.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include "kmdrmainwindow.h"
 
diff --git a/kommander/plugin/specialinformation.cpp b/kommander/plugin/specialinformation.cpp
index 41ea61b4..afa44542 100644
--- a/kommander/plugin/specialinformation.cpp
+++ b/kommander/plugin/specialinformation.cpp
@@ -16,7 +16,7 @@
 #include "specials.h"
 #include "specialinformation.h"
 
-#include <klocale.h> 
+#include <tdelocale.h> 
 
 SpecialFunction::SpecialFunction(const TQString& name, const TQString& description,
     int minArgs, int maxArgs)
diff --git a/kommander/pluginmanager/main.cpp b/kommander/pluginmanager/main.cpp
index 439828b9..52a706e6 100644
--- a/kommander/pluginmanager/main.cpp
+++ b/kommander/pluginmanager/main.cpp
@@ -18,7 +18,7 @@
 /* KDE INCLUDES */
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <tqapplication.h>
 #include <tqobject.h>
diff --git a/kommander/pluginmanager/mainwindow.cpp b/kommander/pluginmanager/mainwindow.cpp
index bc85f2ff..1f07af77 100644
--- a/kommander/pluginmanager/mainwindow.cpp
+++ b/kommander/pluginmanager/mainwindow.cpp
@@ -23,9 +23,9 @@
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 MainWindow::MainWindow( TQWidget* parent, const char *name, WFlags f )
diff --git a/kommander/widget/expression.cpp b/kommander/widget/expression.cpp
index d29d94e8..6ced8689 100644
--- a/kommander/widget/expression.cpp
+++ b/kommander/widget/expression.cpp
@@ -16,7 +16,7 @@
 
 #include "expression.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Expression::Expression() : m_start(0), m_error(false)
 {
diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp
index 6e8555e1..cd7b6f4c 100644
--- a/kommander/widget/functionlib.cpp
+++ b/kommander/widget/functionlib.cpp
@@ -32,14 +32,14 @@
 #include <tqmetaobject.h>
 
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <dcopclient.h>
 #include <tdeapplication.h>
 #include <kcolordialog.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpassdlg.h>
 
 using namespace Parse;
diff --git a/kommander/widget/kommanderfunctions.cpp b/kommander/widget/kommanderfunctions.cpp
index 4631af85..3d580f88 100644
--- a/kommander/widget/kommanderfunctions.cpp
+++ b/kommander/widget/kommanderfunctions.cpp
@@ -24,8 +24,8 @@
 #include <dcopclient.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 #include "kommanderwidget.h"
 #include "specials.h"
diff --git a/kommander/widget/kommanderwidget.cpp b/kommander/widget/kommanderwidget.cpp
index a3442d73..7d80c8db 100644
--- a/kommander/widget/kommanderwidget.cpp
+++ b/kommander/widget/kommanderwidget.cpp
@@ -20,9 +20,9 @@
 #include <dcopclient.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 
 /* QT INCLUDES */
diff --git a/kommander/widget/myprocess.cpp b/kommander/widget/myprocess.cpp
index bc5fbdc8..45e64790 100644
--- a/kommander/widget/myprocess.cpp
+++ b/kommander/widget/myprocess.cpp
@@ -14,9 +14,9 @@
  *                                                                         *
  ***************************************************************************/
 /* KDE INCLUDES */
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* QT INCLUDES */
 #include <tqapplication.h>
diff --git a/kommander/widget/parser.cpp b/kommander/widget/parser.cpp
index 09841908..b5c9d508 100644
--- a/kommander/widget/parser.cpp
+++ b/kommander/widget/parser.cpp
@@ -14,7 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "parser.h"
 #include "parserdata.h"
diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp
index 7804e439..3d5a1d04 100644
--- a/kommander/widgets/aboutdialog.cpp
+++ b/kommander/widgets/aboutdialog.cpp
@@ -18,7 +18,7 @@
 #include <tdeaboutdata.h>
 #include <tdeaboutapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <tqtextstream.h>
diff --git a/kommander/widgets/buttongroup.cpp b/kommander/widgets/buttongroup.cpp
index a110889a..3d17b042 100644
--- a/kommander/widgets/buttongroup.cpp
+++ b/kommander/widgets/buttongroup.cpp
@@ -14,7 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 /* KDE INCLUDES */
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* QT INCLUDES */
 #include <tqobject.h>
diff --git a/kommander/widgets/closebutton.cpp b/kommander/widgets/closebutton.cpp
index 4ad1c3c3..21b4edff 100644
--- a/kommander/widgets/closebutton.cpp
+++ b/kommander/widgets/closebutton.cpp
@@ -15,8 +15,8 @@
  ***************************************************************************/
 
 /* KDE INCLUDES */
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 /* QT INCLUDES */
 #include <tqdialog.h>
diff --git a/kommander/widgets/combobox.cpp b/kommander/widgets/combobox.cpp
index 16275a21..278b5141 100644
--- a/kommander/widgets/combobox.cpp
+++ b/kommander/widgets/combobox.cpp
@@ -16,7 +16,7 @@
 
 /* KDE INCLUDES */
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* QT INCLUDES */
 #include <tqobject.h>
diff --git a/kommander/widgets/dialog.cpp b/kommander/widgets/dialog.cpp
index 21a3f7c1..4f73cedc 100644
--- a/kommander/widgets/dialog.cpp
+++ b/kommander/widgets/dialog.cpp
@@ -14,7 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 /* KDE INCLUDES */
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* QT INCLUDES */
 #include <tqstring.h>
diff --git a/kommander/widgets/execbutton.cpp b/kommander/widgets/execbutton.cpp
index f4b73ccc..0864bedd 100644
--- a/kommander/widgets/execbutton.cpp
+++ b/kommander/widgets/execbutton.cpp
@@ -16,8 +16,8 @@
 
 /* KDE INCLUDES */
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 /* QT INCLUDES */
 #include <tqcursor.h>
diff --git a/kommander/widgets/fontdialog.cpp b/kommander/widgets/fontdialog.cpp
index d03f87d8..d4125840 100644
--- a/kommander/widgets/fontdialog.cpp
+++ b/kommander/widgets/fontdialog.cpp
@@ -16,7 +16,7 @@
 
 #include <tdefontdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 enum Functions {
   FirstFunction = 139,
diff --git a/kommander/widgets/groupbox.cpp b/kommander/widgets/groupbox.cpp
index 7d4f43e8..a90f447e 100644
--- a/kommander/widgets/groupbox.cpp
+++ b/kommander/widgets/groupbox.cpp
@@ -23,7 +23,7 @@
 #include <tqevent.h>
 #include <tqgroupbox.h>
 #include <tqobjectlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* OTHER INCLUDES */
 #include "kommanderplugin.h"
diff --git a/kommander/widgets/lineedit.cpp b/kommander/widgets/lineedit.cpp
index 884e8b16..1cc6c774 100644
--- a/kommander/widgets/lineedit.cpp
+++ b/kommander/widgets/lineedit.cpp
@@ -21,7 +21,7 @@
 /* OTHER INCLUDES */
 #include <specials.h>
 #include "lineedit.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kommanderplugin.h>
 
 enum functions {
diff --git a/kommander/widgets/listbox.cpp b/kommander/widgets/listbox.cpp
index 618e054d..1c5892eb 100644
--- a/kommander/widgets/listbox.cpp
+++ b/kommander/widgets/listbox.cpp
@@ -14,7 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 /* KDE INCLUDES */
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 /* QT INCLUDES */
diff --git a/kommander/widgets/pixmaplabel.cpp b/kommander/widgets/pixmaplabel.cpp
index 7eab9e0d..887b8d6e 100644
--- a/kommander/widgets/pixmaplabel.cpp
+++ b/kommander/widgets/pixmaplabel.cpp
@@ -22,7 +22,7 @@
 #include <tqpixmap.h>
 
 /* KDE INCLUDES */
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 /* OTHER INCLUDES */
diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp
index cfeb1e7d..a6f0e503 100644
--- a/kommander/widgets/popupmenu.cpp
+++ b/kommander/widgets/popupmenu.cpp
@@ -14,9 +14,9 @@
 
 #include <tqcursor.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kommanderplugin.h>
 
diff --git a/kommander/widgets/progressbar.cpp b/kommander/widgets/progressbar.cpp
index 8d2a51e2..ca14d44a 100644
--- a/kommander/widgets/progressbar.cpp
+++ b/kommander/widgets/progressbar.cpp
@@ -14,7 +14,7 @@
  ***************************************************************************/
 
 /* KDE INCLUDES */
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* QT INCLUDES */
 #include <tqobject.h>
diff --git a/kommander/widgets/richtexteditor.cpp b/kommander/widgets/richtexteditor.cpp
index daafcdab..3233ea8f 100644
--- a/kommander/widgets/richtexteditor.cpp
+++ b/kommander/widgets/richtexteditor.cpp
@@ -14,7 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 /* KDE INCLUDES */
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* QT INCLUDES */
 #include <tqlayout.h>
diff --git a/kommander/widgets/scriptobject.cpp b/kommander/widgets/scriptobject.cpp
index d1cc6951..c353949c 100644
--- a/kommander/widgets/scriptobject.cpp
+++ b/kommander/widgets/scriptobject.cpp
@@ -18,9 +18,9 @@
 #include <tqwidget.h>
 
 /* KDE INCLUDES */
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 /* OTHER INCLUDES */
diff --git a/kommander/widgets/table.cpp b/kommander/widgets/table.cpp
index 862bb17a..64aec692 100644
--- a/kommander/widgets/table.cpp
+++ b/kommander/widgets/table.cpp
@@ -15,9 +15,9 @@
 
 
 /* KDE INCLUDES */
-#include <klocale.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 
 /* QT INCLUDES */
 #include <tqmetaobject.h>
diff --git a/kommander/widgets/tabwidget.cpp b/kommander/widgets/tabwidget.cpp
index a56c9118..7180a7d0 100644
--- a/kommander/widgets/tabwidget.cpp
+++ b/kommander/widgets/tabwidget.cpp
@@ -14,7 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 /* KDE INCLUDES */
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 /* QT INCLUDES */
diff --git a/kommander/widgets/textbrowser.cpp b/kommander/widgets/textbrowser.cpp
index 770b853b..18d6d091 100644
--- a/kommander/widgets/textbrowser.cpp
+++ b/kommander/widgets/textbrowser.cpp
@@ -15,7 +15,7 @@
  ***************************************************************************/
 
 /* KDE INCLUDES */
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* QT INCLUDES */
 #include <tqstringlist.h>
diff --git a/kommander/widgets/textedit.cpp b/kommander/widgets/textedit.cpp
index 3279e277..65302ac5 100644
--- a/kommander/widgets/textedit.cpp
+++ b/kommander/widgets/textedit.cpp
@@ -24,7 +24,7 @@
 /* OTHER INCLUDES */
 #include <specials.h>
 #include "textedit.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kommanderplugin.h>
 
 enum Functions {
diff --git a/kommander/widgets/timer.cpp b/kommander/widgets/timer.cpp
index 44de93a5..a05c26ba 100644
--- a/kommander/widgets/timer.cpp
+++ b/kommander/widgets/timer.cpp
@@ -18,9 +18,9 @@
 #include <tqwidget.h>
 
 /* KDE INCLUDES */
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 /* OTHER INCLUDES */
diff --git a/kommander/widgets/toolbox.cpp b/kommander/widgets/toolbox.cpp
index c2d37ff4..9fca3935 100644
--- a/kommander/widgets/toolbox.cpp
+++ b/kommander/widgets/toolbox.cpp
@@ -14,7 +14,7 @@
 #include "specials.h"
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define ADDWIDGET 120
 #define CURRENTWIDGET 121
diff --git a/kommander/widgets/treewidget.cpp b/kommander/widgets/treewidget.cpp
index 3e62a26d..0a4b0ad9 100644
--- a/kommander/widgets/treewidget.cpp
+++ b/kommander/widgets/treewidget.cpp
@@ -17,8 +17,8 @@
  ***************************************************************************/
 
 /* KDE INCLUDES */
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
 
diff --git a/kommander/working/plugintemplate/plugin.cpp b/kommander/working/plugintemplate/plugin.cpp
index d8b91da0..a0138bde 100644
--- a/kommander/working/plugintemplate/plugin.cpp
+++ b/kommander/working/plugintemplate/plugin.cpp
@@ -2,9 +2,9 @@
 #include "%{APPNAMELC}.h"
 
 #include <kommanderplugin.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "%{APPNAMELC}.h"
 
 class %{APPNAME}Plugin : public KommanderPlugin
diff --git a/kommander/working/plugintemplate/widget.cpp b/kommander/working/plugintemplate/widget.cpp
index d6ad8a0b..cda13f92 100644
--- a/kommander/working/plugintemplate/widget.cpp
+++ b/kommander/working/plugintemplate/widget.cpp
@@ -4,9 +4,9 @@
 #include <kommanderplugin.h>
 #include <specials.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 enum Functions {
diff --git a/kxsldbg/kxsldbg.cpp b/kxsldbg/kxsldbg.cpp
index f0f7c4d8..465bd8af 100644
--- a/kxsldbg/kxsldbg.cpp
+++ b/kxsldbg/kxsldbg.cpp
@@ -7,7 +7,7 @@
 
 #include <kkeydialog.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kedittoolbar.h>
 
@@ -15,7 +15,7 @@
 #include <kstdaction.h>
 
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
 
 KXsldbg::KXsldbg()
diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
index 7b69ec0c..870ff927 100644
--- a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
+++ b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
@@ -22,7 +22,7 @@
 #include <kinstance.h>
 #include <kiconloader.h>
 #include <tqmessagebox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeversion.h>
 #if KDE_IS_VERSION(3,1,90)
 #include <kinputdialog.h>
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp b/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp
index 79ff678e..8593ab6b 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp
@@ -27,7 +27,7 @@
 #include "help.h"
 #include "files.h"
 #include <stdlib.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h> 
 
 /**
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp
index 525c3728..196f2ba9 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp
@@ -23,7 +23,7 @@
 #include "arraylist.h"
 #include "xsldbgmsg.h"
 #include "utils.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h> 
 #include <tqfileinfo.h>
 #include <tqstringlist.h>
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
index 6d9fe60e..46e270df 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
@@ -100,7 +100,7 @@
 #include <libexslt/exsltconfig.h>
 
 #include <tdecmdlineargs.h> 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqfile.h>
 
 #ifdef WIN32
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.h b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.h
index 26abeb49..27250e31 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.h
@@ -81,7 +81,7 @@
 #include <libxslt/xsltutils.h>
 
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "breakpoint.h"
 
diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp b/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp
index a94e3a0f..05e59b8c 100644
--- a/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp
@@ -15,7 +15,7 @@
  *                                                                         										*
  ************************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "xsldbgbreakpointlistitem.h"
 
 XsldbgBreakpointListItem::XsldbgBreakpointListItem(TQListView *parent,
diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp
index ba14d115..453b4f60 100644
--- a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp
@@ -15,7 +15,7 @@
  *                                                                         										*
  ************************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlistview.h>
 #include <tqlineedit.h>
 #include <tqmessagebox.h>
diff --git a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp
index ddf862ca..ade07c6e 100644
--- a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp
@@ -15,7 +15,7 @@
  *                                                                         										*
  ************************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 
 #include <tqdialog.h>
diff --git a/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp b/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp
index deead4fa..a9521964 100644
--- a/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp
@@ -15,7 +15,7 @@
  *                                                                         										*
  ************************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 
 #include <libxml/tree.h>
diff --git a/kxsldbg/kxsldbgpart/xsldbginspector.cpp b/kxsldbg/kxsldbgpart/xsldbginspector.cpp
index d280adbd..8b1a2734 100644
--- a/kxsldbg/kxsldbgpart/xsldbginspector.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbginspector.cpp
@@ -8,7 +8,7 @@
 
 #include "xsldbginspector.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqvariant.h>
 #include <tqlistbox.h>
diff --git a/kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp b/kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp
index 0d27f916..3d0725b1 100644
--- a/kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp
@@ -16,7 +16,7 @@
  ************************************************************************************/ 
  
 #include "xsldbglocallistitem.h" 
-#include <klocale.h>
+#include <tdelocale.h>
  
 XsldbgLocalListItem::XsldbgLocalListItem(TQListView *parent, TQString fileName, int lineNumber, 
 	TQString localName, TQString templateContext, TQString selectXPath, bool localVariable) 
diff --git a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp
index fa8c756b..7f3e857d 100644
--- a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp
@@ -23,7 +23,7 @@
 #include "xsldbglocalvariablesimpl.h" 
 #include "xsldbglocallistitem.h" 
 #include "xsldbgdebugger.h"
-#include <klocale.h> 
+#include <tdelocale.h> 
  
  
 XsldbgLocalVariablesImpl::XsldbgLocalVariablesImpl(XsldbgDebugger *debugger, 
diff --git a/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp b/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp
index ae3531a5..1b6ee2bc 100644
--- a/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp
@@ -19,7 +19,7 @@
   *@author Keith Isdale
   */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlayout.h>
 #include <tqmessagebox.h>
diff --git a/kxsldbg/main.cpp b/kxsldbg/main.cpp
index 46653c1a..f90cfb77 100644
--- a/kxsldbg/main.cpp
+++ b/kxsldbg/main.cpp
@@ -2,7 +2,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 static const char *description =
diff --git a/kxsldbg/xsldbgmain.cpp b/kxsldbg/xsldbgmain.cpp
index 8c5ee55e..fb9b619d 100644
--- a/kxsldbg/xsldbgmain.cpp
+++ b/kxsldbg/xsldbgmain.cpp
@@ -37,8 +37,8 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 /* Forward delare private functions */
 static int notifyXsldbgAppSimple(XsldbgMessageEnum type, const void *data);
diff --git a/lib/compatibility/knewstuff/downloaddialog.cpp b/lib/compatibility/knewstuff/downloaddialog.cpp
index 37a264cf..9932eb8c 100644
--- a/lib/compatibility/knewstuff/downloaddialog.cpp
+++ b/lib/compatibility/knewstuff/downloaddialog.cpp
@@ -21,13 +21,13 @@
 #include "downloaddialog.h"
 #include "downloaddialog.moc"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktabctl.h>
 #include <tdelistview.h>
 #include <kdebug.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
diff --git a/lib/compatibility/knewstuff/engine.cpp b/lib/compatibility/knewstuff/engine.cpp
index 3309569a..9827d4f4 100644
--- a/lib/compatibility/knewstuff/engine.cpp
+++ b/lib/compatibility/knewstuff/engine.cpp
@@ -25,8 +25,8 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeio/job.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include "knewstuff.h"
diff --git a/lib/compatibility/knewstuff/entry.cpp b/lib/compatibility/knewstuff/entry.cpp
index e2390266..4b79e152 100644
--- a/lib/compatibility/knewstuff/entry.cpp
+++ b/lib/compatibility/knewstuff/entry.cpp
@@ -20,8 +20,8 @@
 
 #include "entry.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 using namespace KNS;
 
diff --git a/lib/compatibility/knewstuff/knewstuff.cpp b/lib/compatibility/knewstuff/knewstuff.cpp
index 07034b45..b652ba4a 100644
--- a/lib/compatibility/knewstuff/knewstuff.cpp
+++ b/lib/compatibility/knewstuff/knewstuff.cpp
@@ -21,7 +21,7 @@
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "engine.h"
diff --git a/lib/compatibility/knewstuff/knewstuffgeneric.cpp b/lib/compatibility/knewstuff/knewstuffgeneric.cpp
index 64b918d8..4ce7fa4c 100644
--- a/lib/compatibility/knewstuff/knewstuffgeneric.cpp
+++ b/lib/compatibility/knewstuff/knewstuffgeneric.cpp
@@ -24,11 +24,11 @@
 #include <tqdir.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ktar.h>
 
 #include "entry.h"
diff --git a/lib/compatibility/knewstuff/knewstuffsecure.cpp b/lib/compatibility/knewstuff/knewstuffsecure.cpp
index a6a905c0..7fb50a0f 100644
--- a/lib/compatibility/knewstuff/knewstuffsecure.cpp
+++ b/lib/compatibility/knewstuff/knewstuffsecure.cpp
@@ -18,10 +18,10 @@
 //kde includes
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <ktar.h>
 #include <ktempdir.h>
diff --git a/lib/compatibility/knewstuff/provider.cpp b/lib/compatibility/knewstuff/provider.cpp
index 4c631847..f2088184 100644
--- a/lib/compatibility/knewstuff/provider.cpp
+++ b/lib/compatibility/knewstuff/provider.cpp
@@ -21,9 +21,9 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeio/job.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include "provider.h"
 #include "provider.moc"
diff --git a/lib/compatibility/knewstuff/providerdialog.cpp b/lib/compatibility/knewstuff/providerdialog.cpp
index ddc0b2ef..f71558ec 100644
--- a/lib/compatibility/knewstuff/providerdialog.cpp
+++ b/lib/compatibility/knewstuff/providerdialog.cpp
@@ -23,8 +23,8 @@
 #include <tqlabel.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "engine.h"
 #include "provider.h"
diff --git a/lib/compatibility/knewstuff/security.cpp b/lib/compatibility/knewstuff/security.cpp
index 941081b7..e6124431 100644
--- a/lib/compatibility/knewstuff/security.cpp
+++ b/lib/compatibility/knewstuff/security.cpp
@@ -22,9 +22,9 @@
  //kde includes
 #include <kdebug.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpassdlg.h>
 #include <kprocio.h>
 
diff --git a/lib/compatibility/knewstuff/uploaddialog.cpp b/lib/compatibility/knewstuff/uploaddialog.cpp
index 9545bb80..c07ef565 100644
--- a/lib/compatibility/knewstuff/uploaddialog.cpp
+++ b/lib/compatibility/knewstuff/uploaddialog.cpp
@@ -27,10 +27,10 @@
 #include <ktextedit.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurlrequester.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 
diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
index f6bed90c..ee670afb 100644
--- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
@@ -34,13 +34,13 @@
 
 #ifndef NO_KDE2
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdetoolbar.h>
 #include <tdepopupmenu.h>
 #include <twin.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "config.h"
 #ifdef TQ_WS_X11
diff --git a/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp b/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp
index 6ef95971..625fab54 100644
--- a/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp
@@ -26,9 +26,9 @@
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "ktabbar.h"
 #include "ktabwidget.h"
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp
index 916cee5b..e1cab53e 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp
@@ -32,8 +32,8 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 
 #include <math.h>
 #include <tqpopupmenu.h>
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
index 4e6586f7..47c81c0a 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
@@ -45,7 +45,7 @@
 #include <tqnamespace.h>
 #include <tqimage.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp
index ca8c3e28..96099c69 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp
@@ -38,7 +38,7 @@
 #include "tdemdichildfrm.h"
 #include "tdemdichildarea.h"
 #include "tdemdimainfrm.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <iostream>
 
 #ifdef TQ_WS_WIN 
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp
index 69b4effd..e743fc1e 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp
@@ -39,7 +39,7 @@
 #include "tdemdichildfrm.h"
 #include "tdemdidefines.h"
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqiconset.h>
 
 //============ KMdiChildView ============//
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp
index 86612830..a8a4dc37 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp
@@ -28,13 +28,13 @@
 #include <tqtimer.h>
 #include <tqtooltip.h>
 #include <tdemultitabbar.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 //TODO: Well, this is already defined in tdeui/kdockwidget.cpp
 static const char* const tdemdi_not_close_xpm[] =
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
index d3bea4c2..2e0076a1 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
@@ -25,7 +25,7 @@
 #include <tdeconfig.h>
 #include <tdetoolbar.h>
 #include <tdemainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tqstring.h>
 #include <assert.h>
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
index 96fdf21a..050c0256 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
@@ -43,12 +43,12 @@
 #include <tqpopupmenu.h>
 #include <tqmenubar.h>
 
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <tqtabwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kiconloader.h>
 #include <tdemdidockcontainer.h>
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h
index db464c9c..14996638 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h
@@ -32,7 +32,7 @@
 #define _KMDIMAINFRM_H_
 
 #include <tdeparts/dockmainwindow.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdepopupmenu.h>
 
 #include <tqptrlist.h>
diff --git a/lib/ksavealldialog.cpp b/lib/ksavealldialog.cpp
index cac2c059..dd32a8af 100644
--- a/lib/ksavealldialog.cpp
+++ b/lib/ksavealldialog.cpp
@@ -21,7 +21,7 @@
 #include <tqlabel.h>
 #include <tqheader.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <tdelistbox.h>
 #include <tdelistview.h>
diff --git a/lib/qextfileinfo.cpp b/lib/qextfileinfo.cpp
index d13f9733..094e1f77 100644
--- a/lib/qextfileinfo.cpp
+++ b/lib/qextfileinfo.cpp
@@ -26,7 +26,7 @@
 #include <tdeio/scheduler.h>
 #include <kdirlister.h>
 #include <tdefileitem.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 //app includes
diff --git a/quanta/components/csseditor/colorrequester.cpp b/quanta/components/csseditor/colorrequester.cpp
index 043e3470..2548917b 100644
--- a/quanta/components/csseditor/colorrequester.cpp
+++ b/quanta/components/csseditor/colorrequester.cpp
@@ -21,7 +21,7 @@
 #include <tqtooltip.h>
 #include <tqiconset.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaccel.h>
 
 #include "propertysetter.h"
diff --git a/quanta/components/csseditor/colorslider.cpp b/quanta/components/csseditor/colorslider.cpp
index 411f056c..d8d2b0f6 100644
--- a/quanta/components/csseditor/colorslider.cpp
+++ b/quanta/components/csseditor/colorslider.cpp
@@ -18,7 +18,7 @@
 #include <tqvbox.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "colorslider.h"
 #include "propertysetter.h"
diff --git a/quanta/components/csseditor/csseditor.cpp b/quanta/components/csseditor/csseditor.cpp
index 9b84bd6a..c449b184 100644
--- a/quanta/components/csseditor/csseditor.cpp
+++ b/quanta/components/csseditor/csseditor.cpp
@@ -25,7 +25,7 @@
 #include <tqfileinfo.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
 #include <kstandarddirs.h>
diff --git a/quanta/components/csseditor/cssselector.cpp b/quanta/components/csseditor/cssselector.cpp
index b1da7961..1124273e 100644
--- a/quanta/components/csseditor/cssselector.cpp
+++ b/quanta/components/csseditor/cssselector.cpp
@@ -30,9 +30,9 @@
 #include <tqwhatsthis.h>
 
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
 #include "project.h"
diff --git a/quanta/components/csseditor/encodingselector.cpp b/quanta/components/csseditor/encodingselector.cpp
index ad5b958b..2f1bc6f2 100644
--- a/quanta/components/csseditor/encodingselector.cpp
+++ b/quanta/components/csseditor/encodingselector.cpp
@@ -18,7 +18,7 @@
 
 
 #include "encodingselector.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h> 
 #include <tqtextcodec.h>
 
diff --git a/quanta/components/csseditor/fontfamilychooser.cpp b/quanta/components/csseditor/fontfamilychooser.cpp
index 6a390340..7f62599e 100644
--- a/quanta/components/csseditor/fontfamilychooser.cpp
+++ b/quanta/components/csseditor/fontfamilychooser.cpp
@@ -20,12 +20,12 @@
 #include <tqstringlist.h>
 #include <tqlistbox.h>
 #include <tqfont.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqiconset.h>
 #include <tqpixmap.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tqregexp.h>
 #include <tqlineedit.h>
 #include <tqwhatsthis.h>
diff --git a/quanta/components/csseditor/propertysetter.cpp b/quanta/components/csseditor/propertysetter.cpp
index 922c7dbe..cbaabe5c 100644
--- a/quanta/components/csseditor/propertysetter.cpp
+++ b/quanta/components/csseditor/propertysetter.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 
 
diff --git a/quanta/components/csseditor/styleeditor.cpp b/quanta/components/csseditor/styleeditor.cpp
index e39e5564..d40812ed 100644
--- a/quanta/components/csseditor/styleeditor.cpp
+++ b/quanta/components/csseditor/styleeditor.cpp
@@ -22,7 +22,7 @@
 //kde includes
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kurl.h>
 #include <tdetexteditor/editinterface.h>
diff --git a/quanta/components/csseditor/stylesheetparser.cpp b/quanta/components/csseditor/stylesheetparser.cpp
index 0b80caa2..6ae436ff 100644
--- a/quanta/components/csseditor/stylesheetparser.cpp
+++ b/quanta/components/csseditor/stylesheetparser.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include "stylesheetparser.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 static const TQString msg1(i18n("has not been closed")),
diff --git a/quanta/components/csseditor/tlpeditors.cpp b/quanta/components/csseditor/tlpeditors.cpp
index ab70afd6..e5c3c2ff 100644
--- a/quanta/components/csseditor/tlpeditors.cpp
+++ b/quanta/components/csseditor/tlpeditors.cpp
@@ -25,7 +25,7 @@
 #include <kurl.h>
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kimagefilepreview.h>
 
diff --git a/quanta/components/cvsservice/cvsservice.cpp b/quanta/components/cvsservice/cvsservice.cpp
index df0e916b..735eb2c8 100644
--- a/quanta/components/cvsservice/cvsservice.cpp
+++ b/quanta/components/cvsservice/cvsservice.cpp
@@ -29,8 +29,8 @@
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 
 // CvsService
diff --git a/quanta/components/debugger/backtracelistview.cpp b/quanta/components/debugger/backtracelistview.cpp
index 0c0afdc7..637f76a4 100644
--- a/quanta/components/debugger/backtracelistview.cpp
+++ b/quanta/components/debugger/backtracelistview.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 // KDE Includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.cpp b/quanta/components/debugger/dbgp/dbgpnetwork.cpp
index 4454f0d7..7730960d 100644
--- a/quanta/components/debugger/dbgp/dbgpnetwork.cpp
+++ b/quanta/components/debugger/dbgp/dbgpnetwork.cpp
@@ -22,7 +22,7 @@
 #include <kserversocket.h>
 #include <kstreamsocket.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 DBGpNetwork::DBGpNetwork()
 : TQObject()
diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
index 3fe2f972..6e2ec6ce 100644
--- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
+++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
@@ -18,9 +18,9 @@
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
diff --git a/quanta/components/debugger/debuggerbreakpointview.cpp b/quanta/components/debugger/debuggerbreakpointview.cpp
index e32c0de8..d36fecf8 100644
--- a/quanta/components/debugger/debuggerbreakpointview.cpp
+++ b/quanta/components/debugger/debuggerbreakpointview.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 // KDE Includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp
index bdab1245..ff41b764 100644
--- a/quanta/components/debugger/debuggermanager.cpp
+++ b/quanta/components/debugger/debuggermanager.cpp
@@ -19,11 +19,11 @@
 #include <tdetexteditor/markinterfaceextension.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <tdeparts/componentfactory.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <qextfileinfo.h>
 #include <kinputdialog.h>
 #include <tqlineedit.h>
diff --git a/quanta/components/debugger/debuggerui.cpp b/quanta/components/debugger/debuggerui.cpp
index faf844bc..9f512460 100644
--- a/quanta/components/debugger/debuggerui.cpp
+++ b/quanta/components/debugger/debuggerui.cpp
@@ -19,7 +19,7 @@
 
 #include <kiconloader.h>
 #include <kdockwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqstring.h>
 #include <tdehtmlview.h>
diff --git a/quanta/components/debugger/debuggervariable.cpp b/quanta/components/debugger/debuggervariable.cpp
index 390290a7..219f607d 100644
--- a/quanta/components/debugger/debuggervariable.cpp
+++ b/quanta/components/debugger/debuggervariable.cpp
@@ -17,7 +17,7 @@
 
 #include "debuggervariable.h"
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 DebuggerVariable::DebuggerVariable()
     : m_isReference(false)
diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.cpp b/quanta/components/debugger/gubed/quantadebuggergubed.cpp
index 872e1707..14d46941 100644
--- a/quanta/components/debugger/gubed/quantadebuggergubed.cpp
+++ b/quanta/components/debugger/gubed/quantadebuggergubed.cpp
@@ -17,7 +17,7 @@
 #include <kdebug.h>
 #include <kserversocket.h>
 #include <kstreamsocket.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <tqlineedit.h>
 #include <tqslider.h>
diff --git a/quanta/components/debugger/interfaces/debuggerclient.cpp b/quanta/components/debugger/interfaces/debuggerclient.cpp
index 97140dbb..38ab9b67 100644
--- a/quanta/components/debugger/interfaces/debuggerclient.cpp
+++ b/quanta/components/debugger/interfaces/debuggerclient.cpp
@@ -18,8 +18,8 @@
 #include "debuggerclient.h"
 #include "debuggerinterface.h"
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 
 // CTor
diff --git a/quanta/components/debugger/pathmapper.cpp b/quanta/components/debugger/pathmapper.cpp
index c38e2fec..23cc6171 100644
--- a/quanta/components/debugger/pathmapper.cpp
+++ b/quanta/components/debugger/pathmapper.cpp
@@ -22,7 +22,7 @@
 #include "project.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstring.h>
 #include <qextfileinfo.h>
 #include <tqdom.h>
diff --git a/quanta/components/debugger/quantadebuggerinterface.cpp b/quanta/components/debugger/quantadebuggerinterface.cpp
index 83f5ce0c..b73ae953 100644
--- a/quanta/components/debugger/quantadebuggerinterface.cpp
+++ b/quanta/components/debugger/quantadebuggerinterface.cpp
@@ -17,9 +17,9 @@
 
 #include <tdetexteditor/document.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "debuggerinterface.h"
 #include "quantadebuggerinterface.h"
diff --git a/quanta/components/debugger/variableslistview.cpp b/quanta/components/debugger/variableslistview.cpp
index 04eb90a1..4799afe4 100644
--- a/quanta/components/debugger/variableslistview.cpp
+++ b/quanta/components/debugger/variableslistview.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 // KDE Includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
diff --git a/quanta/components/framewizard/fmfpeditor.cpp b/quanta/components/framewizard/fmfpeditor.cpp
index a191cd19..2815e280 100644
--- a/quanta/components/framewizard/fmfpeditor.cpp
+++ b/quanta/components/framewizard/fmfpeditor.cpp
@@ -23,7 +23,7 @@
 #include <kurlrequester.h>
 #include <tqstringlist.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 //#include <kpreviewwidgetbase.h> 
 
 /*class PreviewWidget : public KPreviewWidgetBase {
diff --git a/quanta/components/framewizard/framewizard.cpp b/quanta/components/framewizard/framewizard.cpp
index 08ee1090..97cfadf0 100644
--- a/quanta/components/framewizard/framewizard.cpp
+++ b/quanta/components/framewizard/framewizard.cpp
@@ -18,9 +18,9 @@
 #include "framewizard.h"
 #include "fmrceditor.h"
 #include "fmfpeditor.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 //#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpushbutton.h>
 
 #include "fwglobal.h"
diff --git a/quanta/components/tableeditor/tableeditor.cpp b/quanta/components/tableeditor/tableeditor.cpp
index fe1d201f..f5f6ec31 100644
--- a/quanta/components/tableeditor/tableeditor.cpp
+++ b/quanta/components/tableeditor/tableeditor.cpp
@@ -16,8 +16,8 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeparts/componentfactory.h>
 #include <tdepopupmenu.h>
 #include <kpushbutton.h>
diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp
index b9032d6d..a1a53eab 100644
--- a/quanta/dialogs/actionconfigdialog.cpp
+++ b/quanta/dialogs/actionconfigdialog.cpp
@@ -32,9 +32,9 @@
 #include <kiconloader.h>
 #include <kkeybutton.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
diff --git a/quanta/dialogs/dirtydlg.cpp b/quanta/dialogs/dirtydlg.cpp
index 08ce2883..720c3d8a 100644
--- a/quanta/dialogs/dirtydlg.cpp
+++ b/quanta/dialogs/dirtydlg.cpp
@@ -21,7 +21,7 @@
 
 //kde includes
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
diff --git a/quanta/dialogs/dtepeditdlg.cpp b/quanta/dialogs/dtepeditdlg.cpp
index 13be01e7..c9b12ac7 100644
--- a/quanta/dialogs/dtepeditdlg.cpp
+++ b/quanta/dialogs/dtepeditdlg.cpp
@@ -29,8 +29,8 @@
 #include <kicondialog.h>
 #include <tdelistbox.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 //own includes
diff --git a/quanta/dialogs/filecombo.cpp b/quanta/dialogs/filecombo.cpp
index 8f31f692..1293d8b4 100644
--- a/quanta/dialogs/filecombo.cpp
+++ b/quanta/dialogs/filecombo.cpp
@@ -21,7 +21,7 @@
 #include <tqpushbutton.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
 
diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp
index 6524beb9..85d3065b 100644
--- a/quanta/dialogs/settings/abbreviation.cpp
+++ b/quanta/dialogs/settings/abbreviation.cpp
@@ -25,12 +25,12 @@
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinputdialog.h>
 #include <tdelistbox.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 //app includes
diff --git a/quanta/dialogs/settings/parseroptions.cpp b/quanta/dialogs/settings/parseroptions.cpp
index 1f0e8b3c..fac7207b 100644
--- a/quanta/dialogs/settings/parseroptions.cpp
+++ b/quanta/dialogs/settings/parseroptions.cpp
@@ -18,7 +18,7 @@
 #include <tqcombobox.h>
 #include <tqspinbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 /*
diff --git a/quanta/dialogs/settings/previewoptions.cpp b/quanta/dialogs/settings/previewoptions.cpp
index 2df03ea9..b5cb7318 100644
--- a/quanta/dialogs/settings/previewoptions.cpp
+++ b/quanta/dialogs/settings/previewoptions.cpp
@@ -20,8 +20,8 @@
 #include <tqradiobutton.h>
 #include <tqcheckbox.h>
 // kde includes
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 PreviewOptions::PreviewOptions(TQWidget *parent, const char *name)
   : PreviewOptionsS(parent,name)
diff --git a/quanta/dialogs/specialchardialog.cpp b/quanta/dialogs/specialchardialog.cpp
index aff627ef..3ea29117 100644
--- a/quanta/dialogs/specialchardialog.cpp
+++ b/quanta/dialogs/specialchardialog.cpp
@@ -20,7 +20,7 @@
 #include <tqtextstream.h>
 #include <tqregexp.h> 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdelistbox.h>
 #include <klineedit.h>
diff --git a/quanta/dialogs/tagdialogs/colorcombo.cpp b/quanta/dialogs/tagdialogs/colorcombo.cpp
index 188f2ca0..5b735fcf 100644
--- a/quanta/dialogs/tagdialogs/colorcombo.cpp
+++ b/quanta/dialogs/tagdialogs/colorcombo.cpp
@@ -46,12 +46,12 @@
 
 #include <kcolordialog.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kseparator.h>
 #include <kpalette.h>
 #include <kimageeffect.h>
diff --git a/quanta/dialogs/tagdialogs/listdlg.cpp b/quanta/dialogs/tagdialogs/listdlg.cpp
index c9b20d5a..eeb6bfc2 100644
--- a/quanta/dialogs/tagdialogs/listdlg.cpp
+++ b/quanta/dialogs/tagdialogs/listdlg.cpp
@@ -17,7 +17,7 @@
 
 //kde include
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 //qt includes
 #include <tqpushbutton.h>
diff --git a/quanta/dialogs/tagdialogs/tagdialog.cpp b/quanta/dialogs/tagdialogs/tagdialog.cpp
index fe466986..7db3c307 100644
--- a/quanta/dialogs/tagdialogs/tagdialog.cpp
+++ b/quanta/dialogs/tagdialogs/tagdialog.cpp
@@ -21,7 +21,7 @@
 #include <tqevent.h>
 
 // include kde headers
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdeconfig.h>
diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.cpp b/quanta/dialogs/tagdialogs/tagimgdlg.cpp
index 9a032000..4c9531ee 100644
--- a/quanta/dialogs/tagdialogs/tagimgdlg.cpp
+++ b/quanta/dialogs/tagdialogs/tagimgdlg.cpp
@@ -21,7 +21,7 @@
 #include <tqimage.h>
 //kde includes
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
 #include <kurl.h>
diff --git a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp
index a761d62c..97c82811 100644
--- a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp
+++ b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp
@@ -8,7 +8,7 @@
 
             (C) 2006 Andras Mantia
 **********************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <knumvalidator.h>
 #include <kiconloader.h>
diff --git a/quanta/dialogs/tagdialogs/tagmaildlg.cpp b/quanta/dialogs/tagdialogs/tagmaildlg.cpp
index bf78291d..1d2c44be 100644
--- a/quanta/dialogs/tagdialogs/tagmaildlg.cpp
+++ b/quanta/dialogs/tagdialogs/tagmaildlg.cpp
@@ -23,9 +23,9 @@
 #include <tdeapplication.h>
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kabc/stdaddressbook.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdeabc/stdaddressbook.h>
 
 //qt includes
 #include <tqlineedit.h>
diff --git a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp
index 9313bb08..bea9a81f 100644
--- a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp
+++ b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp
@@ -15,7 +15,7 @@
 
 #include "tagmiscdlg.h"
 #include "tagmisc.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
 
diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp b/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp
index 44d461c4..be0dff6a 100644
--- a/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp
+++ b/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp
@@ -8,7 +8,7 @@
 
 **********************************************************************/
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqbuttongroup.h>
 #include "tagquicklistdlg.h"
 #include <tqspinbox.h>
diff --git a/quanta/dialogs/tagdialogs/tagxml.cpp b/quanta/dialogs/tagdialogs/tagxml.cpp
index 0292dc79..2db18a3e 100644
--- a/quanta/dialogs/tagdialogs/tagxml.cpp
+++ b/quanta/dialogs/tagdialogs/tagxml.cpp
@@ -19,7 +19,7 @@
 #include "tagattr.h"
 #include <klineedit.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqcheckbox.h>
 #include <tqlayout.h>
diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp
index 69da8c4d..418f7f17 100644
--- a/quanta/messages/annotationoutput.cpp
+++ b/quanta/messages/annotationoutput.cpp
@@ -23,8 +23,8 @@
 #include <kdebug.h>
 #include <tdeio/netaccess.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 
 #include "annotationoutput.h"
diff --git a/quanta/messages/messageitem.cpp b/quanta/messages/messageitem.cpp
index dc1c7ad8..043dabbe 100644
--- a/quanta/messages/messageitem.cpp
+++ b/quanta/messages/messageitem.cpp
@@ -17,7 +17,7 @@
 
 #include "messageitem.h"
 #include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 MessageItem::MessageItem( TQListBox * listbox, const TQString &text, int line, int column, const TQString &fname )
   :TQListBoxText(listbox,text),lineNumber(line),columnNumber(column),filename(fname)
diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp
index 5925fd01..05fad523 100644
--- a/quanta/messages/messageoutput.cpp
+++ b/quanta/messages/messageoutput.cpp
@@ -19,8 +19,8 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
 
diff --git a/quanta/parsers/dtd/dtd.cpp b/quanta/parsers/dtd/dtd.cpp
index 19ccc218..7fb1b057 100644
--- a/quanta/parsers/dtd/dtd.cpp
+++ b/quanta/parsers/dtd/dtd.cpp
@@ -22,12 +22,12 @@
 #include <tqstringlist.h>
 #include <tqdom.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kdebug.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 
 #include "dtd.h"
 #include "../tquantacommon.h"
diff --git a/quanta/parsers/dtd/dtdparser.cpp b/quanta/parsers/dtd/dtdparser.cpp
index 52bd35c8..502551fd 100644
--- a/quanta/parsers/dtd/dtdparser.cpp
+++ b/quanta/parsers/dtd/dtdparser.cpp
@@ -26,8 +26,8 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <tdeio/netaccess.h>
 
diff --git a/quanta/parsers/parser.cpp b/quanta/parsers/parser.cpp
index c5934c81..cfca7279 100644
--- a/quanta/parsers/parser.cpp
+++ b/quanta/parsers/parser.cpp
@@ -58,7 +58,7 @@
 #include <kdebug.h>
 #include <kdirwatch.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdetexteditor/document.h>
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/encodinginterface.h>
diff --git a/quanta/parsers/parsercommon.cpp b/quanta/parsers/parsercommon.cpp
index 56bee015..7f9b08cd 100644
--- a/quanta/parsers/parsercommon.cpp
+++ b/quanta/parsers/parsercommon.cpp
@@ -19,7 +19,7 @@
 
 //kde includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdetexteditor/editinterface.h>
 
 //own includes
diff --git a/quanta/parts/kafka/domtreeview.cpp b/quanta/parts/kafka/domtreeview.cpp
index 5e1757e3..1c5c572d 100644
--- a/quanta/parts/kafka/domtreeview.cpp
+++ b/quanta/parts/kafka/domtreeview.cpp
@@ -20,7 +20,7 @@
 
 #include <kdebug.h>
 #include <tdehtml_part.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstring.h>
 #include <tqlayout.h>
 #include <dom/dom_text.h>
diff --git a/quanta/parts/kafka/htmldocumentproperties.cpp b/quanta/parts/kafka/htmldocumentproperties.cpp
index 3895ef12..c18b358d 100644
--- a/quanta/parts/kafka/htmldocumentproperties.cpp
+++ b/quanta/parts/kafka/htmldocumentproperties.cpp
@@ -22,8 +22,8 @@
 #include <kpushbutton.h>
 #include <kurlrequester.h>
 #include <kurl.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "node.h"
diff --git a/quanta/parts/kafka/kafkahtmlpart.cpp b/quanta/parts/kafka/kafkahtmlpart.cpp
index 9d35c33b..2a04e6b5 100644
--- a/quanta/parts/kafka/kafkahtmlpart.cpp
+++ b/quanta/parts/kafka/kafkahtmlpart.cpp
@@ -27,9 +27,9 @@
 #include <tqpopupmenu.h> 
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdehtmlview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ktrader.h>
 #include <klibloader.h>
 #include <tdeparts/factory.h>
diff --git a/quanta/parts/kafka/wkafkapart.cpp b/quanta/parts/kafka/wkafkapart.cpp
index c8517556..fda42583 100644
--- a/quanta/parts/kafka/wkafkapart.cpp
+++ b/quanta/parts/kafka/wkafkapart.cpp
@@ -27,9 +27,9 @@
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/selectioninterface.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemultipledrag.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
 
 #include <tqregexp.h>
diff --git a/quanta/parts/preview/whtmlpart.cpp b/quanta/parts/preview/whtmlpart.cpp
index 66edea90..86de0b2d 100644
--- a/quanta/parts/preview/whtmlpart.cpp
+++ b/quanta/parts/preview/whtmlpart.cpp
@@ -25,9 +25,9 @@
 #include <tdeversion.h>
 #include <tdehtml_settings.h>
 #include <tdehtmlview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 //app includes
 #include "whtmlpart.h"
diff --git a/quanta/plugins/quantaplugin.cpp b/quanta/plugins/quantaplugin.cpp
index 99b3d03c..19cc5981 100644
--- a/quanta/plugins/quantaplugin.cpp
+++ b/quanta/plugins/quantaplugin.cpp
@@ -17,15 +17,15 @@
 
 /* KDE INCLUDES */
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeaction.h>
 #include <tdeparts/componentfactory.h>
 #include <tdeparts/part.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdockwidget.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 /* QT INCLUDES */
 #include <tqstring.h>
diff --git a/quanta/plugins/quantapluginconfig.cpp b/quanta/plugins/quantapluginconfig.cpp
index 02bb3724..57488d2f 100644
--- a/quanta/plugins/quantapluginconfig.cpp
+++ b/quanta/plugins/quantapluginconfig.cpp
@@ -18,8 +18,8 @@
 /* KDE INCLUDES */
 #include <kdialogbase.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kicondialog.h>
 
 /* QT INCLUDES */
diff --git a/quanta/plugins/quantaplugineditor.cpp b/quanta/plugins/quantaplugineditor.cpp
index 6c8245f3..ba5294f2 100644
--- a/quanta/plugins/quantaplugineditor.cpp
+++ b/quanta/plugins/quantaplugineditor.cpp
@@ -18,8 +18,8 @@
 /* KDE INCLUDES */
 #include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kicondialog.h>
 #include <kdialogbase.h>
 
diff --git a/quanta/plugins/quantaplugininterface.cpp b/quanta/plugins/quantaplugininterface.cpp
index 0c937d8f..ce838550 100644
--- a/quanta/plugins/quantaplugininterface.cpp
+++ b/quanta/plugins/quantaplugininterface.cpp
@@ -20,9 +20,9 @@
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <tdemainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 /* QT INCLUDES */
 #include <tqdict.h>
diff --git a/quanta/project/eventconfigurationdlg.cpp b/quanta/project/eventconfigurationdlg.cpp
index 0e20506c..5301bc29 100644
--- a/quanta/project/eventconfigurationdlg.cpp
+++ b/quanta/project/eventconfigurationdlg.cpp
@@ -21,8 +21,8 @@
 #include <kcombobox.h>
 #include <kdialogbase.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 //app includes
 #include "eventconfigurationdlg.h"
diff --git a/quanta/project/eventeditordlg.cpp b/quanta/project/eventeditordlg.cpp
index 6210e1cd..14f26618 100644
--- a/quanta/project/eventeditordlg.cpp
+++ b/quanta/project/eventeditordlg.cpp
@@ -22,7 +22,7 @@
 //kde includes
 #include <tdeaction.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
  //app includes
 #include "eventeditordlg.h"
diff --git a/quanta/project/membereditdlg.cpp b/quanta/project/membereditdlg.cpp
index b7111b5b..540f931c 100644
--- a/quanta/project/membereditdlg.cpp
+++ b/quanta/project/membereditdlg.cpp
@@ -21,10 +21,10 @@
 #include <kdialogbase.h>
 #include <kinputdialog.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 
 //app includes
 #include "listdlg.h"
diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp
index 596ce6c8..107ba14a 100644
--- a/quanta/project/project.cpp
+++ b/quanta/project/project.cpp
@@ -33,9 +33,9 @@
 #include <kdirwatch.h>
 #include <tdeio/netaccess.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeparts/componentfactory.h>
 #include <kprogress.h>
 #include <kstringhandler.h>
diff --git a/quanta/project/projectnewgeneral.cpp b/quanta/project/projectnewgeneral.cpp
index c60a9ac2..ce9faf08 100644
--- a/quanta/project/projectnewgeneral.cpp
+++ b/quanta/project/projectnewgeneral.cpp
@@ -28,8 +28,8 @@
 // kde includes
 #include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <kprotocolinfo.h>
 #include <tdeversion.h>
diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp
index b430b43b..1f4750b1 100644
--- a/quanta/project/projectnewlocal.cpp
+++ b/quanta/project/projectnewlocal.cpp
@@ -26,7 +26,7 @@
 #include <tqregexp.h>
 
 // kde includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <kprogress.h>
diff --git a/quanta/project/projectnewweb.cpp b/quanta/project/projectnewweb.cpp
index 7d62d276..d1692ab6 100644
--- a/quanta/project/projectnewweb.cpp
+++ b/quanta/project/projectnewweb.cpp
@@ -25,11 +25,11 @@
 #include <tqcombobox.h>
 
 // kde includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kiconloader.h>
 #include <tdeio/job.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kled.h>
 
 // app includes
diff --git a/quanta/project/projectoptions.ui.h b/quanta/project/projectoptions.ui.h
index ef8ab07d..54871a6c 100644
--- a/quanta/project/projectoptions.ui.h
+++ b/quanta/project/projectoptions.ui.h
@@ -18,8 +18,8 @@
 #include <kcombobox.h>
 #include <tdefiledialog.h>
 #include <tdeversion.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 
 void ProjectOptions::buttonTemplate_clicked()
diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp
index defbc145..08f0f4b5 100644
--- a/quanta/project/projectprivate.cpp
+++ b/quanta/project/projectprivate.cpp
@@ -36,13 +36,13 @@
 #include <kinputdialog.h>
 #include <tdeio/netaccess.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeparts/componentfactory.h>
 #include <kprogress.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 #include <kurlrequester.h>
 #include <kurlrequesterdlg.h>
diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp
index e61f6249..481ea134 100644
--- a/quanta/project/projectupload.cpp
+++ b/quanta/project/projectupload.cpp
@@ -37,18 +37,18 @@
 #include <tdeapplication.h>
 #include <kurl.h>
 #include <tdeio/job.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprotocolinfo.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <kprogress.h>
 #include <kpassdlg.h>
 #include <kpushbutton.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kuser.h>
 
 //standard includes
diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp
index e04fd444..e78eb438 100644
--- a/quanta/project/rescanprj.cpp
+++ b/quanta/project/rescanprj.cpp
@@ -24,9 +24,9 @@
 // kde includes
 #include <kdebug.h>
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefileitem.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kprogress.h>
 
 // app includes
diff --git a/quanta/project/teammembersdlg.cpp b/quanta/project/teammembersdlg.cpp
index fe13a530..1d2516f5 100644
--- a/quanta/project/teammembersdlg.cpp
+++ b/quanta/project/teammembersdlg.cpp
@@ -21,8 +21,8 @@
 #include <kdialogbase.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 //app includes
 #include "teammembersdlg.h"
diff --git a/quanta/project/uploadprofiles.cpp b/quanta/project/uploadprofiles.cpp
index b0e0d489..25166e98 100644
--- a/quanta/project/uploadprofiles.cpp
+++ b/quanta/project/uploadprofiles.cpp
@@ -19,7 +19,7 @@
 
 // KDE includes
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // app includes
 #include "servertreeview.h"
diff --git a/quanta/src/CMakeLists.txt b/quanta/src/CMakeLists.txt
index 86d93f09..91910b2a 100644
--- a/quanta/src/CMakeLists.txt
+++ b/quanta/src/CMakeLists.txt
@@ -72,7 +72,7 @@ tde_add_executable( quanta AUTOMOC
     tableeditor-static preview-static
     utility-static quantamodule-static
     kafkalibrary-static tdemdi-shared tdehtml-shared
-    knewstuff-shared kabc-shared tdetexteditor-shared
+    knewstuff-shared tdeabc-shared tdetexteditor-shared
     ${LIBXML_LIBRARIES} ${LIBXSLT_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp
index 753fa255..a2f316e8 100644
--- a/quanta/src/document.cpp
+++ b/quanta/src/document.cpp
@@ -34,14 +34,14 @@
 // KDE includes
 #include <tdeapplication.h>
 #include <twin.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdeactionclasses.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <kdirwatch.h>
 #include <kdebug.h>
 #include <kprogress.h>
diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp
index a102e506..737a3a00 100644
--- a/quanta/src/dtds.cpp
+++ b/quanta/src/dtds.cpp
@@ -32,9 +32,9 @@
 #include <kdialogbase.h>
 #include <kurl.h>
 #include <kurlrequester.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
 
diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp
index 80232b7f..fc826178 100644
--- a/quanta/src/kqapp.cpp
+++ b/quanta/src/kqapp.cpp
@@ -25,7 +25,7 @@
 #include <kurl.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <ksplashscreen.h>
 #include <dcopclient.h>
 #include <tdeversion.h>
diff --git a/quanta/src/main.cpp b/quanta/src/main.cpp
index dcc10e57..91e0dbd5 100644
--- a/quanta/src/main.cpp
+++ b/quanta/src/main.cpp
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 
 // kde includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kiconloader.h>
 #include <ksimpleconfig.h>
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index 812afa55..75ac7db0 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -56,11 +56,11 @@
 #include <kcolordialog.h>
 #include <kcombobox.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kencodingfiledialog.h>
 #include <tdefiledialog.h>
-#include <kmenubar.h>
-#include <klocale.h>
+#include <tdemenubar.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdehtmlview.h>
 #include <kdialogbase.h>
@@ -75,7 +75,7 @@
 #include <kprocess.h>
 #include <kprogress.h>
 #include <ktempdir.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ktextedit.h>
 #include <kdebug.h>
 #include <ktar.h>
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index fa09db96..0a4d0262 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -39,11 +39,11 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
-#include <kmenubar.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdemenubar.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdehtmlview.h>
 #include <kstandarddirs.h>
diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp
index fdf9497c..354cb464 100644
--- a/quanta/src/quantadoc.cpp
+++ b/quanta/src/quantadoc.cpp
@@ -27,11 +27,11 @@
 
 
 // include files for KDE
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdeconfig.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdirwatch.h>
 #include <tdeversion.h>
 #include <kdebug.h>
diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp
index d5dabb1e..bcef6729 100644
--- a/quanta/src/quantaview.cpp
+++ b/quanta/src/quantaview.cpp
@@ -36,11 +36,11 @@
 #include <kdebug.h>
 #include <kdirwatch.h>
 #include <tdehtmlview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurldrag.h>
 #include <tdeversion.h>
 #include <tdeparts/partmanager.h>
diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp
index 7c73f093..f76973d7 100644
--- a/quanta/src/viewmanager.cpp
+++ b/quanta/src/viewmanager.cpp
@@ -18,7 +18,7 @@
 //kde includes
 #include <kdirwatch.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemdimainfrm.h>
 #include <kurl.h>
 #include <tdepopupmenu.h>
diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp
index 3fa97e81..948778e0 100644
--- a/quanta/treeviews/basetreeview.cpp
+++ b/quanta/treeviews/basetreeview.cpp
@@ -36,10 +36,10 @@
 #include <kdebug.h>
 #include <krun.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kopenwith.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpropertiesdialog.h>
 #include <tdefiledialog.h>
 #include <kprogress.h>
@@ -47,7 +47,7 @@
 #include <kurldrag.h>
 #include <kurl.h>
 #include <ktar.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ktrader.h>
 #include <tdeapplication.h>
 #include <kcursor.h>
diff --git a/quanta/treeviews/doctreeview.cpp b/quanta/treeviews/doctreeview.cpp
index b6372153..9b9e7d14 100644
--- a/quanta/treeviews/doctreeview.cpp
+++ b/quanta/treeviews/doctreeview.cpp
@@ -24,7 +24,7 @@
 // KDE clases
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp
index e560b61b..1ac3f6eb 100644
--- a/quanta/treeviews/filestreeview.cpp
+++ b/quanta/treeviews/filestreeview.cpp
@@ -18,11 +18,11 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
 #include <kopenwith.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tdefiledialog.h>
 #include <kprogress.h>
diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp
index 9aa97c1e..a8a59a42 100644
--- a/quanta/treeviews/projecttreeview.cpp
+++ b/quanta/treeviews/projecttreeview.cpp
@@ -22,14 +22,14 @@
 #include <tqdict.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdepopupmenu.h>
 #include <kpropertiesdialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeapplication.h>
 #include <kstringhandler.h>
 
diff --git a/quanta/treeviews/scripttreeview.cpp b/quanta/treeviews/scripttreeview.cpp
index 8c7719cf..bcc90d41 100644
--- a/quanta/treeviews/scripttreeview.cpp
+++ b/quanta/treeviews/scripttreeview.cpp
@@ -15,15 +15,15 @@
 //kde includes
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <krun.h>
 #include <kstandarddirs.h>
 #include <ktar.h>
 #include <ktempdir.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 #include <kdebug.h>
 
diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp
index a0ed5238..88b4533e 100644
--- a/quanta/treeviews/servertreeview.cpp
+++ b/quanta/treeviews/servertreeview.cpp
@@ -20,10 +20,10 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kopenwith.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tdefiledialog.h>
 #include <kprogress.h>
diff --git a/quanta/treeviews/structtreetag.cpp b/quanta/treeviews/structtreetag.cpp
index f54cb23c..03a59ac1 100644
--- a/quanta/treeviews/structtreetag.cpp
+++ b/quanta/treeviews/structtreetag.cpp
@@ -19,7 +19,7 @@
 
 // KDE includes
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // app includes
 #include "structtreeview.h"
diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp
index b9d12626..a46cb590 100644
--- a/quanta/treeviews/structtreeview.cpp
+++ b/quanta/treeviews/structtreeview.cpp
@@ -30,8 +30,8 @@
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdetexteditor/view.h>
diff --git a/quanta/treeviews/tagattributeitems.cpp b/quanta/treeviews/tagattributeitems.cpp
index d706dd99..556a2823 100644
--- a/quanta/treeviews/tagattributeitems.cpp
+++ b/quanta/treeviews/tagattributeitems.cpp
@@ -25,7 +25,7 @@
 #include <tdeapplication.h>
 #include <kcolorcombo.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <kdebug.h>
 
diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp
index 4383986b..c82de08e 100644
--- a/quanta/treeviews/tagattributetree.cpp
+++ b/quanta/treeviews/tagattributetree.cpp
@@ -23,7 +23,7 @@
 
 //kde includes
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstringhandler.h>
 #include <kdebug.h>
diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp
index 488c16b6..2fb96798 100644
--- a/quanta/treeviews/templatestreeview.cpp
+++ b/quanta/treeviews/templatestreeview.cpp
@@ -35,19 +35,19 @@
 
 // KDE includes
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <tdemainwindow.h>
 #include <kmimetype.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcombobox.h>
 #include <tdepopupmenu.h>
 #include <kpropertiesdialog.h>
 #include <kurlrequester.h>
 #include <kurlrequesterdlg.h>
 #include <ktempdir.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 #include <kurldrag.h>
 #include <ktar.h>
diff --git a/quanta/treeviews/uploadtreeview.cpp b/quanta/treeviews/uploadtreeview.cpp
index f45681ad..7780f8aa 100644
--- a/quanta/treeviews/uploadtreeview.cpp
+++ b/quanta/treeviews/uploadtreeview.cpp
@@ -16,7 +16,7 @@
 #include <tqregexp.h>
 
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <tdefileitem.h>
 
diff --git a/quanta/utility/newstuff.cpp b/quanta/utility/newstuff.cpp
index 96c18bbe..f818571d 100644
--- a/quanta/utility/newstuff.cpp
+++ b/quanta/utility/newstuff.cpp
@@ -16,9 +16,9 @@
 #include <tqfileinfo.h>
 
 //kde includes
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <ktar.h>
 
diff --git a/quanta/utility/qpevents.cpp b/quanta/utility/qpevents.cpp
index 0482a84a..8a8dfa26 100644
--- a/quanta/utility/qpevents.cpp
+++ b/quanta/utility/qpevents.cpp
@@ -22,8 +22,8 @@
 //kde includes
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 //app includes
 #include "qpevents.h"
diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp
index ba312f80..37151a85 100644
--- a/quanta/utility/quantabookmarks.cpp
+++ b/quanta/utility/quantabookmarks.cpp
@@ -22,7 +22,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <tdepopupmenu.h>
diff --git a/quanta/utility/quantacommon.cpp b/quanta/utility/quantacommon.cpp
index 9ebabe86..84679f0d 100644
--- a/quanta/utility/quantacommon.cpp
+++ b/quanta/utility/quantacommon.cpp
@@ -33,13 +33,13 @@
 #include <kdirwatch.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprotocolinfo.h>
 #include <kprogress.h>
 #include <ktempdir.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 //remove the below ones when KTQPasteAction is removed
 #include <dcopclient.h>
diff --git a/quanta/utility/quantanetaccess.cpp b/quanta/utility/quantanetaccess.cpp
index eb47cb86..56046601 100644
--- a/quanta/utility/quantanetaccess.cpp
+++ b/quanta/utility/quantanetaccess.cpp
@@ -19,8 +19,8 @@
 
 #include <tdeio/netaccess.h>
 #include <kurl.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdefileitem.h>
 #include <kstringhandler.h>
 
diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp
index 903f353a..1ea54048 100644
--- a/quanta/utility/tagaction.cpp
+++ b/quanta/utility/tagaction.cpp
@@ -30,11 +30,11 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kprocess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeshortcut.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdetexteditor/document.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdetexteditor/editinterface.h>
diff --git a/quanta/utility/tagactionmanager.cpp b/quanta/utility/tagactionmanager.cpp
index 2fda25f7..542b5064 100644
--- a/quanta/utility/tagactionmanager.cpp
+++ b/quanta/utility/tagactionmanager.cpp
@@ -19,7 +19,7 @@
 #include <tdeactioncollection.h>
 #include <tdeaction.h>
 #include <tdehtmlview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dom/dom_node.h>
 
 #include <tqwidget.h>
diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp
index 87d88d46..18d4c419 100644
--- a/quanta/utility/tagactionset.cpp
+++ b/quanta/utility/tagactionset.cpp
@@ -21,7 +21,7 @@
 #include <tdeactionclasses.h>
 #include <dom/dom_node.h>
 #include <dom/dom_string.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqwidget.h>
 
diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp
index 5f95cdc6..26765eee 100644
--- a/quanta/utility/toolbartabwidget.cpp
+++ b/quanta/utility/toolbartabwidget.cpp
@@ -27,13 +27,13 @@
 #include <tdeaccelmanager.h>
 #include <tdeversion.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tdetoolbar.h>
 #include <tdetoolbarbutton.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 //app includes
 #include "toolbartabwidget.h"
diff --git a/tdefilereplace/kaddstringdlg.cpp b/tdefilereplace/kaddstringdlg.cpp
index 6992ca20..0e3c5f02 100644
--- a/tdefilereplace/kaddstringdlg.cpp
+++ b/tdefilereplace/kaddstringdlg.cpp
@@ -25,7 +25,7 @@
 #include <tqwidgetstack.h>
 
 // KDE
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
diff --git a/tdefilereplace/knewprojectdlg.cpp b/tdefilereplace/knewprojectdlg.cpp
index 10402fa8..d21801bd 100644
--- a/tdefilereplace/knewprojectdlg.cpp
+++ b/tdefilereplace/knewprojectdlg.cpp
@@ -29,14 +29,14 @@
 
 //KDE
 #include <kseparator.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcharsets.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
 #include <klineedit.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 #include <tdeversion.h>
diff --git a/tdefilereplace/koptionsdlg.cpp b/tdefilereplace/koptionsdlg.cpp
index f18681e0..94dab7d4 100644
--- a/tdefilereplace/koptionsdlg.cpp
+++ b/tdefilereplace/koptionsdlg.cpp
@@ -28,7 +28,7 @@
 #include <kcharsets.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 //#include <kdebug.h>
diff --git a/tdefilereplace/main.cpp b/tdefilereplace/main.cpp
index 87cba501..573577e6 100644
--- a/tdefilereplace/main.cpp
+++ b/tdefilereplace/main.cpp
@@ -19,7 +19,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("Batch search and replace tool");
diff --git a/tdefilereplace/report.cpp b/tdefilereplace/report.cpp
index 48e64031..a3b7dfab 100644
--- a/tdefilereplace/report.cpp
+++ b/tdefilereplace/report.cpp
@@ -21,7 +21,7 @@
 
 // KDE
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kuser.h>
 
 // local
diff --git a/tdefilereplace/report.h b/tdefilereplace/report.h
index 2255f240..75c27cb3 100644
--- a/tdefilereplace/report.h
+++ b/tdefilereplace/report.h
@@ -23,7 +23,7 @@
 class TQString;
 
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 #include "configurationclasses.h"
 class TDEListView;
 
diff --git a/tdefilereplace/tdefilereplace.cpp b/tdefilereplace/tdefilereplace.cpp
index b96883d9..24ead465 100644
--- a/tdefilereplace/tdefilereplace.cpp
+++ b/tdefilereplace/tdefilereplace.cpp
@@ -17,9 +17,9 @@
 //kde includes
 #include <kedittoolbar.h>
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kkeydialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 //app includes
 #include "tdefilereplace.h"
diff --git a/tdefilereplace/tdefilereplacelib.cpp b/tdefilereplace/tdefilereplacelib.cpp
index d638272b..558b9dfb 100644
--- a/tdefilereplace/tdefilereplacelib.cpp
+++ b/tdefilereplace/tdefilereplacelib.cpp
@@ -27,7 +27,7 @@
 
 //KDE
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
 
diff --git a/tdefilereplace/tdefilereplacelib.h b/tdefilereplace/tdefilereplacelib.h
index eb83f9a2..74d26ee4 100644
--- a/tdefilereplace/tdefilereplacelib.h
+++ b/tdefilereplace/tdefilereplacelib.h
@@ -22,7 +22,7 @@
 #define TDEFILEREPLACELIB_H
 
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 class KlistView;
 
 // local
diff --git a/tdefilereplace/tdefilereplacepart.cpp b/tdefilereplace/tdefilereplacepart.cpp
index 5a0e5520..db98b00d 100644
--- a/tdefilereplace/tdefilereplacepart.cpp
+++ b/tdefilereplace/tdefilereplacepart.cpp
@@ -30,12 +30,12 @@
 #include <tdefiledialog.h>
 #include <kinstance.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeparts/genericfactory.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconeffect.h>
 #include <tdelistview.h>
 #include <kuser.h>
diff --git a/tdefilereplace/tdefilereplaceview.cpp b/tdefilereplace/tdefilereplaceview.cpp
index 7897d7f5..1d60f3d5 100644
--- a/tdefilereplace/tdefilereplaceview.cpp
+++ b/tdefilereplace/tdefilereplaceview.cpp
@@ -22,8 +22,8 @@
 
 // KDE
 #include <tdelistview.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <krun.h>
 #include <kpropertiesdialog.h>
diff --git a/tdefilereplace/whatthis.h b/tdefilereplace/whatthis.h
index 6692d373..cf05cc00 100644
--- a/tdefilereplace/whatthis.h
+++ b/tdefilereplace/whatthis.h
@@ -21,7 +21,7 @@
 #include <tqstring.h>
 
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace whatthisNameSpace
 {
-- 
cgit v1.2.1