1 files changed, 11 insertions, 11 deletions

diff --git a/src/gui/rulers/ControlRuler.cpp b/src/gui/rulers/ControlRuler.cpp
index c728093..ef61c50 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* tqparentView,
+                           EditViewBase* parentView,
                            TQCanvas* c, TQWidget* tqparent,
                            const char* name, WFlags f) :
         RosegardenCanvasView(c, tqparent, name, f),
-        m_tqparentEditView(tqparentView),
+        m_parentEditView(parentView),
         m_mainHorizontalScrollBar(0),
         m_rulerScale(rulerScale),
         m_eventSelection(new EventSelection(*segment)),
@@ -89,7 +89,7 @@ ControlRuler::ControlRuler(Segment *segment,
     setFixedHeight(tqsizeHint().height());
 
     connect(this, TQT_SIGNAL(stateChange(const TQString&, bool)),
-            m_tqparentEditView, TQT_SLOT(slotStateChanged(const TQString&, bool)));
+            m_parentEditView, TQT_SLOT(slotStateChanged(const TQString&, bool)));
 
     m_numberFloat = new TextFloat(this);
     m_numberFloat->hide();
@@ -127,13 +127,13 @@ void ControlRuler::slotUpdateElementsHPos()
         ControlItem* item = dynamic_cast<ControlItem*>(*it);
         if (!item)
             continue;
-        tqlayoutItem(item);
+        layoutItem(item);
     }
 
     canvas()->update();
 }
 
-void ControlRuler::tqlayoutItem(ControlItem* item)
+void ControlRuler::layoutItem(ControlItem* item)
 {
     timeT itemTime = item->getElementAdapter()->getTime();
 
@@ -146,7 +146,7 @@ void ControlRuler::tqlayoutItem(ControlItem* item)
 
     item->setWidth(width);
 
-    //     RG_DEBUG << "ControlRuler::tqlayoutItem ControlItem x = " << x << " - width = " << width << endl;
+    //     RG_DEBUG << "ControlRuler::layoutItem ControlItem x = " << x << " - width = " << width << endl;
 }
 
 void ControlRuler::setControlTool(ControlTool* tool)
@@ -281,7 +281,7 @@ void ControlRuler::contentsMouseReleaseEvent(TQMouseEvent* e)
                                         m_eventSelection->getEndTime());
 
         RG_DEBUG << "ControlRuler::contentsMouseReleaseEvent : adding command\n";
-        m_tqparentEditView->addCommandToHistory(command);
+        m_parentEditView->addCommandToHistory(command);
 
         m_itemMoved = false;
     }
@@ -310,7 +310,7 @@ void ControlRuler::contentsMouseMoveEvent(TQMouseEvent* e)
     //
     TQPoint totalPos = mapTo(tqtopLevelWidget(), TQPoint(0, 0));
 
-    int scrollX = dynamic_cast<EditView*>(m_tqparentEditView)->getRawCanvasView()->
+    int scrollX = dynamic_cast<EditView*>(m_parentEditView)->getRawCanvasView()->
                   horizontalScrollBar()->value();
 
     /*
@@ -393,10 +393,10 @@ void ControlRuler::createMenu()
 {
     RG_DEBUG << "ControlRuler::createMenu()\n";
 
-    KMainWindow* tqparentMainWindow = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
+    KMainWindow* parentMainWindow = dynamic_cast<KMainWindow*>(tqtopLevelWidget());
 
-    if (tqparentMainWindow && tqparentMainWindow->factory()) {
-        m_menu = static_cast<TQPopupMenu*>(tqparentMainWindow->factory()->container(m_menuName, tqparentMainWindow));
+    if (parentMainWindow && parentMainWindow->factory()) {
+        m_menu = static_cast<TQPopupMenu*>(parentMainWindow->factory()->container(m_menuName, parentMainWindow));
 
         if (!m_menu) {
             RG_DEBUG << "ControlRuler::createMenu() failed\n";