diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /konqueror/shellcmdplugin | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/shellcmdplugin')
| -rw-r--r-- | konqueror/shellcmdplugin/kshellcmdexecutor.cpp | 2 | ||||
| -rw-r--r-- | konqueror/shellcmdplugin/kshellcmdplugin.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
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; |