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, 7 insertions, 7 deletions

diff --git a/src/gui/rulers/MarkerRuler.cpp b/src/gui/rulers/MarkerRuler.cpp
index f20cc73..749dfef 100644
--- a/src/gui/rulers/MarkerRuler.cpp
+++ b/src/gui/rulers/MarkerRuler.cpp
@@ -61,10 +61,10 @@ MarkerRuler::MarkerRuler(RosegardenGUIDoc *doc,
                          RulerScale *rulerScale,
                          int barHeight,
                          double xorigin,
-                         TQWidget* tqparent,
+                         TQWidget* parent,
                          const char* name,
                          WFlags f)
-        : TQWidget(tqparent, name, f),
+        : TQWidget(parent, name, f),
         m_barHeight(barHeight),
         m_xorigin(xorigin),
         m_currentXOffset(0),
@@ -73,15 +73,15 @@ MarkerRuler::MarkerRuler(RosegardenGUIDoc *doc,
         m_menu(0),
         m_doc(doc),
         m_rulerScale(rulerScale),
-        m_parentMainWindow(dynamic_cast<KMainWindow*>(doc->tqparent()))
+        m_parentMainWindow(dynamic_cast<KMainWindow*>(doc->parent()))
 {
-    // If the tqparent window has a main window above it, we need to use
-    // that as the tqparent main window, not the document's tqparent.
+    // If the parent window has a main window above it, we need to use
+    // that as the parent main window, not the document's parent.
     // Otherwise we'll end up adding all actions to the same
     // (document-level) action collection regardless of which window
     // we're in.
-    TQObject *probe = TQT_TQOBJECT(tqparent);
-    while (probe && !dynamic_cast<KMainWindow *>(probe)) probe = probe->tqparent();
+    TQObject *probe = TQT_TQOBJECT(parent);
+    while (probe && !dynamic_cast<KMainWindow *>(probe)) probe = probe->parent();
     if (probe) m_parentMainWindow = dynamic_cast<KMainWindow *>(probe);
 
     //    m_barFont = new TQFont("helvetica", 12);