Rename additional header files to avoid conflicts with KDE4

22 files changed, 26 insertions, 26 deletions

diff --git a/kexi/kexidb/connection.cpp b/kexi/kexidb/connection.cpp
index 9037b0414..dd2eb76b4 100644
--- a/kexi/kexidb/connection.cpp
+++ b/kexi/kexidb/connection.cpp
@@ -44,7 +44,7 @@
 #include <tqguardedptr.h>
 #include <tqdom.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #define KEXIDB_EXTENDED_TABLE_SCHEMA_VERSION 1
diff --git a/kexi/kexidb/connectiondata.cpp b/kexi/kexidb/connectiondata.cpp
index 4f45b0f48..14c23dfec 100644
--- a/kexi/kexidb/connectiondata.cpp
+++ b/kexi/kexidb/connectiondata.cpp
@@ -24,7 +24,7 @@
 #include <tqfileinfo.h>
 #include <tqdir.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace KexiDB;
 
diff --git a/kexi/kexidb/cursor.cpp b/kexi/kexidb/cursor.cpp
index b5f095e23..41bf47351 100644
--- a/kexi/kexidb/cursor.cpp
+++ b/kexi/kexidb/cursor.cpp
@@ -26,7 +26,7 @@
 #include <kexiutils/utils.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/kexi/kexidb/dbproperties.cpp b/kexi/kexidb/dbproperties.cpp
index 490a7390f..ba9b1be0e 100644
--- a/kexi/kexidb/dbproperties.cpp
+++ b/kexi/kexidb/dbproperties.cpp
@@ -18,7 +18,7 @@
 */
 
 #include "dbproperties.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace KexiDB;
 
diff --git a/kexi/kexidb/driver.cpp b/kexi/kexidb/driver.cpp
index 8e08b83f6..953243e4f 100644
--- a/kexi/kexidb/driver.cpp
+++ b/kexi/kexidb/driver.cpp
@@ -29,7 +29,7 @@
 
 #include <tqfileinfo.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <assert.h>
diff --git a/kexi/kexidb/drivermanager.cpp b/kexi/kexidb/drivermanager.cpp
index 498c4610b..0ce563a91 100644
--- a/kexi/kexidb/drivermanager.cpp
+++ b/kexi/kexidb/drivermanager.cpp
@@ -30,7 +30,7 @@
 #include <tdeparts/componentfactory.h>
 #include <ktrader.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservice.h>
 
 #include <assert.h>
diff --git a/kexi/kexidb/drivers/mySQL/mysqlcursor.cpp b/kexi/kexidb/drivers/mySQL/mysqlcursor.cpp
index abfdb44f2..590e7ceca 100644
--- a/kexi/kexidb/drivers/mySQL/mysqlcursor.cpp
+++ b/kexi/kexidb/drivers/mySQL/mysqlcursor.cpp
@@ -23,7 +23,7 @@
 #include "mysqlconnection_p.h"
 #include <kexidb/error.h>
 #include <kexidb/utils.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <limits.h>
 
diff --git a/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp b/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp
index d6262befc..76684483a 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp
+++ b/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <kexidb/error.h>
 #include <kexidb/global.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <string>
 #include "pqxxpreparedstatement.h"
 #include "pqxxconnection_p.h"
diff --git a/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp b/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
index b7219e71d..746a383ae 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
+++ b/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
@@ -24,7 +24,7 @@
 #include <kexidb/error.h>
 #include <kexidb/global.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <cstdlib>
diff --git a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp
index fe6a78ea2..c8282963d 100644
--- a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqptrvector.h>
 #include <tqdatetime.h>
diff --git a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
index 71ba23216..afc861439 100644
--- a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
@@ -23,9 +23,9 @@
 #include <kstandarddirs.h>
 #include <kprogress.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <ktempfile.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
+#include <tdemessagebox.h>
 #include <tdeio/global.h>
 
 #include <tqfileinfo.h>
diff --git a/kexi/kexidb/expression.cpp b/kexi/kexidb/expression.cpp
index fabdf6034..f4e5ccfe8 100644
--- a/kexi/kexidb/expression.cpp
+++ b/kexi/kexidb/expression.cpp
@@ -28,7 +28,7 @@
 #include <ctype.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqdatetime.h>
 
diff --git a/kexi/kexidb/field.cpp b/kexi/kexidb/field.cpp
index 79b38aca7..41cce80be 100644
--- a/kexi/kexidb/field.cpp
+++ b/kexi/kexidb/field.cpp
@@ -27,7 +27,7 @@
 
 // we use here i18n() but this depends on kde libs: TODO: add #ifdefs
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqdatetime.h>
 
diff --git a/kexi/kexidb/object.cpp b/kexi/kexidb/object.cpp
index 2e32274d8..bc3249fc6 100644
--- a/kexi/kexidb/object.cpp
+++ b/kexi/kexidb/object.cpp
@@ -21,7 +21,7 @@
 #include <kexidb/error.h>
 #include <kexidb/msghandler.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 using namespace KexiDB;
diff --git a/kexi/kexidb/object.h b/kexi/kexidb/object.h
index 232535d19..6fb183bac 100644
--- a/kexi/kexidb/object.h
+++ b/kexi/kexidb/object.h
@@ -21,7 +21,7 @@
 #define KEXIDB_OBJECT_H
 
 #include <kexidb/error.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstdguiitem.h>
 #include <tqstring.h>
 
diff --git a/kexi/kexidb/parser/parser_p.cpp b/kexi/kexidb/parser/parser_p.cpp
index 1d2e52952..df4f3323d 100644
--- a/kexi/kexidb/parser/parser_p.cpp
+++ b/kexi/kexidb/parser/parser_p.cpp
@@ -21,7 +21,7 @@
 #include "sqlparser.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqregexp.h>
 
diff --git a/kexi/kexidb/parser/sqlparser.cpp b/kexi/kexidb/parser/sqlparser.cpp
index 097deb3bb..b7ddccd84 100644
--- a/kexi/kexidb/parser/sqlparser.cpp
+++ b/kexi/kexidb/parser/sqlparser.cpp
@@ -800,7 +800,7 @@
 
 #include <tqobject.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqptrlist.h>
 #include <tqcstring.h>
 #include <tqvariant.h>
diff --git a/kexi/kexidb/parser/sqlparser.y b/kexi/kexidb/parser/sqlparser.y
index c2d8e8870..a33978065 100644
--- a/kexi/kexidb/parser/sqlparser.y
+++ b/kexi/kexidb/parser/sqlparser.y
@@ -466,7 +466,7 @@
 
 #include <tqobject.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqptrlist.h>
 #include <tqcstring.h>
 #include <tqvariant.h>
diff --git a/kexi/kexidb/parser/sqlscanner.cpp b/kexi/kexidb/parser/sqlscanner.cpp
index 75ee2535e..3cd6bdf3a 100644
--- a/kexi/kexidb/parser/sqlscanner.cpp
+++ b/kexi/kexidb/parser/sqlscanner.cpp
@@ -507,7 +507,7 @@ char *yytext;
 #include "sqltypes.h"
 #include <iostream>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define YY_NO_UNPUT
 #define ECOUNT current += yyleng; ctoken = yytext
diff --git a/kexi/kexidb/parser/sqlscanner.l b/kexi/kexidb/parser/sqlscanner.l
index 5f74a0caf..b16a615da 100644
--- a/kexi/kexidb/parser/sqlscanner.l
+++ b/kexi/kexidb/parser/sqlscanner.l
@@ -26,7 +26,7 @@
 #include "sqltypes.h"
 #include <iostream>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define YY_NO_UNPUT
 #define ECOUNT current += yyleng; ctoken = yytext
diff --git a/kexi/kexidb/queryschema.cpp b/kexi/kexidb/queryschema.cpp
index 31727bd55..1ee0d52df 100644
--- a/kexi/kexidb/queryschema.cpp
+++ b/kexi/kexidb/queryschema.cpp
@@ -34,7 +34,7 @@
 #include <tqbitarray.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace KexiDB;
 
diff --git a/kexi/kexidb/utils.cpp b/kexi/kexidb/utils.cpp
index d6652f6d0..edb472a07 100644
--- a/kexi/kexidb/utils.cpp
+++ b/kexi/kexidb/utils.cpp
@@ -29,10 +29,10 @@
 #include <tqbuffer.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstaticdeleter.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #include "utils_p.h"