summaryrefslogtreecommitdiffstats
path: root/kexi/plugins/queries
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:48:17 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:48:17 -0600
commit63f984a752aa6a6a73e3af795b05a5a042833eff (patch)
tree89b2d1529273ebe59f8c41800aa6c53ee4c29bb1 /kexi/plugins/queries
parent3b6870c6e1177574772803b5b09416903ee40fc0 (diff)
downloadkoffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz
koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kexi/plugins/queries')
-rw-r--r--kexi/plugins/queries/kexiaddparamdialog.cpp2
-rw-r--r--kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp2
-rw-r--r--kexi/plugins/queries/kexiquerydesignerguieditor.cpp4
-rw-r--r--kexi/plugins/queries/kexiquerydesignersql.cpp2
-rw-r--r--kexi/plugins/queries/kexiquerydesignersqlhistory.cpp4
5 files changed, 7 insertions, 7 deletions
diff --git a/kexi/plugins/queries/kexiaddparamdialog.cpp b/kexi/plugins/queries/kexiaddparamdialog.cpp
index 9b7f5db9..0b117d84 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 555a84cf..82bd2fe2 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 9a6f3205..45ea8e1d 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 0f39cb59..39e36bbb 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 3328e42f..c528540a 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"