From 29df04c24350cc76a41e2410d1c92445f9338b98 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:51:30 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- quanta/src/quanta_init.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'quanta/src/quanta_init.cpp') diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp index 42765a21..73d6c858 100644 --- a/quanta/src/quanta_init.cpp +++ b/quanta/src/quanta_init.cpp @@ -133,7 +133,7 @@ void QuantaInit::initQuanta() m_config = quantaApp->m_config; parser = new Parser(); - TQStringList tmpDirs = KGlobal::dirs()->resourceDirs("tmp"); + TQStringList tmpDirs = TDEGlobal::dirs()->resourceDirs("tmp"); TQDir dir; tmpDir = tmpDirs[0]; for (uint i = 0; i < tmpDirs.count(); i++) @@ -276,7 +276,7 @@ void QuantaInit::initQuanta() //get the PID of this running instance qConfig.quantaPID = TQString::number(int(getpid()), 10); - qConfig.backupDirPath = KGlobal::instance()->dirs()->saveLocation("data", resourceDir + "backups/"); + qConfig.backupDirPath = TDEGlobal::instance()->dirs()->saveLocation("data", resourceDir + "backups/"); m_quanta->autosaveTimer = new TQTimer(m_quanta); connect(m_quanta->autosaveTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAutosaveTimer())); @@ -1267,19 +1267,19 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList) void QuantaInit::execCommandPS(const TQString& cmd) { - //We create a KProcess that executes the "ps" *nix command to get the PIDs of the + //We create a TDEProcess that executes the "ps" *nix command to get the PIDs of the //other instances of quanta actually running - KProcess *execCommand = new KProcess(); + TDEProcess *execCommand = new TDEProcess(); *(execCommand) << TQStringList::split(" ",cmd); - connect(execCommand, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotGetScriptOutput(KProcess*,char*,int))); - connect(execCommand, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotGetScriptError(KProcess*,char*,int))); - connect(execCommand, TQT_SIGNAL(processExited(KProcess*)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotProcessExited(KProcess*))); + connect(execCommand, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotGetScriptOutput(TDEProcess*,char*,int))); + connect(execCommand, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotGetScriptError(TDEProcess*,char*,int))); + connect(execCommand, TQT_SIGNAL(processExited(TDEProcess*)), + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotProcessExited(TDEProcess*))); - if (!execCommand->start(KProcess::NotifyOnExit,KProcess::All)) + if (!execCommand->start(TDEProcess::NotifyOnExit,TDEProcess::All)) { KMessageBox::error(m_quanta, i18n("Failed to query for running Quanta instances.")); } @@ -1516,7 +1516,7 @@ void QuantaInit::readAbbreviations() bool mainAbbrevFileFound = false; TQStringList mainFileList; mainFileList << qConfig.globalDataDir + resourceDir + "abbreviations.xml"; - mainFileList << KGlobal::dirs()->saveLocation("data") + resourceDir + "abbreviations.xml"; + mainFileList << TDEGlobal::dirs()->saveLocation("data") + resourceDir + "abbreviations.xml"; for (uint i = 0; i < mainFileList.count(); i++) { if (!TQFile::exists(mainFileList[i])) @@ -1565,7 +1565,7 @@ void QuantaInit::readAbbreviations() dirName = dirURL.path(1); TQString abbrevFile = dirName; TQString tmpStr = dirName; - TQStringList resourceDirs = KGlobal::dirs()->resourceDirs("data"); + TQStringList resourceDirs = TDEGlobal::dirs()->resourceDirs("data"); bool dirFound = false; for (uint i = 0; i < resourceDirs.count(); i++) { @@ -1578,7 +1578,7 @@ void QuantaInit::readAbbreviations() } if (dirFound) { - abbrevFile = KGlobal::dirs()->saveLocation("data", tmpStr) +"/"; + abbrevFile = TDEGlobal::dirs()->saveLocation("data", tmpStr) +"/"; } abbrevFile.append("abbreviations"); if (!TQFile::exists(abbrevFile)) -- cgit v1.2.1