summaryrefslogtreecommitdiffstats
path: root/src/gui/editors/guitar/Fingering.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/editors/guitar/Fingering.cpp')
-rw-r--r--src/gui/editors/guitar/Fingering.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gui/editors/guitar/Fingering.cpp b/src/gui/editors/guitar/Fingering.cpp
index 7e5ecc4..59459e9 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 lastStringtqStatus = m_strings[getNbStrings() - 1];
+ int lastStringStatus = m_strings[getNbStrings() - 1];
- 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));
+ 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));
}
Fingering::Barre
Fingering::getBarre() const
{
- int lastStringtqStatus = m_strings[getNbStrings() - 1];
+ int lastStringStatus = m_strings[getNbStrings() - 1];
Barre res;
- res.fret = lastStringtqStatus;
+ res.fret = lastStringStatus;
for(unsigned int i = 0; i < 3; ++i) {
- if (m_strings[i] > OPEN && m_strings[i] == lastStringtqStatus)
+ if (m_strings[i] > OPEN && m_strings[i] == lastStringStatus)
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'").tqarg(t).tqarg(ch);
+ errorString = i18n("couldn't parse fingering '%1' in '%2'").arg(t).arg(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.getStringtqStatus(i) != b.getStringtqStatus(i)) {
- return a.getStringtqStatus(i) < b.getStringtqStatus(i);
+ if (a.getStringStatus(i) != b.getStringStatus(i)) {
+ return a.getStringStatus(i) < b.getStringStatus(i);
}
}
return false;