diff options
| author | Florian Jung <flo@windfisch.org> | 2011-08-15 12:37:39 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-08-15 12:37:39 +0000 |
| commit | 23f3026199641b6e2a2af69e10353cbe304e5649 (patch) | |
| tree | e6cd69a129b10ec59ba96b4fa01fc9c5875e0be1 /muse2/muse/songfile.cpp | |
| parent | 078e927639369928a6fa0483c82867dae6cbf9a2 (diff) | |
added transport and panic toolbars to all TopWins
removed the Toplevel class, as the TopWin::type() function replaces it
Diffstat (limited to 'muse2/muse/songfile.cpp')
| -rw-r--r-- | muse2/muse/songfile.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/muse2/muse/songfile.cpp b/muse2/muse/songfile.cpp index d6c06889..d64fc6cd 100644 --- a/muse2/muse/songfile.cpp +++ b/muse2/muse/songfile.cpp @@ -1011,14 +1011,14 @@ void MusE::readToplevels(Xml& xml) if(!pl->empty()) { startPianoroll(pl); - toplevels.back().object()->readStatus(xml); + toplevels.back()->readStatus(xml); pl = new PartList; } } else if (tag == "scoreedit") { ScoreEdit* score = new ScoreEdit(this, 0, arranger->cursorValue()); score->show(); - toplevels.push_back(Toplevel(Toplevel::SCORE, score)); + toplevels.push_back(score); connect(score, SIGNAL(deleted(TopWin*)), SLOT(toplevelDeleted(TopWin*))); connect(score, SIGNAL(name_changed()), SLOT(scoreNamingChanged())); score->readStatus(xml); @@ -1027,7 +1027,7 @@ void MusE::readToplevels(Xml& xml) if(!pl->empty()) { startDrumEditor(pl); - toplevels.back().object()->readStatus(xml); + toplevels.back()->readStatus(xml); pl = new PartList; } } @@ -1035,33 +1035,33 @@ void MusE::readToplevels(Xml& xml) if(!pl->empty()) { startListEditor(pl); - toplevels.back().object()->readStatus(xml); + toplevels.back()->readStatus(xml); pl = new PartList; } } else if (tag == "master") { startMasterEditor(); - toplevels.back().object()->readStatus(xml); + toplevels.back()->readStatus(xml); } else if (tag == "lmaster") { startLMasterEditor(); - toplevels.back().object()->readStatus(xml); + toplevels.back()->readStatus(xml); } else if (tag == "marker") { showMarker(true); - toplevels.back().object()->readStatus(xml); + toplevels.back()->readStatus(xml); } else if (tag == "waveedit") { if(!pl->empty()) { startWaveEditor(pl); - toplevels.back().object()->readStatus(xml); + toplevels.back()->readStatus(xml); pl = new PartList; } } else if (tag == "cliplist") { startClipList(true); - toplevels.back().object()->readStatus(xml); + toplevels.back()->readStatus(xml); } else xml.unknown("MusE"); @@ -1531,8 +1531,8 @@ void MusE::write(Xml& xml) const if (!toplevels.empty()) { xml.tag(level++, "toplevels"); for (ciToplevel i = toplevels.begin(); i != toplevels.end(); ++i) { - if (i->object()->isVisible()) - i->object()->writeStatus(level, xml); + if ((*i)->isVisible()) + (*i)->writeStatus(level, xml); } xml.tag(level--, "/toplevels"); } |