From 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:55:37 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 konqueror/shellcmdplugin/kshellcmddialog.cpp   | 2 +-
 konqueror/shellcmdplugin/kshellcmdexecutor.cpp | 4 ++--
 konqueror/shellcmdplugin/kshellcmdplugin.cpp   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'konqueror/shellcmdplugin')

diff --git a/konqueror/shellcmdplugin/kshellcmddialog.cpp b/konqueror/shellcmdplugin/kshellcmddialog.cpp
index eefa57337..b4ea0cb5d 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 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)
diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
index d4b3041ab..5c96fea85 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>
-- 
cgit v1.2.3