diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:26:42 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:26:42 -0600 |
| commit | 59ff04ffaf48f18383b39ea6da17b8e18b6b50c3 (patch) | |
| tree | 3c5878d4255116c6146b38687214acf355eb7564 /src/document | |
| parent | c329cc4e7edb85184878ba8238c4344cbaba2ac0 (diff) | |
| download | rosegarden-59ff04ffaf48f18383b39ea6da17b8e18b6b50c3.tar.gz rosegarden-59ff04ffaf48f18383b39ea6da17b8e18b6b50c3.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/document')
| -rw-r--r-- | src/document/RosegardenGUIDoc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/document/RosegardenGUIDoc.cpp b/src/document/RosegardenGUIDoc.cpp index fab09c3..3db3cfc 100644 --- a/src/document/RosegardenGUIDoc.cpp +++ b/src/document/RosegardenGUIDoc.cpp @@ -545,7 +545,7 @@ void RosegardenGUIDoc::newDocument() void RosegardenGUIDoc::performAutoload() { TQString autoloadFile = - KGlobal::dirs()->findResource("appdata", "autoload.rg"); + TDEGlobal::dirs()->findResource("appdata", "autoload.rg"); TQFileInfo autoloadFileInfo(autoloadFile); @@ -2305,12 +2305,12 @@ RosegardenGUIDoc::syncDevices() if (isSequencerRunning() && !rgapp->isSequencerRegistered() && timeout == 0) { // Give up, kill sequencer if possible, and report - KProcess *proc = new KProcess; + TDEProcess *proc = new TDEProcess; *proc << "/usr/bin/killall"; *proc << "rosegardensequencer"; *proc << "lt-rosegardensequencer"; - proc->start(KProcess::Block, KProcess::All); + proc->start(TDEProcess::Block, TDEProcess::All); if (proc->exitStatus()) { RG_DEBUG << "couldn't kill any sequencer processes" << endl; |