diff options
Diffstat (limited to 'src/gui/editors/guitar/Fingering.cpp')
| -rw-r--r-- | src/gui/editors/guitar/Fingering.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gui/editors/guitar/Fingering.cpp b/src/gui/editors/guitar/Fingering.cpp index 59459e9..7e5ecc4 100644 --- a/src/gui/editors/guitar/Fingering.cpp +++ b/src/gui/editors/guitar/Fingering.cpp @@ -69,24 +69,24 @@ Fingering::getStartFret() const bool Fingering::hasBarre() const { - int lastStringStatus = m_strings[getNbStrings() - 1]; + int lastStringtqStatus = m_strings[getNbStrings() - 1]; - return ((m_strings[0] > OPEN && m_strings[0] == lastStringStatus) || - (m_strings[1] > OPEN && m_strings[1] == lastStringStatus) || - (m_strings[2] > OPEN && m_strings[2] == lastStringStatus)); + return ((m_strings[0] > OPEN && m_strings[0] == lastStringtqStatus) || + (m_strings[1] > OPEN && m_strings[1] == lastStringtqStatus) || + (m_strings[2] > OPEN && m_strings[2] == lastStringtqStatus)); } Fingering::Barre Fingering::getBarre() const { - int lastStringStatus = m_strings[getNbStrings() - 1]; + int lastStringtqStatus = m_strings[getNbStrings() - 1]; Barre res; - res.fret = lastStringStatus; + res.fret = lastStringtqStatus; for(unsigned int i = 0; i < 3; ++i) { - if (m_strings[i] > OPEN && m_strings[i] == lastStringStatus) + if (m_strings[i] > OPEN && m_strings[i] == lastStringtqStatus) res.start = i; break; } @@ -115,7 +115,7 @@ Fingering::parseFingering(const TQString& ch, TQString& errorString) // NOTATION_DEBUG << "Fingering::parseFingering : '" << t << "' = MUTED\n"; fingering[idx] = MUTED; } else { - errorString = i18n("couldn't parse fingering '%1' in '%2'").arg(t).arg(ch); + errorString = i18n("couldn't parse fingering '%1' in '%2'").tqarg(t).tqarg(ch); } } @@ -140,8 +140,8 @@ std::string Fingering::toString() const bool operator<(const Fingering& a, const Fingering& b) { for(unsigned int i = 0; i < Fingering::DEFAULT_NB_STRINGS; ++i) { - if (a.getStringStatus(i) != b.getStringStatus(i)) { - return a.getStringStatus(i) < b.getStringStatus(i); + if (a.getStringtqStatus(i) != b.getStringtqStatus(i)) { + return a.getStringtqStatus(i) < b.getStringtqStatus(i); } } return false; |