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/sequencer | |
| 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/sequencer')
| -rw-r--r-- | src/sequencer/RosegardenSequencerApp.cpp | 6 | ||||
| -rw-r--r-- | src/sequencer/SequencerMmapper.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/sequencer/RosegardenSequencerApp.cpp b/src/sequencer/RosegardenSequencerApp.cpp index ceeddf6..3acca16 100644 --- a/src/sequencer/RosegardenSequencerApp.cpp +++ b/src/sequencer/RosegardenSequencerApp.cpp @@ -77,7 +77,7 @@ RosegardenSequencerApp::RosegardenSequencerApp() : m_loopStart(0, 0), m_loopEnd(0, 0), m_studio(new MappedStudio()), - m_segmentFilesPath(KGlobal::dirs()->resourceDirs("tmp").last()), + m_segmentFilesPath(TDEGlobal::dirs()->resourceDirs("tmp").last()), m_metaIterator(0), m_controlBlockMmapper(0), m_transportToken(1), @@ -567,7 +567,7 @@ RosegardenSequencerApp::processAsynchronousEvents() lastCheckedAt = tv; try { - m_controlBlockMmapper = new ControlBlockMmapper(KGlobal::dirs()->resourceDirs("tmp").last() + m_controlBlockMmapper = new ControlBlockMmapper(TDEGlobal::dirs()->resourceDirs("tmp").last() + "/rosegarden_control_block"); } catch (Exception e) { // Assume that the control block simply hasn't been @@ -839,7 +839,7 @@ RosegardenSequencerApp::play(const RealTime &time, mmapSegment(m_segmentFilesPath + "/" + segmentsDir[i]); } - TQString tmpDir = KGlobal::dirs()->resourceDirs("tmp").last(); + TQString tmpDir = TDEGlobal::dirs()->resourceDirs("tmp").last(); // Map metronome // diff --git a/src/sequencer/SequencerMmapper.cpp b/src/sequencer/SequencerMmapper.cpp index 0a7e487..80ed6a2 100644 --- a/src/sequencer/SequencerMmapper.cpp +++ b/src/sequencer/SequencerMmapper.cpp @@ -138,7 +138,7 @@ SequencerMmapper::setFileSize(size_t size) TQString SequencerMmapper::createFileName() { - return KGlobal::dirs()->resourceDirs("tmp").last() + + return TDEGlobal::dirs()->resourceDirs("tmp").last() + "/rosegarden_sequencer_timing_block"; } |