Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a.

1 files changed, 14 insertions, 14 deletions

diff --git a/src/document/io/RG21Loader.cpp b/src/document/io/RG21Loader.cpp
index 7f6d7ea..c36a228 100644
--- a/src/document/io/RG21Loader.cpp
+++ b/src/document/io/RG21Loader.cpp
@@ -42,7 +42,7 @@
 #include <tqobject.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <string>
 #include <vector>
 
@@ -69,7 +69,7 @@ RG21Loader::RG21Loader(Studio *studio,
         m_currentClef(Clef::Treble),
         m_currentInstrumentId(MidiInstrumentBase),
         m_inGroup(false),
-        m_tieStatus(0),
+        m_tietqStatus(0),
         m_nbStaves(0)
 {}
 
@@ -106,8 +106,8 @@ bool RG21Loader::parseKey()
     }
 
     TQString keyName = TQString("%1 %2or")
-                      .arg(keyBase)
-                      .arg(m_tokens[3].lower());
+                      .tqarg(keyBase)
+                      .tqarg(m_tokens[3].lower());
 
     m_currentKey = Rosegarden::Key(qstrtostr(keyName));
     Event *keyEvent = m_currentKey.getAsEvent(m_currentSegmentTime);
@@ -173,10 +173,10 @@ bool RG21Loader::parseChordItem()
         noteEvent->set
         <Int>(PITCH, pitch);
 
-        if (m_tieStatus == 1) {
+        if (m_tietqStatus == 1) {
             noteEvent->set
             <Bool>(TIED_FORWARD, true);
-        } else if (m_tieStatus == 2) {
+        } else if (m_tietqStatus == 2) {
             noteEvent->set
             <Bool>(TIED_BACKWARD, true);
         }
@@ -199,10 +199,10 @@ bool RG21Loader::parseChordItem()
     }
 
     m_currentSegmentTime += duration;
-    if (m_tieStatus == 2)
-        m_tieStatus = 0;
-    else if (m_tieStatus == 1)
-        m_tieStatus = 2;
+    if (m_tietqStatus == 2)
+        m_tietqStatus = 0;
+    else if (m_tietqStatus == 1)
+        m_tietqStatus = 2;
 
     return true;
 }
@@ -348,13 +348,13 @@ bool RG21Loader::parseIndicationStart()
 
     if (indicationType == "tie") {
 
-        if (m_tieStatus != 0) {
+        if (m_tietqStatus != 0) {
             RG_DEBUG
             << "RG21Loader:: parseIndicationStart: WARNING: Found tie within "
             << "tie, ignoring" << endl;
             return true;
         }
-        // m_tieStatus = 1;
+        // m_tietqStatus = 1;
 
         Segment::iterator i = m_currentSegment->end();
         if (i != m_currentSegment->begin()) {
@@ -368,7 +368,7 @@ bool RG21Loader::parseIndicationStart()
                 --i;
             }
         }
-        m_tieStatus = 2;
+        m_tietqStatus = 2;
 
         RG_DEBUG << "rg21io: Indication start: it's a tie" << endl;
 
@@ -484,7 +484,7 @@ void RG21Loader::closeGroup()
 
                 // To change the time of an event, we need to erase &
                 // re-insert it.  But erasure will delete the event, and
-                // if it's an indication event that will invalidate our
+                // if it's an indication event that will tqinvalidate our
                 // indicationsExtant entry.  Hence this unpleasantness:
 
                 if ((*i)->isa(Indication::EventType)) {