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 /chalk/plugins/viewplugins/scripting | |
| parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
| download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'chalk/plugins/viewplugins/scripting')
5 files changed, 7 insertions, 7 deletions
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp index 1486d4153..be0b9307a 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp @@ -18,7 +18,7 @@ #include "krs_image.h" -#include <klocale.h> +#include <tdelocale.h> #include <kis_colorspace_factory_registry.h> #include <kis_image.h> diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h index 9b5f5b6b1..777a8aac1 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h @@ -24,7 +24,7 @@ //#include <api/proxy.h> //#include <api/variant.h> -#include <klocale.h> +#include <tdelocale.h> #include <kis_paint_layer.h> #include <kis_paint_device.h> diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp index a3ce4dd6e..fb6548b24 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp @@ -18,7 +18,7 @@ #include "krs_paint_layer.h" -#include <klocale.h> +#include <tdelocale.h> #include <kis_colorspace_factory_registry.h> #include <kis_doc.h> diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp index c8ef92c50..21ab76464 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp @@ -20,7 +20,7 @@ #include "krs_wavelet.h" -#include <klocale.h> +#include <tdelocale.h> #include <kis_math_toolbox.h> diff --git a/chalk/plugins/viewplugins/scripting/scripting.cc b/chalk/plugins/viewplugins/scripting/scripting.cc index c7e1db5f2..207bc0ce3 100644 --- a/chalk/plugins/viewplugins/scripting/scripting.cc +++ b/chalk/plugins/viewplugins/scripting/scripting.cc @@ -29,10 +29,10 @@ #include <kgenericfactory.h> #include <kiconloader.h> #include <kinstance.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #define KROSS_MAIN_EXPORT KDE_EXPORT #include <main/manager.h> |