Rename additional header files to avoid conflicts with KDE4

11 years ago · 279764bab1
parent ee38b2862b
commit 279764bab1
252 changed files with 401 additions and 401 deletions
--- 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"
--- 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"
--- 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>
--- a/kimagemapeditor/imageslistview.cpp
+++ b/kimagemapeditor/imageslistview.cpp
@ -20,7 +20,7 @@
 
 
 // KDE
-#include <klocale.h> 
+#include <tdelocale.h> 
 #include <kdebug.h>

 // locale 
--- 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>
--- 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"
--- 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"
--- 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>

--- 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>
--- 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>

--- 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
--- 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
--- 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>

--- 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>
--- 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>
--- 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;
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>
--- 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;
--- 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>

--- 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>

--- 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>
--- 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>

--- 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>

--- 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>
--- 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>

--- 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>


--- 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>

 /**
--- 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 )
 {
--- 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 )
--- 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 )
--- 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>
--- 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>
--- 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 )
--- 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()",
--- 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>

--- 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
--- 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>
--- 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>

--- 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 )
--- 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 )
--- 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 )
--- 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
--- 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>
--- 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>
--- 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>

--- 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;
--- 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 )
--- 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"
--- 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"
--- 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();
--- 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 )
 {
--- 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 )
--- 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 ),
--- 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;
--- 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"
--- 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 )
--- 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",
--- 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;
--- 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 */
--- 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>
--- 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()
 {
--- 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"

--- 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)
--- 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>
--- 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 )
--- 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)
 {
--- 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;
--- 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"
--- 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 */
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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,
--- 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"
--- 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 {
--- 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 */
--- 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 */
--- 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>

--- 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>
--- 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>
--- 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 */
--- 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>
--- 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 */
--- 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>
--- 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 {
--- 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 */
--- 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
--- 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>

--- 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
--- 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 {
--- 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()
--- 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>
--- 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> 

 /**
--- 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>
--- 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
--- 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"

--- 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,
--- 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>
--- 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>
--- 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>
--- 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>
--- 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) 
--- 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, 
--- 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>
--- 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 =
--- 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);
--- 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>
--- 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"
--- 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;

--- 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"
--- 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"
--- 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>
--- 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"
--- 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"
--- 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>

--- 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>

--- 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
--- 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"
--- 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>
--- 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>

 //////////////////////////////////////////////////////////////////////////////
--- 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 
--- 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 ============//
--- 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[] =
--- 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>
--- 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>
--- 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>
--- 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>
--- 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
--- 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"
--- 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"
--- 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>
--- 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"
--- 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>

--- 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>
--- 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>


--- 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>
--- 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")),
--- 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>

--- 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
--- 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>
--- 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()
--- 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>
--- 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>
--- 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>
--- 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>
--- 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)
--- 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>
--- 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
--- 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>
--- 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"
--- 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>
--- 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 {
--- 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"
--- 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>
--- 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>
--- 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>
--- 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
--- 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>

--- 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
--- 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>

 /*
--- 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)
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>

--- 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>
--- 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>
--- 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"
--- 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)
--- 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>

--- 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"
--- 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>

--- 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>
--- 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
--- 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>
--- 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"
--- 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>
--- 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>
--- 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"
--- 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>
--- 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 */
--- 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>

--- 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>
--- 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"
--- 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"
--- 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"
--- 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>
--- 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>
--- 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>
--- 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
--- 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()
--- 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>
--- 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
--- 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
--- 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"
--- 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"
--- 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}
 )
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>

--- 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>

--- 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>
--- 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"
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>

--- 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>

--- 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"
--- 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>
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>

--- 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"
--- 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>
--- 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>
--- 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>
--- 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");
--- 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
--- 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;

--- 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"
--- 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>

--- 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
--- 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>
--- 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>
--- a/tdefilereplace/whatthis.h
+++ b/tdefilereplace/whatthis.h
@ -21,7 +21,7 @@
 #include <tqstring.h>

 // KDE
-#include <klocale.h>
+#include <tdelocale.h>

 namespace whatthisNameSpace
 {