diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:48:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:48:17 -0600 |
| commit | 63f984a752aa6a6a73e3af795b05a5a042833eff (patch) | |
| tree | 89b2d1529273ebe59f8c41800aa6c53ee4c29bb1 /kword/mailmerge/sql | |
| parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
| download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kword/mailmerge/sql')
| -rw-r--r-- | kword/mailmerge/sql/KWQtSqlEasyFilter.cpp | 2 | ||||
| -rw-r--r-- | kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp | 2 | ||||
| -rw-r--r-- | kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h | 2 | ||||
| -rw-r--r-- | kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp | 2 | ||||
| -rw-r--r-- | kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp index c45d7527..08def7cd 100644 --- a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp +++ b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp @@ -2,7 +2,7 @@ #include "KWQtSqlEasyFilter.moc" #include <tqtable.h> #include <tqscrollview.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqcheckbox.h> diff --git a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp index 2f0c1a73..538e36a6 100644 --- a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp +++ b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp @@ -29,7 +29,7 @@ #include <kiconloader.h> #include <tqsqldatabase.h> #include <tqguardedptr.h> -#include <klocale.h> +#include <tdelocale.h> /****************************************************************** * diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h index c9b24ac3..29264c4e 100644 --- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h +++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h @@ -21,7 +21,7 @@ #define _SERIALLETTER_QtSql_POWER_PLUGIN_H_ #include <tqdom.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdialogbase.h> #include <tqsqldatabase.h> diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp index 2b3f711d..65534802 100644 --- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp +++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp @@ -21,7 +21,7 @@ #include "KWQtSqlSerialDataSource.moc" #include "KWQtSqlEasyFilter.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqsqlcursor.h> #include <tqdatatable.h> diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp index 41e971be..22cde06d 100644 --- a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp +++ b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp @@ -32,7 +32,7 @@ #include <tqsqlcursor.h> #include <tqdatatable.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> |