rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 1 insertions, 1 deletions

diff --git a/src/gui/rulers/ControllerEventsRuler.h b/src/gui/rulers/ControllerEventsRuler.h
index 56a858e..fc1d1f6 100644
--- a/src/gui/rulers/ControllerEventsRuler.h
+++ b/src/gui/rulers/ControllerEventsRuler.h
@@ -58,7 +58,7 @@ public:
                           RulerScale*,
                           EditViewBase* parentView,
                           TQCanvas*,
-                          TQWidget* tqparent=0,
+                          TQWidget* parent=0,
                           const ControlParameter *controller = 0,
                           const char* name=0, WFlags f=0);