From 2d59c280c10a0d408ed804d5ca594884b5ee1f4d Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 31 Aug 2011 04:15:04 +0000 Subject: [PATCH] Fix remaining instances of tqStatus embedded in user visible strings git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1250385 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/document/io/LilyPondExporter.cpp | 2 +- src/gui/rulers/ChordNameRuler.cpp | 8 ++++---- src/gui/seqmanager/SequenceManager.cpp | 8 ++++---- src/sequencer/RosegardenSequencerApp.cpp | 6 +++--- src/sequencer/main.cpp | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/document/io/LilyPondExporter.cpp b/src/document/io/LilyPondExporter.cpp index f2d6008..1262d34 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 << "-" << stringtqStatus << ";"; + str << stringNum << "-" << stringStatus << ";"; } } } diff --git a/src/gui/rulers/ChordNameRuler.cpp b/src/gui/rulers/ChordNameRuler.cpp index 91dde1d..6d83e2d 100644 --- a/src/gui/rulers/ChordNameRuler.cpp +++ b/src/gui/rulers/ChordNameRuler.cpp @@ -327,16 +327,16 @@ ChordNameRuler::recalculate(timeT from, timeT to) NOTATION_DEBUG << "ChordNameRuler::recalculate: from==to, recalculating all" << endl; level = RecalcWhole; } else if (overalltqStatus.from() == overalltqStatus.to()) { - NOTATION_DEBUG << "ChordNameRuler::recalculate: overalltqStatus.from==overalltqStatus.to, ignoring" << endl; + 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 " << overalltqStatus.from() << "->" << overalltqStatus.to() << ", I show " << from << "->" << to << ", recalculating visible area" << endl; + NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overallStatus.from() << "->" << overallStatus.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 " << overalltqStatus.from() << "->" << overalltqStatus.to() << ", I show " << from << "->" << to << ", ignoring" << endl; + NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overallStatus.from() << "->" << overallStatus.to() << ", I show " << from << "->" << to << ", ignoring" << endl; level = RecalcNone; } else { - NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overalltqStatus.from() << "->" << overalltqStatus.to() << ", I show " << from << "->" << to << ", recalculating whole" << endl; + NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overallStatus.from() << "->" << overallStatus.to() << ", I show " << from << "->" << to << ", recalculating whole" << endl; level = RecalcWhole; } } diff --git a/src/gui/seqmanager/SequenceManager.cpp b/src/gui/seqmanager/SequenceManager.cpp index ec80707..df7a3d8 100644 --- a/src/gui/seqmanager/SequenceManager.cpp +++ b/src/gui/seqmanager/SequenceManager.cpp @@ -1278,7 +1278,7 @@ SequenceManager::checkSoundDrivertqStatus(bool warnUser) streamOut << TQString(VERSION); - if (! rgapp->sequencerCall("getSoundDrivertqStatus(TQString)", + if (! rgapp->sequencerCall("getSoundDriverStatus(TQString)", replyType, replyData, data)) { m_soundDrivertqStatus = NO_DRIVER; @@ -1695,7 +1695,7 @@ void SequenceManager::update() void SequenceManager::checkRefreshtqStatus() { - SETQMAN_DEBUG << "SequenceManager::checkRefreshtqStatus()\n"; + SETQMAN_DEBUG << "SequenceManager::checkRefreshStatus()\n"; // Look at trigger segments first: if one of those has changed, we'll // need to be aware of it when scanning segments subsequently @@ -1725,7 +1725,7 @@ void SequenceManager::checkRefreshtqStatus() m_triggerSegments = newTriggerMap; - SETQMAN_DEBUG << "SequenceManager::checkRefreshtqStatus: segments modified by changes to trigger segments are:" << endl; + SETQMAN_DEBUG << "SequenceManager::checkRefreshStatus: segments modified by changes to trigger segments are:" << endl; int x = 0; for (TriggerSegmentRec::SegmentRuntimeIdSet::iterator i = ridset.begin(); i != ridset.end(); ++i) { @@ -1741,7 +1741,7 @@ void SequenceManager::checkRefreshtqStatus() } m_removedSegments.clear(); - SETQMAN_DEBUG << "SequenceManager::checkRefreshtqStatus: we have " + SETQMAN_DEBUG << "SequenceManager::checkRefreshStatus: we have " << m_segments.size() << " segments" << endl; // then the ones which are still there diff --git a/src/sequencer/RosegardenSequencerApp.cpp b/src/sequencer/RosegardenSequencerApp.cpp index 0aabda1..6e20e69 100644 --- a/src/sequencer/RosegardenSequencerApp.cpp +++ b/src/sequencer/RosegardenSequencerApp.cpp @@ -419,9 +419,9 @@ RosegardenSequencerApp::notifySequencertqStatus() if (!kapp->dcopClient()->send(ROSEGARDEN_GUI_APP_NAME, ROSEGARDEN_GUI_IFACE_NAME, - "notifySequencertqStatus(int)", + "notifySequencerStatus(int)", data)) { - SEQUENCER_DEBUG << "RosegardenSequencer::notifySequencertqStatus()" + SEQUENCER_DEBUG << "RosegardenSequencer::notifySequencerStatus()" << " - can't send to RosegardenGUI client" << endl; @@ -1103,7 +1103,7 @@ RosegardenSequencerApp::getSoundDrivertqStatus(const TQString &guiVersion) if (guiVersion == VERSION) drivertqStatus |= VERSION_OK; else { - std::cerr << "WARNING: RosegardenSequencerApp::getSoundDrivertqStatus: " + std::cerr << "WARNING: RosegardenSequencerApp::getSoundDriverStatus: " << "GUI version \"" << guiVersion << "\" does not match sequencer version \"" << VERSION << "\"" << std::endl; diff --git a/src/sequencer/main.cpp b/src/sequencer/main.cpp index 4c10362..21ad97d 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 " << lastSeqtqStatus << " to " << roseSeq->gettqStatus() << endl; + SEQUENCER_DEBUG << "Sequencer status changed from " << lastSeqStatus << " to " << roseSeq->gettqStatus() << endl; roseSeq->notifySequencertqStatus(); lastSeqtqStatus = roseSeq->gettqStatus(); atLeisure = false;