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/PropertyControlRuler.h b/src/gui/rulers/PropertyControlRuler.h
index 704fabe..db1d698 100644
--- a/src/gui/rulers/PropertyControlRuler.h
+++ b/src/gui/rulers/PropertyControlRuler.h
@@ -62,7 +62,7 @@ public:
                          RulerScale*,
                          EditViewBase* parentView,
                          TQCanvas*,
-                         TQWidget* tqparent=0, const char* name=0, WFlags f=0);
+                         TQWidget* parent=0, const char* name=0, WFlags f=0);
 
     virtual ~PropertyControlRuler();