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

37 files changed, 63 insertions, 63 deletions

diff --git a/src/gui/editors/segment/ControlEditorDialog.cpp b/src/gui/editors/segment/ControlEditorDialog.cpp
index 48d0f0a..581e065 100644
--- a/src/gui/editors/segment/ControlEditorDialog.cpp
+++ b/src/gui/editors/segment/ControlEditorDialog.cpp
@@ -72,10 +72,10 @@ namespace Rosegarden
 
 const TQString notShowing(i18n("<not showing>"));
 
-ControlEditorDialog::ControlEditorDialog(TQWidget *tqparent,
+ControlEditorDialog::ControlEditorDialog(TQWidget *parent,
         RosegardenGUIDoc *doc,
         DeviceId device):
-        KMainWindow(tqparent, "controleditordialog"),
+        KMainWindow(parent, "controleditordialog"),
         m_studio(&doc->getStudio()),
         m_doc(doc),
         m_device(device),
diff --git a/src/gui/editors/segment/ControlEditorDialog.h b/src/gui/editors/segment/ControlEditorDialog.h
index e9722e5..fa481d1 100644
--- a/src/gui/editors/segment/ControlEditorDialog.h
+++ b/src/gui/editors/segment/ControlEditorDialog.h
@@ -53,7 +53,7 @@ class ControlEditorDialog : public KMainWindow
   TQ_OBJECT
 
 public:
-    ControlEditorDialog(TQWidget *tqparent,
+    ControlEditorDialog(TQWidget *parent,
                         RosegardenGUIDoc *doc,
                         DeviceId device);
 
diff --git a/src/gui/editors/segment/ControlParameterEditDialog.cpp b/src/gui/editors/segment/ControlParameterEditDialog.cpp
index 47f01db..b00ac83 100644
--- a/src/gui/editors/segment/ControlParameterEditDialog.cpp
+++ b/src/gui/editors/segment/ControlParameterEditDialog.cpp
@@ -55,10 +55,10 @@ namespace Rosegarden
 const TQString notShowing(i18n("<not showing>"));
 
 ControlParameterEditDialog::ControlParameterEditDialog(
-    TQWidget *tqparent,
+    TQWidget *parent,
     ControlParameter *control,
     RosegardenGUIDoc *doc):
-        KDialogBase(tqparent, 0, true,
+        KDialogBase(parent, 0, true,
                     i18n("Edit Control Parameter"), Ok | Cancel),
         m_doc(doc),
         m_control(control)
diff --git a/src/gui/editors/segment/ControlParameterEditDialog.h b/src/gui/editors/segment/ControlParameterEditDialog.h
index 289dc68..727585d 100644
--- a/src/gui/editors/segment/ControlParameterEditDialog.h
+++ b/src/gui/editors/segment/ControlParameterEditDialog.h
@@ -49,7 +49,7 @@ class ControlParameterEditDialog : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    ControlParameterEditDialog(TQWidget *tqparent,
+    ControlParameterEditDialog(TQWidget *parent,
                                ControlParameter *control,
                                RosegardenGUIDoc *doc);
 
diff --git a/src/gui/editors/segment/ControlParameterItem.h b/src/gui/editors/segment/ControlParameterItem.h
index e64b1d3..7be91b3 100644
--- a/src/gui/editors/segment/ControlParameterItem.h
+++ b/src/gui/editors/segment/ControlParameterItem.h
@@ -38,7 +38,7 @@ class ControlParameterItem : public KListViewItem
 {
 public:
     ControlParameterItem(int id,
-                         TQListView *tqparent,
+                         TQListView *parent,
                          TQString str1,
                          TQString str2,
                          TQString str3,
@@ -48,7 +48,7 @@ public:
                          TQString str7,
                          TQString str8,
                          TQString str9):
-        KListViewItem(tqparent, str1, str2, str3, str4, str5, str6, str7, str8),
+        KListViewItem(parent, str1, str2, str3, str4, str5, str6, str7, str8),
         m_id(id) { setText(8, str9); }
 
     int getId() const { return m_id; }
diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp
index dffe446..029ff9c 100644
--- a/src/gui/editors/segment/MarkerEditor.cpp
+++ b/src/gui/editors/segment/MarkerEditor.cpp
@@ -71,9 +71,9 @@
 namespace Rosegarden
 {
 
-MarkerEditor::MarkerEditor(TQWidget *tqparent,
+MarkerEditor::MarkerEditor(TQWidget *parent,
                                        RosegardenGUIDoc *doc):
-        KMainWindow(tqparent, "markereditordialog"),
+        KMainWindow(parent, "markereditordialog"),
         m_doc(doc),
         m_modified(false)
 {
diff --git a/src/gui/editors/segment/MarkerEditor.h b/src/gui/editors/segment/MarkerEditor.h
index c5a1973..1ddc200 100644
--- a/src/gui/editors/segment/MarkerEditor.h
+++ b/src/gui/editors/segment/MarkerEditor.h
@@ -54,7 +54,7 @@ class MarkerEditor : public KMainWindow
   TQ_OBJECT
 
 public:
-    MarkerEditor(TQWidget *tqparent,
+    MarkerEditor(TQWidget *parent,
                        RosegardenGUIDoc *doc);
     ~MarkerEditor();
 
diff --git a/src/gui/editors/segment/MarkerEditorViewItem.h b/src/gui/editors/segment/MarkerEditorViewItem.h
index 03320aa..1a835c0 100644
--- a/src/gui/editors/segment/MarkerEditorViewItem.h
+++ b/src/gui/editors/segment/MarkerEditorViewItem.h
@@ -35,7 +35,7 @@ namespace Rosegarden {
 class MarkerEditorViewItem : public KListViewItem
 {
 public:
-    MarkerEditorViewItem(TQListView * tqparent, int id,
+    MarkerEditorViewItem(TQListView * parent, int id,
                          TQString label1, 
                          TQString label2 = TQString(), 
                          TQString label3 = TQString(),
@@ -44,7 +44,7 @@ public:
                          TQString label6 = TQString(), 
                          TQString label7 = TQString(), 
                          TQString label8 = TQString()):
-        KListViewItem(tqparent, label1, label2, label3, label4,
+        KListViewItem(parent, label1, label2, label3, label4,
                       label5, label6, label7, label8),
 	m_rawTime(0), m_fake(false), m_id(id) { ; }
 
diff --git a/src/gui/editors/segment/PlayList.cpp b/src/gui/editors/segment/PlayList.cpp
index c0154ec..da56edc 100644
--- a/src/gui/editors/segment/PlayList.cpp
+++ b/src/gui/editors/segment/PlayList.cpp
@@ -47,8 +47,8 @@
 namespace Rosegarden
 {
 
-PlayList::PlayList(TQWidget *tqparent, const char *name)
-        : TQVBox(tqparent, name),
+PlayList::PlayList(TQWidget *parent, const char *name)
+        : TQVBox(parent, name),
         m_listView(new PlayListView(this)),
         m_buttonBar(new TQFrame(this)),
         m_barLayout(new TQHBoxLayout(m_buttonBar)),
diff --git a/src/gui/editors/segment/PlayList.h b/src/gui/editors/segment/PlayList.h
index 606eecd..cf7b073 100644
--- a/src/gui/editors/segment/PlayList.h
+++ b/src/gui/editors/segment/PlayList.h
@@ -49,7 +49,7 @@ class PlayList : public TQVBox
   TQ_OBJECT
 
 public:
-    PlayList(TQWidget *tqparent = 0, const char *name = 0);
+    PlayList(TQWidget *parent = 0, const char *name = 0);
     ~PlayList();
 
     PlayListView* getListView() { return m_listView; }
diff --git a/src/gui/editors/segment/PlayListDialog.cpp b/src/gui/editors/segment/PlayListDialog.cpp
index 74c386b..b519b6e 100644
--- a/src/gui/editors/segment/PlayListDialog.cpp
+++ b/src/gui/editors/segment/PlayListDialog.cpp
@@ -36,8 +36,8 @@ namespace Rosegarden
 {
 
 PlayListDialog::PlayListDialog(TQString caption,
-                               TQWidget* tqparent, const char* name)
-        : KDialogBase(tqparent, name, false, caption,
+                               TQWidget* parent, const char* name)
+        : KDialogBase(parent, name, false, caption,
                       KDialogBase::Close,  // standard buttons
                       KDialogBase::Close,  // default button
                       true),
diff --git a/src/gui/editors/segment/PlayListDialog.h b/src/gui/editors/segment/PlayListDialog.h
index 69956dd..0ae205c 100644
--- a/src/gui/editors/segment/PlayListDialog.h
+++ b/src/gui/editors/segment/PlayListDialog.h
@@ -46,7 +46,7 @@ class PlayListDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    PlayListDialog(TQString caption, TQWidget* tqparent = 0, const char* name = 0);
+    PlayListDialog(TQString caption, TQWidget* parent = 0, const char* name = 0);
 
     PlayList* getPlayList() { return m_playList; }
 
diff --git a/src/gui/editors/segment/PlayListView.cpp b/src/gui/editors/segment/PlayListView.cpp
index e83e5e6..ff4d1c8 100644
--- a/src/gui/editors/segment/PlayListView.cpp
+++ b/src/gui/editors/segment/PlayListView.cpp
@@ -29,8 +29,8 @@
 
 namespace Rosegarden {
 
-PlayListView::PlayListView(TQWidget *tqparent, const char *name)
-    : KListView(tqparent, name)
+PlayListView::PlayListView(TQWidget *parent, const char *name)
+    : KListView(parent, name)
 {
     addColumn(i18n("Title"));
     addColumn(i18n("File name"));
diff --git a/src/gui/editors/segment/PlayListView.h b/src/gui/editors/segment/PlayListView.h
index b21551e..43390d0 100644
--- a/src/gui/editors/segment/PlayListView.h
+++ b/src/gui/editors/segment/PlayListView.h
@@ -32,7 +32,7 @@ namespace Rosegarden {
 class PlayListView : public KListView
 {
 public:
-    PlayListView(TQWidget *tqparent=0, const char *name=0);
+    PlayListView(TQWidget *parent=0, const char *name=0);
 
     TQListViewItem* previousSibling(TQListViewItem*);
 
diff --git a/src/gui/editors/segment/PlayListViewItem.cpp b/src/gui/editors/segment/PlayListViewItem.cpp
index 12d60b8..ab0c25c 100644
--- a/src/gui/editors/segment/PlayListViewItem.cpp
+++ b/src/gui/editors/segment/PlayListViewItem.cpp
@@ -26,14 +26,14 @@
 
 namespace Rosegarden {
 
-PlayListViewItem::PlayListViewItem(KListView* tqparent, KURL kurl)
-    : KListViewItem(tqparent, kurl.fileName(), kurl.prettyURL()),
+PlayListViewItem::PlayListViewItem(KListView* parent, KURL kurl)
+    : KListViewItem(parent, kurl.fileName(), kurl.prettyURL()),
       m_kurl(kurl)
 {
 }
 
-PlayListViewItem::PlayListViewItem(KListView* tqparent, TQListViewItem* after, KURL kurl)
-    : KListViewItem(tqparent, after, kurl.fileName(), kurl.prettyURL()),
+PlayListViewItem::PlayListViewItem(KListView* parent, TQListViewItem* after, KURL kurl)
+    : KListViewItem(parent, after, kurl.fileName(), kurl.prettyURL()),
       m_kurl(kurl)
 {
 }
diff --git a/src/gui/editors/segment/PlayListViewItem.h b/src/gui/editors/segment/PlayListViewItem.h
index aa39bb8..a622682 100644
--- a/src/gui/editors/segment/PlayListViewItem.h
+++ b/src/gui/editors/segment/PlayListViewItem.h
@@ -33,8 +33,8 @@ namespace Rosegarden {
 class PlayListViewItem : public KListViewItem
 {
 public:
-    PlayListViewItem(KListView* tqparent, KURL);
-    PlayListViewItem(KListView* tqparent, TQListViewItem*, KURL);
+    PlayListViewItem(KListView* parent, KURL);
+    PlayListViewItem(KListView* parent, TQListViewItem*, KURL);
 
     const KURL& getURL() { return m_kurl; }
 
diff --git a/src/gui/editors/segment/TrackButtons.cpp b/src/gui/editors/segment/TrackButtons.cpp
index fba7327..2e779fd 100644
--- a/src/gui/editors/segment/TrackButtons.cpp
+++ b/src/gui/editors/segment/TrackButtons.cpp
@@ -72,10 +72,10 @@ TrackButtons::TrackButtons(RosegardenGUIDoc* doc,
                            unsigned int trackLabelWidth,
                            bool showTrackLabels,
                            int overallHeight,
-                           TQWidget* tqparent,
+                           TQWidget* parent,
                            const char* name,
                            WFlags f)
-        : TQFrame(tqparent, name, f),
+        : TQFrame(parent, name, f),
         m_doc(doc),
         m_tqlayout(new TQVBoxLayout(this)),
         m_recordSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))),
diff --git a/src/gui/editors/segment/TrackButtons.h b/src/gui/editors/segment/TrackButtons.h
index 050c564..0622642 100644
--- a/src/gui/editors/segment/TrackButtons.h
+++ b/src/gui/editors/segment/TrackButtons.h
@@ -62,7 +62,7 @@ public:
                  unsigned int trackLabelWidth,
                  bool showTrackLabels,
                  int overallHeight,
-                 TQWidget* tqparent = 0,
+                 TQWidget* parent = 0,
                  const char* name = 0,
                  WFlags f=0);
 
diff --git a/src/gui/editors/segment/TrackEditor.cpp b/src/gui/editors/segment/TrackEditor.cpp
index 7381790..3fa85ba 100644
--- a/src/gui/editors/segment/TrackEditor.cpp
+++ b/src/gui/editors/segment/TrackEditor.cpp
@@ -87,10 +87,10 @@ TrackEditor::TrackEditor(RosegardenGUIDoc* doc,
                          RulerScale *rulerScale,
                          bool showTrackLabels,
                          double initialUnitsPerPixel,
-                         TQWidget* tqparent, const char* name,
+                         TQWidget* parent, const char* name,
                          WFlags) :
         DCOPObject("TrackEditorIface"),
-        TQWidget(tqparent, name),
+        TQWidget(parent, name),
         m_doc(doc),
         m_rulerScale(rulerScale),
         m_topStandardRuler(0),
@@ -166,7 +166,7 @@ TrackEditor::init(TQWidget* rosegardenguiview)
 
     connect(rosegardenguiview, TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
             m_compositionModel, TQT_SLOT(slotInstrumentParametersChanged(InstrumentId)));
-    connect(rosegardenguiview->tqparent(), TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
+    connect(rosegardenguiview->parent(), TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
             m_compositionModel, TQT_SLOT(slotInstrumentParametersChanged(InstrumentId)));
 
     m_segmentCanvas = new CompositionView(m_doc, m_compositionModel, this);
diff --git a/src/gui/editors/segment/TrackEditor.h b/src/gui/editors/segment/TrackEditor.h
index 86e3b77..88dab1d 100644
--- a/src/gui/editors/segment/TrackEditor.h
+++ b/src/gui/editors/segment/TrackEditor.h
@@ -78,7 +78,7 @@ public:
                 RulerScale *rulerScale,
                 bool showTrackLabels,
                 double initialUnitsPerPixel = 0,
-                TQWidget* tqparent = 0, const char* name = 0,
+                TQWidget* parent = 0, const char* name = 0,
                 WFlags f=0);
 
     ~TrackEditor();
diff --git a/src/gui/editors/segment/TrackHeader.h b/src/gui/editors/segment/TrackHeader.h
index 56891f4..d1abcc1 100644
--- a/src/gui/editors/segment/TrackHeader.h
+++ b/src/gui/editors/segment/TrackHeader.h
@@ -43,9 +43,9 @@ class TrackHeader : public TQHeader
 
 public:
     TrackHeader(int number,
-                          TQWidget *tqparent=0,
+                          TQWidget *parent=0,
                           const char *name=0 ):
-                            TQHeader(number, tqparent, name) {;}
+                            TQHeader(number, parent, name) {;}
     ~TrackHeader();
 
 protected:
diff --git a/src/gui/editors/segment/TrackLabel.cpp b/src/gui/editors/segment/TrackLabel.cpp
index 53795a7..144fcd6 100644
--- a/src/gui/editors/segment/TrackLabel.cpp
+++ b/src/gui/editors/segment/TrackLabel.cpp
@@ -45,9 +45,9 @@ namespace Rosegarden
 
 TrackLabel::TrackLabel(TrackId id,
                        int position,
-                       TQWidget *tqparent,
+                       TQWidget *parent,
                        const char *name):
-        TQWidgetStack(tqparent, name),
+        TQWidgetStack(parent, name),
         m_instrumentLabel(new TQLabel(this)),
         m_trackLabel(new TQLabel(this)),
         m_id(id),
diff --git a/src/gui/editors/segment/TrackLabel.h b/src/gui/editors/segment/TrackLabel.h
index a7b5207..5369165 100644
--- a/src/gui/editors/segment/TrackLabel.h
+++ b/src/gui/editors/segment/TrackLabel.h
@@ -62,7 +62,7 @@ public:
 
     TrackLabel(TrackId id,
                int position,
-               TQWidget *tqparent,
+               TQWidget *parent,
                const char *name=0);
 
     ~TrackLabel();
diff --git a/src/gui/editors/segment/TrackVUMeter.cpp b/src/gui/editors/segment/TrackVUMeter.cpp
index 5001a28..ad91278 100644
--- a/src/gui/editors/segment/TrackVUMeter.cpp
+++ b/src/gui/editors/segment/TrackVUMeter.cpp
@@ -34,13 +34,13 @@
 namespace Rosegarden
 {
 
-TrackVUMeter::TrackVUMeter(TQWidget *tqparent,
+TrackVUMeter::TrackVUMeter(TQWidget *parent,
                            VUMeterType type,
                            int width,
                            int height,
                            int position,
                            const char *name):
-        VUMeter(tqparent, type, false, false, width, height, VUMeter::Horizontal, name),
+        VUMeter(parent, type, false, false, width, height, VUMeter::Horizontal, name),
         m_position(position), m_textHeight(12)
 {
     tqsetAlignment(AlignCenter);
diff --git a/src/gui/editors/segment/TrackVUMeter.h b/src/gui/editors/segment/TrackVUMeter.h
index 9630301..dad0455 100644
--- a/src/gui/editors/segment/TrackVUMeter.h
+++ b/src/gui/editors/segment/TrackVUMeter.h
@@ -40,7 +40,7 @@ namespace Rosegarden
 class TrackVUMeter: public VUMeter
 {
 public:
-     TrackVUMeter(TQWidget *tqparent = 0,
+     TrackVUMeter(TQWidget *parent = 0,
                   VUMeterType type = Plain,
                   int width = 0,
                   int height = 0,
diff --git a/src/gui/editors/segment/TriggerManagerItem.h b/src/gui/editors/segment/TriggerManagerItem.h
index 1d6a819..eb52a86 100644
--- a/src/gui/editors/segment/TriggerManagerItem.h
+++ b/src/gui/editors/segment/TriggerManagerItem.h
@@ -35,7 +35,7 @@ namespace Rosegarden {
 class TriggerManagerItem : public TQListViewItem
 {
 public:
-    TriggerManagerItem(TQListView * tqparent, TQString label1, 
+    TriggerManagerItem(TQListView * parent, TQString label1, 
 		      TQString label2 = TQString(), 
 		      TQString label3 = TQString(),
 		      TQString label4 = TQString(), 
@@ -43,7 +43,7 @@ public:
 		      TQString label6 = TQString(), 
 		      TQString label7 = TQString(), 
 		      TQString label8 = TQString()):
-        TQListViewItem(tqparent, label1, label2, label3, label4,
+        TQListViewItem(parent, label1, label2, label3, label4,
                       label5, label6, label7, label8) { ; }
 
     virtual int compare(TQListViewItem * i, int col, bool ascending) const;
diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp
index e658cc3..29b7bf0 100644
--- a/src/gui/editors/segment/TriggerSegmentManager.cpp
+++ b/src/gui/editors/segment/TriggerSegmentManager.cpp
@@ -73,9 +73,9 @@
 namespace Rosegarden
 {
 
-TriggerSegmentManager::TriggerSegmentManager(TQWidget *tqparent,
+TriggerSegmentManager::TriggerSegmentManager(TQWidget *parent,
         RosegardenGUIDoc *doc):
-        KMainWindow(tqparent, "triggereditordialog"),
+        KMainWindow(parent, "triggereditordialog"),
         m_doc(doc),
         m_modified(false)
 {
diff --git a/src/gui/editors/segment/TriggerSegmentManager.h b/src/gui/editors/segment/TriggerSegmentManager.h
index dbe5ea0..bae2245 100644
--- a/src/gui/editors/segment/TriggerSegmentManager.h
+++ b/src/gui/editors/segment/TriggerSegmentManager.h
@@ -53,7 +53,7 @@ class TriggerSegmentManager : public KMainWindow
   TQ_OBJECT
 
 public:
-    TriggerSegmentManager(TQWidget *tqparent,
+    TriggerSegmentManager(TQWidget *parent,
                           RosegardenGUIDoc *doc);
     ~TriggerSegmentManager();
 
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);