summaryrefslogtreecommitdiffstats
path: root/konqueror/shellcmdplugin
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
parent9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff)
downloadtdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz
tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/shellcmdplugin')
-rw-r--r--konqueror/shellcmdplugin/kshellcmddialog.cpp2
-rw-r--r--konqueror/shellcmdplugin/kshellcmdexecutor.cpp4
-rw-r--r--konqueror/shellcmdplugin/kshellcmdplugin.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/konqueror/shellcmdplugin/kshellcmddialog.cpp b/konqueror/shellcmdplugin/kshellcmddialog.cpp
index eefa5733..b4ea0cb5 100644
--- a/konqueror/shellcmdplugin/kshellcmddialog.cpp
+++ b/konqueror/shellcmdplugin/kshellcmddialog.cpp
@@ -21,7 +21,7 @@
#include <tqlayout.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstdguiitem.h>
#include <kpushbutton.h>
diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
index 3f93fead..e5e8dabe 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)
diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
index d4b3041a..5c96fea8 100644
--- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp
+++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
@@ -18,7 +18,7 @@
#include "kshellcmdplugin.h"
#include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <konq_dirpart.h>
#include <kprocess.h>
#include <tdeapplication.h>