From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:43:14 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

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

(limited to 'konqueror/shellcmdplugin')

diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
index 7af5ed2bf..3f93feade 100644
--- a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
+++ b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp
@@ -39,7 +39,7 @@ KShellCommandExecutor::KShellCommandExecutor(const TQString& command, TQWidget*
 ,m_writeNotifier(0)
 {
    setTextFormat(PlainText);
-   setFont( KGlobalSettings::fixedFont() );
+   setFont( TDEGlobalSettings::fixedFont() );
 }
 
 KShellCommandExecutor::~KShellCommandExecutor()
diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
index 66dd0b7bb..fefc52de4 100644
--- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp
+++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp
@@ -67,12 +67,12 @@ void KShellCmdPlugin::slotExecuteShellCommand()
    bool ok;
    TQString cmd = KInputDialog::getText( i18n("Execute Shell Command"),
       i18n( "Execute shell command in current directory:" ),
-      KProcess::quote( path ), &ok, part->widget() );
+      TDEProcess::quote( path ), &ok, part->widget() );
    if ( ok )
    {
       TQString chDir;
       chDir="cd ";
-      chDir+=KProcess::quote(part->url().path());
+      chDir+=TDEProcess::quote(part->url().path());
       chDir+="; ";
       chDir+=cmd;
 
-- 
cgit v1.2.1