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

24 files changed, 128 insertions, 128 deletions

diff --git a/src/gui/rulers/ChordNameRuler.cpp b/src/gui/rulers/ChordNameRuler.cpp
index ca366e2..26a5145 100644
--- a/src/gui/rulers/ChordNameRuler.cpp
+++ b/src/gui/rulers/ChordNameRuler.cpp
@@ -182,15 +182,15 @@ 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);
     }
 }
 
 TQSize
-ChordNameRuler::tqsizeHint() const
+ChordNameRuler::sizeHint() const
 {
     double width =
         m_rulerScale->getBarPosition(m_rulerScale->getLastVisibleBar()) +
@@ -204,7 +204,7 @@ ChordNameRuler::tqsizeHint() const
 }
 
 TQSize
-ChordNameRuler::tqminimumSizeHint() const
+ChordNameRuler::minimumSizeHint() const
 {
     double firstBarWidth = m_rulerScale->getBarWidth(0);
     TQSize res = TQSize(int(firstBarWidth), m_height);
@@ -231,8 +231,8 @@ ChordNameRuler::recalculate(timeT from, timeT to)
 
     } else if (m_regetSegmentsOnChange) {
 
-        RefreshtqStatus &rs =
-            m_composition->getRefreshtqStatus(m_compositionRefreshStatusId);
+        RefreshStatus &rs =
+            m_composition->getRefreshStatus(m_compositionRefreshStatusId);
 
         if (rs.needsRefresh()) {
             rs.setNeedsRefresh(false);
@@ -304,15 +304,15 @@ ChordNameRuler::recalculate(timeT from, timeT to)
     if (m_segments.empty())
         return ;
 
-    SegmentRefreshtqStatus overalltqStatus;
-    overalltqStatus.setNeedsRefresh(false);
+    SegmentRefreshStatus overallStatus;
+    overallStatus.setNeedsRefresh(false);
 
     for (SegmentRefreshMap::iterator i = m_segments.begin();
             i != m_segments.end(); ++i) {
-        SegmentRefreshtqStatus &status =
-            i->first->getRefreshtqStatus(i->second);
+        SegmentRefreshStatus &status =
+            i->first->getRefreshStatus(i->second);
         if (status.needsRefresh()) {
-            overalltqStatus.push(status.from(), status.to());
+            overallStatus.push(status.from(), status.to());
         }
     }
 
@@ -326,17 +326,17 @@ ChordNameRuler::recalculate(timeT from, timeT to)
         if (from == to) {
             NOTATION_DEBUG << "ChordNameRuler::recalculate: from==to, recalculating all" << endl;
             level = RecalcWhole;
-        } else if (overalltqStatus.from() == overalltqStatus.to()) {
+        } else if (overallStatus.from() == overallStatus.to()) {
             NOTATION_DEBUG << "ChordNameRuler::recalculate: overallStatus.from==overallStatus.to, ignoring" << endl;
             level = RecalcNone;
-        } else if (overalltqStatus.from() >= from && overalltqStatus.to() <= to) {
-            NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overalltqStatus.from() << "->" << overalltqStatus.to() << ", I show " << from << "->" << to << ", recalculating visible area" << endl;
+        } else if (overallStatus.from() >= from && overallStatus.to() <= to) {
+            NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overallStatus.from() << "->" << overallStatus.to() << ", I show " << from << "->" << to << ", recalculating visible area" << endl;
             level = RecalcVisible;
-        } else if (overalltqStatus.from() >= to || overalltqStatus.to() <= from) {
-            NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overalltqStatus.from() << "->" << overalltqStatus.to() << ", I show " << from << "->" << to << ", ignoring" << endl;
+        } else if (overallStatus.from() >= to || overallStatus.to() <= from) {
+            NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overallStatus.from() << "->" << overallStatus.to() << ", I show " << from << "->" << to << ", ignoring" << endl;
             level = RecalcNone;
         } else {
-            NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overalltqStatus.from() << "->" << overalltqStatus.to() << ", I show " << from << "->" << to << ", recalculating whole" << endl;
+            NOTATION_DEBUG << "ChordNameRuler::recalculate: change is " << overallStatus.from() << "->" << overallStatus.to() << ", I show " << from << "->" << to << ", recalculating whole" << endl;
             level = RecalcWhole;
         }
     }
@@ -346,7 +346,7 @@ ChordNameRuler::recalculate(timeT from, timeT to)
 
     for (SegmentRefreshMap::iterator i = m_segments.begin();
             i != m_segments.end(); ++i) {
-        i->first->getRefreshtqStatus(i->second).setNeedsRefresh(false);
+        i->first->getRefreshStatus(i->second).setNeedsRefresh(false);
     }
 
     if (!m_currentSegment) { //!!! arbitrary, must do better
diff --git a/src/gui/rulers/ChordNameRuler.h b/src/gui/rulers/ChordNameRuler.h
index 54efd7c..9177c50 100644
--- a/src/gui/rulers/ChordNameRuler.h
+++ b/src/gui/rulers/ChordNameRuler.h
@@ -98,8 +98,8 @@ public:
     // may have one of these (to avoid using percussion tracks in chords):
     void setStudio(Studio *studio);
 
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     void setMinimumWidth(int width) { m_width = width; }
 
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 94c66e8..e9db070 100644
--- a/src/gui/rulers/ControlRuler.cpp
+++ b/src/gui/rulers/ControlRuler.cpp
@@ -86,7 +86,7 @@ ControlRuler::ControlRuler(Segment *segment,
 
     m_selectionRect->setPen(TQt::red);
 
-    setFixedHeight(tqsizeHint().height());
+    setFixedHeight(sizeHint().height());
 
     connect(this, TQT_SIGNAL(stateChange(const TQString&, bool)),
             m_parentEditView, TQT_SLOT(slotStateChanged(const TQString&, bool)));
@@ -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()
@@ -308,7 +308,7 @@ void ControlRuler::contentsMouseMoveEvent(TQMouseEvent* e)
 
     // Borrowed from Rotary - compute total position within window
     //
-    TQPoint totalPos = mapTo(tqtopLevelWidget(), TQPoint(0, 0));
+    TQPoint totalPos = mapTo(topLevelWidget(), TQPoint(0, 0));
 
     int scrollX = dynamic_cast<EditView*>(m_parentEditView)->getRawCanvasView()->
                   horizontalScrollBar()->value();
@@ -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));
             }
         }
     }
@@ -393,7 +393,7 @@ void ControlRuler::createMenu()
 {
     RG_DEBUG << "ControlRuler::createMenu()\n";
 
-    KMainWindow* parentMainWindow = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
+    KMainWindow* parentMainWindow = dynamic_cast<KMainWindow*>(topLevelWidget());
 
     if (parentMainWindow && parentMainWindow->factory()) {
         m_menu = static_cast<TQPopupMenu*>(parentMainWindow->factory()->container(m_menuName, parentMainWindow));
diff --git a/src/gui/rulers/ControllerEventsRuler.cpp b/src/gui/rulers/ControllerEventsRuler.cpp
index a6a7d2f..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");
         }
@@ -395,7 +395,7 @@ void ControllerEventsRuler::contentsMouseReleaseEvent(TQMouseEvent *e)
         << ", endValue = " << endValue
         << endl;
 
-        tqdrawControlLine(startTime, endTime, startValue, endValue);
+        drawControlLine(startTime, endTime, startValue, endValue);
 
         m_controlLineShowing = false;
         m_controlLine->hide();
@@ -445,7 +445,7 @@ void ControllerEventsRuler::layoutItem(ControlItem* item)
 }
 
 void
-ControllerEventsRuler::tqdrawControlLine(timeT startTime,
+ControllerEventsRuler::drawControlLine(timeT startTime,
                                        timeT endTime,
                                        int startValue,
                                        int endValue)
diff --git a/src/gui/rulers/ControllerEventsRuler.h b/src/gui/rulers/ControllerEventsRuler.h
index fc1d1f6..9f077fc 100644
--- a/src/gui/rulers/ControllerEventsRuler.h
+++ b/src/gui/rulers/ControllerEventsRuler.h
@@ -96,7 +96,7 @@ protected:
 
     virtual void layoutItem(ControlItem*);
 
-    void tqdrawControlLine(timeT startTime,
+    void drawControlLine(timeT startTime,
                          timeT endTime,
                          int startValue,
                          int endValue);
diff --git a/src/gui/rulers/LoopRuler.cpp b/src/gui/rulers/LoopRuler.cpp
index 885d7fc..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,14 +118,14 @@ 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);
     }
 }
 
-TQSize LoopRuler::tqsizeHint() const
+TQSize LoopRuler::sizeHint() const
 {
     double width =
         m_rulerScale->getBarPosition(m_rulerScale->getLastVisibleBar()) +
@@ -137,7 +137,7 @@ TQSize LoopRuler::tqsizeHint() const
     return res;
 }
 
-TQSize LoopRuler::tqminimumSizeHint() const
+TQSize LoopRuler::minimumSizeHint() const
 {
     double firstBarWidth = m_rulerScale->getBarWidth(0) + m_xorigin;
 
@@ -156,7 +156,7 @@ void LoopRuler::paintEvent(TQPaintEvent* e)
     paint.setClipRegion(e->region());
     paint.setClipRect(e->rect().normalize());
 
-    paint.setBrush(tqcolorGroup().foreground());
+    paint.setBrush(colorGroup().foreground());
     drawBarSections(&paint);
     drawLoopMarker(&paint);
     
@@ -352,7 +352,7 @@ void LoopRuler::slotSetLoopMarker(timeT startLoop,
     m_endLoop = endLoop;
 
     TQPainter paint(this);
-    paint.setBrush(tqcolorGroup().foreground());
+    paint.setBrush(colorGroup().foreground());
     drawBarSections(&paint);
     drawLoopMarker(&paint);
 
diff --git a/src/gui/rulers/LoopRuler.h b/src/gui/rulers/LoopRuler.h
index 1d1fb19..f745cd0 100644
--- a/src/gui/rulers/LoopRuler.h
+++ b/src/gui/rulers/LoopRuler.h
@@ -69,8 +69,8 @@ public:
 
     void setSnapGrid(SnapGrid *grid);
 
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     void scrollHoriz(int x);
 
diff --git a/src/gui/rulers/MarkerRuler.cpp b/src/gui/rulers/MarkerRuler.cpp
index 749dfef..938bfe5 100644
--- a/src/gui/rulers/MarkerRuler.cpp
+++ b/src/gui/rulers/MarkerRuler.cpp
@@ -36,7 +36,7 @@
 #include "commands/edit/ModifyMarkerCommand.h"
 #include "document/MultiViewCommandHistory.h"
 #include <kxmlguifactory.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqcursor.h>
 #include <tqfont.h>
 #include <tqfontmetrics.h>
@@ -156,11 +156,11 @@ void
 MarkerRuler::scrollHoriz(int x)
 {
     m_currentXOffset = static_cast<int>( -x / getHScaleFactor());
-    tqrepaint();
+    repaint();
 }
 
 TQSize 
-MarkerRuler::tqsizeHint() const
+MarkerRuler::sizeHint() const
 {
     int lastBar =
         m_rulerScale->getLastVisibleBar();
@@ -172,7 +172,7 @@ MarkerRuler::tqsizeHint() const
 }
 
 TQSize 
-MarkerRuler::tqminimumSizeHint() const
+MarkerRuler::minimumSizeHint() const
 {
     double firstBarWidth = m_rulerScale->getBarWidth(0) + m_xorigin;
 
@@ -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/MarkerRuler.h b/src/gui/rulers/MarkerRuler.h
index 748108c..9d160d8 100644
--- a/src/gui/rulers/MarkerRuler.h
+++ b/src/gui/rulers/MarkerRuler.h
@@ -63,8 +63,8 @@ public:
 
     virtual ~MarkerRuler();
     
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     void scrollHoriz(int x);
 
diff --git a/src/gui/rulers/PercussionPitchRuler.cpp b/src/gui/rulers/PercussionPitchRuler.cpp
index 16b9558..ec2b00f 100644
--- a/src/gui/rulers/PercussionPitchRuler.cpp
+++ b/src/gui/rulers/PercussionPitchRuler.cpp
@@ -63,13 +63,13 @@ PercussionPitchRuler::PercussionPitchRuler(TQWidget *parent,
     setMouseTracking(true);
 }
 
-TQSize PercussionPitchRuler::tqsizeHint() const
+TQSize PercussionPitchRuler::sizeHint() const
 {
     return TQSize(m_width,
                  (m_lineSpacing + 1) * m_mapping->getPitchExtent());
 }
 
-TQSize PercussionPitchRuler::tqminimumSizeHint() const
+TQSize PercussionPitchRuler::minimumSizeHint() const
 {
     return TQSize(m_width, m_lineSpacing + 1);
 }
@@ -159,7 +159,7 @@ void PercussionPitchRuler::mouseMoveEvent(TQMouseEvent* e)
 {
     // ugh
 
-    MatrixView *matrixView = dynamic_cast<MatrixView*>(tqtopLevelWidget());
+    MatrixView *matrixView = dynamic_cast<MatrixView*>(topLevelWidget());
     if (matrixView) {
         MatrixStaff *staff = matrixView->getStaff(0);
         if (staff) {
diff --git a/src/gui/rulers/PercussionPitchRuler.h b/src/gui/rulers/PercussionPitchRuler.h
index 0bb05db..1e63b92 100644
--- a/src/gui/rulers/PercussionPitchRuler.h
+++ b/src/gui/rulers/PercussionPitchRuler.h
@@ -53,8 +53,8 @@ public:
                          const MidiKeyMapping *mapping,
                          int lineSpacing);
 
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     void drawHoverNote(int evPitch);
 
diff --git a/src/gui/rulers/PitchRuler.cpp b/src/gui/rulers/PitchRuler.cpp
index 117fb87..7817bb8 100644
--- a/src/gui/rulers/PitchRuler.cpp
+++ b/src/gui/rulers/PitchRuler.cpp
@@ -40,15 +40,15 @@ PitchRuler(TQWidget *parent) :
 }
 
 TQSize
-PitchRuler::tqsizeHint() const
+PitchRuler::sizeHint() const
 {
-    return TQWidget::tqsizeHint();
+    return TQWidget::sizeHint();
 }
 
 TQSize
-PitchRuler::tqminimumSizeHint() const
+PitchRuler::minimumSizeHint() const
 {
-    return TQWidget::tqminimumSizeHint();
+    return TQWidget::minimumSizeHint();
 }
 
 }
diff --git a/src/gui/rulers/PitchRuler.h b/src/gui/rulers/PitchRuler.h
index 9e6bd19..715f1d4 100644
--- a/src/gui/rulers/PitchRuler.h
+++ b/src/gui/rulers/PitchRuler.h
@@ -44,8 +44,8 @@ class PitchRuler : public TQWidget
 public:
     PitchRuler(TQWidget *parent);
 
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     virtual void drawHoverNote(int evPitch) = 0;
 
diff --git a/src/gui/rulers/PropertyBox.cpp b/src/gui/rulers/PropertyBox.cpp
index 06880c1..f98300d 100644
--- a/src/gui/rulers/PropertyBox.cpp
+++ b/src/gui/rulers/PropertyBox.cpp
@@ -47,13 +47,13 @@ PropertyBox::PropertyBox(TQString label,
 {}
 
 TQSize
-PropertyBox::tqsizeHint() const
+PropertyBox::sizeHint() const
 {
     return TQSize(m_width, m_height);
 }
 
 TQSize
-PropertyBox::tqminimumSizeHint() const
+PropertyBox::minimumSizeHint() const
 {
     return TQSize(m_width, m_height);
 }
diff --git a/src/gui/rulers/PropertyBox.h b/src/gui/rulers/PropertyBox.h
index 9df80aa..b5aba14 100644
--- a/src/gui/rulers/PropertyBox.h
+++ b/src/gui/rulers/PropertyBox.h
@@ -56,8 +56,8 @@ public:
                TQWidget *parent=0,
                const char *name = 0);
 
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
 protected:
     virtual void paintEvent(TQPaintEvent *);
diff --git a/src/gui/rulers/PropertyViewRuler.cpp b/src/gui/rulers/PropertyViewRuler.cpp
index 8998049..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,15 +94,15 @@ 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);
     }
 }
 
 TQSize
-PropertyViewRuler::tqsizeHint() const
+PropertyViewRuler::sizeHint() const
 {
     double width =
         m_rulerScale->getBarPosition(m_rulerScale->getLastVisibleBar()) +
@@ -115,7 +115,7 @@ PropertyViewRuler::tqsizeHint() const
 }
 
 TQSize
-PropertyViewRuler::tqminimumSizeHint() const
+PropertyViewRuler::minimumSizeHint() const
 {
     double firstBarWidth = m_rulerScale->getBarWidth(0) + m_xorigin;
     TQSize res = TQSize(int(firstBarWidth), m_height);
diff --git a/src/gui/rulers/PropertyViewRuler.h b/src/gui/rulers/PropertyViewRuler.h
index ff275ed..f5740fd 100644
--- a/src/gui/rulers/PropertyViewRuler.h
+++ b/src/gui/rulers/PropertyViewRuler.h
@@ -64,8 +64,8 @@ public:
 
     ~PropertyViewRuler();
 
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     void setMinimumWidth(int width) { m_width = width; }
 
diff --git a/src/gui/rulers/RawNoteRuler.cpp b/src/gui/rulers/RawNoteRuler.cpp
index 75ddc37..30029bc 100644
--- a/src/gui/rulers/RawNoteRuler.cpp
+++ b/src/gui/rulers/RawNoteRuler.cpp
@@ -86,15 +86,15 @@ 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);
     }
 }
 
 TQSize
-RawNoteRuler::tqsizeHint() const
+RawNoteRuler::sizeHint() const
 {
     double width =
         m_rulerScale->getBarPosition(m_rulerScale->getLastVisibleBar()) +
@@ -107,7 +107,7 @@ RawNoteRuler::tqsizeHint() const
 }
 
 TQSize
-RawNoteRuler::tqminimumSizeHint() const
+RawNoteRuler::minimumSizeHint() const
 {
     double firstBarWidth = m_rulerScale->getBarWidth(0) + m_xorigin;
     TQSize res = TQSize(int(firstBarWidth), m_height);
@@ -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 7690ad1..6878785 100644
--- a/src/gui/rulers/RawNoteRuler.h
+++ b/src/gui/rulers/RawNoteRuler.h
@@ -71,8 +71,8 @@ public:
         m_segment = segment;
     }
 
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     void setMinimumWidth(int width) { m_width = width; }
 
@@ -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 8aba08b..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);
     }
@@ -630,7 +630,7 @@ TempoRuler::showTextFloat(tempoT tempo, tempoT target,
 }
 
 TQSize
-TempoRuler::tqsizeHint() const
+TempoRuler::sizeHint() const
 {
     double width =
         m_rulerScale->getBarPosition(m_rulerScale->getLastVisibleBar()) +
@@ -643,7 +643,7 @@ TempoRuler::tqsizeHint() const
 }
 
 TQSize
-TempoRuler::tqminimumSizeHint() const
+TempoRuler::minimumSizeHint() 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")
-                          .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/TempoRuler.h b/src/gui/rulers/TempoRuler.h
index 8327b13..afe1614 100644
--- a/src/gui/rulers/TempoRuler.h
+++ b/src/gui/rulers/TempoRuler.h
@@ -82,8 +82,8 @@ public:
 
     ~TempoRuler();
     
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     void setMinimumWidth(int width) { m_width = width; }
 
diff --git a/src/gui/rulers/TextRuler.cpp b/src/gui/rulers/TextRuler.cpp
index a170b7a..0e1eda4 100644
--- a/src/gui/rulers/TextRuler.cpp
+++ b/src/gui/rulers/TextRuler.cpp
@@ -84,15 +84,15 @@ 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);
     }
 }
 
 TQSize
-TextRuler::tqsizeHint() const
+TextRuler::sizeHint() const
 {
     double width =
         m_rulerScale->getBarPosition(m_rulerScale->getLastVisibleBar()) +
@@ -104,7 +104,7 @@ TextRuler::tqsizeHint() const
 }
 
 TQSize
-TextRuler::tqminimumSizeHint() const
+TextRuler::minimumSizeHint() const
 {
     double firstBarWidth = m_rulerScale->getBarWidth(0);
     TQSize res = TQSize(int(firstBarWidth), m_height);
diff --git a/src/gui/rulers/TextRuler.h b/src/gui/rulers/TextRuler.h
index 057b384..9edbe20 100644
--- a/src/gui/rulers/TextRuler.h
+++ b/src/gui/rulers/TextRuler.h
@@ -82,8 +82,8 @@ public:
 
     ~TextRuler();
 
-    virtual TQSize tqsizeHint() const;
-    virtual TQSize tqminimumSizeHint() const;
+    virtual TQSize sizeHint() const;
+    virtual TQSize minimumSizeHint() const;
 
     void setMinimumWidth(int width) { m_width = width; }