1 files changed, 19 insertions, 19 deletions

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;