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/gui/seqmanager | |
| 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/gui/seqmanager')
| -rw-r--r-- | src/gui/seqmanager/CompositionMmapper.cpp | 4 | ||||
| -rw-r--r-- | src/gui/seqmanager/ControlBlockMmapper.cpp | 2 | ||||
| -rw-r--r-- | src/gui/seqmanager/MetronomeMmapper.cpp | 2 | ||||
| -rw-r--r-- | src/gui/seqmanager/SequenceManager.cpp | 2 | ||||
| -rw-r--r-- | src/gui/seqmanager/SpecialSegmentMmapper.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/seqmanager/CompositionMmapper.cpp b/src/gui/seqmanager/CompositionMmapper.cpp index 869e68c..543959d 100644 --- a/src/gui/seqmanager/CompositionMmapper.cpp +++ b/src/gui/seqmanager/CompositionMmapper.cpp @@ -87,7 +87,7 @@ void CompositionMmapper::cleanup() // Erase all 'segment_*' files // - TQString tmpPath = KGlobal::dirs()->resourceDirs("tmp").last(); + TQString tmpPath = TDEGlobal::dirs()->resourceDirs("tmp").last(); TQDir segmentsDir(tmpPath, "segment_*"); for (unsigned int i = 0; i < segmentsDir.count(); ++i) { @@ -144,7 +144,7 @@ void CompositionMmapper::mmapSegment(Segment* segment) TQString CompositionMmapper::makeFileName(Segment* segment) { - TQStringList tmpDirs = KGlobal::dirs()->resourceDirs("tmp"); + TQStringList tmpDirs = TDEGlobal::dirs()->resourceDirs("tmp"); return TQString("%1/segment_%2") .arg(tmpDirs.last()) diff --git a/src/gui/seqmanager/ControlBlockMmapper.cpp b/src/gui/seqmanager/ControlBlockMmapper.cpp index 2417c67..2d64c57 100644 --- a/src/gui/seqmanager/ControlBlockMmapper.cpp +++ b/src/gui/seqmanager/ControlBlockMmapper.cpp @@ -98,7 +98,7 @@ ControlBlockMmapper::~ControlBlockMmapper() TQString ControlBlockMmapper::createFileName() { - return KGlobal::dirs()->resourceDirs("tmp").last() + "/rosegarden_control_block"; + return TDEGlobal::dirs()->resourceDirs("tmp").last() + "/rosegarden_control_block"; } void ControlBlockMmapper::updateTrackData(Track *t) diff --git a/src/gui/seqmanager/MetronomeMmapper.cpp b/src/gui/seqmanager/MetronomeMmapper.cpp index d9804cd..7002696 100644 --- a/src/gui/seqmanager/MetronomeMmapper.cpp +++ b/src/gui/seqmanager/MetronomeMmapper.cpp @@ -155,7 +155,7 @@ InstrumentId MetronomeMmapper::getMetronomeInstrument() TQString MetronomeMmapper::createFileName() { - return KGlobal::dirs()->resourceDirs("tmp").last() + "/rosegarden_metronome"; + return TDEGlobal::dirs()->resourceDirs("tmp").last() + "/rosegarden_metronome"; } void MetronomeMmapper::dump() diff --git a/src/gui/seqmanager/SequenceManager.cpp b/src/gui/seqmanager/SequenceManager.cpp index b05a3d4..60981c9 100644 --- a/src/gui/seqmanager/SequenceManager.cpp +++ b/src/gui/seqmanager/SequenceManager.cpp @@ -241,7 +241,7 @@ SequenceManager::mapSequencer() try { m_sequencerMapper = new SequencerMapper( - KGlobal::dirs()->resourceDirs("tmp").last() + "/rosegarden_sequencer_timing_block"); + TDEGlobal::dirs()->resourceDirs("tmp").last() + "/rosegarden_sequencer_timing_block"); } catch (Exception) { m_sequencerMapper = 0; } diff --git a/src/gui/seqmanager/SpecialSegmentMmapper.cpp b/src/gui/seqmanager/SpecialSegmentMmapper.cpp index ecd1e11..e556820 100644 --- a/src/gui/seqmanager/SpecialSegmentMmapper.cpp +++ b/src/gui/seqmanager/SpecialSegmentMmapper.cpp @@ -45,7 +45,7 @@ SpecialSegmentMmapper::SpecialSegmentMmapper(RosegardenGUIDoc* doc, TQString SpecialSegmentMmapper::createFileName(TQString baseFileName) { - return KGlobal::dirs()->resourceDirs("tmp").last() + "/" + baseFileName; + return TDEGlobal::dirs()->resourceDirs("tmp").last() + "/" + baseFileName; } unsigned int SpecialSegmentMmapper::getSegmentRepeatCount() |
