summaryrefslogtreecommitdiffstats
path: root/konq-plugins/kimgalleryplugin
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:17:49 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:17:49 -0600
commita9184bb205c837f932e03b2a6cac578582f36ed5 (patch)
tree0b69cad530a4c1d0aa8f36ecd50f72f2f589e980 /konq-plugins/kimgalleryplugin
parent74a2067d286867e313f736d6733407586b71195e (diff)
downloadtdeaddons-a9184bb205c837f932e03b2a6cac578582f36ed5.tar.gz
tdeaddons-a9184bb205c837f932e03b2a6cac578582f36ed5.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'konq-plugins/kimgalleryplugin')
-rw-r--r--konq-plugins/kimgalleryplugin/imgallerydialog.cpp2
-rw-r--r--konq-plugins/kimgalleryplugin/imgalleryplugin.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
index 183ff13..964628a 100644
--- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
+++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp
@@ -31,7 +31,7 @@ Boston, MA 02110-1301, USA.
#include <klocale.h>
#include <kurl.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
#include <kiconloader.h>
#include <kdebug.h>
#include <klineedit.h>
diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
index 71b3dce..34eeca6 100644
--- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
+++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp
@@ -29,7 +29,7 @@ Boston, MA 02110-1301, USA.
#include <tqtextcodec.h>
#include <tqstylesheet.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kglobal.h>
#include <klocale.h>
#include <kcharsets.h>