1 files changed, 8 insertions, 8 deletions

diff --git a/src/gui/rulers/ControllerEventsRuler.cpp b/src/gui/rulers/ControllerEventsRuler.cpp
index 6fe95e6..acbdc65 100644
--- a/src/gui/rulers/ControllerEventsRuler.cpp
+++ b/src/gui/rulers/ControllerEventsRuler.cpp
@@ -57,12 +57,12 @@ namespace Rosegarden
 
 ControllerEventsRuler::ControllerEventsRuler(Segment *segment,
         RulerScale* rulerScale,
-        EditViewBase* tqparentView,
+        EditViewBase* parentView,
         TQCanvas* c,
         TQWidget* tqparent,
         const ControlParameter *controller,
         const char* name, WFlags f)
-        : ControlRuler(segment, rulerScale, tqparentView, c, tqparent, name, f),
+        : ControlRuler(segment, rulerScale, parentView, c, tqparent, name, f),
         m_defaultItemWidth(20),
         m_controlLine(new TQCanvasLine(canvas())),
         m_controlLineShowing(false),
@@ -286,7 +286,7 @@ void ControllerEventsRuler::insertControllerEvent()
                                            insertTime, number,
                                            initialValue, *m_segment);
 
-    m_tqparentEditView->addCommandToHistory(command);
+    m_parentEditView->addCommandToHistory(command);
 }
 
 void ControllerEventsRuler::eraseControllerEvent()
@@ -298,7 +298,7 @@ void ControllerEventsRuler::eraseControllerEvent()
                                         *m_segment,
                                         m_eventSelection->getStartTime(),
                                         m_eventSelection->getEndTime());
-    m_tqparentEditView->addCommandToHistory(command);
+    m_parentEditView->addCommandToHistory(command);
     updateSelection();
 }
 
@@ -329,7 +329,7 @@ void ControllerEventsRuler::clearControllerEvents()
     }
 
     EraseCommand *command = new EraseCommand(*es);
-    m_tqparentEditView->addCommandToHistory(command);
+    m_parentEditView->addCommandToHistory(command);
 
 }
 
@@ -425,7 +425,7 @@ void ControllerEventsRuler::contentsMouseMoveEvent(TQMouseEvent *e)
 
 }
 
-void ControllerEventsRuler::tqlayoutItem(ControlItem* item)
+void ControllerEventsRuler::layoutItem(ControlItem* item)
 {
     timeT itemTime = item->getElementAdapter()->getTime();
 
@@ -440,7 +440,7 @@ void ControllerEventsRuler::tqlayoutItem(ControlItem* item)
 
     item->setWidth(width);
 
-    //RG_DEBUG << "ControllerEventsRuler::tqlayoutItem ControlItem x = " << x
+    //RG_DEBUG << "ControllerEventsRuler::layoutItem ControlItem x = " << x
     //<< " - width = " << width << endl;
 }
 
@@ -493,7 +493,7 @@ ControllerEventsRuler::tqdrawControlLine(timeT startTime,
             time += quantDur;
     }
 
-    m_tqparentEditView->addCommandToHistory(macro);
+    m_parentEditView->addCommandToHistory(macro);
 }
 
 }