summaryrefslogtreecommitdiffstats
path: root/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:44:25 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:44:25 -0600
commitfa6008238fe6befd362a23c8767775a744e22bc2 (patch)
treee1cd2545f72128efed02d79e501397ced82e36bc /digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
parentd21f600cd26a3c713e33fd7065b6e769825d86ed (diff)
downloaddigikam-fa6008238fe6befd362a23c8767775a744e22bc2.tar.gz
digikam-fa6008238fe6befd362a23c8767775a744e22bc2.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'digikam/imageplugins/superimpose/imageeffect_superimpose.cpp')
-rw-r--r--digikam/imageplugins/superimpose/imageeffect_superimpose.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
index f3c73ee..bb674ed 100644
--- a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
+++ b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
@@ -41,7 +41,7 @@
// KDE includes.
#include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutdata.h>
#include <khelpmenu.h>
#include <kiconloader.h>
@@ -54,7 +54,7 @@
#include <tdefiledialog.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
// Local includes.