1 files changed, 24 insertions, 24 deletions

diff --git a/src/gui/rulers/PropertyControlRuler.cpp b/src/gui/rulers/PropertyControlRuler.cpp
index a597820..4a01cb0 100644
--- a/src/gui/rulers/PropertyControlRuler.cpp
+++ b/src/gui/rulers/PropertyControlRuler.cpp
@@ -54,11 +54,11 @@ namespace Rosegarden
 PropertyControlRuler::PropertyControlRuler(PropertyName propertyName,
         Staff* staff,
         RulerScale* rulerScale,
-        EditViewBase* parentView,
-        TQCanvas* c, TQWidget* parent,
+        EditViewBase* tqparentView,
+        TQCanvas* c, TQWidget* tqparent,
         const char* name, WFlags f) :
         ControlRuler(&(staff->getSegment()), rulerScale,
-                     parentView, c, parent, name, f),
+                     tqparentView, c, tqparent, name, f),
         m_propertyName(propertyName),
         m_staff(staff),
         m_propertyLine(new TQCanvasLine(canvas())),
@@ -98,9 +98,9 @@ PropertyControlRuler::drawBackground()
     // Draw some minimum and maximum controller value guide lines
     //
     TQCanvasLine *topLine = new TQCanvasLine(canvas());
-    TQCanvasLine *topQLine = new TQCanvasLine(canvas());
+    TQCanvasLine *topTQLine = new TQCanvasLine(canvas());
     TQCanvasLine *midLine = new TQCanvasLine(canvas());
-    TQCanvasLine *botQLine = new TQCanvasLine(canvas());
+    TQCanvasLine *botTQLine = new TQCanvasLine(canvas());
     TQCanvasLine *bottomLine = new TQCanvasLine(canvas());
     //m_controlLine->setPoints(m_controlLineX, m_controlLineY, m_controlLineX, m_controlLineY);
     int cHeight = canvas()->height();
@@ -111,20 +111,20 @@ PropertyControlRuler::drawBackground()
     topLine->setZ( -10);
     topLine->show();
 
-    topQLine->setPen(TQColor(192, 192, 192));
-    topQLine->setPoints(0, cHeight / 4, cWidth, cHeight / 4);
-    topQLine->setZ( -10);
-    topQLine->show();
+    topTQLine->setPen(TQColor(192, 192, 192));
+    topTQLine->setPoints(0, cHeight / 4, cWidth, cHeight / 4);
+    topTQLine->setZ( -10);
+    topTQLine->show();
 
     midLine->setPen(TQColor(127, 127, 127));
     midLine->setPoints(0, cHeight / 2, cWidth, cHeight / 2);
     midLine->setZ( -10);
     midLine->show();
 
-    botQLine->setPen(TQColor(192, 192, 192));
-    botQLine->setPoints(0, 3*cHeight / 4, cWidth, 3*cHeight / 4);
-    botQLine->setZ( -10);
-    botQLine->show();
+    botTQLine->setPen(TQColor(192, 192, 192));
+    botTQLine->setPoints(0, 3*cHeight / 4, cWidth, 3*cHeight / 4);
+    botTQLine->setZ( -10);
+    botTQLine->show();
 
     bottomLine->setPen(TQColor(127, 127, 127));
     bottomLine->setPoints(0, cHeight - 1, cWidth, cHeight - 1);
@@ -229,7 +229,7 @@ void PropertyControlRuler::startPropertyLine()
 {
     RG_DEBUG << "PropertyControlRuler::startPropertyLine\n";
     m_propertyLineShowing = true;
-    this->setCursor(Qt::pointingHandCursor);
+    this->setCursor(TQt::pointingHandCursor);
 }
 
 void
@@ -238,7 +238,7 @@ PropertyControlRuler::contentsMousePressEvent(TQMouseEvent *e)
     RG_DEBUG << "PropertyControlRuler::contentsMousePressEvent\n";
 
     if (!m_propertyLineShowing) {
-        if (e->button() == MidButton)
+        if (e->button() == Qt::MidButton)
             m_lastEventPos = inverseMapPoint(e->pos());
 
         ControlRuler::contentsMousePressEvent(e); // send super
@@ -247,15 +247,15 @@ PropertyControlRuler::contentsMousePressEvent(TQMouseEvent *e)
     }
 
     // cancel control line mode
-    if (e->button() == RightButton) {
+    if (e->button() == Qt::RightButton) {
         m_propertyLineShowing = false;
         m_propertyLine->hide();
 
-        this->setCursor(Qt::arrowCursor);
+        this->setCursor(TQt::arrowCursor);
         return ;
     }
 
-    if (e->button() == LeftButton) {
+    if (e->button() == Qt::LeftButton) {
         TQPoint p = inverseMapPoint(e->pos());
 
         m_propertyLine->show();
@@ -274,7 +274,7 @@ PropertyControlRuler::contentsMouseReleaseEvent(TQMouseEvent *e)
     /*
     if (m_propertyLineShowing)
     {
-        this->setCursor(Qt::arrowCursor);
+        this->setCursor(TQt::arrowCursor);
         m_propertyLineShowing = false;
         canvas()->update();
     }
@@ -308,7 +308,7 @@ PropertyControlRuler::contentsMouseReleaseEvent(TQMouseEvent *e)
 
         m_propertyLineShowing = false;
         m_propertyLine->hide();
-        this->setCursor(Qt::arrowCursor);
+        this->setCursor(TQt::arrowCursor);
         canvas()->update();
     }
 }
@@ -321,7 +321,7 @@ PropertyControlRuler::contentsMouseMoveEvent(TQMouseEvent *e)
     if (!m_propertyLineShowing) {
         // Don't send super if we're using the middle button
         //
-        if (e->button() == MidButton) {
+        if (e->button() == Qt::MidButton) {
             m_lastEventPos = inverseMapPoint(e->pos());
             return ;
         }
@@ -380,7 +380,7 @@ PropertyControlRuler::drawPropertyLine(timeT startTime,
     EventSelection selection(*m_segment, startTime, endTime, true);
     PropertyPattern pattern = DecrescendoPattern;
 
-    bool haveNotes = selection.contains(Note::EventType);
+    bool haveNotes = selection.tqcontains(Note::EventType);
 
     if (haveNotes) {
 
@@ -391,7 +391,7 @@ PropertyControlRuler::drawPropertyLine(timeT startTime,
                                          startValue,
                                          endValue);
 
-        m_parentEditView->addCommandToHistory(command);
+        m_tqparentEditView->addCommandToHistory(command);
 
     } else {
 
@@ -408,7 +408,7 @@ PropertyControlRuler::selectAllProperties()
     /*
     for(Segment::iterator i = m_segment.begin();
                     i != m_segment.end(); ++i)
-        if (!m_eventSelection->contains(*i)) m_eventSelection->addEvent(*i);
+        if (!m_eventSelection->tqcontains(*i)) m_eventSelection->addEvent(*i);
     */
 
     clearSelectedItems();