summaryrefslogtreecommitdiffstats
path: root/konq-plugins/tdehtmlsettingsplugin
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/tdehtmlsettingsplugin
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/tdehtmlsettingsplugin')
-rw-r--r--konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp
index a12d714..80e88e7 100644
--- a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp
+++ b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp
@@ -20,14 +20,14 @@
#include <dcopclient.h>
#include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <tdeconfig.h>
#include <kglobal.h>
#include <tdehtml_part.h>
#include <kinstance.h>
#include <klocale.h>
#include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kprotocolmanager.h>
#include <kgenericfactory.h>
#include <kaboutdata.h>