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/colorspaces/wet | |
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/wet')
-rw-r--r-- | chalk/colorspaces/wet/kis_texture_filter.h | 2 | ||||
-rw-r--r-- | chalk/colorspaces/wet/kis_wet_colorspace.cc | 2 | ||||
-rw-r--r-- | chalk/colorspaces/wet/kis_wet_palette_widget.cc | 2 | ||||
-rw-r--r-- | chalk/colorspaces/wet/kis_wetness_visualisation_filter.cc | 2 | ||||
-rw-r--r-- | chalk/colorspaces/wet/wet_plugin.cc | 6 | ||||
-rw-r--r-- | chalk/colorspaces/wet/wetphysicsfilter.cc | 2 | ||||
-rw-r--r-- | chalk/colorspaces/wet/wetphysicsfilter.h | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/chalk/colorspaces/wet/kis_texture_filter.h b/chalk/colorspaces/wet/kis_texture_filter.h index 75f12e88..8dbaef59 100644 --- a/chalk/colorspaces/wet/kis_texture_filter.h +++ b/chalk/colorspaces/wet/kis_texture_filter.h @@ -22,7 +22,7 @@ #define _TEXTURE_FILTER_H #include <tqstring.h> -#include <klocale.h> +#include <tdelocale.h> #include <kis_paint_device_action.h> /// Initializes a wet paint device with a texture diff --git a/chalk/colorspaces/wet/kis_wet_colorspace.cc b/chalk/colorspaces/wet/kis_wet_colorspace.cc index 685e5559..b867e01e 100644 --- a/chalk/colorspaces/wet/kis_wet_colorspace.cc +++ b/chalk/colorspaces/wet/kis_wet_colorspace.cc @@ -24,7 +24,7 @@ #include <tqimage.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kis_debug_areas.h> #include "kis_abstract_colorspace.h" diff --git a/chalk/colorspaces/wet/kis_wet_palette_widget.cc b/chalk/colorspaces/wet/kis_wet_palette_widget.cc index 7c115325..43cfd559 100644 --- a/chalk/colorspaces/wet/kis_wet_palette_widget.cc +++ b/chalk/colorspaces/wet/kis_wet_palette_widget.cc @@ -32,7 +32,7 @@ #include <tqstyle.h> #include <tqtooltip.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <koFrameButton.h> diff --git a/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cc b/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cc index 50ba12a5..f17f4e1c 100644 --- a/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cc +++ b/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cc @@ -20,7 +20,7 @@ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kis_meta_registry.h" #include <kis_view.h> #include <kis_image.h> diff --git a/chalk/colorspaces/wet/wet_plugin.cc b/chalk/colorspaces/wet/wet_plugin.cc index 6edc562e..b919a289 100644 --- a/chalk/colorspaces/wet/wet_plugin.cc +++ b/chalk/colorspaces/wet/wet_plugin.cc @@ -29,12 +29,12 @@ #include <tqwidget.h> #include <tdeactionclasses.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> diff --git a/chalk/colorspaces/wet/wetphysicsfilter.cc b/chalk/colorspaces/wet/wetphysicsfilter.cc index e72d63bf..3a439443 100644 --- a/chalk/colorspaces/wet/wetphysicsfilter.cc +++ b/chalk/colorspaces/wet/wetphysicsfilter.cc @@ -19,7 +19,7 @@ #include <stdlib.h> #include <vector> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kis_iterators_pixel.h> diff --git a/chalk/colorspaces/wet/wetphysicsfilter.h b/chalk/colorspaces/wet/wetphysicsfilter.h index eaae1a77..ef542f8e 100644 --- a/chalk/colorspaces/wet/wetphysicsfilter.h +++ b/chalk/colorspaces/wet/wetphysicsfilter.h @@ -21,7 +21,7 @@ #ifndef WET_PHYSICS_FILTER_H #define WET_PHYSICS_FILTER_H -#include <klocale.h> +#include <tdelocale.h> #include <kis_filter.h> #include <kis_types.h> |