Rename additional header files to avoid conflicts with KDE4

buildtools/ada/adaproject_part.cpp

@@ -16,12 +16,12 @@
 #include <tqvbox.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klibloader.h>
 #include <kprocess.h>
 #include <kservice.h>

buildtools/ada/adaprojectoptionsdlg.cpp

@@ -9,8 +9,8 @@
 #include <kurlrequester.h>
 #include <kservice.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <tqlineedit.h>
 #include <tqcombobox.h>

buildtools/autotools/addapplicationdlg.cpp

@@ -21,8 +21,8 @@
 #include <klineedit.h>
 #include <kdebug.h>
 #include <kicondialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 
 #include "autolistviewitems.h"

buildtools/autotools/addexistingdirectoriesdlg.cpp

@@ -18,7 +18,7 @@
 #include <tqlayout.h>
 
 #include <kprogress.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <kprocess.h>
 

buildtools/autotools/addexistingfilesdlg.cpp

@@ -32,7 +32,7 @@
 #include <kprogress.h>
 #include <kprocess.h>
 #include <kurldrag.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <kiconview.h>
 #include <ksqueezedtextlabel.h>

buildtools/autotools/addfiledlg.cpp

@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksqueezedtextlabel.h>
 #include <kurl.h>
 

buildtools/autotools/addicondlg.cpp

@@ -15,7 +15,7 @@
 #include <tqlabel.h>
 #include <klineedit.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <kicontheme.h>

buildtools/autotools/addprefixdlg.cpp

@@ -16,7 +16,7 @@
 #include <tqpushbutton.h>
 #include <kbuttonbox.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 

buildtools/autotools/addservicedlg.cpp

@@ -20,8 +20,8 @@
 #include <kdebug.h>
 #include <kicondialog.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kservicetype.h>
 
 #include "autolistviewitems.h"

buildtools/autotools/addsubprojectdlg.cpp

@@ -21,7 +21,7 @@
 #include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "autolistviewitems.h"
 

buildtools/autotools/addtargetdlg.cpp

@@ -17,8 +17,8 @@
 #include <tqvalidator.h>
 
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <ksqueezedtextlabel.h>
 
 #include "autolistviewitems.h"

buildtools/autotools/addtranslationdlg.cpp

@@ -22,8 +22,8 @@
 #include <tqstrlist.h>
 #include <kbuttonbox.h>
 #include <kdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 

buildtools/autotools/autodetailsview.cpp

@@ -27,7 +27,7 @@
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <tdepopupmenu.h>
 

buildtools/autotools/autoprojectpart.cpp

@@ -37,9 +37,9 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeparts/part.h>
 #include <tdeversion.h>
 #include <kprocess.h>

buildtools/autotools/autoprojectwidget.cpp

@@ -35,7 +35,7 @@
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kregexp.h>
 #include <kurl.h>
 #include <tdefile.h>

buildtools/autotools/autoprojectwidget.h

@@ -25,7 +25,7 @@
 #include <tqlayout.h>
 #include <tqtoolbutton.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "domutil.h"
 #include "makefilehandler.h"

buildtools/autotools/autosubprojectview.cpp

@@ -24,9 +24,9 @@
 #include <kxmlguiclient.h>
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <kprocess.h>
 #include <ksqueezedtextlabel.h>

buildtools/autotools/choosetargetdialog.cpp

@@ -30,7 +30,7 @@
 #include <kdialog.h>
 #include <kdebug.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <ksqueezedtextlabel.h>
 #include <kurl.h>

buildtools/autotools/configureoptionswidget.cpp

@@ -24,8 +24,8 @@
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kservice.h>
 #include <ktrader.h>
 

buildtools/autotools/fileselectorwidget.cpp

@@ -28,13 +28,13 @@
 #include <kurlcompletion.h>
 #include <kprotocolinfo.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 
 #include <kdebug.h>
 
 #include "fileselectorwidget.h"
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <kcombiview.h>
 #include <tdefilepreview.h>
 #include <tdefileview.h>

buildtools/autotools/fileselectorwidget.h

@@ -31,7 +31,7 @@
 #include <tdefileview.h>
 #include <tdefileitem.h>
 
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 
 class AutoProjectPart;
 class SubprojectItem;

buildtools/autotools/kimporticonview.cpp

@@ -19,8 +19,8 @@
 #include <tqrect.h>
 #include <tqwidget.h>
 
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kwordwrap.h>
 
 #include "kimporticonview.h"

buildtools/autotools/managecustomcommand.cpp

@@ -20,7 +20,7 @@
 
 #include <tqtable.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ManageCustomCommand::ManageCustomCommand(TQWidget *parent, const char *name)
     :ManageCustomBuildCommandsBase(parent, name)

buildtools/autotools/removetargetdlg.cpp

@@ -31,7 +31,7 @@
 #include <tdelistbox.h>
 #include <kprogress.h>
 #include <ksqueezedtextlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "autolistviewitems.h"
 

buildtools/autotools/subprojectoptionsdlg.cpp

@@ -24,7 +24,7 @@
 #include <kdialog.h>
 #include <keditlistbox.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 #include <kservice.h>
 #include <kurlrequesterdlg.h>

buildtools/autotools/targetoptionsdlg.cpp

@@ -23,7 +23,7 @@
 #include <kurlrequesterdlg.h>
 #include <kurlrequester.h>
 #include <kurlcompletion.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 #include <tdefiledialog.h>
 #include "autolistviewitems.h"

buildtools/custommakefiles/custommakeconfigwidget.cpp

@@ -24,7 +24,7 @@
 #include <tqvalidator.h>
 #include <klineedit.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <environmentvariableswidget.h>
 

buildtools/custommakefiles/custommanagerwidget.cpp

@@ -22,7 +22,7 @@
 #include <kurlcompletion.h>
 #include <tdefiledialog.h>
 #include <keditlistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "customprojectpart.h"

buildtools/custommakefiles/customotherconfigwidget.cpp

@@ -25,7 +25,7 @@
 #include <tqgroupbox.h>
 #include <tqvalidator.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <environmentvariableswidget.h>
 

buildtools/custommakefiles/customprojectpart.cpp

@@ -33,9 +33,9 @@
 #include <keditlistbox.h>
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeparts/part.h>
 #include <tdepopupmenu.h>
 #include <tdeversion.h>

buildtools/custommakefiles/selectnewfilesdialog.cpp

@@ -16,7 +16,7 @@
 #include <tdelistview.h>
 #include <tqheader.h>
 #include <tqstringlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include "selectnewfilesdialogbase.h"
 

buildtools/lib/widgets/addenvvardlg.cpp

@@ -21,7 +21,7 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <kbuttonbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 

buildtools/lib/widgets/addfilesdialog.cpp

@@ -16,7 +16,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 #include <tqcombobox.h>

buildtools/lib/widgets/runoptionswidget.cpp

@@ -19,7 +19,7 @@
 
 #include "runoptionswidget.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kurlrequester.h>
 #include <kurlcompletion.h>

buildtools/pascal/pascalproject_part.cpp

@@ -19,12 +19,12 @@
 #include <tqlabel.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klibloader.h>
 #include <kservice.h>
 #include <tdeconfig.h>

buildtools/pascal/pascalprojectoptionsdlg.cpp

@@ -11,8 +11,8 @@
 #include <kurlrequester.h>
 #include <kservice.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <tqlineedit.h>
 #include <tqcombobox.h>

buildtools/qmake/createscopedlg.cpp

@@ -16,8 +16,8 @@
 #include <tqcheckbox.h>
 #include <tdefile.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kurlcompletion.h>
 

buildtools/qmake/projectconfigurationdlg.cpp

@@ -42,8 +42,8 @@
 #include <tqtabwidget.h>
 #include <kpushbutton.h>
 #include <kcombobox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "trollprojectwidget.h"
 #include "trollprojectpart.h"

buildtools/qmake/qmakedefaultopts.cpp

@@ -12,7 +12,7 @@
 #include "qmakedefaultopts.h"
 
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqregexp.h>
 #include <kprocess.h>
 

buildtools/qmake/qmakescopeitem.cpp

@@ -18,7 +18,7 @@
 #include <tqregexp.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
 

buildtools/qmake/scope.cpp

@@ -23,8 +23,8 @@
 
 #include <kdirwatch.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <stdlib.h>
 
 #include "urlutil.h"

buildtools/qmake/trollprojectpart.cpp

@@ -22,8 +22,8 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdirwatch.h>
 #include <kstatusbar.h>
 #include <tqmessagebox.h>

buildtools/qmake/trollprojectwidget.cpp

@@ -43,7 +43,7 @@
 #include <tqtooltip.h>
 #include <kdebug.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kregexp.h>
 #include <kurl.h>

buildtools/qmake/trollprojectwidget.h

@@ -27,7 +27,7 @@
 #include <tqvbox.h>
 #include <tqtoolbutton.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeversion.h>
 #include <tqbutton.h>
 #include <tqfileinfo.h>

buildtools/script/scriptnewfiledlg.cpp

@@ -20,8 +20,8 @@
 #include <tqpushbutton.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 

buildtools/script/scriptprojectpart.cpp

@@ -21,8 +21,8 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdevgenericfactory.h>
 #include <kdevcreatefile.h>
 #include <kdirwatch.h>

editors/editor-chooser/editorchooser_part.cpp

@@ -2,7 +2,7 @@
 
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <kdevgenericfactory.h>
 

embedded/visualboyadvance/visualboyadvance_part.cpp

@@ -6,7 +6,7 @@
 #include <tdeaction.h>
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kdevcore.h"
 #include "kdevproject.h"

kdevdesigner/designer/actiondnd.cpp

@@ -47,7 +47,7 @@
 #include <tqstyle.h>
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 TQAction *ActionDrag::the_action = 0;
 

kdevdesigner/designer/actioneditorimpl.cpp

@@ -43,7 +43,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 ),

kdevdesigner/designer/actionlistview.cpp

@@ -28,7 +28,7 @@
 #include "actionlistview.h"
 #include <tqheader.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ActionListView::ActionListView( TQWidget *parent, const char *name )
     : TQListView( parent, name )

kdevdesigner/designer/command.cpp

@@ -58,7 +58,7 @@
 
 #include "kdevdesigner_part.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 CommandHistory::CommandHistory( int s )
     : current( -1 ), steps( s ), savedAt( -1 )

kdevdesigner/designer/connectiontable.cpp

@@ -26,7 +26,7 @@
 
 #include "connectiontable.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ConnectionTable::ConnectionTable( TQWidget *parent, const char *name )
     : TQTable( 0, 4, parent, name )

kdevdesigner/designer/customwidgeteditorimpl.cpp

@@ -53,7 +53,7 @@
 #include <tqtextcodec.h>
 #include <tqcheckbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 CustomWidgetEditor::CustomWidgetEditor( TQWidget *parent, MainWindow *mw )
     : CustomWidgetEditorBase( parent, 0, TRUE ), mainWindow( mw )

kdevdesigner/designer/dbconnectionsimpl.cpp

@@ -40,7 +40,7 @@
 #include "mainwindow.h"
 #include "asciivalidator.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static bool blockChanges = FALSE;
 

kdevdesigner/designer/editfunctionsimpl.cpp

@@ -47,7 +47,7 @@
 #include <tqheader.h>
 #include <tqcheckbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots )
     : EditFunctionsBase( parent, 0, TRUE ), formWindow( fw )

kdevdesigner/designer/formfile.cpp

@@ -44,7 +44,7 @@
 #include <tqapplication.h>
 
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "kdevdesigner_part.h"
 
 static TQString make_func_pretty( const TQString &s )

kdevdesigner/designer/formwindow.cpp

@@ -45,7 +45,7 @@
 #include <stdlib.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "kdevdesigner_part.h"
 
 #include <tqevent.h>

kdevdesigner/designer/hierarchyview.cpp

@@ -44,7 +44,7 @@
 
 #include <kiconloader.h>
 #include "kdevdesigner_part.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqpalette.h>
 #include <tqobjectlist.h>

kdevdesigner/designer/iconvieweditorimpl.cpp

@@ -35,7 +35,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 )

kdevdesigner/designer/kdevdesigner_part.cpp

@@ -26,7 +26,7 @@
 #include <kstdaction.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #include <tqfile.h>
@@ -238,7 +238,7 @@ void KDevDesignerPart::setupToolsAction( TDERadioAction * toggle, TQAction * act
 // It's usually safe to leave the factory code alone.. with the
 // notable exception of the TDEAboutData data
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 TDEInstance*  KDevDesignerPartFactory::s_instance = 0L;
 TDEAboutData* KDevDesignerPartFactory::s_about = 0L;

kdevdesigner/designer/listboxeditorimpl.cpp

@@ -38,7 +38,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 )

kdevdesigner/designer/listvieweditorimpl.cpp

@@ -44,7 +44,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 )

kdevdesigner/designer/mainwindow.cpp

@@ -82,7 +82,7 @@
 #include "designeraction.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqinputdialog.h>
 #include <tqtoolbar.h>

kdevdesigner/designer/mainwindowactions.cpp

@@ -28,7 +28,7 @@
 
 #include <kiconloader.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 
 #include <stdlib.h>

kdevdesigner/designer/menubareditor.cpp

@@ -37,7 +37,7 @@
 #include "menubareditor.h"
 #include "popupmenueditor.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 extern void find_accel( const TQString &txt, TQMap<TQChar, TQWidgetList > &accels, TQWidget *w );
 

kdevdesigner/designer/multilineeditorimpl.cpp

@@ -44,7 +44,7 @@
 #include <tqaction.h>
 #include <tqmetaobject.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ToolBarItem::ToolBarItem( TQWidget *parent, TQWidget *toolBar,
 			  const TQString &label, const TQString &tagstr,

kdevdesigner/designer/newformimpl.cpp

@@ -39,7 +39,7 @@
 
 #include <kiconloader.h>
 #include "kdevdesigner_part.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqiconview.h>
 #include <tqlabel.h>

kdevdesigner/designer/outputwindow.cpp

@@ -37,7 +37,7 @@
 #include <stdio.h>
 #include <tqpainter.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static TQTextEdit *debugoutput = 0;
 bool debugToStderr = FALSE;

kdevdesigner/designer/pixmapcollectioneditor.ui.h

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /**********************************************************************
 ** Copyright (C) 2001-2002 Trolltech AS.  All rights reserved.
 **

kdevdesigner/designer/popupmenueditor.cpp

@@ -47,7 +47,7 @@
 #include "popupmenueditor.h"
 #include "menubareditor.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Drag Object Declaration -------------------------------------------
 

kdevdesigner/designer/project.cpp

@@ -59,7 +59,7 @@
 # include <unistd.h>
 #endif
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #ifndef TQT_NO_SQL
 DatabaseConnection::~DatabaseConnection()

kdevdesigner/designer/projectsettingsimpl.cpp

@@ -35,7 +35,7 @@
 #include "workspace.h"
 
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 
 #include <tqtextedit.h>

kdevdesigner/designer/propertyeditor.cpp

@@ -46,7 +46,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "kdevdesigner_part.h"
 
 #include <tqpainter.h>

kdevdesigner/designer/resource.cpp

@@ -83,7 +83,7 @@
 
 #include <kiconloader.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kdevdesigner_part.h"
 

kdevdesigner/designer/sizehandle.cpp

@@ -33,7 +33,7 @@
 #include <tqwidget.h>
 #include <tqapplication.h>
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 SizeHandle::SizeHandle( FormWindow *parent, Direction d, WidgetSelection *s )
     : TQWidget( parent )

kdevdesigner/designer/sourcefile.cpp

@@ -38,7 +38,7 @@
 #include <stdlib.h>
 
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 SourceFile::SourceFile( const TQString &fn, bool temp, Project *p )
     : filename( fn ), ed( 0 ), fileNameTemp( temp ),

kdevdesigner/designer/startdialogimpl.cpp

@@ -24,7 +24,7 @@
 #include "startdialogimpl.h"
 #include "designerapp.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 FileDialog::FileDialog( const TQString &dir, TQWidget *parent )
     : TQFileDialog( dir, TQString(), parent )

kdevdesigner/designer/tableeditorimpl.cpp

@@ -44,7 +44,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 ),

kdevdesigner/designer/variabledialogimpl.cpp

@@ -37,7 +37,7 @@
 #include "command.h"
 #include "variabledialogimpl.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 VariableDialog::VariableDialog( FormWindow *fw, TQWidget *parent )

kdevdesigner/designer/widgetfactory.cpp

@@ -100,7 +100,7 @@
 #include <globaldefs.h>
 #include <tqobject.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 FormWindow *find_formwindow( TQWidget *w )
 {

kdevdesigner/designer/wizardeditorimpl.cpp

@@ -36,7 +36,7 @@
 #include <tqpushbutton.h>
 #include <tqinputdialog.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw )
     : WizardEditorBase( parent, 0 ), formwindow( fw ), wizard( w ), draggedItem( 0 )

kdevdesigner/designer/workspace.cpp

@@ -51,7 +51,7 @@
 #include <tqtextstream.h>
 #include "qcompletionedit.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 WorkspaceItem::WorkspaceItem( TQListView *parent, Project* p )
     : TQListViewItem( parent )

kdevdesigner/shared/widgetdatabase.cpp

@@ -44,7 +44,7 @@
 
 #include <stdlib.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 const int dbsize = 300;
 const int dbcustom = 200;

kdevdesigner/src/kdevdesigner.cpp

@@ -33,9 +33,9 @@
 #include <kstdaction.h>
 
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KDevDesigner::KDevDesigner()
     : KParts::MainWindow( 0L, "KDevDesigner" )

kdevdesigner/src/main.cpp

@@ -24,7 +24,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 static const char description[] =

languages/ada/adasupportpart.cpp

@@ -10,7 +10,7 @@
 #include <kgenericfactory.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>

languages/ada/problemreporter.cpp

@@ -35,7 +35,7 @@
 #include <tdetexteditor/markinterfaceextension.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <kurl.h>
 #include <tdeapplication.h>

languages/bash/bashsupport_part.cpp

@@ -13,7 +13,7 @@
 #include <tqregexp.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kprocess.h>
 #include <kdebug.h>

languages/cpp/addmethoddialog.cpp

@@ -27,7 +27,7 @@
 #include <kdevpartcontroller.h>
 #include <kdevcreatefile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/editinterface.h>

languages/cpp/app_templates/dcopservice/main.cpp

@@ -4,7 +4,7 @@
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include "%{APPNAMELC}.h"
 

languages/cpp/app_templates/kapp/app.cpp

@@ -8,8 +8,8 @@
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
 #include <kstatusbar.h>

languages/cpp/app_templates/kapp/appview.cpp

@@ -9,9 +9,9 @@
 
 #include <ktrader.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krun.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 %{APPNAME}View::%{APPNAME}View(TQWidget *parent)
     : TQWidget(parent),

languages/cpp/app_templates/kapp/main.cpp

@@ -5,7 +5,7 @@
 #include <dcopclient.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("A TDE Application");

languages/cpp/app_templates/kapp/pref.cpp

@@ -2,7 +2,7 @@
 
 #include "pref.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlayout.h>
 #include <tqlabel.h>

languages/cpp/app_templates/kateplugin/plugin_app.cpp

@@ -3,7 +3,7 @@
 #include "plugin_%{APPNAMELC}.h"
 
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 class PluginView : public KXMLGUIClient

languages/cpp/app_templates/kateplugin/plugin_app.h

@@ -12,7 +12,7 @@
 #include <kate/viewmanager.h>
 
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class KatePluginFactory : public KLibFactory
 {

languages/cpp/app_templates/kateplugin2/plugin_app.cpp

@@ -3,7 +3,7 @@
 #include "plugin_%{APPNAMELC}.h"
 
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
 

languages/cpp/app_templates/kateplugin2/plugin_app.h

@@ -14,7 +14,7 @@
 #include <kate/pluginconfiginterfaceextension.h>
 
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class %{APPNAME}ConfigPage;
 

languages/cpp/app_templates/kde4app/kapp4view.cpp

@@ -2,7 +2,7 @@
 #include "%{APPNAMELC}view.h"
 #include "settings.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <TQtGui/TQLabel>
 
 %{APPNAME}View::%{APPNAME}View(TQWidget *)

languages/cpp/app_templates/kdedcop/app.cpp

@@ -5,7 +5,7 @@
 #include <tqlabel.h>
 
 #include <tdemainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 %{APPNAME}::%{APPNAME}()
     : TDEMainWindow( 0, "%{APPNAME}" )

languages/cpp/app_templates/kdedcop/main.cpp

@@ -4,7 +4,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("A TDE KPart Application");

languages/cpp/app_templates/kdevlang/kdevlang_part.cpp

@@ -4,7 +4,7 @@
 #include <tqtimer.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kdevcore.h>
 #include <kdevpartcontroller.h>

languages/cpp/app_templates/kdevpart/kdevpart_part.cpp

@@ -5,11 +5,11 @@
 #include <tqpopupmenu.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdevplugininfo.h>
 #include <kdevgenericfactory.h>
 

languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp

@@ -5,11 +5,11 @@
 #include <tqpopupmenu.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdevplugininfo.h>
 #include <kdevgenericfactory.h>
 

languages/cpp/app_templates/khello/app.cpp

@@ -5,7 +5,7 @@
 #include <tqlabel.h>
 
 #include <tdemainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 %{APPNAME}::%{APPNAME}()
     : TDEMainWindow( 0, "%{APPNAME}" )

languages/cpp/app_templates/khello/main.cpp

@@ -4,7 +4,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("A TDE KPart Application");

languages/cpp/app_templates/khello2/app.cpp

@@ -1,7 +1,7 @@
 %{CPP_TEMPLATE}
 
 #include <tdemainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "%{APPNAMELC}.h"
 #include "%{APPNAMELC}widget.h"

languages/cpp/app_templates/khello2/main.cpp

@@ -4,7 +4,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("A TDE KPart Application");

languages/cpp/app_templates/kicker/applet.cpp

@@ -1,11 +1,11 @@
 %{CPP_TEMPLATE}
 
 #include <tqlcdnumber.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "%{APPNAMELC}.h"
 

languages/cpp/app_templates/kmake/app.cpp

@@ -2,7 +2,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "mainviewimp.h"
 
 static const char description[] =    I18N_NOOP("A TDE Application");

languages/cpp/app_templates/kmake/mainviewimp.cpp

@@ -1,7 +1,7 @@
 
 #include "mainviewimp.h"
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 MainViewImp::MainViewImp(TQWidget* parent, const char* name, WFlags fl)
 : MainView(parent,name,fl)

languages/cpp/app_templates/kofficepart/kopart_aboutdata.h

@@ -7,7 +7,7 @@
 #define %{APPNAME}_ABOUTDATA
 
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] = I18N_NOOP("%{APPNAME} KOffice Program");
 static const char version[]     = "%{VERSION}";

languages/cpp/app_templates/kofficepart/kopart_factory.cpp

@@ -7,9 +7,9 @@
 #include <%{APPNAMELC}_aboutdata.h>
 #include <kinstance.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 extern "C"
 {

languages/cpp/app_templates/kofficepart/kopart_view.cpp

@@ -10,7 +10,7 @@
 #include <tqiconset.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 %{APPNAME}View::%{APPNAME}View( %{APPNAME}Part* part, TQWidget* parent, const char* name )

languages/cpp/app_templates/kofficepart/main.cpp

@@ -7,7 +7,7 @@
 #include <koDocument.h>
 #include <koMainWindow.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include "%{APPNAMELC}_aboutdata.h"
 

languages/cpp/app_templates/kpartapp/app.cpp

@@ -12,9 +12,9 @@
 #include <kstdaction.h>
 
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 %{APPNAME}::%{APPNAME}()
     : KParts::MainWindow( 0L, "%{APPNAME}" )

languages/cpp/app_templates/kpartapp/app_part.cpp

@@ -5,8 +5,8 @@
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 #include <tqtextstream.h>
@@ -146,7 +146,7 @@ void %{APPNAME}Part::fileSaveAs()
 // It's usually safe to leave the factory code alone.. with the
 // notable exception of the TDEAboutData data
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 TDEInstance*  %{APPNAME}PartFactory::s_instance = 0L;
 TDEAboutData* %{APPNAME}PartFactory::s_about = 0L;

languages/cpp/app_templates/kpartapp/main.cpp

@@ -3,7 +3,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("A TDE KPart Application");

languages/cpp/app_templates/kpartplugin/plugin_app.cpp

@@ -4,9 +4,9 @@
 #include <tdehtml_part.h>
 #include <tdeaction.h>
 #include <kinstance.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* parent, const char* name )
     : Plugin( parent, name )

languages/cpp/app_templates/kscons_kxt/app.cpp

@@ -10,11 +10,11 @@
 #include <tqpaintdevicemetrics.h>
 
 #include <tdeconfigdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <kkeydialog.h>
 #include <ktip.h>

languages/cpp/app_templates/kscons_kxt/appview.cpp

@@ -3,7 +3,7 @@
 #include "%{APPNAMELC}view.h"
 #include "settings.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 
 %{APPNAME}View::%{APPNAME}View(TQWidget *parent)

languages/cpp/app_templates/kscons_kxt/main.cpp

@@ -4,7 +4,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("A TDE Application");

languages/cpp/app_templates/kscons_tdemdi/app_part.cpp

@@ -7,8 +7,8 @@
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 #include <tqtextstream.h>

languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp

@@ -8,7 +8,7 @@
 #include <tqtoolbutton.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <ktip.h>
 #include <tdeparts/part.h>
 #include <tdeparts/partmanager.h>
@@ -23,14 +23,14 @@
 #include <tdeaboutdata.h>
 #include <tdefiledialog.h>
 #include <tdeactionclasses.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <kkeydialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ktabwidget.h>
 #include <kedittoolbar.h>
 #include <tdeversion.h>

languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp

@@ -4,11 +4,11 @@
 #include <tqlayout.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemdichildview.h>
 #include <kdebug.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "%{APPNAMELC}tdemdiView.h"
 

languages/cpp/app_templates/kscons_tdemdi/main.cpp

@@ -4,7 +4,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "%{APPNAMELC}tdemdi.h"
 

languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp

@@ -6,7 +6,7 @@
 #include <tdeparts/part.h>
 #include <kate/document.h>
 #include <kate/view.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klibloader.h>
 #include <kurl.h>
 

languages/cpp/app_templates/kxt/app.cpp

@@ -10,11 +10,11 @@
 #include <tqpaintdevicemetrics.h>
 
 #include <tdeconfigdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <kkeydialog.h>
 

languages/cpp/app_templates/kxt/appview.cpp

@@ -3,7 +3,7 @@
 #include "%{APPNAMELC}view.h"
 #include "settings.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 
 %{APPNAMELC}View::%{APPNAMELC}View(TQWidget *parent)

languages/cpp/app_templates/kxt/main.cpp

@@ -4,7 +4,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("A TDE Application");

languages/cpp/app_templates/noatunui/plugin_app.cpp

@@ -1,8 +1,8 @@
 
 #include "plugin_%{APPNAMELC}_impl.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 extern "C"
 {

languages/cpp/app_templates/noatunui/plugin_impl.cpp

@@ -18,8 +18,8 @@
 
 #include <tdepopupmenu.h>
 #include <kstatusbar.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kurldrag.h>
 //#include <tdefiledialog.h>

languages/cpp/app_templates/noatunvisual/plugin_app.cpp

@@ -5,8 +5,8 @@
 #include "plugin_%{APPNAMELC}.h"
 #include "plugin_%{APPNAMELC}_impl.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 extern "C"
 {

languages/cpp/app_templates/tdecmodule/module.cpp

@@ -2,8 +2,8 @@
 
 #include <tqlayout.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeparts/genericfactory.h>
 
 #include "%{APPNAMELC}.h"

languages/cpp/app_templates/tdeconfig35/app.cpp

@@ -8,8 +8,8 @@
 
 #include <tdeaction.h>
 #include <tdeconfigdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kprinter.h>
 #include <kstatusbar.h>
 

languages/cpp/app_templates/tdeconfig35/appview.cpp

@@ -3,7 +3,7 @@
 #include "%{APPNAMELC}view.h"
 #include "settings.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 
 %{APPNAMELC}View::%{APPNAMELC}View(TQWidget *parent)

languages/cpp/app_templates/tdeconfig35/main.cpp

@@ -4,7 +4,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("A TDE Application");

languages/cpp/app_templates/tdeioslave/slave.cpp

@@ -13,11 +13,11 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <ksock.h>
 

languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp

@@ -4,10 +4,10 @@
 #include <tqcheckbox.h>
 #include <tqcolor.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include "%{APPNAMELC}.h"
 #include "%{APPNAMELC}ui.h"
 

languages/cpp/ast_utils.cpp

@@ -15,7 +15,7 @@
 #include <tqstringlist.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
 

languages/cpp/ccconfigwidget.cpp

@@ -27,8 +27,8 @@
 // kde includes
 #include <kdevproject.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <tdefileitem.h>

languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp

@@ -18,7 +18,7 @@
 #include <tqlayout.h>
 #include <tqvbox.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 
 #include "flagboxes.h"

languages/cpp/configproblemreporter.ui.h

@@ -12,7 +12,7 @@
 
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqfile.h>

languages/cpp/cppcodecompletion.cpp

@@ -41,9 +41,9 @@ email                : david.nolden.tdevelop@art-master.de
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeparts/part.h>
 #include <kstatusbar.h>
 #include <tdetexteditor/document.h>

languages/cpp/cppimplementationwidget.cpp

@@ -26,8 +26,8 @@
 #include <tqregexp.h>
 #include <tqdom.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdelistview.h>
 #include <klineedit.h>
 

languages/cpp/cppnewclassdlg.cpp

@@ -29,8 +29,8 @@
 #include <tqstyle.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqcombobox.h>
 #include <tqlistview.h>
 #include <tqpopupmenu.h>

languages/cpp/cppsupportpart.cpp

@@ -70,14 +70,14 @@
 #include <tqregexp.h>
 #include <tqlabel.h>
 #include <tqvbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdemainwindow.h>
 #include <kstatusbar.h>
 #include <tdeconfig.h>

languages/cpp/creategettersetterconfiguration.cpp

@@ -16,7 +16,7 @@
 #include <domutil.h>
 
 #include <tqdom.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 TQString CreateGetterSetterConfiguration::defaultPath = TQString::fromLatin1( "/kdevcppsupport/creategettersetter" );
 
 CreateGetterSetterConfiguration::CreateGetterSetterConfiguration( CppSupportPart * part ) 

languages/cpp/createpcsdialog.cpp

@@ -31,7 +31,7 @@
 #include <tdeapplication.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstringhandler.h>
 #include <klineedit.h>
 

languages/cpp/debugger/breakpoint.cpp

@@ -17,7 +17,7 @@
 #include "gdbcontroller.h"
 #include "gdbcommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqfileinfo.h>

languages/cpp/debugger/breakpoint.h

@@ -16,7 +16,7 @@
 #ifndef _BREAKPOINT_H_
 #define _BREAKPOINT_H_
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqobject.h>
 #include <tqstring.h>

languages/cpp/debugger/dbgpsdlg.cpp

@@ -17,14 +17,14 @@
 
 #include <kbuttonbox.h>
 #include <kdialog.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 #include <tdelistview.h>
 #include <tdelistviewsearchline.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqframe.h>
 #include <tqlabel.h>

languages/cpp/debugger/dbgtoolbar.cpp

@@ -19,7 +19,7 @@
 
 #include <kdockwindow.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <twin.h>

languages/cpp/debugger/debuggerpart.cpp

@@ -25,12 +25,12 @@
 #include <tdefiledialog.h>
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
 #include <kstatusbar.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/viewcursorinterface.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tqtimer.h>

languages/cpp/debugger/debuggertracingdialog.cpp

@@ -7,7 +7,7 @@
 #include <tqcheckbox.h>
 #include <klineedit.h>
 #include <keditlistbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 namespace GDBDebugger
 {

languages/cpp/debugger/disassemblewidget.cpp

@@ -20,7 +20,7 @@
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <ktextedit.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqdict.h>
 #include <tqheader.h>

languages/cpp/debugger/framestackwidget.cpp

@@ -17,9 +17,9 @@
 #include "gdbparser.h"
 #include "gdbcommand.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqheader.h>
 #include <tqlistbox.h>

languages/cpp/debugger/gdbbreakpointwidget.cpp

@@ -24,10 +24,10 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqvbuttongroup.h>
 #include <tqfileinfo.h>

languages/cpp/debugger/gdbcontroller.cpp

@@ -27,9 +27,9 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <twin.h>
 

languages/cpp/debugger/gdboutputwidget.cpp

@@ -21,7 +21,7 @@
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 
 #include <tqlabel.h>

languages/cpp/debugger/memviewdlg.cpp

@@ -19,8 +19,8 @@
 
 #include <kbuttonbox.h>
 #include <klineedit.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 #include <kdebug.h>
@@ -36,7 +36,7 @@
 #include <tqtoolbox.h>
 #include <tqtextedit.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <khexedit/byteseditinterface.h>
 

languages/cpp/debugger/stty.cpp

@@ -64,7 +64,7 @@
 #include <tqstring.h>
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 

languages/cpp/debugger/variablewidget.cpp

@@ -33,12 +33,12 @@
 #include <tqregexp.h>
 #include <tqcursor.h>
 #include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqpoint.h>
 #include <tqclipboard.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <cctype>
 #include <set>

languages/cpp/doc/gnome1.toc

@@ -182,7 +182,7 @@
     <tocsect3 name="GtkList" url="gtk/gttdelist.html"/>
     <tocsect3 name="GtkListItem" url="gtk/gttdelistitem.html"/>
     <tocsect3 name="GtkMenu" url="gtk/gtkmenu.html"/>
-    <tocsect3 name="GtkMenuBar" url="gtk/gtkmenubar.html"/>
+    <tocsect3 name="GtkMenuBar" url="gtk/gttdemenubar.html"/>
     <tocsect3 name="GtkMenuItem" url="gtk/gtkmenuitem.html"/>
     <tocsect3 name="GtkMenuShell" url="gtk/gtkmenushell.html"/>
     <tocsect3 name="GtkMisc" url="gtk/gtkmisc.html"/>

languages/cpp/includepathresolver.cpp

@@ -30,7 +30,7 @@
 #include "kurl.h" /* defines KURL */
 #include "tqdir.h" /* defines TQDir */
 #include "tqregexp.h" /* defines TQRegExp */
-#include "klocale.h" /* defines [function] i18n */
+#include "tdelocale.h" /* defines [function] i18n */
 #include "blockingkprocess.h" /* defines BlockingTDEProcess */
 #include "includepathresolver.h"
 #include <sys/stat.h>

languages/cpp/kdevdriver.cpp

@@ -1,4 +1,4 @@
-#include "klocale.h" /* defines [function] i18n */
+#include "tdelocale.h" /* defines [function] i18n */
 #include <lexer.h>
 
 #include "kdevdriver.h"

languages/cpp/pcsimporter/customimporter/settingsdialog.cpp

@@ -18,8 +18,8 @@
 #include <kcombobox.h>
 #include <kurlrequester.h>
 #include <tdeversion.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 
 #include <keditlistbox.h>

languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp

@@ -14,7 +14,7 @@
 #include "settingsdialog.h"
 
 #include <kgenericfactory.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kprocess.h>
 #include <kdebug.h>
 

languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp

@@ -17,8 +17,8 @@
 #include <kurlrequester.h>
 #include <kdebug.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 #include <tqdir.h>

languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp

@@ -17,8 +17,8 @@
 #include <kurlrequester.h>
 #include <kdebug.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 #include <tqdir.h>

languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp

@@ -19,8 +19,8 @@
 #include <kurlrequester.h>
 #include <kdebug.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 #include <tqdir.h>

languages/cpp/problemreporter.cpp

@@ -35,7 +35,7 @@
 #include <tdetexteditor/view.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <kurl.h>
 #include <tdeapplication.h>

languages/cpp/qtdesignercppintegration.cpp

@@ -23,9 +23,9 @@
 #include <tqpair.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/view.h>

languages/cpp/setuphelper.cpp

@@ -14,7 +14,7 @@
 #include "blockingkprocess.h"
 #include "driver.h"
 #include <kdebug.h>
-#include "ktempfile.h" /* defines [function] KTempDir */
+#include "tdetempfile.h" /* defines [function] KTempDir */
 #include "kstandarddirs.h" /* defines [function] locateLocal */
 #include "tqdir.h" /* defines TQDir */
 #include <stdio.h>

languages/cpp/simpletype.cpp

@@ -15,7 +15,7 @@
 #include "simpletype.h"
 #include "safetycounter.h"
 #include "simpletypefunction.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 TQMap<TQString, TQString> BuiltinTypes::m_types;
 BuiltinTypes builtin; //Needed so BuiltinTypes::BuiltinTypes is called and the types are initialized

languages/cpp/subclassingdlg.cpp

@@ -33,7 +33,7 @@
 #include <tqdom.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 #include <tqregexp.h>
 #include <tdeconfig.h>

languages/cpp/typedesc.cpp

@@ -23,7 +23,7 @@
 #include "parser.h"
 #include <tqtextstream.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 const char* TypeDesc::functionMark = "[function] ";
 

languages/csharp/csharpdoc.cpp

@@ -7,12 +7,12 @@
 
 #include <tqtextstream.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kinstance.h>
 #include <kprocess.h>
 #include <tdeversion.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 using namespace TDEIO;
 

languages/csharp/csharpsupportpart.cpp

@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <kdevgenericfactory.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqregexp.h>
 #include <codemodel.h>
 #include <tqprogressbar.h>

languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp

@@ -17,7 +17,7 @@
 #include <tqvbox.h>
 #include <tqvbuttongroup.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "pgioptionsplugin.h"
 

languages/fortran/fortransupportpart.cpp

@@ -27,8 +27,8 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kregexp.h>
 #include <kdevgenericfactory.h>

languages/fortran/ftnchetdeconfigwidget.cpp

@@ -17,7 +17,7 @@
 #include <tqlistview.h>
 #include <tqradiobutton.h>
 #include <tqtooltip.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "domutil.h"
 

languages/java/configproblemreporter.ui.h

@@ -7,7 +7,7 @@
 *****************************************************************************/
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 void ConfigureProblemReporter::init()
 {

languages/java/javasupportpart.cpp

@@ -40,13 +40,13 @@
 #include <tqregexp.h>
 #include <tqlabel.h>
 #include <tqvbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
 #include <kstatusbar.h>
 #include <tdeconfig.h>

languages/java/problemreporter.cpp

@@ -34,7 +34,7 @@
 #include <tdetexteditor/view.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <kurl.h>
 #include <tdeapplication.h>

languages/kjssupport/jscodecompletion.cpp

@@ -20,7 +20,7 @@
 #include <tqregexp.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kdebug.h>
 #include <tdeaction.h>

languages/kjssupport/kjssupport_part.cpp

@@ -24,7 +24,7 @@
 #include <tqpopupmenu.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kdevcore.h>
 #include <kdevpartcontroller.h>

languages/kjssupport/subclassingdlg.cpp

@@ -32,7 +32,7 @@
 #include <tqdom.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 #include <tqregexp.h>
 #include <tdeconfig.h>

languages/lib/debugger/debugger.cpp

@@ -2,7 +2,7 @@
 #include "debugger.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdetexteditor/document.h>
 
 // #include "editorproxy.h"

languages/lib/designer_integration/implementationwidget.cpp

@@ -28,8 +28,8 @@
 #include <tqradiobutton.h>
 
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdelistview.h>
 
 #include <kdevproject.h>

languages/lib/designer_integration/qtdesignerintegration.cpp

@@ -23,9 +23,9 @@
 #include <tqregexp.h>
 #include <tqfileinfo.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 
 #include <rurl.h>

languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp

@@ -12,7 +12,7 @@
 #include <tqdialog.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 
 #include "dccoptionsplugin.h"

languages/pascal/compiler/dccoptions/optiontabs.cpp

@@ -8,7 +8,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqspinbox.h>
 #include <tqlabel.h>

languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp

@@ -10,7 +10,7 @@
  ***************************************************************************/
 #include <tqvbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 
 #include "optiontabs.h"

languages/pascal/compiler/fpcoptions/optiontabs.cpp

@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqspinbox.h>
 #include <tqlabel.h>

languages/pascal/pascalsupport_part.cpp

@@ -14,7 +14,7 @@
 #include <tqwhatsthis.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
 #include <tdeapplication.h>

languages/pascal/problemreporter.cpp

@@ -32,7 +32,7 @@
 #include <tdetexteditor/markinterfaceextension.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <kurl.h>
 #include <tdeapplication.h>

languages/perl/perldoc.cpp

@@ -7,12 +7,12 @@
 
 #include <tqtextstream.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kinstance.h>
 #include <kprocess.h>
 #include <tdeversion.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 using namespace TDEIO;
 

languages/perl/perlsupportpart.cpp

@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <kdevgenericfactory.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqregexp.h>
 #include <codemodel.h>
 #include <tqprogressbar.h>

languages/php/phperrorview.cpp

@@ -34,7 +34,7 @@
 #include <tdetexteditor/view.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <kurl.h>
 #include <tdeapplication.h>

languages/php/phpnewclassdlg.cpp

@@ -23,7 +23,7 @@
 #include <iostream>
 #include <tqregexp.h>
 #include <tqtextedit.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kinstance.h>
 #include <kdebug.h>

languages/php/phpsupportpart.cpp

@@ -36,8 +36,8 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdehtmlview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kregexp.h>
 #include <kstatusbar.h>

languages/python/pydoc.cpp

@@ -10,8 +10,8 @@
 #include <kinstance.h>
 #include <kprocess.h>
 #include <tdeversion.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 using namespace TDEIO;
 

languages/python/pythonimplementationwidget.cpp

@@ -26,8 +26,8 @@
 #include <tqtextstream.h>
 
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <filetemplate.h>
 #include <kdevlanguagesupport.h>

languages/python/pythonsupportpart.cpp

@@ -32,7 +32,7 @@
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqregexp.h>
 
 #include "qtdesignerpythonintegration.h"

languages/python/qtdesignerpythonintegration.cpp

@@ -22,9 +22,9 @@
 #include <tqpair.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/view.h>

languages/ruby/debugger/breakpoint.cpp

@@ -21,7 +21,7 @@
 
 #include "breakpoint.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqfileinfo.h>
 #include <tqfontmetrics.h>

languages/ruby/debugger/breakpoint.h

@@ -22,7 +22,7 @@
 #ifndef _BREAKPOINT_H_
 #define _BREAKPOINT_H_
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqstring.h>
 

languages/ruby/debugger/dbgpsdlg.cpp

@@ -23,8 +23,8 @@
 
 #include <kbuttonbox.h>
 #include <kdialog.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>

languages/ruby/debugger/dbgtoolbar.cpp

@@ -25,7 +25,7 @@
 
 #include <kdockwindow.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <twin.h>

languages/ruby/debugger/debuggerpart.cpp

@@ -28,12 +28,12 @@
 #include <tdefiledialog.h>
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
 #include <kstatusbar.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/viewcursorinterface.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tqtimer.h>

languages/ruby/debugger/framestackwidget.cpp

@@ -22,7 +22,7 @@
 #include "framestackwidget.h"
 #include "rdbparser.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqheader.h>

languages/ruby/debugger/rdbbreakpointwidget.cpp

@@ -27,7 +27,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kurl.h>
 

languages/ruby/debugger/rdbcontroller.cpp

@@ -40,9 +40,9 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 
 #include <tqdatetime.h>

languages/ruby/debugger/rdboutputwidget.cpp

@@ -27,7 +27,7 @@
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>

languages/ruby/debugger/stty.cpp

@@ -63,7 +63,7 @@
 #include <tqstring.h>
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 

languages/ruby/debugger/variablewidget.cpp

@@ -36,7 +36,7 @@
 #include <tqpushbutton.h>
 #include <tqregexp.h>
 #include <tqcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqpoint.h>
 #include <tqclipboard.h>

languages/ruby/qtdesignerrubyintegration.cpp

@@ -23,9 +23,9 @@
 #include <tqpair.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/view.h>

languages/ruby/rubyimplementationwidget.cpp

@@ -26,8 +26,8 @@
 #include <tqtextstream.h>
 
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <filetemplate.h>
 #include <kdevlanguagesupport.h>

languages/ruby/rubysupport_part.cpp

@@ -23,7 +23,7 @@
 #include <tqregexp.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kprocess.h>
 #include <kdebug.h>

languages/sql/sqlactions.cpp

@@ -16,7 +16,7 @@
 #include <tqsqldatabase.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdetoolbar.h>
 #include <kiconloader.h>
 #include <kcombobox.h>

languages/sql/sqlconfigwidget.ui.h

@@ -13,9 +13,9 @@
 #include <tqdom.h>
 #include <tqstringlist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <domutil.h>
 

languages/sql/sqloutputwidget.cpp

@@ -20,7 +20,7 @@
 #include <tqlayout.h>
 #include <tqstylesheet.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "sqloutputwidget.h"
 

languages/sql/sqlsupport_part.cpp

@@ -7,14 +7,14 @@
 
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <tdeparts/part.h>
 #include <kdialogbase.h>
 #include <tdetexteditor/editinterface.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kdevcore.h"
 #include "kdevmainwindow.h"

lib/cppparser/driver.cpp

@@ -24,7 +24,7 @@
 #include "lexer.h"
 #include "parser.h"
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <stdlib.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>

lib/cppparser/errors.cpp

@@ -18,7 +18,7 @@
 */
 
 #include "errors.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 QT_STATIC_CONST_IMPL Error& Errors::InternalError = Error( 1, -1, i18n("Internal Error") );
 QT_STATIC_CONST_IMPL Error& Errors::SyntaxError = Error( 2, -1, i18n("Syntax Error before '%1'") );

lib/cppparser/lexer.cpp

@@ -21,7 +21,7 @@
 #include "lookup.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqregexp.h>
 #include <tqmap.h>

lib/cppparser/parser.cpp

@@ -29,7 +29,7 @@
 #include <tqasciidict.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace std;
 

lib/interfaces/kdevplugin.cpp

@@ -33,7 +33,7 @@
 #include "kdevplugincontroller.h"
 
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include <tqdom.h>

lib/util/execcommand.cpp

@@ -21,8 +21,8 @@
 
 #include <kprocess.h>
 #include <kprogress.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, 
                           const TQString& workingDir, const TQStringList& env,

lib/util/settings.cpp

@@ -10,7 +10,7 @@
  ***************************************************************************/
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include "settings.h"

lib/util/tdescriptactionmanager.cpp

@@ -24,8 +24,8 @@
 #include <kdesktopfile.h>
 #include <kstandarddirs.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <scriptinterface.h>
 #include <tdeaction.h>

lib/widgets/flagboxes.cpp

@@ -17,7 +17,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurlrequester.h>
 #include <klineedit.h>

lib/widgets/kdevhtmlpart.cpp

@@ -6,7 +6,7 @@
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <tdemainwindow.h>

lib/widgets/kdevtabwidget.cpp

@@ -11,8 +11,8 @@
 
 #include <tqpopupmenu.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kicontheme.h>
 #include <kiconloader.h>
 

lib/widgets/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>

lib/widgets/processwidget.cpp

@@ -23,7 +23,7 @@
 #include <tdeversion.h>
 #include <tqdir.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <tqpainter.h>
 #include <tqapplication.h>

lib/widgets/propeditor/pcheckbox.cpp

@@ -24,7 +24,7 @@
 #include <tqpainter.h>
 
 #ifndef PURE_QT
-#include <klocale.h>
+#include <tdelocale.h>
 #else
 #include "compat_tools.h"
 #endif

lib/widgets/propeditor/pfontbutton.cpp

@@ -26,7 +26,7 @@
 #include <tdefontrequester.h>
 
 #ifndef PURE_QT
-#include <klocale.h>
+#include <tdelocale.h>
 #else
 #include "compat_tools.h"
 #endif

lib/widgets/propeditor/ppixmapedit.cpp

@@ -27,7 +27,7 @@
 #include <tqcursor.h>
 
 #ifndef PURE_QT
-#include <klocale.h>
+#include <tdelocale.h>
 #else
 #include "compat_tools.h"
 #endif

lib/widgets/propeditor/propertyeditor.cpp

@@ -20,7 +20,7 @@
 #include "propertyeditor.h"
 
 #ifndef PURE_QT
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #else

lib/widgets/propeditor/propertymachinefactory.cpp

@@ -20,7 +20,7 @@
 #include "propertymachinefactory.h"
 
 #ifndef PURE_QT
-#include <klocale.h>
+#include <tdelocale.h>
 #else
 #define i18n TQObject::tr
 #endif

lib/widgets/propeditor/psymbolcombo.cpp

@@ -25,7 +25,7 @@
 
 #ifndef PURE_QT
 #include <kcharselect.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 #include <tqdialog.h>

lib/widgets/propeditor/pyesnobutton.cpp

@@ -24,7 +24,7 @@
 #include <tqpushbutton.h>
 
 #ifndef PURE_QT
-#include <klocale.h>
+#include <tdelocale.h>
 #else
 #include "compat_tools.h"
 #endif

lib/widgets/resizablecombo.cpp

@@ -26,7 +26,7 @@
 #include <tqapplication.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char * resize_xpm[] = {
 "9 18 2 1",

lib/widgets/tdelistviewaction.cpp

@@ -24,7 +24,7 @@
 #include <tqwhatsthis.h>
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 TDEListViewAction::~TDEListViewAction()
 {

parts/abbrev/abbrevpart.cpp

@@ -21,7 +21,7 @@
 #include <tqvbox.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <kstandarddirs.h>
 #include <kdevgenericfactory.h>

parts/appwizard/appwizarddlg.cpp

@@ -37,13 +37,13 @@
 #include <kiconview.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <tdefile.h>

parts/appwizard/appwizardpart.cpp

@@ -16,8 +16,8 @@
 #include "appwizardpart.h"
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kdevcore.h>
 #include <kgenericfactory.h>

parts/appwizard/common/scons/admin/kde.py

@@ -423,7 +423,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 
 	## ui file processing
 	def uic_processing(target, source, env):
-		inc_kde  = '#include <klocale.h>\n#include <kdialog.h>\n'
+		inc_kde  = '#include <tdelocale.h>\n#include <kdialog.h>\n'
 		inc_moc  = '#include "%s"\n' % target[2].name
 		comp_h   = '$QT_UIC $QT_UIC_HFLAGS -o %s %s' % (target[0].path, source[0].path)
 		comp_c   = '$QT_UIC $QT_UIC_CFLAGS -impl %s %s' % (target[0].path, source[0].path)

parts/appwizard/filepropspage.cpp

@@ -2,7 +2,7 @@
 #include <tqlistbox.h>
 #include <klineedit.h>
 #include <tqtextview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqmultilineedit.h>
 

parts/appwizard/importdlg.cpp

@@ -27,8 +27,8 @@
 #include <kdialog.h>
 #include <tdefiledialog.h>
 #include <kinstance.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kcursor.h>
 #include <tdefile.h>

parts/appwizard/misc.cpp

@@ -12,12 +12,12 @@
 #include "misc.h"
 
 #include <tqstring.h>
-#include <kemailsettings.h>
+#include <tdeemailsettings.h>
 
 #include <pwd.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 

parts/astyle/astyle_part.cpp

@@ -9,7 +9,7 @@
 #include <kdialogbase.h>
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <tdeparts/partmanager.h>
 #include <tdetexteditor/editinterface.h>
@@ -25,8 +25,8 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqlineedit.h>
 #include <tqregexp.h>
 

parts/bookmarks/bookmarks_part.cpp

@@ -17,7 +17,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <tdetexteditor/markinterface.h>
 #include <tdetexteditor/editinterface.h>

parts/bookmarks/bookmarks_widget.cpp

@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kdevpartcontroller.h>
 #include <kdevcore.h>

parts/classview/classtooldlg.cpp

@@ -18,7 +18,7 @@
 #include <tqtooltip.h>
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kdevlanguagesupport.h"
 #include "classstore.h"

parts/classview/classtoolwidget.cpp

@@ -14,8 +14,8 @@
 #include "classtoolwidget.h"
 
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdepopupmenu.h>
 #include "classstore.h"
 

parts/classview/classtreebase.cpp

@@ -19,7 +19,7 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #include "kdevcore.h"

parts/classview/classviewpart.cpp

@@ -25,7 +25,7 @@
 #include <tqlineedit.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <tdepopupmenu.h>
 #include <kdebug.h>

parts/classview/classviewwidget.cpp

@@ -38,7 +38,7 @@
 #include <codemodel.h>
 #include <codemodel_utils.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqheader.h>

parts/classview/digraphview.cpp

@@ -17,13 +17,13 @@
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqtextstream.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
-#include <ktempfile.h>
+#include <tdeglobalsettings.h>
+#include <tdetempfile.h>
 #include <tdeversion.h>
 #include <kdebug.h>
 

parts/classview/hierarchydlg.cpp

@@ -12,14 +12,14 @@
 #include "hierarchydlg.h"
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 #include <tdefile.h>
 #include <tdefiledialog.h>
 #include <kurlrequesterdlg.h>
 #include <kurlrequester.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include <tqlayout.h>

parts/classview/viewcombos.cpp

@@ -18,7 +18,7 @@
  *
  */
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "tdelistviewaction.h"

parts/classview/viewcombos.h

@@ -20,7 +20,7 @@
 #ifndef VIEWCOMBOS_H
 #define VIEWCOMBOS_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlistview.h>
 

parts/ctags2/ctags2_part.cpp

@@ -18,7 +18,7 @@
 #include <klineedit.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/document.h>
 #include <tdetexteditor/editinterface.h>

parts/ctags2/ctags2_widget.cpp

@@ -17,7 +17,7 @@
 
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurl.h>
 #include <tdeapplication.h>

parts/ctags2/ctagskinds.cpp

@@ -11,7 +11,7 @@
 
 #include "ctagskinds.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 struct CTagsKindMapping {
     char abbrev;

parts/diff/diffdlg.cpp

@@ -11,7 +11,7 @@
 
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
  
 #include "diffdlg.h"
 #include "diffwidget.h"

parts/diff/diffpart.cpp

@@ -15,7 +15,7 @@
 #include <tqwhatsthis.h>
 #include <tqpopupmenu.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <tdeaction.h>
 #include <tdefiledialog.h>
@@ -24,7 +24,7 @@
 #include <tdeio/job.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/editinterface.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 

parts/diff/diffwidget.cpp

@@ -17,13 +17,13 @@
 
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservice.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tdeparts/componentfactory.h>
 #include <tdeparts/part.h>

parts/distpart/distpart_part.cpp

@@ -22,7 +22,7 @@
 #include <tqwhatsthis.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
 

parts/distpart/distpart_widget.cpp

@@ -26,11 +26,11 @@
 #include <kprocess.h>
 #include <tdefiledialog.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "kdevproject.h"
 #include "domutil.h"
 #include <ktar.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <kdevcore.h>
 #include <tqgroupbox.h>

parts/distpart/specsupport.cpp

@@ -25,7 +25,7 @@
 
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <tqfile.h>
 #include <tqdir.h>

parts/documentation/bookmarkview.cpp

@@ -25,7 +25,7 @@
 
 #include <klineedit.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kpushbutton.h>
 #include <kurlrequester.h>

parts/documentation/contentsview.cpp

@@ -24,7 +24,7 @@
 
 #include <kdebug.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kdevpartcontroller.h>
 #include <kdevdocumentationplugin.h>

parts/documentation/docconfiglistview.cpp

@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "docconfiglistview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kdevdocumentationplugin.h"
 

parts/documentation/documentation_part.cpp

@@ -32,7 +32,7 @@
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktrader.h>
 #include <kdebug.h>
 #include <tdeparts/componentfactory.h>

parts/documentation/documentation_widget.cpp

@@ -26,7 +26,7 @@
 #include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>

parts/documentation/docutils.cpp

@@ -24,7 +24,7 @@
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstringhandler.h>
 
 #include <kdevpartcontroller.h>

parts/documentation/find_documentation.cpp

@@ -39,7 +39,7 @@
 #include "docutils.h"
 #include "contentsview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 FindDocumentation::FindDocumentation(DocumentationWidget* parent, const char* name)
     :FindDocumentationBase(parent, name),

parts/documentation/find_documentation_options.cpp

@@ -23,7 +23,7 @@
 #include <tqcheckbox.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tdeconfig.h>
 #include <tdeapplication.h>

parts/documentation/indexview.cpp

@@ -26,7 +26,7 @@
 
 #include <klineedit.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kdebug.h>
 

parts/documentation/interfaces/kdevdocumentationplugin.cpp

@@ -29,7 +29,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 //class DocumentationItem
 

parts/documentation/plugins/chm/docchmplugin.cpp

@@ -22,7 +22,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <tdeio/netaccess.h>
 #include <iostream>

parts/documentation/plugins/custom/doccustomplugin.cpp

@@ -22,7 +22,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 
 #include <kdevgenericfactory.h>

parts/documentation/plugins/devhelp/docdevhelpplugin.cpp

@@ -29,7 +29,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <kdevgenericfactory.h>

parts/documentation/plugins/djvu/docdjvuplugin.cpp

@@ -22,7 +22,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 
 #include <kdevgenericfactory.h>

parts/documentation/plugins/doxygen/docdoxygenplugin.cpp

@@ -31,7 +31,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <urlutil.h>

parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp

@@ -29,7 +29,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kstandarddirs.h>
 

parts/documentation/plugins/pdb/docpdbplugin.cpp

@@ -22,7 +22,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 
 #include <kdevgenericfactory.h>

parts/documentation/plugins/pdf/docpdfplugin.cpp

@@ -22,7 +22,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 
 #include <kdevgenericfactory.h>

parts/documentation/plugins/qt/docqtplugin.cpp

@@ -28,7 +28,7 @@
 #include <kurl.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 
 #include <urlutil.h>

parts/documentation/protocols/chm/chm.cpp

@@ -27,10 +27,10 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kurl.h>
 #include <kmimemagic.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include "chm.h"
 

parts/documentation/protocols/chm/kchmpart.cpp

@@ -18,9 +18,9 @@
 #include <tqstring.h>
 
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeaboutdata.h>
 

parts/documentation/searchview.cpp

@@ -34,13 +34,13 @@
 #include <tdelistview.h>
 #include <klineedit.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kprocess.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include <kdevpartcontroller.h>

parts/documentation/tools/htdig/htdigindex.cpp

@@ -29,9 +29,9 @@
 #include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
 #include <tdeversion.h>

parts/doxygen/doxygenconfigwidget.cpp

@@ -18,9 +18,9 @@
 #include <tqwhatsthis.h>
 #include <tqtextstream.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "config.h"
 #include "input.h"

parts/doxygen/doxygenpart.cpp

@@ -26,10 +26,10 @@
 #include <domutil.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdemainwindow.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/document.h>

parts/doxygen/input.cpp

@@ -18,9 +18,9 @@
 #include <tqpushbutton.h>
 #include <tqspinbox.h>
 #include <tqtooltip.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include "input.h"

parts/doxygen/messages.cpp

@@ -2,7 +2,7 @@
 
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 static TQMap<TQCString,TQString> sMessages;

parts/filecreate/addglobaldlg.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './addglobaldlg.ui'
 **
@@ -18,7 +18,7 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 /*
  *  Constructs a AddGlobalDlg as a child of 'parent', with the

parts/filecreate/fcconfigwidget.cpp

@@ -24,8 +24,8 @@
 #include <tdeio/netaccess.h>
 #include <kurlrequester.h>
 #include <kicondialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
 

parts/filecreate/filecreate_listitem.cpp

@@ -12,7 +12,7 @@
 
 #include "filecreate_listitem.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include <tqsimplerichtext.h>

parts/filecreate/filecreate_newfile.cpp

@@ -22,9 +22,9 @@
 #include <klineedit.h>
 #include <kurlrequester.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 namespace FileCreate {

parts/filecreate/filecreate_part.cpp

@@ -18,7 +18,7 @@
 
 #include <tdeversion.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
@@ -28,7 +28,7 @@
 #include <tdeapplication.h>
 #include <tdeactionclasses.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kdevcore.h"
 #include "kdevmainwindow.h"

parts/filecreate/filecreate_widget2.cpp

@@ -17,7 +17,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kdevcore.h>
 

parts/filecreate/filecreate_widget3.cpp

@@ -16,7 +16,7 @@
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdevcore.h>
 

parts/filelist/filelist_widget.cpp

@@ -18,7 +18,7 @@
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 
 #include <kdevcore.h>

parts/filelist/projectviewpart.cpp

@@ -38,11 +38,11 @@
 
 #include <tdemainwindow.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdetexteditor/encodinginterface.h>
 #include <tdeparts/part.h>

parts/fileselector/fileselector_part.cpp

@@ -7,16 +7,16 @@
 #include <tqvbox.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <ktextbrowser.h>
 #include <tdeconfig.h>
 #include <tdefileitem.h>
 #include <kdevgenericfactory.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <kdevapi.h>
 #include <kdevcore.h>

parts/fileselector/fileselector_widget.cpp

@@ -57,10 +57,10 @@
 #include <kurlcompletion.h>
 #include <kprotocolinfo.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdetoolbarbutton.h>
 #include <tqtoolbar.h>
 #include <tdepopupmenu.h>

parts/fileselector/fileselector_widget.h

@@ -27,7 +27,7 @@
 #include <kurl.h>
 #include <tdetoolbar.h>
 #include <tqframe.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 
 class KDevMainWindow;
 class KDevPartController;

parts/fileselector/kbookmarkhandler.cpp

@@ -28,7 +28,7 @@
 #include <tdepopupmenu.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <tdeaction.h>
 
 #include "kbookmarkhandler.h"

parts/fileselector/tdeactionselector.cpp

@@ -19,7 +19,7 @@
 
 #include "tdeactionselector.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdialog.h> // for spacingHint()
 #include <kdebug.h>

parts/fileview/addfilegroupdlg.cpp

@@ -13,7 +13,7 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <kbuttonbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 

parts/fileview/filegroupsconfigwidget.cpp

@@ -13,7 +13,7 @@
 
 #include <tqlistview.h>
 #include <knotifyclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "domutil.h"
 #include "addfilegroupdlg.h"

parts/fileview/filegroupspart.cpp

@@ -18,7 +18,7 @@
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdialogbase.h>
 

parts/fileview/filegroupswidget.cpp

@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kxmlguiclient.h>
 #include <tdeaction.h>

parts/fileview/filetreeviewwidgetimpl.cpp

@@ -13,7 +13,7 @@
 #include <kxmlguiclient.h>
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeversion.h>
 
 #include <kdevproject.h>

parts/fileview/filetreewidget.cpp

@@ -20,7 +20,7 @@
 #include <tqcolor.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <tdefileitem.h>
 #include <kurl.h>

parts/fileview/fileviewpart.cpp

@@ -22,7 +22,7 @@
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdialogbase.h>
 

parts/fileview/partwidget.cpp

@@ -20,7 +20,7 @@
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kdevversioncontrol.h"
 #include "kdevcore.h"

parts/fileview/vcsfiletreewidgetimpl.cpp

@@ -14,7 +14,7 @@
 #include <tqpopupmenu.h>
 #include <kxmlguiclient.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 

parts/filter/filterpart.cpp

@@ -13,7 +13,7 @@
 
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/selectioninterface.h>

parts/filter/shellfilterdlg.cpp

@@ -17,8 +17,8 @@
 #include <kbuttonbox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>

parts/filter/shellinsertdlg.cpp

@@ -17,8 +17,8 @@
 #include <tdeconfig.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <klineedit.h>
 #include <kstdguiitem.h>

parts/fullscreen/fullscreen_part.cpp

@@ -10,11 +10,11 @@
  ***************************************************************************/
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kstdaction.h>
 #include <tdemainwindow.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 
 #include <kdevcore.h>
 #include <kdevmainwindow.h>

parts/grepview/grepdlg.cpp

@@ -23,9 +23,9 @@
 #include <kpushbutton.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <tqlabel.h>

parts/grepview/grepviewpart.cpp

@@ -15,7 +15,7 @@
 #include <tqvbox.h>
 #include <tqwhatsthis.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>

parts/grepview/grepviewwidget.cpp

@@ -15,7 +15,7 @@
 #include <tqpainter.h>
 #include <tqtoolbutton.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/selectioninterface.h>
@@ -24,7 +24,7 @@
 #include <ktabwidget.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 using namespace KTextEditor;
 
 #include "kdevcore.h"

parts/konsole/konsoleviewpart.cpp

@@ -15,7 +15,7 @@
 
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kdevcore.h"
 #include "kdevproject.h"

parts/outputviews/appoutputviewpart.cpp

@@ -14,7 +14,7 @@
 #include <tqwhatsthis.h>
 #include <tqdir.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kiconloader.h>
 #include <tdeparts/part.h>

parts/outputviews/appoutputwidget.cpp

@@ -22,7 +22,7 @@
 #include <tqtextstream.h>
 #include <tqclipboard.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstatusbar.h>
 #include <tdeapplication.h>

parts/outputviews/makeactionfilter.cpp

@@ -16,7 +16,7 @@
 #include "makeactionfilter.moc"
 #include "makeitem.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 //#define DEBUG
 

parts/outputviews/makeitem.cpp

@@ -14,7 +14,7 @@
 #include <tqstylesheet.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "tdetexteditor/cursorinterface.h"
 

parts/outputviews/makeviewpart.cpp

@@ -14,7 +14,7 @@
 #include <tqwhatsthis.h>
 #include <tqdir.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kiconloader.h>
 #include <kdevgenericfactory.h>

parts/outputviews/makewidget.cpp

@@ -23,10 +23,10 @@
 #include "urlutil.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 #include <kprocess.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kinstance.h>
 #include <kstatusbar.h>

parts/partexplorer/partexplorer_plugin.cpp

@@ -12,7 +12,7 @@
 #include "partexplorer_plugin.h"
 
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
 #include <tdeaction.h>

parts/partexplorer/partexplorerform.cpp

@@ -18,8 +18,8 @@
 #include <tqlabel.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kcombobox.h>
 #include <kservicetype.h> 

parts/quickopen/quickopen_part.cpp

@@ -25,7 +25,7 @@
 
 #include <tdeaction.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>

parts/quickopen/quickopenclassdialog.cpp

@@ -23,7 +23,7 @@
 #include <kdevlanguagesupport.h>
 
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcompletion.h>
 #include <klineedit.h>

parts/quickopen/quickopenfiledialog.cpp

@@ -23,7 +23,7 @@
 
 
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcompletion.h>
 #include <klineedit.h>

parts/quickopen/quickopenfunctionchooseform.cpp

@@ -19,7 +19,7 @@
  */
 
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kdebug.h>
 #include <ksqueezedtextlabel.h>

parts/quickopen/quickopenfunctiondialog.cpp

@@ -18,14 +18,14 @@
  *
  */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqvaluelist.h>
 
 #include <kcompletion.h>
 #include <kdebug.h>
 #include <tdelistbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 
 #include <kdevplugin.h>

parts/regexptest/regexptestdlg.cpp

@@ -24,8 +24,8 @@
 #include <tdeversion.h>
 #include <kregexp.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdetexteditor/editinterface.h>

parts/regexptest/regexptestpart.cpp

@@ -11,7 +11,7 @@
 
 #include "regexptestpart.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
 #include <tdeaction.h>

parts/replace/replace_part.cpp

@@ -14,7 +14,7 @@
 
 #include <tdeaction.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
 #include <kdebug.h>

parts/replace/replace_widget.cpp

@@ -32,7 +32,7 @@
 #include <kdevproject.h>
 #include <kdevpartcontroller.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 
 #include <tqlayout.h>

parts/scripting/scriptingpart.cpp

@@ -24,11 +24,11 @@
 #include <tqpopupmenu.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdevplugininfo.h>
 #include <kdevgenericfactory.h>
 

parts/snippet/snippet_part.cpp

@@ -11,7 +11,7 @@
 
 #include <tdeaction.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tqvbox.h>
 #include <kdialogbase.h>

parts/snippet/snippet_widget.cpp

@@ -10,14 +10,14 @@
 #include <klibloader.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <kpushbutton.h>
 #include <tdelistview.h>
 #include <tqheader.h>
 #include <klineedit.h>
 #include <ktextedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqsplitter.h>
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/editor.h>

parts/snippet/snippetdlg.ui.h

@@ -13,7 +13,7 @@
 ** init() function in place of a constructor, and a destroy() function in
 ** place of a destructor.
 *****************************************************************************/
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 void SnippetDlg::slotHelp()
 {

parts/snippet/snippetitem.h

@@ -10,7 +10,7 @@
 #define SNIPPETITEM_H
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class TQString;
 

parts/texttools/texttoolspart.cpp

@@ -13,7 +13,7 @@
 
 #include <tqwhatsthis.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
 #include <tdetexteditor/editinterface.h>

parts/texttools/texttoolswidget.cpp

@@ -15,7 +15,7 @@
 #include <tqregexp.h>
 #include <tqtimer.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <tdepopupmenu.h>
 #include <tdetexteditor/viewcursorinterface.h>

parts/tipofday/tipofday_part.cpp

@@ -11,7 +11,7 @@
 #include <kdevgenericfactory.h>
 #include <kdevplugininfo.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <ktextbrowser.h>
 #include <ktip.h>

parts/tools/kapplicationtree.cpp

@@ -38,9 +38,9 @@
 #include <kcombobox.h>
 #include <kdesktopfile.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kmimemagic.h>
 #include <krun.h>

parts/tools/tools_part.cpp

@@ -14,7 +14,7 @@
 #include <kdesktopfile.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <kprocess.h>
 #include <tdetexteditor/document.h>

parts/tools/toolsconfig.cpp

@@ -11,7 +11,7 @@
 #include <kdesktopfile.h>
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "tools_part.h"
 #include "kapplicationtree.h"

parts/tools/toolsconfigwidget.cpp

@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <kdesktopfile.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <kurldrag.h>
 

parts/uimode/uichooser_part.cpp

@@ -5,7 +5,7 @@
 #include <kdialogbase.h>
 #include <kdevgenericfactory.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevcore.h>
 #include <configwidgetproxy.h>
 #include <kdevplugininfo.h>

parts/valgrind/valgrind_dialog.cpp

@@ -4,11 +4,11 @@
 #include <tqwidgetstack.h>
 
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <klineedit.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "dialog_widget.h"
 #include "valgrind_dialog.h"

parts/valgrind/valgrind_part.cpp

@@ -5,11 +5,11 @@
 #include <tqfile.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <tdeaction.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
 

parts/valgrind/valgrind_widget.cpp

@@ -7,7 +7,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 
 #include <kdevcore.h>

parts/vcsmanager/vcsmanagerpart.cpp

@@ -24,11 +24,11 @@
 #include <tqpopupmenu.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdevplugininfo.h>
 #include <kdevgenericfactory.h>
 #include <kdebug.h>

parts/vcsmanager/vcsmanagerprojectconfig.cpp

@@ -21,7 +21,7 @@
 #include <tqstring.h>
 
 #include <ktrader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "domutil.h"
 

src/Mainpage.dox

@@ -20,7 +20,7 @@ Example:
     #include <tdeaboutdata.h>
     #include <tdeapplication.h>
     #include <tdecmdlineargs.h>
-    #include <klocale.h>
+    #include <tdelocale.h>
     #include <dcopclient.h>
     
     #include <splashscreen.h>

src/core.cpp

@@ -8,7 +8,7 @@
 #include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeactioncollection.h>
 
 #include "toplevel.h"

src/editorproxy.cpp

@@ -20,7 +20,7 @@
 #include <kxmlguifactory.h>
 #include <tdemainwindow.h>
 #include <tdeactioncollection.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdestdaccel.h>
 
 #include "toplevel.h"

src/generalinfowidget.cpp

@@ -16,11 +16,11 @@
 #include <tqdir.h>
 
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kcharsets.h>
 #include <tqregexp.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "generalinfowidget.h"
 #include "generalinfowidget.moc"

src/kdevideextension.cpp

@@ -26,7 +26,7 @@
 #include <tqcombobox.h>
 #include <klineedit.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>

src/languageselectwidget.cpp

@@ -21,8 +21,8 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kservice.h>
 #include <ktrader.h>
 #include <tdeapplication.h>

src/main.cpp

@@ -3,7 +3,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>

src/main_assistant.cpp

@@ -3,7 +3,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>

src/mainwindowshare.cpp

@@ -27,13 +27,13 @@
 #include <tdeaboutdata.h>
 #include <kstdaction.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <tdeparts/mainwindow.h>
 #include <kdialogbase.h>
 #include <tdeconfig.h>
 #include <kkeydialog.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kedittoolbar.h>
 #include <kbugreport.h>
 #include <kurlrequester.h>

src/newui/button.cpp

@@ -31,7 +31,7 @@
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 

src/newui/buttonbar.cpp

@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "button.h"
 

src/newui/ddockwindow.cpp

@@ -28,10 +28,10 @@
 #include <tqpopupmenu.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 

src/partcontroller.cpp

@@ -17,8 +17,8 @@
 #include <tdeapplication.h>
 #include <krun.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeparts/part.h>
 #include <tdeparts/factory.h>
 #include <tdeparts/partmanager.h>
@@ -26,7 +26,7 @@
 #include <tdefiledialog.h>
 #include <tdemainwindow.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
 #include <tdehtml_part.h>
 #include <tdepopupmenu.h>

src/plugincontroller.cpp

@@ -6,9 +6,9 @@
 #include <klibloader.h>
 #include <kservice.h>
 #include <ktrader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
 #include <tdeparts/componentfactory.h>
 #include <assert.h>

src/profileengine/editor/profileeditor.cpp

@@ -28,10 +28,10 @@
 #include <tdelistbox.h>
 #include <tdelistview.h>
 #include <kcombobox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdialogbase.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeversion.h>
 
 #include <profile.h>

src/profileengine/lib/profileengine.cpp

@@ -22,7 +22,7 @@
 
 #include <kurl.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include <kdevplugin.h>

src/projectmanager.cpp

@@ -10,9 +10,9 @@
 
 class TQDomDocument;
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservice.h>
 #include <ktrader.h>
 #include <tdefiledialog.h>
@@ -22,11 +22,11 @@ class TQDomDocument;
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kprocess.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeio/netaccess.h>
-#include <ktempfile.h>
-#include <kmenubar.h>
+#include <tdetempfile.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <kiconloader.h>
 

src/projectsession.cpp

@@ -22,8 +22,8 @@
 
 #include <tdeparts/part.h>
 #include <kurl.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdetexteditor/document.h>

src/simplemainwindow.cpp

@@ -25,9 +25,9 @@
 #include <kstdaction.h>
 #include <tdeparts/part.h>
 #include <tdepopupmenu.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kedittoolbar.h>
 #include <tdetexteditor/view.h>

src/splashscreen.cpp

@@ -7,8 +7,8 @@
 #include <tqtimer.h>
 #include <tqfont.h>
 
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 
 KDevSplashScreen::KDevSplashScreen(const TQPixmap& pixmap, WFlags f) : TQSplashScreen(pixmap, f)
 {

src/statusbar.cpp

@@ -16,8 +16,8 @@
 #include <tqfontmetrics.h>
 
 #include <kdebug.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdeversion.h>

vcs/clearcase/clearcasepart.cpp

@@ -18,9 +18,9 @@
 #include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <kdevgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 
 #include "kdevcore.h"

vcs/clearcase/commentdlg.cpp

@@ -16,8 +16,8 @@
 #include <tqpushbutton.h>
 #include <tdeapplication.h>
 #include <kbuttonbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstdguiitem.h>
 
 CcaseCommentDlg::CcaseCommentDlg(bool bCheckin)

vcs/cvsservice/annotatedialog.cpp

@@ -13,8 +13,8 @@
 #include <tqdir.h>
 #include <tqstringlist.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <cvsjob_stub.h>

vcs/cvsservice/annotatepage.cpp

@@ -15,15 +15,15 @@
 #include <tqdatetime.h>
 #include <tqlabel.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <krfcdate.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <dcopref.h>
 #include <cvsjob_stub.h>

vcs/cvsservice/annotateview.cpp

@@ -18,9 +18,9 @@
 #include <tqheader.h>
 #include <tqdatetime.h>
 #include <tqpainter.h>
-#include <kglobalsettings.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "annotatepage.h"

vcs/cvsservice/changelog.cpp

@@ -13,7 +13,7 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 
-#include <kemailsettings.h>
+#include <tdeemailsettings.h>
 
 #include "changelog.h"
 

vcs/cvsservice/checkoutdialog.cpp

@@ -17,8 +17,8 @@
 
 #include <tdelistview.h>
 #include <kurlrequester.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kcursor.h>
 #include <kdebug.h>

vcs/cvsservice/commitdlg.cpp

@@ -19,8 +19,8 @@
 
 #include <tdeapplication.h>
 #include <kbuttonbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 
 #include "commitdlg.h"

vcs/cvsservice/cvsdiffpage.cpp

@@ -15,9 +15,9 @@
 #include <tqdir.h>
 #include <tqstringlist.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <cvsjob_stub.h>

vcs/cvsservice/cvslogdialog.cpp

@@ -14,9 +14,9 @@
 #include <tqdir.h>
 #include <tqstringlist.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <cvsjob_stub.h>

vcs/cvsservice/cvslogpage.cpp

@@ -15,9 +15,9 @@
 #include <tqdir.h>
 #include <tqstringlist.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <dcopref.h>
 

vcs/cvsservice/cvsoptions.cpp

@@ -14,7 +14,7 @@
 
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "domutil.h"
 #include "kdevproject.h"

vcs/cvsservice/cvspart.cpp

@@ -19,8 +19,8 @@
 
 #include <tdepopupmenu.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdialogbase.h>
 #include <kstandarddirs.h>
 #include <tdeaction.h>

vcs/cvsservice/cvspartimpl.cpp

@@ -15,10 +15,10 @@
 #include<tqcheckbox.h>
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <tdemainwindow.h>

vcs/cvsservice/cvsprocesswidget.cpp

@@ -15,8 +15,8 @@
 #include <dcopref.h>
 #include <kstatusbar.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "kdevpartcontroller.h"
 #include "kdevmainwindow.h"

vcs/cvsservice/diffdialog.cpp

@@ -13,7 +13,7 @@
 #include <tqradiobutton.h>
 
 #include "diffdialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqbuttongroup.h>
 
 ///////////////////////////////////////////////////////////////////////////////

vcs/cvsservice/diffwidget.cpp

@@ -17,13 +17,13 @@
 
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservice.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tdeparts/componentfactory.h>
 #include <tdeparts/part.h>

vcs/cvsservice/editorsdialog.cpp

@@ -9,9 +9,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <dcopref.h>
 

vcs/cvsservice/integrator/integratordlg.cpp

@@ -31,8 +31,8 @@
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kprocess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <klineedit.h>
 

vcs/perforce/commitdlg.cpp

@@ -19,9 +19,9 @@
 #include <tqregexp.h>
 #include <kprocess.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include <stdlib.h>

vcs/perforce/perforcepart.cpp

@@ -19,7 +19,7 @@
 #include <kdebug.h>
 #include <kdevgenericfactory.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kurl.h>

vcs/perforce/perforcepart.h

@@ -14,7 +14,7 @@
 #define _PERFORCEPART_H_
 
 #include <kdevversioncontrol.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class Context;
 class TQPopupMenu;

vcs/subversion/integrator/svnintegratordlg.cpp

@@ -30,8 +30,8 @@
 #include <tdeio/scheduler.h>
 #include <kprocess.h>
 #include <tdeversion.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tdeio/netaccess.h>

vcs/subversion/kdevsvnd.cpp

@@ -19,9 +19,9 @@
 */
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <ktextedit.h>
 #include <kpassdlg.h>

vcs/subversion/kdevsvnd_widgets.cpp

@@ -16,7 +16,7 @@
 #include <tqpushbutton.h>
 #include <tqlistview.h>
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 SvnSSLTrustPrompt::SvnSSLTrustPrompt( TQWidget* parent, const char* name, bool modal, WFlags f )
 	:SvnSSLTrustPromptBase( parent, name, modal, f )

vcs/subversion/subversion_core.cpp

@@ -37,14 +37,14 @@
 #include <tdemainwindow.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <tqtextcodec.h>
 #include <tqtextstream.h>
 #include <tqtextbrowser.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tqregexp.h>
 
 #include <tdeapplication.h>

vcs/subversion/subversion_fileinfo.cpp

@@ -30,7 +30,7 @@
 #include <tqregexp.h>
 
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 SVNFileInfoProvider::SVNFileInfoProvider(subversionPart *parent, const char *name)
     : KDevVCSFileInfoProvider( parent, "svnfileinfoprovider" ),

vcs/subversion/subversion_part.cpp

@@ -20,7 +20,7 @@
 
 #include <tqwhatsthis.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
@@ -52,7 +52,7 @@
 #include <tqwidget.h>
 #include <kdevplugininfo.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 using namespace SvnGlobal;
 

vcs/subversion/subversion_widget.cpp

@@ -25,7 +25,7 @@
 #include "subversion_part.h"
 #include "subversion_widget.h"
 #include <ktextedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqtoolbutton.h>
 #include <tqpushbutton.h>
 

vcs/subversion/svn_blamewidget.cpp

@@ -21,8 +21,8 @@
 #include <tqstringlist.h>
 #include <tqfont.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 SvnBlameWidget::SvnBlameWidget( TQWidget *parent, const char* name, bool modal, WFlags f )
 	:TQWidget( parent )

vcs/subversion/svn_fileselectdlg_commit.cpp

@@ -28,9 +28,9 @@
 #include <tqfileinfo.h>
 #include <tqcheckbox.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include "kdevmainwindow.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kdevproject.h>
 

vcs/subversion/svn_logviewwidget.cpp

@@ -24,9 +24,9 @@
 #include "subversion_global.h"
 #include <kdevproject.h>
 #include <ktextedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqradiobutton.h>
 #include <tqcombobox.h>
 #include <knuminput.h>

vcs/subversion/svn_tdeio.cpp

@@ -31,11 +31,11 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <ksock.h>
 #include <dcopclient.h>