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

30 files changed, 62 insertions, 62 deletions

diff --git a/src/gui/rulers/ChordNameRuler.cpp b/src/gui/rulers/ChordNameRuler.cpp
index 121d911..91dde1d 100644
--- a/src/gui/rulers/ChordNameRuler.cpp
+++ b/src/gui/rulers/ChordNameRuler.cpp
@@ -62,9 +62,9 @@ ChordNameRuler::ChordNameRuler(RulerScale *rulerScale,
                                RosegardenGUIDoc *doc,
                                double xorigin,
                                int height,
-                               TQWidget *tqparent,
+                               TQWidget *parent,
                                const char *name) :
-        TQWidget(tqparent, name),
+        TQWidget(parent, name),
         m_xorigin(xorigin),
         m_height(height),
         m_currentXOffset(0),
@@ -103,9 +103,9 @@ ChordNameRuler::ChordNameRuler(RulerScale *rulerScale,
                                std::vector<Segment *> &segments,
                                double xorigin,
                                int height,
-                               TQWidget *tqparent,
+                               TQWidget *parent,
                                const char *name) :
-        TQWidget(tqparent, name),
+        TQWidget(parent, name),
         m_xorigin(xorigin),
         m_height(height),
         m_currentXOffset(0),
diff --git a/src/gui/rulers/ChordNameRuler.h b/src/gui/rulers/ChordNameRuler.h
index 1b77ae0..54efd7c 100644
--- a/src/gui/rulers/ChordNameRuler.h
+++ b/src/gui/rulers/ChordNameRuler.h
@@ -70,7 +70,7 @@ public:
                    RosegardenGUIDoc *doc,
                    double xorigin = 0.0,
                    int height = 0,
-                   TQWidget* tqparent = 0,
+                   TQWidget* parent = 0,
                    const char *name = 0);
 
     /**
@@ -84,7 +84,7 @@ public:
                    std::vector<Segment *> &segments,
                    double xorigin = 0.0,
                    int height = 0,
-                   TQWidget* tqparent = 0,
+                   TQWidget* parent = 0,
                    const char *name = 0);
 
     ~ChordNameRuler();
diff --git a/src/gui/rulers/ControlRuler.cpp b/src/gui/rulers/ControlRuler.cpp
index 469bf1b..94c66e8 100644
--- a/src/gui/rulers/ControlRuler.cpp
+++ b/src/gui/rulers/ControlRuler.cpp
@@ -63,9 +63,9 @@ const int ControlRuler::ItemHeightRange = 64;
 ControlRuler::ControlRuler(Segment *segment,
                            RulerScale* rulerScale,
                            EditViewBase* parentView,
-                           TQCanvas* c, TQWidget* tqparent,
+                           TQCanvas* c, TQWidget* parent,
                            const char* name, WFlags f) :
-        RosegardenCanvasView(c, tqparent, name, f),
+        RosegardenCanvasView(c, parent, name, f),
         m_parentEditView(parentView),
         m_mainHorizontalScrollBar(0),
         m_rulerScale(rulerScale),
@@ -402,7 +402,7 @@ void ControlRuler::createMenu()
             RG_DEBUG << "ControlRuler::createMenu() failed\n";
         }
     } else {
-        RG_DEBUG << "ControlRuler::createMenu() failed: no tqparent factory\n";
+        RG_DEBUG << "ControlRuler::createMenu() failed: no parent factory\n";
     }
 }
 
diff --git a/src/gui/rulers/ControlRuler.h b/src/gui/rulers/ControlRuler.h
index 8df6da1..8c8c833 100644
--- a/src/gui/rulers/ControlRuler.h
+++ b/src/gui/rulers/ControlRuler.h
@@ -72,7 +72,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 ~ControlRuler();
 
     virtual TQString getName() = 0;
diff --git a/src/gui/rulers/ControlSelector.cpp b/src/gui/rulers/ControlSelector.cpp
index 7f36234..15e2814 100644
--- a/src/gui/rulers/ControlSelector.cpp
+++ b/src/gui/rulers/ControlSelector.cpp
@@ -29,9 +29,9 @@
 
 namespace Rosegarden {
 
-ControlSelector::ControlSelector(ControlRuler* tqparent)
-    : TQObject(tqparent),
-      m_ruler(tqparent)
+ControlSelector::ControlSelector(ControlRuler* parent)
+    : TQObject(parent),
+      m_ruler(parent)
 {
 }
 
diff --git a/src/gui/rulers/ControlSelector.h b/src/gui/rulers/ControlSelector.h
index 8ad1917..9df2425 100644
--- a/src/gui/rulers/ControlSelector.h
+++ b/src/gui/rulers/ControlSelector.h
@@ -41,7 +41,7 @@ namespace Rosegarden {
 class ControlSelector : public TQObject
 {
 public:
-    ControlSelector(ControlRuler* tqparent);
+    ControlSelector(ControlRuler* parent);
     virtual ~ControlSelector() {};
     
     virtual void handleMouseButtonPress(TQMouseEvent *e);
diff --git a/src/gui/rulers/ControllerEventsRuler.cpp b/src/gui/rulers/ControllerEventsRuler.cpp
index acbdc65..a6a7d2f 100644
--- a/src/gui/rulers/ControllerEventsRuler.cpp
+++ b/src/gui/rulers/ControllerEventsRuler.cpp
@@ -59,10 +59,10 @@ ControllerEventsRuler::ControllerEventsRuler(Segment *segment,
         RulerScale* rulerScale,
         EditViewBase* parentView,
         TQCanvas* c,
-        TQWidget* tqparent,
+        TQWidget* parent,
         const ControlParameter *controller,
         const char* name, WFlags f)
-        : ControlRuler(segment, rulerScale, parentView, c, tqparent, name, f),
+        : ControlRuler(segment, rulerScale, parentView, c, parent, name, f),
         m_defaultItemWidth(20),
         m_controlLine(new TQCanvasLine(canvas())),
         m_controlLineShowing(false),
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);
 
diff --git a/src/gui/rulers/LoopRuler.cpp b/src/gui/rulers/LoopRuler.cpp
index 2d84890..885d7fc 100644
--- a/src/gui/rulers/LoopRuler.cpp
+++ b/src/gui/rulers/LoopRuler.cpp
@@ -51,9 +51,9 @@ LoopRuler::LoopRuler(RosegardenGUIDoc *doc,
                      int height,
                      double xorigin,
                      bool invert,
-                     TQWidget *tqparent,
+                     TQWidget *parent,
                      const char *name) : 
-    TQWidget(tqparent, name),
+    TQWidget(parent, name),
     m_doc(doc),
     m_height(height),
     m_xorigin(xorigin),
diff --git a/src/gui/rulers/LoopRuler.h b/src/gui/rulers/LoopRuler.h
index ac397fe..1d1fb19 100644
--- a/src/gui/rulers/LoopRuler.h
+++ b/src/gui/rulers/LoopRuler.h
@@ -62,7 +62,7 @@ public:
               int height = 0,
               double xorigin = 0.0,
               bool invert = false,
-              TQWidget* tqparent = 0,
+              TQWidget* parent = 0,
               const char *name = 0);
 
     ~LoopRuler();
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);
diff --git a/src/gui/rulers/MarkerRuler.h b/src/gui/rulers/MarkerRuler.h
index 0dda828..748108c 100644
--- a/src/gui/rulers/MarkerRuler.h
+++ b/src/gui/rulers/MarkerRuler.h
@@ -57,7 +57,7 @@ public:
                      RulerScale *rulerScale,
                      int buttonHeight,
                      double xorigin = 0.0,
-                     TQWidget* tqparent = 0,
+                     TQWidget* parent = 0,
                      const char* name = 0,
                      WFlags f=0);
 
diff --git a/src/gui/rulers/PercussionPitchRuler.cpp b/src/gui/rulers/PercussionPitchRuler.cpp
index e72cf4e..16b9558 100644
--- a/src/gui/rulers/PercussionPitchRuler.cpp
+++ b/src/gui/rulers/PercussionPitchRuler.cpp
@@ -44,10 +44,10 @@
 namespace Rosegarden
 {
 
-PercussionPitchRuler::PercussionPitchRuler(TQWidget *tqparent,
+PercussionPitchRuler::PercussionPitchRuler(TQWidget *parent,
         const MidiKeyMapping *mapping,
         int lineSpacing) :
-        PitchRuler(tqparent),
+        PitchRuler(parent),
         m_mapping(mapping),
         m_lineSpacing(lineSpacing),
         m_mouseDown(false),
diff --git a/src/gui/rulers/PercussionPitchRuler.h b/src/gui/rulers/PercussionPitchRuler.h
index 53d1adc..0bb05db 100644
--- a/src/gui/rulers/PercussionPitchRuler.h
+++ b/src/gui/rulers/PercussionPitchRuler.h
@@ -49,7 +49,7 @@ class PercussionPitchRuler : public PitchRuler
     Q_OBJECT
   TQ_OBJECT
 public:
-    PercussionPitchRuler(TQWidget *tqparent,
+    PercussionPitchRuler(TQWidget *parent,
                          const MidiKeyMapping *mapping,
                          int lineSpacing);
 
diff --git a/src/gui/rulers/PitchRuler.cpp b/src/gui/rulers/PitchRuler.cpp
index b771c18..117fb87 100644
--- a/src/gui/rulers/PitchRuler.cpp
+++ b/src/gui/rulers/PitchRuler.cpp
@@ -33,8 +33,8 @@ namespace Rosegarden
 {
 
 PitchRuler::
-PitchRuler(TQWidget *tqparent) :
-        TQWidget(tqparent)
+PitchRuler(TQWidget *parent) :
+        TQWidget(parent)
 {
     // nothing else
 }
diff --git a/src/gui/rulers/PitchRuler.h b/src/gui/rulers/PitchRuler.h
index fd07bdf..9e6bd19 100644
--- a/src/gui/rulers/PitchRuler.h
+++ b/src/gui/rulers/PitchRuler.h
@@ -42,7 +42,7 @@ class PitchRuler : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    PitchRuler(TQWidget *tqparent);
+    PitchRuler(TQWidget *parent);
 
     virtual TQSize tqsizeHint() const;
     virtual TQSize tqminimumSizeHint() const;
diff --git a/src/gui/rulers/PropertyBox.cpp b/src/gui/rulers/PropertyBox.cpp
index 1a21dcf..06880c1 100644
--- a/src/gui/rulers/PropertyBox.cpp
+++ b/src/gui/rulers/PropertyBox.cpp
@@ -38,9 +38,9 @@ namespace Rosegarden
 PropertyBox::PropertyBox(TQString label,
                          int width,
                          int height,
-                         TQWidget *tqparent,
+                         TQWidget *parent,
                          const char *name):
-        TQWidget(tqparent, name),
+        TQWidget(parent, name),
         m_label(label),
         m_width(width),
         m_height(height)
diff --git a/src/gui/rulers/PropertyBox.h b/src/gui/rulers/PropertyBox.h
index 2b26428..9df80aa 100644
--- a/src/gui/rulers/PropertyBox.h
+++ b/src/gui/rulers/PropertyBox.h
@@ -53,7 +53,7 @@ public:
     PropertyBox(TQString label,
                int width,
                int height,
-               TQWidget *tqparent=0,
+               TQWidget *parent=0,
                const char *name = 0);
 
     virtual TQSize tqsizeHint() const;
diff --git a/src/gui/rulers/PropertyControlRuler.cpp b/src/gui/rulers/PropertyControlRuler.cpp
index e832907..ddfe3fe 100644
--- a/src/gui/rulers/PropertyControlRuler.cpp
+++ b/src/gui/rulers/PropertyControlRuler.cpp
@@ -55,10 +55,10 @@ PropertyControlRuler::PropertyControlRuler(PropertyName propertyName,
         Staff* staff,
         RulerScale* rulerScale,
         EditViewBase* parentView,
-        TQCanvas* c, TQWidget* tqparent,
+        TQCanvas* c, TQWidget* parent,
         const char* name, WFlags f) :
         ControlRuler(&(staff->getSegment()), rulerScale,
-                     parentView, c, tqparent, name, f),
+                     parentView, c, parent, name, f),
         m_propertyName(propertyName),
         m_staff(staff),
         m_propertyLine(new TQCanvasLine(canvas())),
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();
 
diff --git a/src/gui/rulers/PropertyViewRuler.cpp b/src/gui/rulers/PropertyViewRuler.cpp
index e871f16..8998049 100644
--- a/src/gui/rulers/PropertyViewRuler.cpp
+++ b/src/gui/rulers/PropertyViewRuler.cpp
@@ -52,9 +52,9 @@ PropertyViewRuler::PropertyViewRuler(RulerScale *rulerScale,
                                      const PropertyName &property,
                                      double xorigin,
                                      int height,
-                                     TQWidget *tqparent,
+                                     TQWidget *parent,
                                      const char *name) :
-        TQWidget(tqparent, name),
+        TQWidget(parent, name),
         m_propertyName(property),
         m_xorigin(xorigin),
         m_height(height),
diff --git a/src/gui/rulers/PropertyViewRuler.h b/src/gui/rulers/PropertyViewRuler.h
index 5640bf6..ff275ed 100644
--- a/src/gui/rulers/PropertyViewRuler.h
+++ b/src/gui/rulers/PropertyViewRuler.h
@@ -59,7 +59,7 @@ public:
                       const PropertyName &property,
                       double xorigin = 0.0,
                       int height = 0,
-                      TQWidget* tqparent = 0,
+                      TQWidget* parent = 0,
                       const char *name = 0);
 
     ~PropertyViewRuler();
diff --git a/src/gui/rulers/RawNoteRuler.cpp b/src/gui/rulers/RawNoteRuler.cpp
index ee159c1..75ddc37 100644
--- a/src/gui/rulers/RawNoteRuler.cpp
+++ b/src/gui/rulers/RawNoteRuler.cpp
@@ -50,9 +50,9 @@ RawNoteRuler::RawNoteRuler(RulerScale *rulerScale,
                            Segment *segment,
                            double xorigin,
                            int height,
-                           TQWidget *tqparent,
+                           TQWidget *parent,
                            const char *name) :
-        TQWidget(tqparent, name),
+        TQWidget(parent, name),
         m_xorigin(xorigin),
         m_height(height),
         m_currentXOffset(0),
@@ -559,7 +559,7 @@ RawNoteRuler::paintEvent(TQPaintEvent* e)
         // at a time when no other notes are playing (at least of
         // those that started no earlier than the paint start time).
         // Each node in that tree represents a note that starts
-        // playing during its tqparent node's note, or at the same time
+        // playing during its parent node's note, or at the same time
         // as it.
 
         drawNode(paint, *DefaultVelocityColour::getInstance(), *fi, m_height - 3, 2);
diff --git a/src/gui/rulers/RawNoteRuler.h b/src/gui/rulers/RawNoteRuler.h
index fc62946..7690ad1 100644
--- a/src/gui/rulers/RawNoteRuler.h
+++ b/src/gui/rulers/RawNoteRuler.h
@@ -62,7 +62,7 @@ public:
                  Segment *segment,
                  double xorigin = 0.0,
                  int height = 0,
-                 TQWidget* tqparent = 0,
+                 TQWidget* parent = 0,
                  const char *name = 0);
 
     ~RawNoteRuler();
diff --git a/src/gui/rulers/StandardRuler.cpp b/src/gui/rulers/StandardRuler.cpp
index 2f7dc72..4869d84 100644
--- a/src/gui/rulers/StandardRuler.cpp
+++ b/src/gui/rulers/StandardRuler.cpp
@@ -49,10 +49,10 @@ StandardRuler::StandardRuler(RosegardenGUIDoc *doc,
                              double xorigin,
                              int barHeight,
                              bool invert,
-                             TQWidget* tqparent,
+                             TQWidget* parent,
                              const char* name,
                              WFlags f):
-        TQVBox(tqparent, name, f),
+        TQVBox(parent, name, f),
         m_invert(invert),
         m_loopRulerHeight(10),
         m_currentXOffset(0),
diff --git a/src/gui/rulers/StandardRuler.h b/src/gui/rulers/StandardRuler.h
index f41fc24..327abdb 100644
--- a/src/gui/rulers/StandardRuler.h
+++ b/src/gui/rulers/StandardRuler.h
@@ -55,7 +55,7 @@ public:
                   double xorigin,
                   int buttonHeight,
                   bool invert = false, // draw upside-down
-                  TQWidget* tqparent = 0,
+                  TQWidget* parent = 0,
                   const char* name = 0,
                   WFlags f=0);
 
diff --git a/src/gui/rulers/TempoRuler.cpp b/src/gui/rulers/TempoRuler.cpp
index 9928541..8aba08b 100644
--- a/src/gui/rulers/TempoRuler.cpp
+++ b/src/gui/rulers/TempoRuler.cpp
@@ -70,9 +70,9 @@ TempoRuler::TempoRuler(RulerScale *rulerScale,
                        double xorigin,
                        int height,
                        bool small,
-                       TQWidget *tqparent,
+                       TQWidget *parent,
                        const char *name) :
-        TQWidget(tqparent, name),
+        TQWidget(parent, name),
         m_xorigin(xorigin),
         m_height(height),
         m_currentXOffset(0),
@@ -614,12 +614,12 @@ TempoRuler::showTextFloat(tempoT tempo, tempoT target,
     //    std::cerr << "cp = " << cp.x() << "," << cp.y() << ", tempo = " << qpm << std::endl;
     TQPoint mp = cp + pos();
 
-    TQWidget *tqparent = parentWidget();
-    while (tqparent->parentWidget() &&
-            !tqparent->isTopLevel() &&
-            !tqparent->isDialog()) {
-        mp += tqparent->pos();
-        tqparent = tqparent->parentWidget();
+    TQWidget *parent = parentWidget();
+    while (parent->parentWidget() &&
+            !parent->isTopLevel() &&
+            !parent->isDialog()) {
+        mp += parent->pos();
+        parent = parent->parentWidget();
     }
 
     int yoff = cp.y() + m_textFloat->height() + 3;
diff --git a/src/gui/rulers/TempoRuler.h b/src/gui/rulers/TempoRuler.h
index f74d695..8327b13 100644
--- a/src/gui/rulers/TempoRuler.h
+++ b/src/gui/rulers/TempoRuler.h
@@ -77,7 +77,7 @@ public:
                double xorigin = 0.0,
                int height = 0,
                bool small = false,
-               TQWidget* tqparent = 0,
+               TQWidget* parent = 0,
                const char *name = 0);
 
     ~TempoRuler();
diff --git a/src/gui/rulers/TextRuler.cpp b/src/gui/rulers/TextRuler.cpp
index d5db081..a170b7a 100644
--- a/src/gui/rulers/TextRuler.cpp
+++ b/src/gui/rulers/TextRuler.cpp
@@ -46,9 +46,9 @@ namespace Rosegarden
 TextRuler::TextRuler(RulerScale *rulerScale,
                      Segment *segment,
                      int height,
-                     TQWidget *tqparent,
+                     TQWidget *parent,
                      const char *name)
-        : TQWidget(tqparent, name),
+        : TQWidget(parent, name),
         m_height(height),
         m_currentXOffset(0),
         m_width( -1),
diff --git a/src/gui/rulers/TextRuler.h b/src/gui/rulers/TextRuler.h
index 90b9aea..057b384 100644
--- a/src/gui/rulers/TextRuler.h
+++ b/src/gui/rulers/TextRuler.h
@@ -77,7 +77,7 @@ public:
     TextRuler(RulerScale *rulerScale,
               Segment *segment,
               int height = 0,
-              TQWidget* tqparent = 0,
+              TQWidget* parent = 0,
               const char *name = 0);
 
     ~TextRuler();