Rename old tq methods that no longer need a unique name

5 files changed, 19 insertions, 19 deletions

diff --git a/src/document/RosegardenGUIDoc.cpp b/src/document/RosegardenGUIDoc.cpp
index 2e7a3ae..4d73c3c 100644
--- a/src/document/RosegardenGUIDoc.cpp
+++ b/src/document/RosegardenGUIDoc.cpp
@@ -239,7 +239,7 @@ void RosegardenGUIDoc::setModified(bool m)
     RG_DEBUG << "RosegardenGUIDoc[" << this << "]::setModified(" << m << ")\n";
 }
 
-void RosegardenGUIDoc::clearModifiedtqStatus()
+void RosegardenGUIDoc::clearModifiedStatus()
 {
     setModified(false);
     setAutoSaved(true);
@@ -1612,7 +1612,7 @@ RosegardenGUIDoc::xmlParse(TQString fileContents, TQString &errMsg,
     } else {
 
         if (getSequenceManager() &&
-            !(getSequenceManager()->getSoundDrivertqStatus() & AUDIO_OK)) {
+            !(getSequenceManager()->getSoundDriverStatus() & AUDIO_OK)) {
 
             KStartupLogo::hideIfStillThere();
             CurrentProgressDialog::freeze();
diff --git a/src/document/RosegardenGUIDoc.h b/src/document/RosegardenGUIDoc.h
index 1218673..c50d62b 100644
--- a/src/document/RosegardenGUIDoc.h
+++ b/src/document/RosegardenGUIDoc.h
@@ -147,7 +147,7 @@ protected:
      * action on the view connected to the document.
      *
      * this is just an accessor, other components should call
-     * slotDocumentModified() and clearModifiedtqStatus() instead of
+     * slotDocumentModified() and clearModifiedStatus() instead of
      * this method, which perform all the related housework.
      * 
      */
@@ -164,7 +164,7 @@ public:
      * clears the 'modified' status of the document (sets it back to false).
      * 
      */
-    void clearModifiedtqStatus();
+    void clearModifiedStatus();
 
     /**
      * "save modified" - asks the user for saving if the document is
diff --git a/src/document/io/LilyPondExporter.cpp b/src/document/io/LilyPondExporter.cpp
index 3c18d41..0ffccff 100644
--- a/src/document/io/LilyPondExporter.cpp
+++ b/src/document/io/LilyPondExporter.cpp
@@ -1992,16 +1992,16 @@ LilyPondExporter::writeBar(Segment *s,
                         str << "c:" << barreStart << "-" << barreEnd << "-" << barreFret << ";";
                     }
 
-                    if (fingering.getStringtqStatus( 6-stringNum ) == Guitar::Fingering::MUTED) {
+                    if (fingering.getStringStatus( 6-stringNum ) == Guitar::Fingering::MUTED) {
                         str << stringNum << "-x;";
-                    } else if (fingering.getStringtqStatus( 6-stringNum ) == Guitar::Fingering::OPEN) {
+                    } else if (fingering.getStringStatus( 6-stringNum ) == Guitar::Fingering::OPEN) {
                         str << stringNum << "-o;";
                     } else {
-                        int stringtqStatus = fingering.getStringtqStatus(6-stringNum);
+                        int stringStatus = fingering.getStringStatus(6-stringNum);
                         if ((stringNum <= barreStart) && (stringNum >= barreEnd)) {
                             str << stringNum << "-" << barreFret << ";";
                         } else {
-                            str << stringNum << "-" << stringtqStatus << ";";
+                            str << stringNum << "-" << stringStatus << ";";
                         }
                     }
                 }
diff --git a/src/document/io/RG21Loader.cpp b/src/document/io/RG21Loader.cpp
index c36a228..bb901f2 100644
--- a/src/document/io/RG21Loader.cpp
+++ b/src/document/io/RG21Loader.cpp
@@ -69,7 +69,7 @@ RG21Loader::RG21Loader(Studio *studio,
         m_currentClef(Clef::Treble),
         m_currentInstrumentId(MidiInstrumentBase),
         m_inGroup(false),
-        m_tietqStatus(0),
+        m_tieStatus(0),
         m_nbStaves(0)
 {}
 
@@ -173,10 +173,10 @@ bool RG21Loader::parseChordItem()
         noteEvent->set
         <Int>(PITCH, pitch);
 
-        if (m_tietqStatus == 1) {
+        if (m_tieStatus == 1) {
             noteEvent->set
             <Bool>(TIED_FORWARD, true);
-        } else if (m_tietqStatus == 2) {
+        } else if (m_tieStatus == 2) {
             noteEvent->set
             <Bool>(TIED_BACKWARD, true);
         }
@@ -199,10 +199,10 @@ bool RG21Loader::parseChordItem()
     }
 
     m_currentSegmentTime += duration;
-    if (m_tietqStatus == 2)
-        m_tietqStatus = 0;
-    else if (m_tietqStatus == 1)
-        m_tietqStatus = 2;
+    if (m_tieStatus == 2)
+        m_tieStatus = 0;
+    else if (m_tieStatus == 1)
+        m_tieStatus = 2;
 
     return true;
 }
@@ -348,13 +348,13 @@ bool RG21Loader::parseIndicationStart()
 
     if (indicationType == "tie") {
 
-        if (m_tietqStatus != 0) {
+        if (m_tieStatus != 0) {
             RG_DEBUG
             << "RG21Loader:: parseIndicationStart: WARNING: Found tie within "
             << "tie, ignoring" << endl;
             return true;
         }
-        // m_tietqStatus = 1;
+        // m_tieStatus = 1;
 
         Segment::iterator i = m_currentSegment->end();
         if (i != m_currentSegment->begin()) {
@@ -368,7 +368,7 @@ bool RG21Loader::parseIndicationStart()
                 --i;
             }
         }
-        m_tietqStatus = 2;
+        m_tieStatus = 2;
 
         RG_DEBUG << "rg21io: Indication start: it's a tie" << endl;
 
diff --git a/src/document/io/RG21Loader.h b/src/document/io/RG21Loader.h
index 236d6c6..583367c 100644
--- a/src/document/io/RG21Loader.h
+++ b/src/document/io/RG21Loader.h
@@ -145,7 +145,7 @@ protected:
     int m_groupUntupledLength;
     int m_groupUntupledCount;
 
-    int m_tietqStatus; // 0 -> none, 1 -> tie started, 2 -> seen one note
+    int m_tieStatus; // 0 -> none, 1 -> tie started, 2 -> seen one note
 
     TQString m_currentLine;
     TQString m_currentStaffName;