summaryrefslogtreecommitdiffstats
path: root/konqueror/shellcmdplugin/kshellcmdexecutor.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/shellcmdplugin/kshellcmdexecutor.cpp
parent9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff)
downloadtdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz
tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/shellcmdplugin/kshellcmdexecutor.cpp')
-rw-r--r--konqueror/shellcmdplugin/kshellcmdexecutor.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
index 3f93feade..e5e8dabe4 100644
--- a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
+++ b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
@@ -27,9 +27,9 @@
#include <tqsocketnotifier.h>
#include <kinputdialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdesu/process.h>
-#include <klocale.h>
+#include <tdelocale.h>
KShellCommandExecutor::KShellCommandExecutor(const TQString& command, TQWidget* parent)
:TQTextView(parent)