Rename additional header files to avoid conflicts with KDE4

20 files changed, 30 insertions, 30 deletions

diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp
index 29cbfcaa..338cb08c 100644
--- a/kexi/formeditor/commands.cpp
+++ b/kexi/formeditor/commands.cpp
@@ -25,9 +25,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 "formIO.h"
diff --git a/kexi/formeditor/connectiondialog.cpp b/kexi/formeditor/connectiondialog.cpp
index 0e59a08f..8376beb7 100644
--- a/kexi/formeditor/connectiondialog.cpp
+++ b/kexi/formeditor/connectiondialog.cpp
@@ -27,9 +27,9 @@
 
 #include <kpushbutton.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kexitableview.h"
 #include "kexitableviewdata.h"
diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp
index 3f7d201b..a785893f 100644
--- a/kexi/formeditor/container.cpp
+++ b/kexi/formeditor/container.cpp
@@ -27,7 +27,7 @@
 #include <tqcursor.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 
 #include <cstdlib> // for abs()
diff --git a/kexi/formeditor/editlistviewdialog.cpp b/kexi/formeditor/editlistviewdialog.cpp
index eca07032..44bc8096 100644
--- a/kexi/formeditor/editlistviewdialog.cpp
+++ b/kexi/formeditor/editlistviewdialog.cpp
@@ -24,7 +24,7 @@
 #include <tdelistbox.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <koproperty/editor.h>
 #include <koproperty/set.h>
diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp
index 81360927..18ce167c 100644
--- a/kexi/formeditor/factories/containerfactory.cpp
+++ b/kexi/formeditor/factories/containerfactory.cpp
@@ -42,7 +42,7 @@
 #include <kgenericfactory.h>
 #include <ktextedit.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 
diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp
index ebc9606f..c5a4a5cb 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.cpp
+++ b/kexi/formeditor/factories/stdwidgetfactory.cpp
@@ -31,7 +31,7 @@
 #include <kprogress.h>
 #include <kiconloader.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 
diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp
index 1e185d6d..b52c2087 100644
--- a/kexi/formeditor/form.cpp
+++ b/kexi/formeditor/form.cpp
@@ -25,10 +25,10 @@
 #include <tqptrdict.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcommand.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "container.h"
 #include "objecttree.h"
diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp
index 264b3bad..3d6fc8ca 100644
--- a/kexi/formeditor/formIO.cpp
+++ b/kexi/formeditor/formIO.cpp
@@ -34,7 +34,7 @@
 #include <tqpainter.h>
 
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcommand.h>
 #include <tdeaccelmanager.h>
 
diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index 9ab98f4a..25f13b97 100644
--- a/kexi/formeditor/formmanager.cpp
+++ b/kexi/formeditor/formmanager.cpp
@@ -31,20 +31,20 @@
 #include <tqvaluevector.h>
 #include <tqvbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 #include <kstdaction.h>
 #include <tdeaction.h>
 #include <kxmlguiclient.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <tdestyle.h>
 #include <tdeactionclasses.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kdialogbase.h>
 #include <ktextedit.h>
 #include <ktabwidget.h>
diff --git a/kexi/formeditor/objecttreeview.cpp b/kexi/formeditor/objecttreeview.cpp
index e668aa48..22434c87 100644
--- a/kexi/formeditor/objecttreeview.cpp
+++ b/kexi/formeditor/objecttreeview.cpp
@@ -22,7 +22,7 @@
 #include <tqpainter.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "objecttree.h"
 #include "form.h"
diff --git a/kexi/formeditor/resizehandle.cpp b/kexi/formeditor/resizehandle.cpp
index bdd0e3b0..1c3ad69d 100644
--- a/kexi/formeditor/resizehandle.cpp
+++ b/kexi/formeditor/resizehandle.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqpainter.h>
 #include <tqcursor.h>
diff --git a/kexi/formeditor/richtextdialog.cpp b/kexi/formeditor/richtextdialog.cpp
index 291b96dc..9fde7052 100644
--- a/kexi/formeditor/richtextdialog.cpp
+++ b/kexi/formeditor/richtextdialog.cpp
@@ -23,7 +23,7 @@
 #include <kcolorcombo.h>
 #include <tdetoolbarradiogroup.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "richtextdialog.h"
 
diff --git a/kexi/formeditor/tabstopdialog.cpp b/kexi/formeditor/tabstopdialog.cpp
index f28c8e2a..bbc34098 100644
--- a/kexi/formeditor/tabstopdialog.cpp
+++ b/kexi/formeditor/tabstopdialog.cpp
@@ -23,7 +23,7 @@
 
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 #include "form.h"
diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
index 4445e9ec..15bb1a2f 100644
--- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
@@ -28,7 +28,7 @@
 #include <tdeversion.h>
 #include <tdeaction.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <kstdaction.h>
@@ -36,7 +36,7 @@
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "form.h"
 #include "formIO.h"
diff --git a/kexi/formeditor/test/kfd_mainwindow.cpp b/kexi/formeditor/test/kfd_mainwindow.cpp
index d1a3edfd..455fd311 100644
--- a/kexi/formeditor/test/kfd_mainwindow.cpp
+++ b/kexi/formeditor/test/kfd_mainwindow.cpp
@@ -21,8 +21,8 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 #include "kfd_mainwindow.h"
diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp
index 649c2fe9..401bfd20 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -28,7 +28,7 @@
 #include <tdeversion.h>
 #include <tdeaction.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <kstdaction.h>
@@ -36,7 +36,7 @@
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "form.h"
 #include "formIO.h"
diff --git a/kexi/formeditor/test/main.cpp b/kexi/formeditor/test/main.cpp
index 3f0727b7..53aa5720 100644
--- a/kexi/formeditor/test/main.cpp
+++ b/kexi/formeditor/test/main.cpp
@@ -22,7 +22,7 @@
 #include <kiconloader.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char *description =
     I18N_NOOP("KFormDesigner");
diff --git a/kexi/formeditor/widgetfactory.cpp b/kexi/formeditor/widgetfactory.cpp
index 9537085e..b90193bc 100644
--- a/kexi/formeditor/widgetfactory.cpp
+++ b/kexi/formeditor/widgetfactory.cpp
@@ -27,7 +27,7 @@
 #include <tqmetaobject.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 //#ifdef KEXI_KTEXTEDIT
 #include <ktextedit.h>
 //#else
diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp
index fcb0ffe6..23991774 100644
--- a/kexi/formeditor/widgetlibrary.cpp
+++ b/kexi/formeditor/widgetlibrary.cpp
@@ -23,7 +23,7 @@
 #include <tqstrlist.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klibloader.h>
 #include <tdeparts/componentfactory.h>
 #include <ktrader.h>
diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp
index 73c79c30..74b1a4f6 100644
--- a/kexi/formeditor/widgetpropertyset.cpp
+++ b/kexi/formeditor/widgetpropertyset.cpp
@@ -28,9 +28,9 @@
 #include <tqapplication.h>
 #include <tqeventloop.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "objecttree.h"
 #include "form.h"