summaryrefslogtreecommitdiffstats
path: root/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:55:37 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:55:37 -0600
commit77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch)
treea1cce95474892add7cb970b8e9fbdb16e12bc2d7 /konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
parent9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff)
downloadtdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz
tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/remoteencodingplugin/kremoteencodingplugin.cpp')
-rw-r--r--konqueror/remoteencodingplugin/kremoteencodingplugin.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
index 846fae1be..8889861b3 100644
--- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
+++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
@@ -26,14 +26,14 @@
#include <kdebug.h>
#include <tdeaction.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <kcharsets.h>
#include <tdepopupmenu.h>
#include <dcopclient.h>
#include <kgenericfactory.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
#include <kprotocolinfo.h>
#include <tdeio/slaveconfig.h>
#include <konq_dirpart.h>