Rename old tq methods that no longer need a unique name

3 files changed, 15 insertions, 15 deletions

diff --git a/src/gui/editors/guitar/Fingering.cpp b/src/gui/editors/guitar/Fingering.cpp
index 7e5ecc4..e129296 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;
     }
@@ -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;
diff --git a/src/gui/editors/guitar/Fingering.h b/src/gui/editors/guitar/Fingering.h
index b413d3b..32693dd 100644
--- a/src/gui/editors/guitar/Fingering.h
+++ b/src/gui/editors/guitar/Fingering.h
@@ -60,8 +60,8 @@ public:
      * returns the fret number on which the string is pressed, or one of MUTED and OPEN  
      * 
      */
-    int  getStringtqStatus(int stringNb) const       { return m_strings[stringNb]; } 
-    void setStringtqStatus(int stringNb, int status) { m_strings[stringNb] = status; } 
+    int  getStringStatus(int stringNb) const       { return m_strings[stringNb]; } 
+    void setStringStatus(int stringNb, int status) { m_strings[stringNb] = status; } 
     unsigned int getStartFret() const;
     unsigned int getNbStrings() const { return m_strings.size(); }
         
diff --git a/src/gui/editors/guitar/FingeringBox.cpp b/src/gui/editors/guitar/FingeringBox.cpp
index 6ca2c39..49058b2 100644
--- a/src/gui/editors/guitar/FingeringBox.cpp
+++ b/src/gui/editors/guitar/FingeringBox.cpp
@@ -219,16 +219,16 @@ FingeringBox::processMouseRelease(unsigned int release_string_num,
                 
                 if(m_press_fret_num == 0) {
                     
-                    int stringtqStatus = m_fingering.getStringtqStatus(m_press_string_num);
+                    int stringStatus = m_fingering.getStringStatus(m_press_string_num);
 
-                    if (stringtqStatus == Guitar::Fingering::OPEN)
+                    if (stringStatus == Guitar::Fingering::OPEN)
                         aVal = Guitar::Fingering::MUTED;
-                    else if (stringtqStatus > Guitar::Fingering::OPEN)
+                    else if (stringStatus > Guitar::Fingering::OPEN)
                         aVal = Guitar::Fingering::OPEN;
 
                 }
                 
-                m_fingering.setStringtqStatus(m_press_string_num, aVal);
+                m_fingering.setStringStatus(m_press_string_num, aVal);
                 
                 update();
             }