diff options
| author | Orcan Ogetbil <oget.fedora@gmail.com> | 2011-10-07 02:20:29 +0000 |
|---|---|---|
| committer | Orcan Ogetbil <oget.fedora@gmail.com> | 2011-10-07 02:20:29 +0000 |
| commit | f16b2037025918e32c5fd90527f76e1102e5ecb9 (patch) | |
| tree | 0da3b7a29d13b5b826b291ccb2f2676d2e227b40 /muse2/muse/undo.cpp | |
| parent | 42039e7f7f215f6008829d8c6be591c998f1228c (diff) | |
(hopefully) final huge namespace update.
Diffstat (limited to 'muse2/muse/undo.cpp')
| -rw-r--r-- | muse2/muse/undo.cpp | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/muse2/muse/undo.cpp b/muse2/muse/undo.cpp index c0191362..eb554495 100644 --- a/muse2/muse/undo.cpp +++ b/muse2/muse/undo.cpp @@ -32,6 +32,8 @@ #include <QAction> #include <set> +namespace MusECore { + // iundo points to last Undo() in Undo-list static bool undoMode = false; // for debugging @@ -500,12 +502,12 @@ void Song::doUndo2() break; case UndoOp::AddTempo: //printf("doUndo2: UndoOp::AddTempo. deleting tempo at: %d\n", i->a); - tempomap.delTempo(i->a); + MusEGlobal::tempomap.delTempo(i->a); updateFlags |= SC_TEMPO; break; case UndoOp::DeleteTempo: //printf("doUndo2: UndoOp::DeleteTempo. adding tempo at: %d, tempo=%d\n", i->a, i->b); - tempomap.addTempo(i->a, i->b); + MusEGlobal::tempomap.addTempo(i->a, i->b); updateFlags |= SC_TEMPO; break; case UndoOp::AddSig: @@ -520,12 +522,12 @@ void Song::doUndo2() break; case UndoOp::AddKey: ///sigmap.del(i->a); - keymap.delKey(i->a); + MusEGlobal::keymap.delKey(i->a); updateFlags |= SC_KEY; break; case UndoOp::DeleteKey: ///sigmap.add(i->a, i->b, i->c); - keymap.addKey(i->a, (key_enum)i->b); + MusEGlobal::keymap.addKey(i->a, (key_enum)i->b); updateFlags |= SC_KEY; break; case UndoOp::ModifyClip: @@ -739,12 +741,12 @@ void Song::doRedo2() break; case UndoOp::AddTempo: //printf("doRedo2: UndoOp::AddTempo. adding tempo at: %d with tempo=%d\n", i->a, i->b); - tempomap.addTempo(i->a, i->b); + MusEGlobal::tempomap.addTempo(i->a, i->b); updateFlags |= SC_TEMPO; break; case UndoOp::DeleteTempo: //printf("doRedo2: UndoOp::DeleteTempo. deleting tempo at: %d with tempo=%d\n", i->a, i->b); - tempomap.delTempo(i->a); + MusEGlobal::tempomap.delTempo(i->a); updateFlags |= SC_TEMPO; break; case UndoOp::AddSig: @@ -758,11 +760,11 @@ void Song::doRedo2() updateFlags |= SC_SIG; break; case UndoOp::AddKey: - keymap.addKey(i->a, (key_enum)i->b); + MusEGlobal::keymap.addKey(i->a, (key_enum)i->b); updateFlags |= SC_KEY; break; case UndoOp::DeleteKey: - keymap.delKey(i->a); + MusEGlobal::keymap.delKey(i->a); updateFlags |= SC_KEY; break; case UndoOp::ModifyClip: @@ -930,7 +932,7 @@ bool Song::doUndo1() break; case UndoOp::ModifyClip: - SndFile::applyUndoFile(i->filename, i->tmpwavfile, i->startframe, i->endframe); + MusECore::SndFile::applyUndoFile(i->filename, i->tmpwavfile, i->startframe, i->endframe); break; default: @@ -1021,7 +1023,7 @@ bool Song::doRedo1() removeTrack1(i->oTrack); break; case UndoOp::ModifyClip: - SndFile::applyUndoFile(i->filename, i->tmpwavfile, i->startframe, i->endframe); + MusECore::SndFile::applyUndoFile(i->filename, i->tmpwavfile, i->startframe, i->endframe); break; default: break; @@ -1073,3 +1075,4 @@ void Song::doRedo3() dirty = true; } +} // namespace MusECore |