Remove additional unneeded tq method conversions

11 files changed, 62 insertions, 62 deletions

diff --git a/src/gui/rulers/ChordNameRuler.cpp b/src/gui/rulers/ChordNameRuler.cpp
index 80a985f..26a5145 100644
--- a/src/gui/rulers/ChordNameRuler.cpp
+++ b/src/gui/rulers/ChordNameRuler.cpp
@@ -182,10 +182,10 @@ ChordNameRuler::slotScrollHoriz(int x)
 
     if (dx > 0) { // moving right, so the existing stuff moves left
         bitBlt(this, 0, 0, this, dx, 0, w - dx, h);
-        tqrepaint(w - dx, 0, dx, h);
+        repaint(w - dx, 0, dx, h);
     } else {      // moving left, so the existing stuff moves right
         bitBlt(this, -dx, 0, this, 0, 0, w + dx, h);
-        tqrepaint(0, 0, -dx, h);
+        repaint(0, 0, -dx, h);
     }
 }
 
diff --git a/src/gui/rulers/ControlItem.h b/src/gui/rulers/ControlItem.h
index 2aea4b8..d3075b7 100644
--- a/src/gui/rulers/ControlItem.h
+++ b/src/gui/rulers/ControlItem.h
@@ -54,7 +54,7 @@ public:
 
     virtual void setSelected(bool yes);
 
-    /// recompute height according to represented value prior to a canvas tqrepaint
+    /// recompute height according to represented value prior to a canvas repaint
     virtual void updateFromValue();
 
     /// update value according to height after a user edit
diff --git a/src/gui/rulers/ControlRuler.cpp b/src/gui/rulers/ControlRuler.cpp
index 6248a3d..e9db070 100644
--- a/src/gui/rulers/ControlRuler.cpp
+++ b/src/gui/rulers/ControlRuler.cpp
@@ -113,7 +113,7 @@ void ControlRuler::slotUpdate()
     canvas()->setAllChanged(); // TODO: be a bit more subtle, call setChanged(<time area>)
 
     canvas()->update();
-    tqrepaint();
+    repaint();
 }
 
 void ControlRuler::slotUpdateElementsHPos()
@@ -335,7 +335,7 @@ void ControlRuler::contentsMouseMoveEvent(TQMouseEvent* e)
             // set value to highest in selection
             if (item->getValue() >= value) {
                 value = item->getValue();
-                m_numberFloat->setText(TQString("%1").tqarg(value));
+                m_numberFloat->setText(TQString("%1").arg(value));
             }
         }
     }
diff --git a/src/gui/rulers/ControllerEventsRuler.cpp b/src/gui/rulers/ControllerEventsRuler.cpp
index 9ee49e6..fef6e15 100644
--- a/src/gui/rulers/ControllerEventsRuler.cpp
+++ b/src/gui/rulers/ControllerEventsRuler.cpp
@@ -191,9 +191,9 @@ TQString ControllerEventsRuler::getName()
             TQString hexValue;
             hexValue.sprintf("0x%x", m_controller->getControllerValue());
 
-            name = TQString("%1 (%2 / %3)").tqarg(strtoqstr(m_controller->getName()))
-                   .tqarg(int(m_controller->getControllerValue()))
-                   .tqarg(hexValue);
+            name = TQString("%1 (%2 / %3)").arg(strtoqstr(m_controller->getName()))
+                   .arg(int(m_controller->getControllerValue()))
+                   .arg(hexValue);
         } else if (m_controller->getType() == PitchBend::EventType) {
             name = i18n("Pitch Bend");
         }
diff --git a/src/gui/rulers/LoopRuler.cpp b/src/gui/rulers/LoopRuler.cpp
index 3a3ad97..b8b45fe 100644
--- a/src/gui/rulers/LoopRuler.cpp
+++ b/src/gui/rulers/LoopRuler.cpp
@@ -103,7 +103,7 @@ void LoopRuler::scrollHoriz(int x)
 {
     if (getHScaleFactor() != 1.0) {
         m_currentXOffset = static_cast<int>( -x / getHScaleFactor());
-        tqrepaint();
+        repaint();
         return;
     }
 
@@ -118,10 +118,10 @@ void LoopRuler::scrollHoriz(int x)
 
     if (dx > 0) { // moving right, so the existing stuff moves left
         bitBlt(this, 0, 0, this, dx, 0, w - dx, h);
-        tqrepaint(w - dx, 0, dx, h);
+        repaint(w - dx, 0, dx, h);
     } else {      // moving left, so the existing stuff moves right
         bitBlt(this, -dx, 0, this, 0, 0, w + dx, h);
-        tqrepaint(0, 0, -dx, h);
+        repaint(0, 0, -dx, h);
     }
 }
 
diff --git a/src/gui/rulers/MarkerRuler.cpp b/src/gui/rulers/MarkerRuler.cpp
index 1ff0dfd..6d385b5 100644
--- a/src/gui/rulers/MarkerRuler.cpp
+++ b/src/gui/rulers/MarkerRuler.cpp
@@ -156,7 +156,7 @@ void
 MarkerRuler::scrollHoriz(int x)
 {
     m_currentXOffset = static_cast<int>( -x / getHScaleFactor());
-    tqrepaint();
+    repaint();
 }
 
 TQSize 
@@ -366,7 +366,7 @@ MarkerRuler::paintEvent(TQPaintEvent*)
             painter.setWorldXForm(false);
 
             if (i >= 0)
-                painter.drawText(textDrawPoint, TQString("%1").tqarg(i + 1));
+                painter.drawText(textDrawPoint, TQString("%1").arg(i + 1));
 
             painter.setWorldXForm(enableXForm);
         } else {
diff --git a/src/gui/rulers/PropertyViewRuler.cpp b/src/gui/rulers/PropertyViewRuler.cpp
index 6a2c8a7..2a39713 100644
--- a/src/gui/rulers/PropertyViewRuler.cpp
+++ b/src/gui/rulers/PropertyViewRuler.cpp
@@ -69,7 +69,7 @@ PropertyViewRuler::PropertyViewRuler(RulerScale *rulerScale,
 
     setBackgroundColor(GUIPalette::getColour(GUIPalette::SegmentCanvas));
 
-    TQString tip = i18n("%1 controller").tqarg(strtoqstr(property));
+    TQString tip = i18n("%1 controller").arg(strtoqstr(property));
     TQToolTip::add
         (this, tip);
 }
@@ -94,10 +94,10 @@ PropertyViewRuler::slotScrollHoriz(int x)
 
     if (dx > 0) { // moving right, so the existing stuff moves left
         bitBlt(this, 0, 0, this, dx, 0, w - dx, h);
-        tqrepaint(w - dx, 0, dx, h);
+        repaint(w - dx, 0, dx, h);
     } else {      // moving left, so the existing stuff moves right
         bitBlt(this, -dx, 0, this, 0, 0, w + dx, h);
-        tqrepaint(0, 0, -dx, h);
+        repaint(0, 0, -dx, h);
     }
 }
 
diff --git a/src/gui/rulers/RawNoteRuler.cpp b/src/gui/rulers/RawNoteRuler.cpp
index ff86d60..30029bc 100644
--- a/src/gui/rulers/RawNoteRuler.cpp
+++ b/src/gui/rulers/RawNoteRuler.cpp
@@ -86,10 +86,10 @@ RawNoteRuler::slotScrollHoriz(int x)
 
     if (dx > 0) { // moving right, so the existing stuff moves left
         bitBlt(this, 0, 0, this, dx, 0, w - dx, h);
-        tqrepaint(w - dx, 0, dx, h);
+        repaint(w - dx, 0, dx, h);
     } else {      // moving left, so the existing stuff moves right
         bitBlt(this, -dx, 0, this, 0, 0, w + dx, h);
-        tqrepaint(0, 0, -dx, h);
+        repaint(0, 0, -dx, h);
     }
 }
 
@@ -182,7 +182,7 @@ RawNoteRuler::addChildren(Segment *s,
         else
             rightmost = j;
 
-        node->tqchildren.push_back(subnode);
+        node->children.push_back(subnode);
         j = s->findTime(jex.second);
     }
 
@@ -263,8 +263,8 @@ RawNoteRuler::dumpSubtree(EventTreeNode *node, int depth)
     else {
         std::cerr << "no-pitch]" << std::endl;
     }
-    for (EventTreeNode::NodeList::iterator i = node->tqchildren.begin();
-            i != node->tqchildren.end(); ++i) {
+    for (EventTreeNode::NodeList::iterator i = node->children.begin();
+            i != node->children.end(); ++i) {
         dumpSubtree(*i, depth + 1);
     }
 #endif
@@ -292,14 +292,14 @@ RawNoteRuler::dumpForest(EventTreeNode::NodeList *forest)
 int
 RawNoteRuler::EventTreeNode::getDepth()
 {
-    int subtqchildrenDepth = 0;
-    for (NodeList::iterator i = tqchildren.begin();
-            i != tqchildren.end(); ++i) {
+    int subchildrenDepth = 0;
+    for (NodeList::iterator i = children.begin();
+            i != children.end(); ++i) {
         int subchildDepth = (*i)->getDepth();
-        if (subchildDepth > subtqchildrenDepth)
-            subtqchildrenDepth = subchildDepth;
+        if (subchildDepth > subchildrenDepth)
+            subchildrenDepth = subchildDepth;
     }
-    return subtqchildrenDepth + 1;
+    return subchildrenDepth + 1;
 }
 
 int
@@ -312,8 +312,8 @@ RawNoteRuler::EventTreeNode::getChildrenAboveOrBelow(bool below, int p)
 
     int max = 0;
 
-    for (NodeList::iterator i = tqchildren.begin();
-            i != tqchildren.end(); ++i) {
+    for (NodeList::iterator i = children.begin();
+            i != children.end(); ++i) {
         int forThisChild = (*i)->getChildrenAboveOrBelow(below, pitch);
         long thisChildPitch = pitch;
         (*(*i)->node)->get
@@ -339,7 +339,7 @@ RawNoteRuler::drawNode(TQPainter &paint, DefaultVelocityColour &vc,
 
     int below = node->getChildrenAboveOrBelow(true);
 
-    NOTATION_DEBUG << "RawNoteRuler::drawNode: tqchildren above: "
+    NOTATION_DEBUG << "RawNoteRuler::drawNode: children above: "
     << above << ", below: " << below << endl;
 #endif
 
@@ -414,8 +414,8 @@ RawNoteRuler::drawNode(TQPainter &paint, DefaultVelocityColour &vc,
     paint.drawLine(ui0, iy + 1, ui0, iy + ih - 1);
     paint.drawLine(ui1 - 1, iy + 1, ui1 - 1, iy + ih - 1);
 
-    for (EventTreeNode::NodeList::iterator i = node->tqchildren.begin();
-            i != node->tqchildren.end(); ++i) {
+    for (EventTreeNode::NodeList::iterator i = node->children.begin();
+            i != node->children.end(); ++i) {
 
         long nodePitch = myPitch;
         (*(*i)->node)->get
@@ -451,9 +451,9 @@ RawNoteRuler::paintEvent(TQPaintEvent* e)
             trackPosition = track->getPosition();
 
 	TQToolTip::add(this,i18n("Track #%1, Segment \"%2\" (runtime id %3)")
-		           .tqarg(trackPosition + 1)
-		           .tqarg(m_segment->getLabel().c_str())
-		           .tqarg(m_segment->getRuntimeId()));
+		           .arg(trackPosition + 1)
+		           .arg(m_segment->getLabel().c_str())
+		           .arg(m_segment->getRuntimeId()));
     }
 
     //    START_TIMING;
diff --git a/src/gui/rulers/RawNoteRuler.h b/src/gui/rulers/RawNoteRuler.h
index fcbf72b..6878785 100644
--- a/src/gui/rulers/RawNoteRuler.h
+++ b/src/gui/rulers/RawNoteRuler.h
@@ -97,8 +97,8 @@ private:
         
         EventTreeNode(Segment::iterator n) : node(n) { }
         ~EventTreeNode() {
-            for (NodeList::iterator i = tqchildren.begin();
-                 i != tqchildren.end(); ++i) {
+            for (NodeList::iterator i = children.begin();
+                 i != children.end(); ++i) {
                 delete *i;
             }
         }
@@ -107,7 +107,7 @@ private:
         int getChildrenAboveOrBelow(bool below = false, int pitch = -1);
         
         Segment::iterator node;
-        NodeList tqchildren;
+        NodeList children;
     };
 
     std::pair<timeT, timeT> getExtents(Segment::iterator);
diff --git a/src/gui/rulers/TempoRuler.cpp b/src/gui/rulers/TempoRuler.cpp
index 363a678..30d6108 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);
-        tqrepaint(w - dx, 0, dx, h);
+        repaint(w - dx, 0, dx, h);
     } else {      // moving left, so the existing stuff moves right
         bitBlt(this, -dx, 0, this, 0, 0, w + dx, h);
-        tqrepaint(0, 0, -dx, h);
+        repaint(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")
-                       .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);
+                       .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);
 
             timeText = TQString("%1\n%2")
-                       .tqarg(timeText)
-                       //		.tqarg(rt.toString().c_str());
-                       .tqarg(rt.toText(true).c_str());
+                       .arg(timeText)
+                       //		.arg(rt.toString().c_str());
+                       .arg(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)")
-                        .tqarg(qi).tqarg(q0).tqarg(q00)
-                        .tqarg(bi).tqarg(b0).tqarg(b00);
+                        .arg(qi).arg(q0).arg(q00)
+                        .arg(bi).arg(b0).arg(b00);
             haveSet = true;
         }
     }
 
     if (!haveSet) {
-        tempoText = i18n("%1.%2%3 bpm").tqarg(qi).tqarg(q0).tqarg(q00);
+        tempoText = i18n("%1.%2%3 bpm").arg(qi).arg(q0).arg(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").tqarg(tempoText).tqarg(tqi).tqarg(tq0).tqarg(tq00);
+        tempoText = i18n("%1 - %2.%3%4").arg(tempoText).arg(tqi).arg(tq0).arg(tq00);
     }
 
     if (showTime && time >= 0) {
-        m_textFloat->setText(TQString("%1\n%2").tqarg(timeText).tqarg(tempoText));
+        m_textFloat->setText(TQString("%1\n%2").arg(timeText).arg(tempoText));
     } else {
         m_textFloat->setText(tempoText);
     }
@@ -917,8 +917,8 @@ TempoRuler::paintEvent(TQPaintEvent* e)
                 m_composition->getTimeSignatureAt(time);
 
             TQString str = TQString("%1/%2")
-                          .tqarg(sig.getNumerator())
-                          .tqarg(sig.getDenominator());
+                          .arg(sig.getNumerator())
+                          .arg(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").tqarg(bpm);
+            TQString tempoString = TQString("%1").arg(bpm);
 
             if (tempo == prevTempo) {
                 if (m_small)
diff --git a/src/gui/rulers/TextRuler.cpp b/src/gui/rulers/TextRuler.cpp
index db9b437..0e1eda4 100644
--- a/src/gui/rulers/TextRuler.cpp
+++ b/src/gui/rulers/TextRuler.cpp
@@ -84,10 +84,10 @@ TextRuler::slotScrollHoriz(int x)
 
     if (dx > 0) { // moving right, so the existing stuff moves left
         bitBlt(this, 0, 0, this, dx, 0, w - dx, h);
-        tqrepaint(w - dx, 0, dx, h);
+        repaint(w - dx, 0, dx, h);
     } else {      // moving left, so the existing stuff moves right
         bitBlt(this, -dx, 0, this, 0, 0, w + dx, h);
-        tqrepaint(0, 0, -dx, h);
+        repaint(0, 0, -dx, h);
     }
 }