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/paintops | |
| 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/paintops')
| -rw-r--r-- | chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc | 4 | ||||
| -rw-r--r-- | chalk/plugins/paintops/defaultpaintops/kis_penop.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc index 3b48e439..25f12b87 100644 --- a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc +++ b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc @@ -17,11 +17,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/chalk/plugins/paintops/defaultpaintops/kis_penop.cc b/chalk/plugins/paintops/defaultpaintops/kis_penop.cc index 40e2b2e6..4a8da9a1 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_penop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_penop.cc @@ -28,7 +28,7 @@ #include "kis_brush.h" #include "kis_global.h" #include "kis_paint_device.h" -#include "klocale.h" +#include "tdelocale.h" #include "kis_layer.h" #include "kis_painter.h" #include "kis_types.h" |