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

This reverts commit 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a.

1 files changed, 24 insertions, 24 deletions

diff --git a/src/gui/rulers/TempoRuler.cpp b/src/gui/rulers/TempoRuler.cpp
index 30d6108..8aba08b 100644
--- a/src/gui/rulers/TempoRuler.cpp
+++ b/src/gui/rulers/TempoRuler.cpp
@@ -231,10 +231,10 @@ TempoRuler::slotScrollHoriz(int x)
 
     if (dx > 0) { // moving right, so the existing stuff moves left
         bitBlt(this, 0, 0, this, dx, 0, w - dx, h);
-        repaint(w - dx, 0, dx, h);
+        tqrepaint(w - dx, 0, dx, h);
     } else {      // moving left, so the existing stuff moves right
         bitBlt(this, -dx, 0, this, 0, 0, w + dx, h);
-        repaint(0, 0, -dx, h);
+        tqrepaint(0, 0, -dx, h);
     }
 }
 
@@ -555,20 +555,20 @@ TempoRuler::showTextFloat(tempoT tempo, tempoT target,
 
             // blargh -- duplicated with TempoView::makeTimeString
             timeText = TQString("%1%2%3-%4%5-%6%7-%8%9")
-                       .arg(bar / 100)
-                       .arg((bar % 100) / 10)
-                       .arg(bar % 10)
-                       .arg(beat / 10)
-                       .arg(beat % 10)
-                       .arg(fraction / 10)
-                       .arg(fraction % 10)
-                       .arg(remainder / 10)
-                       .arg(remainder % 10);
+                       .tqarg(bar / 100)
+                       .tqarg((bar % 100) / 10)
+                       .tqarg(bar % 10)
+                       .tqarg(beat / 10)
+                       .tqarg(beat % 10)
+                       .tqarg(fraction / 10)
+                       .tqarg(fraction % 10)
+                       .tqarg(remainder / 10)
+                       .tqarg(remainder % 10);
 
             timeText = TQString("%1\n%2")
-                       .arg(timeText)
-                       //		.arg(rt.toString().c_str());
-                       .arg(rt.toText(true).c_str());
+                       .tqarg(timeText)
+                       //		.tqarg(rt.toString().c_str());
+                       .tqarg(rt.toText(true).c_str());
         }
 
         TimeSignature sig =
@@ -586,14 +586,14 @@ TempoRuler::showTextFloat(tempoT tempo, tempoT target,
             int b00 = int(bpm * 100 + 0.0001) % 10;
 
             tempoText = i18n("%1.%2%3 (%4.%5%6 bpm)")
-                        .arg(qi).arg(q0).arg(q00)
-                        .arg(bi).arg(b0).arg(b00);
+                        .tqarg(qi).tqarg(q0).tqarg(q00)
+                        .tqarg(bi).tqarg(b0).tqarg(b00);
             haveSet = true;
         }
     }
 
     if (!haveSet) {
-        tempoText = i18n("%1.%2%3 bpm").arg(qi).arg(q0).arg(q00);
+        tempoText = i18n("%1.%2%3 bpm").tqarg(qi).tqarg(q0).tqarg(q00);
     }
 
     if (target > 0 && target != tempo) {
@@ -601,11 +601,11 @@ TempoRuler::showTextFloat(tempoT tempo, tempoT target,
         int tqi = int(tq + 0.0001);
         int tq0 = int(tq * 10 + 0.0001) % 10;
         int tq00 = int(tq * 100 + 0.0001) % 10;
-        tempoText = i18n("%1 - %2.%3%4").arg(tempoText).arg(tqi).arg(tq0).arg(tq00);
+        tempoText = i18n("%1 - %2.%3%4").tqarg(tempoText).tqarg(tqi).tqarg(tq0).tqarg(tq00);
     }
 
     if (showTime && time >= 0) {
-        m_textFloat->setText(TQString("%1\n%2").arg(timeText).arg(tempoText));
+        m_textFloat->setText(TQString("%1\n%2").tqarg(timeText).tqarg(tempoText));
     } else {
         m_textFloat->setText(tempoText);
     }
@@ -630,7 +630,7 @@ TempoRuler::showTextFloat(tempoT tempo, tempoT target,
 }
 
 TQSize
-TempoRuler::sizeHint() const
+TempoRuler::tqsizeHint() const
 {
     double width =
         m_rulerScale->getBarPosition(m_rulerScale->getLastVisibleBar()) +
@@ -643,7 +643,7 @@ TempoRuler::sizeHint() const
 }
 
 TQSize
-TempoRuler::minimumSizeHint() const
+TempoRuler::tqminimumSizeHint() const
 {
     double firstBarWidth = m_rulerScale->getBarWidth(0) + m_xorigin;
     TQSize res = TQSize(int(firstBarWidth), m_height);
@@ -917,8 +917,8 @@ TempoRuler::paintEvent(TQPaintEvent* e)
                 m_composition->getTimeSignatureAt(time);
 
             TQString str = TQString("%1/%2")
-                          .arg(sig.getNumerator())
-                          .arg(sig.getDenominator());
+                          .tqarg(sig.getNumerator())
+                          .tqarg(sig.getDenominator());
 
             paint.setFont(m_boldFont);
             paint.drawText(static_cast<int>(x) + 2, m_height - 2, str);
@@ -930,7 +930,7 @@ TempoRuler::paintEvent(TQPaintEvent* e)
             long bpm = long(tempo);
             //	    long frac = long(tempo * 100 + 0.001) - 100 * bpm;
 
-            TQString tempoString = TQString("%1").arg(bpm);
+            TQString tempoString = TQString("%1").tqarg(bpm);
 
             if (tempo == prevTempo) {
                 if (m_small)