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

9 files changed, 15 insertions, 15 deletions

diff --git a/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.cpp b/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.cpp
index 1ae0acd..182eb9b 100644
--- a/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.cpp
+++ b/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.cpp
@@ -44,8 +44,8 @@ static int apuExtantCount = 0;
 AudioPreviewUpdater::AudioPreviewUpdater(AudioPreviewThread &thread,
         const Composition& c, const Segment* s,
         const TQRect& r,
-        CompositionModelImpl* tqparent)
-        : TQObject(tqparent),
+        CompositionModelImpl* parent)
+        : TQObject(parent),
         m_thread(thread),
         m_composition(c),
         m_segment(s),
diff --git a/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h b/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h
index 047f9b2..f7ef967 100644
--- a/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h
+++ b/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h
@@ -53,7 +53,7 @@ public:
                         const Composition &composition,
                         const Segment *segment,
                         const TQRect &displayExtent,
-                        CompositionModelImpl *tqparent);
+                        CompositionModelImpl *parent);
     ~AudioPreviewUpdater();
 
     void update();
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
index d4e7909..7d38151 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
@@ -88,12 +88,12 @@ protected:
 
 CompositionView::CompositionView(RosegardenGUIDoc* doc,
                                  CompositionModel* model,
-                                 TQWidget * tqparent, const char * name, WFlags f)
+                                 TQWidget * parent, const char * name, WFlags f)
 #if KDE_VERSION >= KDE_MAKE_VERSION(3,2,0)
-        : RosegardenScrollView(tqparent, name, f | WNoAutoErase | WStaticContents),
+        : RosegardenScrollView(parent, name, f | WNoAutoErase | WStaticContents),
 #else
         :
-        RosegardenScrollView(tqparent, name, f | WRepaintNoErase | WResizeNoErase | WStaticContents),
+        RosegardenScrollView(parent, name, f | WRepaintNoErase | WResizeNoErase | WStaticContents),
 #endif
         m_model(model),
         m_currentItem(0),
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.h b/src/gui/editors/segment/segmentcanvas/CompositionView.h
index 12c5fb4..a1f6f07 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionView.h
+++ b/src/gui/editors/segment/segmentcanvas/CompositionView.h
@@ -67,7 +67,7 @@ class CompositionView : public RosegardenScrollView
   TQ_OBJECT
 public:
     CompositionView(RosegardenGUIDoc*, CompositionModel*,
-                    TQWidget * tqparent=0, const char* name=0, WFlags f=0);
+                    TQWidget * parent=0, const char* name=0, WFlags f=0);
 
     void setPointerPos(int pos);
     int getPointerPos() { return m_pointerPos; }
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h b/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h
index 00d942e..cdf373e 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h
@@ -44,7 +44,7 @@ class RulerScale;
 class SegmentItemPreview 
 {
 public:
-    SegmentItemPreview(Segment& tqparent,
+    SegmentItemPreview(Segment& parent,
                        RulerScale* scale);
     virtual ~SegmentItemPreview();
 
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp b/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp
index 130add7..85800b2 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp
@@ -42,7 +42,7 @@ namespace Rosegarden
 {
 
 SegmentTool::SegmentTool(CompositionView* canvas, RosegardenGUIDoc *doc)
-        : BaseTool("segment_tool_menu", dynamic_cast<KMainWindow*>(doc->tqparent())->factory(), TQT_TQOBJECT(canvas)),
+        : BaseTool("segment_tool_menu", dynamic_cast<KMainWindow*>(doc->parent())->factory(), TQT_TQOBJECT(canvas)),
         m_canvas(canvas),
         m_doc(doc),
         m_changeMade(false)
@@ -86,7 +86,7 @@ SegmentTool::createMenu()
     RG_DEBUG << "SegmentTool::createMenu()\n";
 
     RosegardenGUIApp *app =
-        dynamic_cast<RosegardenGUIApp*>(m_doc->tqparent());
+        dynamic_cast<RosegardenGUIApp*>(m_doc->parent());
 
     if (app) {
         m_menu = static_cast<TQPopupMenu*>
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentTool.h b/src/gui/editors/segment/segmentcanvas/SegmentTool.h
index 1b33ba3..5b054a8 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentTool.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentTool.h
@@ -64,7 +64,7 @@ public:
     virtual ~SegmentTool();
 
     /**
-     * Is called by the tqparent View (EditView or SegmentCanvas) when
+     * Is called by the parent View (EditView or SegmentCanvas) when
      * the tool is set as current.
      * Add any setup here
      */
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp
index c0b4aeb..68bee60 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp
@@ -42,9 +42,9 @@
 namespace Rosegarden
 {
 
-SegmentToolBox::SegmentToolBox(CompositionView* tqparent, RosegardenGUIDoc* doc)
-        : BaseToolBox(tqparent),
-        m_canvas(tqparent),
+SegmentToolBox::SegmentToolBox(CompositionView* parent, RosegardenGUIDoc* doc)
+        : BaseToolBox(parent),
+        m_canvas(parent),
         m_doc(doc)
 {}
 
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.h b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.h
index c975e53..92306f3 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.h
@@ -45,7 +45,7 @@ class SegmentToolBox : public BaseToolBox
     Q_OBJECT
   TQ_OBJECT
 public:
-    SegmentToolBox(CompositionView* tqparent, RosegardenGUIDoc*);
+    SegmentToolBox(CompositionView* parent, RosegardenGUIDoc*);
 
     virtual SegmentTool* getTool(const TQString& toolName);