From 63f984a752aa6a6a73e3af795b05a5a042833eff Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:48:17 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 kexi/widget/kexibrowser.cpp                        | 4 ++--
 kexi/widget/kexicharencodingcombobox.cpp           | 4 ++--
 kexi/widget/kexidatatable.cpp                      | 2 +-
 kexi/widget/kexidswelcome.cpp                      | 4 ++--
 kexi/widget/kexieditor.cpp                         | 2 +-
 kexi/widget/kexifieldcombobox.cpp                  | 4 ++--
 kexi/widget/kexifieldlistview.cpp                  | 4 ++--
 kexi/widget/kexipropertyeditorview.cpp             | 2 +-
 kexi/widget/kexiqueryparameters.cpp                | 2 +-
 kexi/widget/kexiscrollview.cpp                     | 2 +-
 kexi/widget/kexismalltoolbutton.cpp                | 2 +-
 kexi/widget/pixmapcollection.cpp                   | 4 ++--
 kexi/widget/relations/kexirelationview.cpp         | 6 +++---
 kexi/widget/relations/kexirelationviewtable.cpp    | 2 +-
 kexi/widget/relations/kexirelationwidget.cpp       | 2 +-
 kexi/widget/tableview/kexiblobtableedit.cpp        | 6 +++---
 kexi/widget/tableview/kexibooltableedit.cpp        | 6 +++---
 kexi/widget/tableview/kexidataawareobjectiface.cpp | 2 +-
 kexi/widget/tableview/kexidatatableview.cpp        | 4 ++--
 kexi/widget/tableview/kexidatetableedit.cpp        | 4 ++--
 kexi/widget/tableview/kexidatetimetableedit.cpp    | 4 ++--
 kexi/widget/tableview/kexiinputtableedit.cpp       | 6 +++---
 kexi/widget/tableview/kexitableedit.cpp            | 4 ++--
 kexi/widget/tableview/kexitableview.cpp            | 6 +++---
 kexi/widget/tableview/kexitableview_p.cpp          | 2 +-
 kexi/widget/tableview/kexitableviewdata.cpp        | 2 +-
 kexi/widget/tableview/kexitextformatter.cpp        | 2 +-
 kexi/widget/tableview/kexitimetableedit.cpp        | 4 ++--
 kexi/widget/utils/kexicontextmenuutils.cpp         | 4 ++--
 kexi/widget/utils/kexidatetimeformatter.cpp        | 4 ++--
 kexi/widget/utils/kexidisplayutils.cpp             | 2 +-
 kexi/widget/utils/kexirecordnavigator.cpp          | 2 +-
 32 files changed, 55 insertions(+), 55 deletions(-)

(limited to 'kexi/widget')

diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp
index 4aa82bec..2c86d4f7 100644
--- a/kexi/widget/kexibrowser.cpp
+++ b/kexi/widget/kexibrowser.cpp
@@ -32,10 +32,10 @@
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 #include <kimageeffect.h>
 #include <tdeconfig.h>
diff --git a/kexi/widget/kexicharencodingcombobox.cpp b/kexi/widget/kexicharencodingcombobox.cpp
index ad368e69..76f19ba6 100644
--- a/kexi/widget/kexicharencodingcombobox.cpp
+++ b/kexi/widget/kexicharencodingcombobox.cpp
@@ -22,8 +22,8 @@
 #include <tqtextcodec.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
 
 KexiCharacterEncodingComboBox::KexiCharacterEncodingComboBox( 
diff --git a/kexi/widget/kexidatatable.cpp b/kexi/widget/kexidatatable.cpp
index 797fa440..18319585 100644
--- a/kexi/widget/kexidatatable.cpp
+++ b/kexi/widget/kexidatatable.cpp
@@ -24,7 +24,7 @@
 #include <tqlabel.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
 
diff --git a/kexi/widget/kexidswelcome.cpp b/kexi/widget/kexidswelcome.cpp
index e1184553..6f722f0e 100644
--- a/kexi/widget/kexidswelcome.cpp
+++ b/kexi/widget/kexidswelcome.cpp
@@ -21,9 +21,9 @@
 #include <tqcheckbox.h>
 #include <tqpushbutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 
diff --git a/kexi/widget/kexieditor.cpp b/kexi/widget/kexieditor.cpp
index 05115b69..5df84c96 100644
--- a/kexi/widget/kexieditor.cpp
+++ b/kexi/widget/kexieditor.cpp
@@ -25,7 +25,7 @@
 
 #include <tqlayout.h>
 #include <tqframe.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 //uncomment this to enable KTextEdit-based editor
diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp
index 1c1f929b..ceb2aa41 100644
--- a/kexi/widget/kexifieldcombobox.cpp
+++ b/kexi/widget/kexifieldcombobox.cpp
@@ -34,8 +34,8 @@
 #include <kiconloader.h>
 #include <tdeversion.h>
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 
 #include <kexidb/tableschema.h>
 #include <kexidb/queryschema.h>
diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp
index f688fa64..348e9ee0 100644
--- a/kexi/widget/kexifieldlistview.cpp
+++ b/kexi/widget/kexifieldlistview.cpp
@@ -33,8 +33,8 @@
 #include <kiconloader.h>
 #include <tdeversion.h>
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 
 #include <kexidb/tableschema.h>
 #include <kexidb/queryschema.h>
diff --git a/kexi/widget/kexipropertyeditorview.cpp b/kexi/widget/kexipropertyeditorview.cpp
index bf5c6491..1612871b 100644
--- a/kexi/widget/kexipropertyeditorview.cpp
+++ b/kexi/widget/kexipropertyeditorview.cpp
@@ -24,7 +24,7 @@
 #include <koproperty/editor.h>
 #include <koproperty/property.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #include <tqlayout.h>
diff --git a/kexi/widget/kexiqueryparameters.cpp b/kexi/widget/kexiqueryparameters.cpp
index 04257ec2..171df484 100644
--- a/kexi/widget/kexiqueryparameters.cpp
+++ b/kexi/widget/kexiqueryparameters.cpp
@@ -20,7 +20,7 @@
 #include "kexiqueryparameters.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
 #include <knumvalidator.h>
 
diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp
index ba4c8f9e..59fddb06 100644
--- a/kexi/widget/kexiscrollview.cpp
+++ b/kexi/widget/kexiscrollview.cpp
@@ -26,7 +26,7 @@
 
 #include <kdebug.h>
 #include <kstaticdeleter.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <utils/kexirecordnavigator.h>
 #include <core/kexi.h>
diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp
index 27f89395..bb3b0ec8 100644
--- a/kexi/widget/kexismalltoolbutton.cpp
+++ b/kexi/widget/kexismalltoolbutton.cpp
@@ -24,7 +24,7 @@
 #include <tqstyle.h>
 
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <core/kexi.h>
 
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp
index 1917e8f3..8c4d9551 100644
--- a/kexi/widget/pixmapcollection.cpp
+++ b/kexi/widget/pixmapcollection.cpp
@@ -34,8 +34,8 @@
 #include <kpixmapio.h>
 #include <tdepopupmenu.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "pixmapcollection.h"
 
diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp
index 5340691f..7dcec415 100644
--- a/kexi/widget/relations/kexirelationview.cpp
+++ b/kexi/widget/relations/kexirelationview.cpp
@@ -30,11 +30,11 @@
 #include <tqlineedit.h>
 #include <tqpopupmenu.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
-#include <kglobalsettings.h>
-#include <kmessagebox.h>
+#include <tdeglobalsettings.h>
+#include <tdemessagebox.h>
 
 #include <kexidb/tableschema.h>
 #include <kexidb/indexschema.h>
diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp
index b9420f67..4bab34e4 100644
--- a/kexi/widget/relations/kexirelationviewtable.cpp
+++ b/kexi/widget/relations/kexirelationviewtable.cpp
@@ -34,7 +34,7 @@
 #include <kiconloader.h>
 #include <tdeversion.h>
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <kexidb/tableschema.h>
 #include <kexidb/utils.h>
diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp
index 47075bbb..eef477a5 100644
--- a/kexi/widget/relations/kexirelationwidget.cpp
+++ b/kexi/widget/relations/kexirelationwidget.cpp
@@ -27,7 +27,7 @@
 #include <tqtimer.h>
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index 4982fffa..df2816fe 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -38,7 +38,7 @@
 #include <tqbuffer.h>
 
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kmimetype.h>
 #include <kmimemagic.h>
 #include <kuserprofile.h>
@@ -47,10 +47,10 @@
 #include <kopenwith.h>
 #include <kurl.h>
 #include <karrowbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <tdeio/job.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 #include <tdestdaccel.h>
diff --git a/kexi/widget/tableview/kexibooltableedit.cpp b/kexi/widget/tableview/kexibooltableedit.cpp
index c4067dfd..2bc14f4a 100644
--- a/kexi/widget/tableview/kexibooltableedit.cpp
+++ b/kexi/widget/tableview/kexibooltableedit.cpp
@@ -25,10 +25,10 @@
 #include <tqapplication.h>
 #include <tqclipboard.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 
 KexiBoolTableEdit::KexiBoolTableEdit(KexiTableViewColumn &column, TQWidget *parent)
diff --git a/kexi/widget/tableview/kexidataawareobjectiface.cpp b/kexi/widget/tableview/kexidataawareobjectiface.cpp
index ce0b7695..68690ef9 100644
--- a/kexi/widget/tableview/kexidataawareobjectiface.cpp
+++ b/kexi/widget/tableview/kexidataawareobjectiface.cpp
@@ -29,7 +29,7 @@
 #include <tqlabel.h>
 #include <tqtooltip.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <kexi.h>
 #include <kexiutils/validator.h>
diff --git a/kexi/widget/tableview/kexidatatableview.cpp b/kexi/widget/tableview/kexidatatableview.cpp
index 8bfc1c48..800c76e7 100644
--- a/kexi/widget/tableview/kexidatatableview.cpp
+++ b/kexi/widget/tableview/kexidatatableview.cpp
@@ -22,8 +22,8 @@
 #include <tqtimer.h>
 #include <tqapplication.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeaction.h>
 
diff --git a/kexi/widget/tableview/kexidatetableedit.cpp b/kexi/widget/tableview/kexidatetableedit.cpp
index 6e538fd1..36a44566 100644
--- a/kexi/widget/tableview/kexidatetableedit.cpp
+++ b/kexi/widget/tableview/kexidatetableedit.cpp
@@ -37,8 +37,8 @@
 #include <tqclipboard.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdatepicker.h>
 #include <kdatetbl.h>
 #include <klineedit.h>
diff --git a/kexi/widget/tableview/kexidatetimetableedit.cpp b/kexi/widget/tableview/kexidatetimetableedit.cpp
index aff64f58..b52aa2e6 100644
--- a/kexi/widget/tableview/kexidatetimetableedit.cpp
+++ b/kexi/widget/tableview/kexidatetimetableedit.cpp
@@ -37,8 +37,8 @@
 #include <tqclipboard.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdatepicker.h>
 #include <kdatetbl.h>
 #include <klineedit.h>
diff --git a/kexi/widget/tableview/kexiinputtableedit.cpp b/kexi/widget/tableview/kexiinputtableedit.cpp
index 69c5c4ef..b6853037 100644
--- a/kexi/widget/tableview/kexiinputtableedit.cpp
+++ b/kexi/widget/tableview/kexiinputtableedit.cpp
@@ -29,10 +29,10 @@
 #include <tqclipboard.h>
 #include <tqtooltip.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdecompletionbox.h>
 #include <knumvalidator.h>
 #include <kexiutils/longlongvalidator.h>
diff --git a/kexi/widget/tableview/kexitableedit.cpp b/kexi/widget/tableview/kexitableedit.cpp
index b082bd95..3305fff1 100644
--- a/kexi/widget/tableview/kexitableedit.cpp
+++ b/kexi/widget/tableview/kexitableedit.cpp
@@ -26,8 +26,8 @@
 #include <tqpalette.h>
 #include <tqpainter.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 KexiTableEdit::KexiTableEdit(KexiTableViewColumn &column, TQWidget* parent)
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index 9a36dfad..f054f084 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -37,12 +37,12 @@
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #ifndef KEXI_NO_PRINT
 # include <kprinter.h>
diff --git a/kexi/widget/tableview/kexitableview_p.cpp b/kexi/widget/tableview/kexitableview_p.cpp
index 983378cb..5ac72064 100644
--- a/kexi/widget/tableview/kexitableview_p.cpp
+++ b/kexi/widget/tableview/kexitableview_p.cpp
@@ -29,7 +29,7 @@
 
 #include <tqlabel.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 
 KexiTableViewPrivate::KexiTableViewPrivate(KexiTableView* t)
diff --git a/kexi/widget/tableview/kexitableviewdata.cpp b/kexi/widget/tableview/kexitableviewdata.cpp
index a4e45daf..c28ad570 100644
--- a/kexi/widget/tableview/kexitableviewdata.cpp
+++ b/kexi/widget/tableview/kexitableviewdata.cpp
@@ -34,7 +34,7 @@
 #include <kexi.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqapplication.h>
 
diff --git a/kexi/widget/tableview/kexitextformatter.cpp b/kexi/widget/tableview/kexitextformatter.cpp
index 9829f347..5ff28920 100644
--- a/kexi/widget/tableview/kexitextformatter.cpp
+++ b/kexi/widget/tableview/kexitextformatter.cpp
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kexitextformatter.h"
 #include <widget/utils/kexidatetimeformatter.h>
diff --git a/kexi/widget/tableview/kexitimetableedit.cpp b/kexi/widget/tableview/kexitimetableedit.cpp
index b6dc69d4..e6bec4b6 100644
--- a/kexi/widget/tableview/kexitimetableedit.cpp
+++ b/kexi/widget/tableview/kexitimetableedit.cpp
@@ -35,8 +35,8 @@
 #include <tqclipboard.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdatepicker.h>
 #include <kdatetbl.h>
 #include <klineedit.h>
diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp
index caae10b6..6e5b5c9e 100644
--- a/kexi/widget/utils/kexicontextmenuutils.cpp
+++ b/kexi/widget/utils/kexicontextmenuutils.cpp
@@ -20,12 +20,12 @@
 #include "kexicontextmenuutils.h"
 
 #include <tdeactioncollection.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <kimageio.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqfiledialog.h>
 #include <tqapplication.h>
diff --git a/kexi/widget/utils/kexidatetimeformatter.cpp b/kexi/widget/utils/kexidatetimeformatter.cpp
index 21bb24de..37142564 100644
--- a/kexi/widget/utils/kexidatetimeformatter.cpp
+++ b/kexi/widget/utils/kexidatetimeformatter.cpp
@@ -20,8 +20,8 @@
 #include "kexidatetimeformatter.h"
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdatepicker.h>
 #include <kdatetbl.h>
 #include <klineedit.h>
diff --git a/kexi/widget/utils/kexidisplayutils.cpp b/kexi/widget/utils/kexidisplayutils.cpp
index 11b1d742..8d626187 100644
--- a/kexi/widget/utils/kexidisplayutils.cpp
+++ b/kexi/widget/utils/kexidisplayutils.cpp
@@ -24,7 +24,7 @@
 #include <tqimage.h>
 #include <tqwidget.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstaticdeleter.h>
 
 // a color for displaying default values or autonumbers
diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp
index 9dd8cccc..18d1b09c 100644
--- a/kexi/widget/utils/kexirecordnavigator.cpp
+++ b/kexi/widget/utils/kexirecordnavigator.cpp
@@ -25,7 +25,7 @@
 #include <tqtooltip.h>
 #include <tqscrollview.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <kguiitem.h>
-- 
cgit v1.2.1