diff options
Diffstat (limited to 'src/gui/seqmanager/CompositionMmapper.cpp')
| -rw-r--r-- | src/gui/seqmanager/CompositionMmapper.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/gui/seqmanager/CompositionMmapper.cpp b/src/gui/seqmanager/CompositionMmapper.cpp index 30983fe..778b655 100644 --- a/src/gui/seqmanager/CompositionMmapper.cpp +++ b/src/gui/seqmanager/CompositionMmapper.cpp @@ -49,7 +49,7 @@ CompositionMmapper::CompositionMmapper(RosegardenGUIDoc *doc) { cleanup(); - SEQMAN_DEBUG << "CompositionMmapper() - doc = " << doc << endl; + SETQMAN_DEBUG << "CompositionMmapper() - doc = " << doc << endl; Composition &comp = m_doc->getComposition(); for (Composition::iterator it = comp.begin(); it != comp.end(); it++) { @@ -67,7 +67,7 @@ CompositionMmapper::CompositionMmapper(RosegardenGUIDoc *doc) CompositionMmapper::~CompositionMmapper() { - SEQMAN_DEBUG << "~CompositionMmapper()\n"; + SETQMAN_DEBUG << "~CompositionMmapper()\n"; // // Clean up possible left-overs @@ -92,7 +92,7 @@ void CompositionMmapper::cleanup() TQDir segmentsDir(tmpPath, "segment_*"); for (unsigned int i = 0; i < segmentsDir.count(); ++i) { TQString segmentName = tmpPath + '/' + segmentsDir[i]; - SEQMAN_DEBUG << "CompositionMmapper : cleaning up " << segmentName << endl; + SETQMAN_DEBUG << "CompositionMmapper : cleaning up " << segmentName << endl; TQFile::remove (segmentName); } @@ -107,7 +107,7 @@ bool CompositionMmapper::segmentModified(Segment* segment) return false; // this can happen with the SegmentSplitCommand, where the new segment's transpose is set // even though it's not mapped yet - SEQMAN_DEBUG << "CompositionMmapper::segmentModified(" << segment << ") - mmapper = " + SETQMAN_DEBUG << "CompositionMmapper::segmentModified(" << segment << ") - mmapper = " << mmapper << endl; return mmapper->refresh(); @@ -115,24 +115,24 @@ bool CompositionMmapper::segmentModified(Segment* segment) void CompositionMmapper::segmentAdded(Segment* segment) { - SEQMAN_DEBUG << "CompositionMmapper::segmentAdded(" << segment << ")\n"; + SETQMAN_DEBUG << "CompositionMmapper::segmentAdded(" << segment << ")\n"; mmapSegment(segment); } void CompositionMmapper::segmentDeleted(Segment* segment) { - SEQMAN_DEBUG << "CompositionMmapper::segmentDeleted(" << segment << ")\n"; + SETQMAN_DEBUG << "CompositionMmapper::segmentDeleted(" << segment << ")\n"; SegmentMmapper* mmapper = m_segmentMmappers[segment]; m_segmentMmappers.erase(segment); - SEQMAN_DEBUG << "CompositionMmapper::segmentDeleted() : deleting SegmentMmapper " << mmapper << endl; + SETQMAN_DEBUG << "CompositionMmapper::segmentDeleted() : deleting SegmentMmapper " << mmapper << endl; delete mmapper; } void CompositionMmapper::mmapSegment(Segment* segment) { - SEQMAN_DEBUG << "CompositionMmapper::mmapSegment(" << segment << ")\n"; + SETQMAN_DEBUG << "CompositionMmapper::mmapSegment(" << segment << ")\n"; SegmentMmapper* mmapper = SegmentMmapperFactory::makeMmapperForSegment(m_doc, segment, @@ -147,8 +147,8 @@ TQString CompositionMmapper::makeFileName(Segment* segment) TQStringList tmpDirs = KGlobal::dirs()->resourceDirs("tmp"); return TQString("%1/segment_%2") - .arg(tmpDirs.last()) - .arg((uintptr_t)segment, 0, 16); + .tqarg(tmpDirs.last()) + .tqarg((uintptr_t)segment, 0, 16); } TQString CompositionMmapper::getSegmentFileName(Segment* s) @@ -158,7 +158,7 @@ TQString CompositionMmapper::getSegmentFileName(Segment* s) if (mmapper) return mmapper->getFileName(); else - return TQString::null; + return TQString(); } size_t CompositionMmapper::getSegmentFileSize(Segment* s) |