diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:48:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:48:17 -0600 |
| commit | 63f984a752aa6a6a73e3af795b05a5a042833eff (patch) | |
| tree | 89b2d1529273ebe59f8c41800aa6c53ee4c29bb1 /kexi/kexidb/drivers | |
| parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
| download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kexi/kexidb/drivers')
| -rw-r--r-- | kexi/kexidb/drivers/mySQL/mysqlcursor.cpp | 2 | ||||
| -rw-r--r-- | kexi/kexidb/drivers/pqxx/pqxxconnection.cpp | 2 | ||||
| -rw-r--r-- | kexi/kexidb/drivers/pqxx/pqxxcursor.cpp | 2 | ||||
| -rw-r--r-- | kexi/kexidb/drivers/sqlite/sqlitecursor.cpp | 2 | ||||
| -rw-r--r-- | kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp | 6 |
5 files changed, 7 insertions, 7 deletions
diff --git a/kexi/kexidb/drivers/mySQL/mysqlcursor.cpp b/kexi/kexidb/drivers/mySQL/mysqlcursor.cpp index abfdb44f..590e7cec 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 d6262bef..76684483 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 b7219e71..746a383a 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 fe6a78ea..c8282963 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 71ba2321..afc86143 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> |