diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-31 22:52:22 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-31 22:52:22 +0000 |
commit | 69c1fdb63e9be2d99084edfe5b5d5c389a8ab91a (patch) | |
tree | d5c2652080ec899495019d0dae310e2e66079b08 | |
parent | 2d59c280c10a0d408ed804d5ca594884b5ee1f4d (diff) | |
download | rosegarden-69c1fdb63e9be2d99084edfe5b5d5c389a8ab91a.tar.gz rosegarden-69c1fdb63e9be2d99084edfe5b5d5c389a8ab91a.zip |
Fix rosegarden FTBFS
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1250647 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r-- | src/document/io/LilyPondExporter.cpp | 2 | ||||
-rw-r--r-- | src/gui/rulers/ChordNameRuler.cpp | 6 | ||||
-rw-r--r-- | src/sequencer/main.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/document/io/LilyPondExporter.cpp b/src/document/io/LilyPondExporter.cpp index 1262d34..f2d6008 100644 --- a/src/document/io/LilyPondExporter.cpp +++ b/src/document/io/LilyPondExporter.cpp @@ -2001,7 +2001,7 @@ LilyPondExporter::writeBar(Segment *s, if ((stringNum <= barreStart) && (stringNum >= barreEnd)) { str << stringNum << "-" << barreFret << ";"; } else { - str << stringNum << "-" << stringStatus << ";"; + str << stringNum << "-" << stringtqStatus << ";"; } } } diff --git a/src/gui/rulers/ChordNameRuler.cpp b/src/gui/rulers/ChordNameRuler.cpp index 6d83e2d..ca366e2 100644 --- a/src/gui/rulers/ChordNameRuler.cpp +++ b/src/gui/rulers/ChordNameRuler.cpp @@ -330,13 +330,13 @@ ChordNameRuler::recalculate(timeT from, timeT to) NOTATION_DEBUG << "ChordNameRuler::recalculate: overallStatus.from==overallStatus.to, ignoring" << endl; level = RecalcNone; } else if (overalltqStatus.from() >= from && overalltqStatus.to() <= to) { - NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overallStatus.from() << "->" << overallStatus.to() << ", I show " << from << "->" << to << ", recalculating visible area" << endl; + NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overalltqStatus.from() << "->" << overalltqStatus.to() << ", I show " << from << "->" << to << ", recalculating visible area" << endl; level = RecalcVisible; } else if (overalltqStatus.from() >= to || overalltqStatus.to() <= from) { - NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overallStatus.from() << "->" << overallStatus.to() << ", I show " << from << "->" << to << ", ignoring" << endl; + NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overalltqStatus.from() << "->" << overalltqStatus.to() << ", I show " << from << "->" << to << ", ignoring" << endl; level = RecalcNone; } else { - NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overallStatus.from() << "->" << overallStatus.to() << ", I show " << from << "->" << to << ", recalculating whole" << endl; + NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overalltqStatus.from() << "->" << overalltqStatus.to() << ", I show " << from << "->" << to << ", recalculating whole" << endl; level = RecalcWhole; } } diff --git a/src/sequencer/main.cpp b/src/sequencer/main.cpp index 21ad97d..4c10362 100644 --- a/src/sequencer/main.cpp +++ b/src/sequencer/main.cpp @@ -227,7 +227,7 @@ int main(int argc, char *argv[]) if (roseSeq->checkExternalTransport()) { atLeisure = false; } else if (lastSeqtqStatus != roseSeq->gettqStatus()) { - SEQUENCER_DEBUG << "Sequencer status changed from " << lastSeqStatus << " to " << roseSeq->gettqStatus() << endl; + SEQUENCER_DEBUG << "Sequencer status changed from " << lastSeqtqStatus << " to " << roseSeq->gettqStatus() << endl; roseSeq->notifySequencertqStatus(); lastSeqtqStatus = roseSeq->gettqStatus(); atLeisure = false; |