summaryrefslogtreecommitdiffstats
path: root/konqueror/remoteencodingplugin
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:19:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:19:22 -0600
commita5430e4b98efd05937bd3bfe78c56eb826f145fa (patch)
tree1af88f74a9d800399de58491b215fb303cbfb1f3 /konqueror/remoteencodingplugin
parenteba183d4de47093c6e44a99c8d7fe313aa2834c9 (diff)
downloadtdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.tar.gz
tdebase-a5430e4b98efd05937bd3bfe78c56eb826f145fa.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/remoteencodingplugin')
-rw-r--r--konqueror/remoteencodingplugin/kremoteencodingplugin.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
index 5e669972b..846fae1be 100644
--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
@@ -25,12 +25,12 @@
*/
#include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <klocale.h>
#include <kglobal.h>
#include <tdeconfig.h>
#include <kcharsets.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <dcopclient.h>
#include <kgenericfactory.h>
#include <kprotocolmanager.h>