diff options
Diffstat (limited to 'src/gui/rulers/ChordNameRuler.cpp')
| -rw-r--r-- | src/gui/rulers/ChordNameRuler.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/gui/rulers/ChordNameRuler.cpp b/src/gui/rulers/ChordNameRuler.cpp index ca366e2..80a985f 100644 --- a/src/gui/rulers/ChordNameRuler.cpp +++ b/src/gui/rulers/ChordNameRuler.cpp @@ -190,7 +190,7 @@ ChordNameRuler::slotScrollHoriz(int x) } TQSize -ChordNameRuler::tqsizeHint() const +ChordNameRuler::sizeHint() const { double width = m_rulerScale->getBarPosition(m_rulerScale->getLastVisibleBar()) + @@ -204,7 +204,7 @@ ChordNameRuler::tqsizeHint() const } TQSize -ChordNameRuler::tqminimumSizeHint() const +ChordNameRuler::minimumSizeHint() const { double firstBarWidth = m_rulerScale->getBarWidth(0); TQSize res = TQSize(int(firstBarWidth), m_height); @@ -231,8 +231,8 @@ ChordNameRuler::recalculate(timeT from, timeT to) } else if (m_regetSegmentsOnChange) { - RefreshtqStatus &rs = - m_composition->getRefreshtqStatus(m_compositionRefreshStatusId); + RefreshStatus &rs = + m_composition->getRefreshStatus(m_compositionRefreshStatusId); if (rs.needsRefresh()) { rs.setNeedsRefresh(false); @@ -304,15 +304,15 @@ ChordNameRuler::recalculate(timeT from, timeT to) if (m_segments.empty()) return ; - SegmentRefreshtqStatus overalltqStatus; - overalltqStatus.setNeedsRefresh(false); + SegmentRefreshStatus overallStatus; + overallStatus.setNeedsRefresh(false); for (SegmentRefreshMap::iterator i = m_segments.begin(); i != m_segments.end(); ++i) { - SegmentRefreshtqStatus &status = - i->first->getRefreshtqStatus(i->second); + SegmentRefreshStatus &status = + i->first->getRefreshStatus(i->second); if (status.needsRefresh()) { - overalltqStatus.push(status.from(), status.to()); + overallStatus.push(status.from(), status.to()); } } @@ -326,17 +326,17 @@ ChordNameRuler::recalculate(timeT from, timeT to) if (from == to) { NOTATION_DEBUG << "ChordNameRuler::recalculate: from==to, recalculating all" << endl; level = RecalcWhole; - } else if (overalltqStatus.from() == overalltqStatus.to()) { + } else if (overallStatus.from() == overallStatus.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 " << overalltqStatus.from() << "->" << overalltqStatus.to() << ", I show " << from << "->" << to << ", recalculating visible area" << endl; + } else if (overallStatus.from() >= from && overallStatus.to() <= to) { + 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; + } else if (overallStatus.from() >= to || overallStatus.to() <= from) { + 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; } } @@ -346,7 +346,7 @@ ChordNameRuler::recalculate(timeT from, timeT to) for (SegmentRefreshMap::iterator i = m_segments.begin(); i != m_segments.end(); ++i) { - i->first->getRefreshtqStatus(i->second).setNeedsRefresh(false); + i->first->getRefreshStatus(i->second).setNeedsRefresh(false); } if (!m_currentSegment) { //!!! arbitrary, must do better |