1 files changed, 22 insertions, 22 deletions

diff --git a/src/gui/rulers/ControlRuler.cpp b/src/gui/rulers/ControlRuler.cpp
index 7fea1fc..c728093 100644
--- a/src/gui/rulers/ControlRuler.cpp
+++ b/src/gui/rulers/ControlRuler.cpp
@@ -62,11 +62,11 @@ const int ControlRuler::ItemHeightRange = 64;
 
 ControlRuler::ControlRuler(Segment *segment,
                            RulerScale* rulerScale,
-                           EditViewBase* parentView,
-                           TQCanvas* c, TQWidget* parent,
+                           EditViewBase* tqparentView,
+                           TQCanvas* c, TQWidget* tqparent,
                            const char* name, WFlags f) :
-        RosegardenCanvasView(c, parent, name, f),
-        m_parentEditView(parentView),
+        RosegardenCanvasView(c, tqparent, name, f),
+        m_tqparentEditView(tqparentView),
         m_mainHorizontalScrollBar(0),
         m_rulerScale(rulerScale),
         m_eventSelection(new EventSelection(*segment)),
@@ -84,12 +84,12 @@ ControlRuler::ControlRuler(Segment *segment,
 {
     setHScrollBarMode(TQScrollView::AlwaysOff);
 
-    m_selectionRect->setPen(Qt::red);
+    m_selectionRect->setPen(TQt::red);
 
-    setFixedHeight(sizeHint().height());
+    setFixedHeight(tqsizeHint().height());
 
     connect(this, TQT_SIGNAL(stateChange(const TQString&, bool)),
-            m_parentEditView, TQT_SLOT(slotStateChanged(const TQString&, bool)));
+            m_tqparentEditView, TQT_SLOT(slotStateChanged(const TQString&, bool)));
 
     m_numberFloat = new TextFloat(this);
     m_numberFloat->hide();
@@ -113,7 +113,7 @@ void ControlRuler::slotUpdate()
     canvas()->setAllChanged(); // TODO: be a bit more subtle, call setChanged(<time area>)
 
     canvas()->update();
-    repaint();
+    tqrepaint();
 }
 
 void ControlRuler::slotUpdateElementsHPos()
@@ -127,13 +127,13 @@ void ControlRuler::slotUpdateElementsHPos()
         ControlItem* item = dynamic_cast<ControlItem*>(*it);
         if (!item)
             continue;
-        layoutItem(item);
+        tqlayoutItem(item);
     }
 
     canvas()->update();
 }
 
-void ControlRuler::layoutItem(ControlItem* item)
+void ControlRuler::tqlayoutItem(ControlItem* item)
 {
     timeT itemTime = item->getElementAdapter()->getTime();
 
@@ -146,7 +146,7 @@ void ControlRuler::layoutItem(ControlItem* item)
 
     item->setWidth(width);
 
-    //     RG_DEBUG << "ControlRuler::layoutItem ControlItem x = " << x << " - width = " << width << endl;
+    //     RG_DEBUG << "ControlRuler::tqlayoutItem ControlItem x = " << x << " - width = " << width << endl;
 }
 
 void ControlRuler::setControlTool(ControlTool* tool)
@@ -186,7 +186,7 @@ void ControlRuler::contentsMousePressEvent(TQMouseEvent* e)
 
     // clear selection unless control was pressed, in which case
     // add the event to the current selection
-    if (!(e->state() && TQMouseEvent::ControlButton)) {
+    if (!(e->state() && TQ_ControlButton)) {
         clearSelectedItems();
     }
 
@@ -216,7 +216,7 @@ void ControlRuler::contentsMousePressEvent(TQMouseEvent* e)
 
             } else { // select it
 
-                if (!(e->state() && TQMouseEvent::ControlButton)) {
+                if (!(e->state() && TQ_ControlButton)) {
                     if (item->z() > topItem->z())
                         topItem = item;
 
@@ -231,7 +231,7 @@ void ControlRuler::contentsMousePressEvent(TQMouseEvent* e)
         }
     }
 
-    if (topItem && !m_selectedItems.contains(topItem)) { // select the top item
+    if (topItem && !m_selectedItems.tqcontains(topItem)) { // select the top item
         m_selectedItems << topItem;
         topItem->setSelected(true);
         topItem->handleMouseButtonPress(e);
@@ -281,7 +281,7 @@ void ControlRuler::contentsMouseReleaseEvent(TQMouseEvent* e)
                                         m_eventSelection->getEndTime());
 
         RG_DEBUG << "ControlRuler::contentsMouseReleaseEvent : adding command\n";
-        m_parentEditView->addCommandToHistory(command);
+        m_tqparentEditView->addCommandToHistory(command);
 
         m_itemMoved = false;
     }
@@ -308,9 +308,9 @@ void ControlRuler::contentsMouseMoveEvent(TQMouseEvent* e)
 
     // Borrowed from Rotary - compute total position within window
     //
-    TQPoint totalPos = mapTo(topLevelWidget(), TQPoint(0, 0));
+    TQPoint totalPos = mapTo(tqtopLevelWidget(), TQPoint(0, 0));
 
-    int scrollX = dynamic_cast<EditView*>(m_parentEditView)->getRawCanvasView()->
+    int scrollX = dynamic_cast<EditView*>(m_tqparentEditView)->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").arg(value));
+                m_numberFloat->setText(TQString("%1").tqarg(value));
             }
         }
     }
@@ -393,16 +393,16 @@ void ControlRuler::createMenu()
 {
     RG_DEBUG << "ControlRuler::createMenu()\n";
 
-    KMainWindow* parentMainWindow = dynamic_cast<KMainWindow*>(topLevelWidget());
+    KMainWindow* tqparentMainWindow = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
 
-    if (parentMainWindow && parentMainWindow->factory()) {
-        m_menu = static_cast<TQPopupMenu*>(parentMainWindow->factory()->container(m_menuName, parentMainWindow));
+    if (tqparentMainWindow && tqparentMainWindow->factory()) {
+        m_menu = static_cast<TQPopupMenu*>(tqparentMainWindow->factory()->container(m_menuName, tqparentMainWindow));
 
         if (!m_menu) {
             RG_DEBUG << "ControlRuler::createMenu() failed\n";
         }
     } else {
-        RG_DEBUG << "ControlRuler::createMenu() failed: no parent factory\n";
+        RG_DEBUG << "ControlRuler::createMenu() failed: no tqparent factory\n";
     }
 }