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/parser | |
| 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/parser')
| -rw-r--r-- | kexi/kexidb/parser/parser_p.cpp | 2 | ||||
| -rw-r--r-- | kexi/kexidb/parser/sqlparser.cpp | 2 | ||||
| -rw-r--r-- | kexi/kexidb/parser/sqlparser.y | 2 | ||||
| -rw-r--r-- | kexi/kexidb/parser/sqlscanner.cpp | 2 | ||||
| -rw-r--r-- | kexi/kexidb/parser/sqlscanner.l | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/kexi/kexidb/parser/parser_p.cpp b/kexi/kexidb/parser/parser_p.cpp index 1d2e5295..df4f3323 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 097deb3b..b7ddccd8 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 c2d8e887..a3397806 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 75ee2535..3cd6bdf3 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 5f74a0ca..b16a615d 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 |