Rename additional header files to avoid conflicts with KDE4

35 files changed, 46 insertions, 46 deletions

diff --git a/kexi/plugins/forms/kexidataprovider.cpp b/kexi/plugins/forms/kexidataprovider.cpp
index 35e51dc16..637c94346 100644
--- a/kexi/plugins/forms/kexidataprovider.cpp
+++ b/kexi/plugins/forms/kexidataprovider.cpp
@@ -23,7 +23,7 @@
 #include <tqobjectlist.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <widget/tableview/kexitableitem.h>
 #include <widget/tableview/kexitableviewdata.h>
diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp
index 6910bda95..54ecbb1d5 100644
--- a/kexi/plugins/forms/kexidatasourcepage.cpp
+++ b/kexi/plugins/forms/kexidatasourcepage.cpp
@@ -25,7 +25,7 @@
 #include <tqheader.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdetoolbarbutton.h>
 #include <kdebug.h>
 #include <tdepopupmenu.h>
diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp
index 9f63c09ca..1154e1107 100644
--- a/kexi/plugins/forms/kexidbfactory.cpp
+++ b/kexi/plugins/forms/kexidbfactory.cpp
@@ -25,7 +25,7 @@
 #include <tqstyle.h>
 
 #include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdeactioncollection.h>
diff --git a/kexi/plugins/forms/kexiformeventhandler.cpp b/kexi/plugins/forms/kexiformeventhandler.cpp
index 4d1f0ec76..aae999061 100644
--- a/kexi/plugins/forms/kexiformeventhandler.cpp
+++ b/kexi/plugins/forms/kexiformeventhandler.cpp
@@ -23,7 +23,7 @@
 #include <tqobjectlist.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tableview/kexitableitem.h>
 #include <tableview/kexitableviewdata.h>
diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp
index 9437facae..f4056728c 100644
--- a/kexi/plugins/forms/widgets/kexidbautofield.cpp
+++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp
@@ -28,7 +28,7 @@
 #include <tqapplication.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kexidbcheckbox.h"
 #include "kexidbimagebox.h"
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
index ed441d4fd..fb9636003 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
@@ -32,7 +32,7 @@
 
 #include <kdebug.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <kimageio.h>
@@ -40,7 +40,7 @@
 #include <kstaticdeleter.h>
 #include <kimageeffect.h>
 #include <tdestdaccel.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kguiitem.h>
 
 #include <widget/utils/kexidropdownbutton.h>
diff --git a/kexi/plugins/importexport/csv/kexicsvexport.cpp b/kexi/plugins/importexport/csv/kexicsvexport.cpp
index 2e49660d9..7b369c60e 100644
--- a/kexi/plugins/importexport/csv/kexicsvexport.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexport.cpp
@@ -34,7 +34,7 @@
 #include <tqgroupbox.h>
 #include <tqclipboard.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kactivelabel.h>
 #include <kpushbutton.h>
diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
index 070ea2349..104e43b39 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
@@ -34,7 +34,7 @@
 #include <tqgroupbox.h>
 #include <tqclipboard.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kactivelabel.h>
 #include <kpushbutton.h>
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index 2bbe979ca..941a7bd06 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -46,9 +46,9 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kcharsets.h>
 #include <knuminput.h>
diff --git a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
index 642c2b3a1..dce13f384 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
@@ -28,8 +28,8 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcombobox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
 
 KexiCSVImportOptions::KexiCSVImportOptions()
diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
index c0608072d..b1ee43668 100644
--- a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
@@ -23,7 +23,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kdialogbase.h>
 #include <kactivelabel.h>
diff --git a/kexi/plugins/macros/kexiactions/datatableaction.cpp b/kexi/plugins/macros/kexiactions/datatableaction.cpp
index 4e211a53d..6fa700c4d 100644
--- a/kexi/plugins/macros/kexiactions/datatableaction.cpp
+++ b/kexi/plugins/macros/kexiactions/datatableaction.cpp
@@ -27,7 +27,7 @@
 #include <core/keximainwindow.h>
 #include <core/kexiinternalpart.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace KexiMacro;
 
diff --git a/kexi/plugins/macros/kexiactions/executeaction.cpp b/kexi/plugins/macros/kexiactions/executeaction.cpp
index 7383b9a80..f34ca89cd 100644
--- a/kexi/plugins/macros/kexiactions/executeaction.cpp
+++ b/kexi/plugins/macros/kexiactions/executeaction.cpp
@@ -27,7 +27,7 @@
 #include <core/kexipart.h>
 #include <core/keximainwindow.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace KexiMacro;
 
diff --git a/kexi/plugins/macros/kexiactions/messageaction.cpp b/kexi/plugins/macros/kexiactions/messageaction.cpp
index f421abb58..bb588dee6 100644
--- a/kexi/plugins/macros/kexiactions/messageaction.cpp
+++ b/kexi/plugins/macros/kexiactions/messageaction.cpp
@@ -22,8 +22,8 @@
 
 #include <core/keximainwindow.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 using namespace KexiMacro;
diff --git a/kexi/plugins/macros/kexiactions/navigateaction.cpp b/kexi/plugins/macros/kexiactions/navigateaction.cpp
index 336039aea..5f10bd1ad 100644
--- a/kexi/plugins/macros/kexiactions/navigateaction.cpp
+++ b/kexi/plugins/macros/kexiactions/navigateaction.cpp
@@ -31,7 +31,7 @@
 #include <widget/kexidataawareview.h>
 #include <widget/tableview/kexidataawareobjectiface.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 using namespace KexiMacro;
diff --git a/kexi/plugins/macros/kexiactions/objectnamevariable.h b/kexi/plugins/macros/kexiactions/objectnamevariable.h
index 03545f695..da94c8c51 100644
--- a/kexi/plugins/macros/kexiactions/objectnamevariable.h
+++ b/kexi/plugins/macros/kexiactions/objectnamevariable.h
@@ -30,7 +30,7 @@
 #include <core/kexipartmanager.h>
 #include <core/kexipartinfo.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace KexiMacro {
 
diff --git a/kexi/plugins/macros/kexiactions/objectvariable.h b/kexi/plugins/macros/kexiactions/objectvariable.h
index 65def3aa3..0fb2dd4d1 100644
--- a/kexi/plugins/macros/kexiactions/objectvariable.h
+++ b/kexi/plugins/macros/kexiactions/objectvariable.h
@@ -31,7 +31,7 @@
 #include <core/kexipartmanager.h>
 #include <core/kexipartinfo.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 namespace KexiMacro {
diff --git a/kexi/plugins/macros/kexiactions/openaction.cpp b/kexi/plugins/macros/kexiactions/openaction.cpp
index f5206ff5d..0a41b6444 100644
--- a/kexi/plugins/macros/kexiactions/openaction.cpp
+++ b/kexi/plugins/macros/kexiactions/openaction.cpp
@@ -27,7 +27,7 @@
 #include <core/kexipart.h>
 #include <core/keximainwindow.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace KexiMacro;
 
diff --git a/kexi/plugins/macros/kexipart/keximacroerror.h b/kexi/plugins/macros/kexipart/keximacroerror.h
index 6a9d2964b..a953f0d9e 100644
--- a/kexi/plugins/macros/kexipart/keximacroerror.h
+++ b/kexi/plugins/macros/kexipart/keximacroerror.h
@@ -27,9 +27,9 @@
 #include <tqpushbutton.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include "../lib/context.h"
diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
index 07c8f8e15..c87cb5b4d 100644
--- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
@@ -24,7 +24,7 @@
 
 #include <kcombobox.h>
 #include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
diff --git a/kexi/plugins/macros/tests/komacrotest.cpp b/kexi/plugins/macros/tests/komacrotest.cpp
index c1754ef34..f05f8290d 100644
--- a/kexi/plugins/macros/tests/komacrotest.cpp
+++ b/kexi/plugins/macros/tests/komacrotest.cpp
@@ -19,7 +19,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeunittest/runner.h>
 
 static const char description[] =
diff --git a/kexi/plugins/macros/tests/komacrotestgui.cpp b/kexi/plugins/macros/tests/komacrotestgui.cpp
index f0bc50c18..ea4bbb9c7 100644
--- a/kexi/plugins/macros/tests/komacrotestgui.cpp
+++ b/kexi/plugins/macros/tests/komacrotestgui.cpp
@@ -19,7 +19,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "tdeunittest/runnergui.h"
 
diff --git a/kexi/plugins/macros/tests/testaction.cpp b/kexi/plugins/macros/tests/testaction.cpp
index 4e7bb67b0..3e4d28162 100644
--- a/kexi/plugins/macros/tests/testaction.cpp
+++ b/kexi/plugins/macros/tests/testaction.cpp
@@ -25,7 +25,7 @@
 #include "../lib/macroitem.h"
 #include "../lib/variable.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 using namespace KoMacroTest;
diff --git a/kexi/plugins/queries/kexiaddparamdialog.cpp b/kexi/plugins/queries/kexiaddparamdialog.cpp
index 9b7f5db94..0b117d845 100644
--- a/kexi/plugins/queries/kexiaddparamdialog.cpp
+++ b/kexi/plugins/queries/kexiaddparamdialog.cpp
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <tqvbox.h>
diff --git a/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp b/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp
index 555a84cff..82bd2fe25 100644
--- a/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp
+++ b/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp
@@ -22,7 +22,7 @@
 #include "kexidynamicqueryparameterdialog.moc"
 
 #include <tqvbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqlineedit.h>
 #include <tqobjectlist.h>
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
index 9a6f32057..45ea8e1d4 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
@@ -26,8 +26,8 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <kexidb/field.h>
 #include <kexidb/queryschema.h>
diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp
index 0f39cb59e..39e36bbb7 100644
--- a/kexi/plugins/queries/kexiquerydesignersql.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersql.cpp
@@ -26,7 +26,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 
 #include <kexiutils/utils.h>
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
index 3328e42fc..c528540a7 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
@@ -23,10 +23,10 @@
 #include <tqregexp.h>
 
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeapplication.h>
 
 #include "kexiquerydesignersqlhistory.h"
diff --git a/kexi/plugins/relations/kexirelationmaindlg.cpp b/kexi/plugins/relations/kexirelationmaindlg.cpp
index affc1214a..4c77b6dde 100644
--- a/kexi/plugins/relations/kexirelationmaindlg.cpp
+++ b/kexi/plugins/relations/kexirelationmaindlg.cpp
@@ -19,7 +19,7 @@
 
 #include "kexirelationmaindlg.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 
diff --git a/kexi/plugins/reports/kexireportfactory.cpp b/kexi/plugins/reports/kexireportfactory.cpp
index cf54b2545..35036222e 100644
--- a/kexi/plugins/reports/kexireportfactory.cpp
+++ b/kexi/plugins/reports/kexireportfactory.cpp
@@ -20,7 +20,7 @@
 #include <tqvaluevector.h>
 
 #include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <klineedit.h>
diff --git a/kexi/plugins/tables/kexilookupcolumnpage.cpp b/kexi/plugins/tables/kexilookupcolumnpage.cpp
index 143a03921..f718efd0c 100644
--- a/kexi/plugins/tables/kexilookupcolumnpage.cpp
+++ b/kexi/plugins/tables/kexilookupcolumnpage.cpp
@@ -25,7 +25,7 @@
 #include <tqheader.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdetoolbarbutton.h>
 #include <kdebug.h>
 #include <tdepopupmenu.h>
diff --git a/kexi/plugins/tables/kexitabledesignercommands.cpp b/kexi/plugins/tables/kexitabledesignercommands.cpp
index 4f6c9ff9b..843a9a133 100644
--- a/kexi/plugins/tables/kexitabledesignercommands.cpp
+++ b/kexi/plugins/tables/kexitabledesignercommands.cpp
@@ -24,9 +24,9 @@
 #include <tqmetaobject.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaccelmanager.h>
 
 #include <koproperty/property.h>
diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp
index 514be26a6..df715cbe1 100644
--- a/kexi/plugins/tables/kexitabledesignerview.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview.cpp
@@ -28,10 +28,10 @@
 
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconeffect.h>
 
 #include <koproperty/set.h>
diff --git a/kexi/plugins/tables/kexitabledesignerview_p.cpp b/kexi/plugins/tables/kexitabledesignerview_p.cpp
index 761107c24..7e5521e32 100644
--- a/kexi/plugins/tables/kexitabledesignerview_p.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview_p.cpp
@@ -26,10 +26,10 @@
 
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <koproperty/set.h>
 
diff --git a/kexi/plugins/tables/kexitablepart.cpp b/kexi/plugins/tables/kexitablepart.cpp
index 07541f4d9..5b8538a7e 100644
--- a/kexi/plugins/tables/kexitablepart.cpp
+++ b/kexi/plugins/tables/kexitablepart.cpp
@@ -23,7 +23,7 @@
 
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ktabwidget.h>
 #include <kiconloader.h>