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 /tools | |
| parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
| download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/converter/koconverter.cpp | 4 | ||||
| -rw-r--r-- | tools/kthesaurus/main.cc | 4 | ||||
| -rw-r--r-- | tools/spell/main.cc | 4 | ||||
| -rw-r--r-- | tools/tdefile-plugins/abiword/tdefile_abiword.cpp | 2 | ||||
| -rw-r--r-- | tools/tdefile-plugins/gnumeric/tdefile_gnumeric.cpp | 2 | ||||
| -rw-r--r-- | tools/tdefile-plugins/koffice/tdefile_koffice.cpp | 2 | ||||
| -rw-r--r-- | tools/tdefile-plugins/ooo/tdefile_ooo.cpp | 4 | ||||
| -rw-r--r-- | tools/thesaurus/main.h | 4 |
8 files changed, 13 insertions, 13 deletions
diff --git a/tools/converter/koconverter.cpp b/tools/converter/koconverter.cpp index 82779c445..9bad2fb57 100644 --- a/tools/converter/koconverter.cpp +++ b/tools/converter/koconverter.cpp @@ -23,8 +23,8 @@ #include <tdeaboutdata.h> #include <kimageio.h> #include <tdecmdlineargs.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kmimetype.h> #include <tdeapplication.h> #include <kdebug.h> diff --git a/tools/kthesaurus/main.cc b/tools/kthesaurus/main.cc index b802985d7..f94373f84 100644 --- a/tools/kthesaurus/main.cc +++ b/tools/kthesaurus/main.cc @@ -23,8 +23,8 @@ #include <tdecmdlineargs.h> #include <kdatatool.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <koffice_export.h> static TDECmdLineOptions options[] = { diff --git a/tools/spell/main.cc b/tools/spell/main.cc index 5686b06a1..f8baf9eb7 100644 --- a/tools/spell/main.cc +++ b/tools/spell/main.cc @@ -19,8 +19,8 @@ */ #include "main.h" -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kdebug.h> #include <kinstance.h> #include <tdeconfig.h> diff --git a/tools/tdefile-plugins/abiword/tdefile_abiword.cpp b/tools/tdefile-plugins/abiword/tdefile_abiword.cpp index 59a645f75..eb76cdb4d 100644 --- a/tools/tdefile-plugins/abiword/tdefile_abiword.cpp +++ b/tools/tdefile-plugins/abiword/tdefile_abiword.cpp @@ -20,7 +20,7 @@ #include <config.h> #include "tdefile_abiword.h" -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <kfilterdev.h> diff --git a/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.cpp b/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.cpp index 296866630..4406a87b7 100644 --- a/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.cpp +++ b/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.cpp @@ -20,7 +20,7 @@ #include <config.h> #include "tdefile_gnumeric.h" -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <kfilterdev.h> diff --git a/tools/tdefile-plugins/koffice/tdefile_koffice.cpp b/tools/tdefile-plugins/koffice/tdefile_koffice.cpp index e4c897783..fb2028cf5 100644 --- a/tools/tdefile-plugins/koffice/tdefile_koffice.cpp +++ b/tools/tdefile-plugins/koffice/tdefile_koffice.cpp @@ -20,7 +20,7 @@ #include <config.h> #include "tdefile_koffice.h" -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <KoStore.h> #include <KoStoreDevice.h> diff --git a/tools/tdefile-plugins/ooo/tdefile_ooo.cpp b/tools/tdefile-plugins/ooo/tdefile_ooo.cpp index 358bc8769..f73aa6d65 100644 --- a/tools/tdefile-plugins/ooo/tdefile_ooo.cpp +++ b/tools/tdefile-plugins/ooo/tdefile_ooo.cpp @@ -39,12 +39,12 @@ #include <config.h> #include "tdefile_ooo.h" -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <KoStore.h> #include <KoStoreDevice.h> #include <kzip.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqptrstack.h> #include <tqdom.h> diff --git a/tools/thesaurus/main.h b/tools/thesaurus/main.h index 00fb732e3..aa2e19193 100644 --- a/tools/thesaurus/main.h +++ b/tools/thesaurus/main.h @@ -50,8 +50,8 @@ #include <kgenericfactory.h> #include <klibloader.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <kpushbutton.h> #include <krun.h> |