Rename additional header files to avoid conflicts with KDE4

38 files changed, 40 insertions, 40 deletions

diff --git a/kdevdesigner/designer/actiondnd.cpp b/kdevdesigner/designer/actiondnd.cpp
index 51593ca0..33f0c4bf 100644
--- a/kdevdesigner/designer/actiondnd.cpp
+++ b/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;
 
diff --git a/kdevdesigner/designer/actioneditorimpl.cpp b/kdevdesigner/designer/actioneditorimpl.cpp
index 84514875..294507a9 100644
--- a/kdevdesigner/designer/actioneditorimpl.cpp
+++ b/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 ),
diff --git a/kdevdesigner/designer/actionlistview.cpp b/kdevdesigner/designer/actionlistview.cpp
index 3bce8872..3e8c95c2 100644
--- a/kdevdesigner/designer/actionlistview.cpp
+++ b/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 )
diff --git a/kdevdesigner/designer/command.cpp b/kdevdesigner/designer/command.cpp
index 71707900..b9b97827 100644
--- a/kdevdesigner/designer/command.cpp
+++ b/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 )
diff --git a/kdevdesigner/designer/connectiontable.cpp b/kdevdesigner/designer/connectiontable.cpp
index 2448f92d..834fdc96 100644
--- a/kdevdesigner/designer/connectiontable.cpp
+++ b/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 )
diff --git a/kdevdesigner/designer/customwidgeteditorimpl.cpp b/kdevdesigner/designer/customwidgeteditorimpl.cpp
index f923f604..f417f6f2 100644
--- a/kdevdesigner/designer/customwidgeteditorimpl.cpp
+++ b/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 )
diff --git a/kdevdesigner/designer/dbconnectionsimpl.cpp b/kdevdesigner/designer/dbconnectionsimpl.cpp
index b5b4409f..e589679b 100644
--- a/kdevdesigner/designer/dbconnectionsimpl.cpp
+++ b/kdevdesigner/designer/dbconnectionsimpl.cpp
@@ -40,7 +40,7 @@
 #include "mainwindow.h"
 #include "asciivalidator.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static bool blockChanges = FALSE;
 
diff --git a/kdevdesigner/designer/editfunctionsimpl.cpp b/kdevdesigner/designer/editfunctionsimpl.cpp
index 1f39da2c..5681f00b 100644
--- a/kdevdesigner/designer/editfunctionsimpl.cpp
+++ b/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 )
diff --git a/kdevdesigner/designer/formfile.cpp b/kdevdesigner/designer/formfile.cpp
index c893b42f..4ba5b7c7 100644
--- a/kdevdesigner/designer/formfile.cpp
+++ b/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 )
diff --git a/kdevdesigner/designer/formwindow.cpp b/kdevdesigner/designer/formwindow.cpp
index b4e681da..4e5bc09d 100644
--- a/kdevdesigner/designer/formwindow.cpp
+++ b/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>
diff --git a/kdevdesigner/designer/hierarchyview.cpp b/kdevdesigner/designer/hierarchyview.cpp
index a5357072..c6433cd0 100644
--- a/kdevdesigner/designer/hierarchyview.cpp
+++ b/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>
diff --git a/kdevdesigner/designer/iconvieweditorimpl.cpp b/kdevdesigner/designer/iconvieweditorimpl.cpp
index a5781e89..32a81412 100644
--- a/kdevdesigner/designer/iconvieweditorimpl.cpp
+++ b/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 )
diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp
index 758dd1f4..ac966d00 100644
--- a/kdevdesigner/designer/kdevdesigner_part.cpp
+++ b/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;
diff --git a/kdevdesigner/designer/listboxeditorimpl.cpp b/kdevdesigner/designer/listboxeditorimpl.cpp
index db3ddcc8..01dfa64e 100644
--- a/kdevdesigner/designer/listboxeditorimpl.cpp
+++ b/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 )
diff --git a/kdevdesigner/designer/listvieweditorimpl.cpp b/kdevdesigner/designer/listvieweditorimpl.cpp
index bd6c0e64..c5ec7498 100644
--- a/kdevdesigner/designer/listvieweditorimpl.cpp
+++ b/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 )
diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp
index 062ef52b..3d900532 100644
--- a/kdevdesigner/designer/mainwindow.cpp
+++ b/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>
diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp
index 17583ecf..7fa1d1f7 100644
--- a/kdevdesigner/designer/mainwindowactions.cpp
+++ b/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>
diff --git a/kdevdesigner/designer/menubareditor.cpp b/kdevdesigner/designer/menubareditor.cpp
index 0618b078..f62e15e0 100644
--- a/kdevdesigner/designer/menubareditor.cpp
+++ b/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 );
 
diff --git a/kdevdesigner/designer/multilineeditorimpl.cpp b/kdevdesigner/designer/multilineeditorimpl.cpp
index c883da66..ef06f77b 100644
--- a/kdevdesigner/designer/multilineeditorimpl.cpp
+++ b/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,
diff --git a/kdevdesigner/designer/newformimpl.cpp b/kdevdesigner/designer/newformimpl.cpp
index e6bfbfec..0cdc738b 100644
--- a/kdevdesigner/designer/newformimpl.cpp
+++ b/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>
diff --git a/kdevdesigner/designer/outputwindow.cpp b/kdevdesigner/designer/outputwindow.cpp
index c38483a8..a23c14a7 100644
--- a/kdevdesigner/designer/outputwindow.cpp
+++ b/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;
diff --git a/kdevdesigner/designer/pixmapcollectioneditor.ui.h b/kdevdesigner/designer/pixmapcollectioneditor.ui.h
index c999d539..82bd7929 100644
--- a/kdevdesigner/designer/pixmapcollectioneditor.ui.h
+++ b/kdevdesigner/designer/pixmapcollectioneditor.ui.h
@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 /**********************************************************************
 ** Copyright (C) 2001-2002 Trolltech AS.  All rights reserved.
 **
diff --git a/kdevdesigner/designer/popupmenueditor.cpp b/kdevdesigner/designer/popupmenueditor.cpp
index ab6e6d97..da6289dd 100644
--- a/kdevdesigner/designer/popupmenueditor.cpp
+++ b/kdevdesigner/designer/popupmenueditor.cpp
@@ -47,7 +47,7 @@
 #include "popupmenueditor.h"
 #include "menubareditor.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Drag Object Declaration -------------------------------------------
 
diff --git a/kdevdesigner/designer/project.cpp b/kdevdesigner/designer/project.cpp
index 23bcbfe2..0ab26894 100644
--- a/kdevdesigner/designer/project.cpp
+++ b/kdevdesigner/designer/project.cpp
@@ -59,7 +59,7 @@
 # include <unistd.h>
 #endif
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #ifndef TQT_NO_SQL
 DatabaseConnection::~DatabaseConnection()
diff --git a/kdevdesigner/designer/projectsettingsimpl.cpp b/kdevdesigner/designer/projectsettingsimpl.cpp
index ca6c34ea..99bb800d 100644
--- a/kdevdesigner/designer/projectsettingsimpl.cpp
+++ b/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>
diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp
index 2f2d1221..e7a5d387 100644
--- a/kdevdesigner/designer/propertyeditor.cpp
+++ b/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>
diff --git a/kdevdesigner/designer/resource.cpp b/kdevdesigner/designer/resource.cpp
index 02b50684..a6285db5 100644
--- a/kdevdesigner/designer/resource.cpp
+++ b/kdevdesigner/designer/resource.cpp
@@ -83,7 +83,7 @@
 
 #include <kiconloader.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kdevdesigner_part.h"
 
diff --git a/kdevdesigner/designer/sizehandle.cpp b/kdevdesigner/designer/sizehandle.cpp
index f9daaefc..d60f223b 100644
--- a/kdevdesigner/designer/sizehandle.cpp
+++ b/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 )
diff --git a/kdevdesigner/designer/sourcefile.cpp b/kdevdesigner/designer/sourcefile.cpp
index 9713fed9..3d848bbf 100644
--- a/kdevdesigner/designer/sourcefile.cpp
+++ b/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 ),
diff --git a/kdevdesigner/designer/startdialogimpl.cpp b/kdevdesigner/designer/startdialogimpl.cpp
index b6f62ad2..adff44fd 100644
--- a/kdevdesigner/designer/startdialogimpl.cpp
+++ b/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 )
diff --git a/kdevdesigner/designer/tableeditorimpl.cpp b/kdevdesigner/designer/tableeditorimpl.cpp
index 0013398c..060611f6 100644
--- a/kdevdesigner/designer/tableeditorimpl.cpp
+++ b/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 ),
diff --git a/kdevdesigner/designer/variabledialogimpl.cpp b/kdevdesigner/designer/variabledialogimpl.cpp
index 82461e91..d2d7ef67 100644
--- a/kdevdesigner/designer/variabledialogimpl.cpp
+++ b/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 )
diff --git a/kdevdesigner/designer/widgetfactory.cpp b/kdevdesigner/designer/widgetfactory.cpp
index d27cfc30..9d04535a 100644
--- a/kdevdesigner/designer/widgetfactory.cpp
+++ b/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 )
 {
diff --git a/kdevdesigner/designer/wizardeditorimpl.cpp b/kdevdesigner/designer/wizardeditorimpl.cpp
index d791d783..c4c4f83d 100644
--- a/kdevdesigner/designer/wizardeditorimpl.cpp
+++ b/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 )
diff --git a/kdevdesigner/designer/workspace.cpp b/kdevdesigner/designer/workspace.cpp
index 5845e516..b806cc6c 100644
--- a/kdevdesigner/designer/workspace.cpp
+++ b/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 )
diff --git a/kdevdesigner/shared/widgetdatabase.cpp b/kdevdesigner/shared/widgetdatabase.cpp
index a8c7803b..be4b6091 100644
--- a/kdevdesigner/shared/widgetdatabase.cpp
+++ b/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;
diff --git a/kdevdesigner/src/kdevdesigner.cpp b/kdevdesigner/src/kdevdesigner.cpp
index fb90e0e0..f846e99b 100644
--- a/kdevdesigner/src/kdevdesigner.cpp
+++ b/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" )
diff --git a/kdevdesigner/src/main.cpp b/kdevdesigner/src/main.cpp
index b26498a6..fa850cf6 100644
--- a/kdevdesigner/src/main.cpp
+++ b/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[] =