1 files changed, 15 insertions, 15 deletions

diff --git a/src/gui/rulers/LoopRuler.cpp b/src/gui/rulers/LoopRuler.cpp
index 0a0adb2..fec733b 100644
--- a/src/gui/rulers/LoopRuler.cpp
+++ b/src/gui/rulers/LoopRuler.cpp
@@ -51,9 +51,9 @@ LoopRuler::LoopRuler(RosegardenGUIDoc *doc,
                      int height,
                      double xorigin,
                      bool invert,
-                     TQWidget *parent,
+                     TQWidget *tqparent,
                      const char *name) : 
-    TQWidget(parent, name),
+    TQWidget(tqparent, name),
     m_doc(doc),
     m_height(height),
     m_xorigin(xorigin),
@@ -71,7 +71,7 @@ LoopRuler::LoopRuler(RosegardenGUIDoc *doc,
 {
     /*
      * I need to understand if this ruler is being built for the main
-     * window (Track Editor) or for any of the segment editors. Apparently
+     * window (Track Editor) or for any of the segment editors. Aptqparently
      * the name parameter is supplied (non-NULL) only for the main window.
      * I can't find of any other (more decent) way to do this. Sorry.
      */
@@ -103,7 +103,7 @@ void LoopRuler::scrollHoriz(int x)
 {
     if (getHScaleFactor() != 1.0) {
         m_currentXOffset = static_cast<int>( -x / getHScaleFactor());
-        repaint();
+        tqrepaint();
         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);
-        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);
     }
 }
 
-TQSize LoopRuler::sizeHint() const
+TQSize LoopRuler::tqsizeHint() const
 {
     double width =
         m_rulerScale->getBarPosition(m_rulerScale->getLastVisibleBar()) +
@@ -137,7 +137,7 @@ TQSize LoopRuler::sizeHint() const
     return res;
 }
 
-TQSize LoopRuler::minimumSizeHint() const
+TQSize LoopRuler::tqminimumSizeHint() 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(colorGroup().foreground());
+    paint.setBrush(tqcolorGroup().foreground());
     drawBarSections(&paint);
     drawLoopMarker(&paint);
     
@@ -255,10 +255,10 @@ LoopRuler::mousePressEvent(TQMouseEvent *mE)
 {
     RG_DEBUG << "LoopRuler::mousePressEvent: x = " << mE->x() << endl;
 
-    Qt::ButtonState bs = mE->state();
-    setLoopingMode((bs & Qt::ShiftButton) != 0);
+    TQt::ButtonState bs = mE->state();
+    setLoopingMode((bs & TQt::ShiftButton) != 0);
 
-    if (mE->button() == LeftButton) {
+    if (mE->button() == Qt::LeftButton) {
         double x = mE->pos().x() / getHScaleFactor() - m_currentXOffset - m_xorigin;
 
         if (m_loopingMode) {
@@ -280,7 +280,7 @@ LoopRuler::mousePressEvent(TQMouseEvent *mE)
 void
 LoopRuler::mouseReleaseEvent(TQMouseEvent *mE)
 {
-    if (mE->button() == LeftButton) {
+    if (mE->button() == Qt::LeftButton) {
         if (m_loopingMode) {
             // Cancel the loop if there was no drag
             //
@@ -321,7 +321,7 @@ LoopRuler::mouseDoubleClickEvent(TQMouseEvent *mE)
 
     RG_DEBUG << "LoopRuler::mouseDoubleClickEvent: x = " << x << ", looping = " << m_loopingMode << endl;
 
-    if (mE->button() == LeftButton && !m_loopingMode)
+    if (mE->button() == Qt::LeftButton && !m_loopingMode)
         emit setPlayPosition(m_grid->snapX(x));
 }
 
@@ -352,7 +352,7 @@ void LoopRuler::slotSetLoopMarker(timeT startLoop,
     m_endLoop = endLoop;
 
     TQPainter paint(this);
-    paint.setBrush(colorGroup().foreground());
+    paint.setBrush(tqcolorGroup().foreground());
     drawBarSections(&paint);
     drawLoopMarker(&paint);