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 /kdesktop/krootwm.cc | |
| 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/krootwm.cc')
| -rw-r--r-- | kdesktop/krootwm.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc index 283d46cb3..403c89f13 100644 --- a/kdesktop/krootwm.cc +++ b/kdesktop/krootwm.cc @@ -136,7 +136,7 @@ KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE) m_actionCollection, "open_terminal" ); } - if (!KGlobal::config()->isImmutable()) + if (!TDEGlobal::config()->isImmutable()) { new KAction(i18n("Configure Desktop..."), "configure", 0, this, TQT_SLOT( slotConfigureDesktop() ), m_actionCollection, "configdesktop" ); @@ -754,15 +754,15 @@ TQStringList KRootWm::configModules() { void KRootWm::slotOpenTerminal() { // kdDebug() << "KRootWm::slotOpenTerminal" << endl; - KProcess* p = new KProcess; + TDEProcess* p = new TDEProcess; TQ_CHECK_PTR(p); - KConfigGroupSaver gs(KGlobal::config(), "General"); - TQString terminal = KGlobal::config()->readPathEntry("TerminalApplication", "konsole"); + KConfigGroupSaver gs(TDEGlobal::config(), "General"); + TQString terminal = TDEGlobal::config()->readPathEntry("TerminalApplication", "konsole"); - *p << terminal << "--workdir=" + KGlobalSettings::desktopPath() + "/"; + *p << terminal << "--workdir=" + TDEGlobalSettings::desktopPath() + "/"; - p->start(KProcess::DontCare); + p->start(TDEProcess::DontCare); delete p; } |