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 /chalk/colorspaces/rgb_u8 | |
| parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
| download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'chalk/colorspaces/rgb_u8')
| -rw-r--r-- | chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc | 2 | ||||
| -rw-r--r-- | chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h | 2 | ||||
| -rw-r--r-- | chalk/colorspaces/rgb_u8/rgb_plugin.cc | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc index f1522798..0aaea6da 100644 --- a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc +++ b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc @@ -26,7 +26,7 @@ #include <tqcolor.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_rgb_colorspace.h" #include "kis_u8_base_colorspace.h" diff --git a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h index 8fdfb355..820b58b5 100644 --- a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h +++ b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h @@ -18,7 +18,7 @@ #ifndef KIS_STRATEGY_COLORSPACE_RGB_H_ #define KIS_STRATEGY_COLORSPACE_RGB_H_ -#include "klocale.h" +#include "tdelocale.h" #include "kis_global.h" #include "kis_u8_base_colorspace.h" diff --git a/chalk/colorspaces/rgb_u8/rgb_plugin.cc b/chalk/colorspaces/rgb_u8/rgb_plugin.cc index f987e33f..26310125 100644 --- a/chalk/colorspaces/rgb_u8/rgb_plugin.cc +++ b/chalk/colorspaces/rgb_u8/rgb_plugin.cc @@ -22,12 +22,12 @@ #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> #include <kis_debug_areas.h> |