diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kdesktop/minicli.cpp | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kdesktop/minicli.cpp')
| -rw-r--r-- | kdesktop/minicli.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp index 89b4bc69f..dca215de3 100644 --- a/kdesktop/minicli.cpp +++ b/kdesktop/minicli.cpp @@ -130,7 +130,7 @@ Minicli::Minicli( TQWidget *parent, const char *name) m_systempathAutocomplete = 0; m_pURLCompletion = new KURLCompletion(KURLCompletion::FileCompletion); m_pEXECompletion = new KURLCompletion(KURLCompletion::SystemExeCompletion); - //m_pURLCompletion->setCompletionMode( KGlobalSettings::completionMode() ); + //m_pURLCompletion->setCompletionMode( TDEGlobalSettings::completionMode() ); connect( m_pURLCompletion, TQT_SIGNAL( match(const TQString&) ), TQT_SLOT( slotMatch(const TQString&) )); connect( m_pEXECompletion, TQT_SIGNAL( match(const TQString&) ), TQT_SLOT( slotEXEMatch(const TQString&) )); @@ -241,7 +241,7 @@ void Minicli::loadConfig() m_dlg->cbCommand->completionObject()->setItems( compList ); int mode = KDesktopSettings::completionMode(); - m_dlg->cbCommand->setCompletionMode( (KGlobalSettings::Completion) mode ); + m_dlg->cbCommand->setCompletionMode( (TDEGlobalSettings::Completion) mode ); KCompletionBox* box = m_dlg->cbCommand->completionBox(); if (box) @@ -268,7 +268,7 @@ void Minicli::loadConfig() completion->insertItems (users); m_dlg->leUsername->setCompletionObject(completion, true); - m_dlg->leUsername->setCompletionMode(KGlobalSettings::completionMode()); + m_dlg->leUsername->setCompletionMode(TDEGlobalSettings::completionMode()); m_dlg->leUsername->setAutoDeleteCompletionObject( true ); } @@ -1074,7 +1074,7 @@ TQString Minicli::calculate(const TQString &exp) TQString result, cmd; const TQString bc = KStandardDirs::findExe("bc"); if ( !bc.isEmpty() ) - cmd = TQString("echo %1 | %2").arg(KProcess::quote(TQString("scale=8; ")+exp), KProcess::quote(bc)); + cmd = TQString("echo %1 | %2").arg(TDEProcess::quote(TQString("scale=8; ")+exp), TDEProcess::quote(bc)); else cmd = TQString("echo $((%1))").arg(exp); FILE *fs = popen(TQFile::encodeName(cmd).data(), "r"); |