Rename additional header files to avoid conflicts with KDE4

14 files changed, 20 insertions, 20 deletions

diff --git a/kexi/core/kexi.cpp b/kexi/core/kexi.cpp
index 5ce1bc84..cf17da06 100644
--- a/kexi/core/kexi.cpp
+++ b/kexi/core/kexi.cpp
@@ -39,7 +39,7 @@
 #include <ksharedptr.h>
 #include <kmimetype.h>
 #include <kstaticdeleter.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 using namespace Kexi;
 
diff --git a/kexi/core/kexi.h b/kexi/core/kexi.h
index 921db42b..f90ec767 100644
--- a/kexi/core/kexi.h
+++ b/kexi/core/kexi.h
@@ -31,8 +31,8 @@
 #include <kexidb/drivermanager.h>
 #include <kexidb/driver.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 namespace Kexi
 {
diff --git a/kexi/core/kexiaboutdata.cpp b/kexi/core/kexiaboutdata.cpp
index e41cf0ff..f3573887 100644
--- a/kexi/core/kexiaboutdata.cpp
+++ b/kexi/core/kexiaboutdata.cpp
@@ -23,7 +23,7 @@
 #include <kexi_version.h>
 #include <tdeversion.h>
 #include <kofficeversion.h> //only for KOFFICE_VERSION_STRING
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char *description =
 	I18N_NOOP("Database creation for everyone")
diff --git a/kexi/core/kexicmdlineargs.h b/kexi/core/kexicmdlineargs.h
index 5c31f63f..62cbbe7f 100644
--- a/kexi/core/kexicmdlineargs.h
+++ b/kexi/core/kexicmdlineargs.h
@@ -23,7 +23,7 @@
 #define KEXICMDLINEARGS_H
 
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static TDECmdLineOptions options[] =
 {
diff --git a/kexi/core/kexicontexthelp.cpp b/kexi/core/kexicontexthelp.cpp
index ac2ed101..627bd761 100644
--- a/kexi/core/kexicontexthelp.cpp
+++ b/kexi/core/kexicontexthelp.cpp
@@ -21,7 +21,7 @@
 #include <KoContextCelp.h>
 #include <kxmlguiclient.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tqlayout.h>
 #include <kdebug.h>
diff --git a/kexi/core/kexiguimsghandler.cpp b/kexi/core/kexiguimsghandler.cpp
index 5b2b2791..eb5bdc24 100644
--- a/kexi/core/kexiguimsghandler.cpp
+++ b/kexi/core/kexiguimsghandler.cpp
@@ -23,7 +23,7 @@
 #include <kexidb/utils.h>
 #include <kexiutils/utils.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdialogbase.h>
 
 KexiGUIMessageHandler::KexiGUIMessageHandler(TQWidget *parent)
diff --git a/kexi/core/kexiinternalpart.cpp b/kexi/core/kexiinternalpart.cpp
index 0cfce53b..8635fa49 100644
--- a/kexi/core/kexiinternalpart.cpp
+++ b/kexi/core/kexiinternalpart.cpp
@@ -29,7 +29,7 @@
 
 #include <kdebug.h>
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktrader.h>
 #include <tdeparts/componentfactory.h>
 #include <kexidb/msghandler.h>
diff --git a/kexi/core/kexipart.cpp b/kexi/core/kexipart.cpp
index e1ed78fe..e907110a 100644
--- a/kexi/core/kexipart.cpp
+++ b/kexi/core/kexipart.cpp
@@ -38,7 +38,7 @@
 
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 namespace KexiPart {
 //! @internal
diff --git a/kexi/core/kexiproject.cpp b/kexi/core/kexiproject.cpp
index 1dbe4eef..e5b1c2a4 100644
--- a/kexi/core/kexiproject.cpp
+++ b/kexi/core/kexiproject.cpp
@@ -24,7 +24,7 @@
 
 #include <kmimetype.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kexiutils/identifier.h>
 
diff --git a/kexi/core/kexiprojectconnectiondata.cpp b/kexi/core/kexiprojectconnectiondata.cpp
index 17ce3d89..52567288 100644
--- a/kexi/core/kexiprojectconnectiondata.cpp
+++ b/kexi/core/kexiprojectconnectiondata.cpp
@@ -25,13 +25,13 @@
 #include <tqfile.h>
 #include <tqregexp.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <tdeio/netaccess.h>
 #include <kurl.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <kexidb/connectiondata.h>
 #include <kexidb/drivermanager.h>
diff --git a/kexi/core/kexiprojectdata.cpp b/kexi/core/kexiprojectdata.cpp
index dd877873..53daea99 100644
--- a/kexi/core/kexiprojectdata.cpp
+++ b/kexi/core/kexiprojectdata.cpp
@@ -26,13 +26,13 @@
 #include <tqfile.h>
 #include <tqregexp.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <tdeio/netaccess.h>
 #include <kurl.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <kexidb/drivermanager.h>
 #include "kexiprojectdata.h"
diff --git a/kexi/core/kexitemplateloader.cpp b/kexi/core/kexitemplateloader.cpp
index 7ced2d6f..c68bd124 100644
--- a/kexi/core/kexitemplateloader.cpp
+++ b/kexi/core/kexitemplateloader.cpp
@@ -20,8 +20,8 @@
 #include "kexitemplateloader.h"
 
 #include <kstandarddirs.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
diff --git a/kexi/core/kexiuseraction.cpp b/kexi/core/kexiuseraction.cpp
index 3bc22a7a..ad97123e 100644
--- a/kexi/core/kexiuseraction.cpp
+++ b/kexi/core/kexiuseraction.cpp
@@ -1,4 +1,4 @@
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdeshortcut.h>
 
diff --git a/kexi/core/kexiuseractionmethod.cpp b/kexi/core/kexiuseractionmethod.cpp
index 41b35782..bef945e3 100644
--- a/kexi/core/kexiuseractionmethod.cpp
+++ b/kexi/core/kexiuseractionmethod.cpp
@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kexiuseraction.h"
 #include "kexiuseractionmethod.h"