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

23 files changed, 56 insertions, 56 deletions

diff --git a/src/gui/editors/notation/FontViewFrame.cpp b/src/gui/editors/notation/FontViewFrame.cpp
index 5bfdee1..3770441 100644
--- a/src/gui/editors/notation/FontViewFrame.cpp
+++ b/src/gui/editors/notation/FontViewFrame.cpp
@@ -46,8 +46,8 @@
 namespace Rosegarden
 {
 
-FontViewFrame::FontViewFrame( int pixelSize, TQWidget* tqparent, const char* name ) :
-        TQFrame(tqparent, name),
+FontViewFrame::FontViewFrame( int pixelSize, TQWidget* parent, const char* name ) :
+        TQFrame(parent, name),
         m_fontSize(pixelSize),
         m_tableFont(0)
 {
diff --git a/src/gui/editors/notation/FontViewFrame.h b/src/gui/editors/notation/FontViewFrame.h
index 524e393..fbfc95a 100644
--- a/src/gui/editors/notation/FontViewFrame.h
+++ b/src/gui/editors/notation/FontViewFrame.h
@@ -46,7 +46,7 @@ class FontViewFrame : public TQFrame
   TQ_OBJECT
 
 public:
-    FontViewFrame(int pixelSize, TQWidget *tqparent = 0, const char *name = 0);
+    FontViewFrame(int pixelSize, TQWidget *parent = 0, const char *name = 0);
     virtual ~FontViewFrame();
 
     TQSize tqsizeHint() const;
diff --git a/src/gui/editors/notation/HeadersGroup.cpp b/src/gui/editors/notation/HeadersGroup.cpp
index b08ed1c..f7dcc82 100644
--- a/src/gui/editors/notation/HeadersGroup.cpp
+++ b/src/gui/editors/notation/HeadersGroup.cpp
@@ -43,8 +43,8 @@ namespace Rosegarden
 
 
 HeadersGroup::
-HeadersGroup(TQWidget *tqparent, NotationView * nv, Composition * comp) :
-        TQVBox(tqparent),
+HeadersGroup(TQWidget *parent, NotationView * nv, Composition * comp) :
+        TQVBox(parent),
         m_notationView(nv),
         m_composition(comp),
         m_usedHeight(0),
diff --git a/src/gui/editors/notation/HeadersGroup.h b/src/gui/editors/notation/HeadersGroup.h
index a995646..a3fb706 100644
--- a/src/gui/editors/notation/HeadersGroup.h
+++ b/src/gui/editors/notation/HeadersGroup.h
@@ -59,7 +59,7 @@ public:
     /**
      * Create an empty headers group
      */
-    HeadersGroup(TQWidget *tqparent, NotationView * nv, Composition * comp);
+    HeadersGroup(TQWidget *parent, NotationView * nv, Composition * comp);
 
     void removeAllHeaders();
 
diff --git a/src/gui/editors/notation/NotationCanvasView.cpp b/src/gui/editors/notation/NotationCanvasView.cpp
index 40c2d59..a80d04d 100644
--- a/src/gui/editors/notation/NotationCanvasView.cpp
+++ b/src/gui/editors/notation/NotationCanvasView.cpp
@@ -49,9 +49,9 @@ namespace Rosegarden
 {
 
 NotationCanvasView::NotationCanvasView(const LinedStaffManager &staffmgr,
-                                       TQCanvas *viewing, TQWidget *tqparent,
+                                       TQCanvas *viewing, TQWidget *parent,
                                        const char *name, WFlags f) :
-        RosegardenCanvasView(viewing, tqparent, name, f),
+        RosegardenCanvasView(viewing, parent, name, f),
         m_linedStaffManager(staffmgr),
         m_lastYPosNearStaff(0),
         m_currentStaff(0),
diff --git a/src/gui/editors/notation/NotationCanvasView.h b/src/gui/editors/notation/NotationCanvasView.h
index e327de8..01f19b2 100644
--- a/src/gui/editors/notation/NotationCanvasView.h
+++ b/src/gui/editors/notation/NotationCanvasView.h
@@ -70,7 +70,7 @@ class NotationCanvasView : public RosegardenCanvasView
 
 public:
     NotationCanvasView(const LinedStaffManager &staffmgr,
-                       TQCanvas *viewing, TQWidget *tqparent=0,
+                       TQCanvas *viewing, TQWidget *parent=0,
                        const char *name=0, WFlags f=0);
 
     ~NotationCanvasView();
diff --git a/src/gui/editors/notation/NotationHLayout.cpp b/src/gui/editors/notation/NotationHLayout.cpp
index be40dca..e971521 100644
--- a/src/gui/editors/notation/NotationHLayout.cpp
+++ b/src/gui/editors/notation/NotationHLayout.cpp
@@ -58,8 +58,8 @@ using namespace BaseProperties;
 
 NotationHLayout::NotationHLayout(Composition *c, NotePixmapFactory *npf,
                                  const NotationProperties &properties,
-                                 TQObject* tqparent, const char* name) :
-    ProgressReporter(tqparent, name),
+                                 TQObject* parent, const char* name) :
+    ProgressReporter(parent, name),
     HorizontalLayoutEngine(c),
     m_totalWidth(0.),
     m_pageMode(false),
diff --git a/src/gui/editors/notation/NotationHLayout.h b/src/gui/editors/notation/NotationHLayout.h
index aba9a27..07cf25e 100644
--- a/src/gui/editors/notation/NotationHLayout.h
+++ b/src/gui/editors/notation/NotationHLayout.h
@@ -68,7 +68,7 @@ public:
     NotationHLayout(Composition *c,
                     NotePixmapFactory *npf,
                     const NotationProperties &properties,
-                    TQObject* tqparent, const char* name = 0);
+                    TQObject* parent, const char* name = 0);
 
     virtual ~NotationHLayout();
 
diff --git a/src/gui/editors/notation/NotationSelector.h b/src/gui/editors/notation/NotationSelector.h
index f865cb7..85ab92a 100644
--- a/src/gui/editors/notation/NotationSelector.h
+++ b/src/gui/editors/notation/NotationSelector.h
@@ -160,7 +160,7 @@ protected:
     NotationSelector(NotationView*);
 
     /**
-     * Set the current selection on the tqparent NotationView
+     * Set the current selection on the parent NotationView
      */
     void setViewCurrentSelection(bool preview);
 
diff --git a/src/gui/editors/notation/NotationToolBox.cpp b/src/gui/editors/notation/NotationToolBox.cpp
index d3511fb..f2fa642 100644
--- a/src/gui/editors/notation/NotationToolBox.cpp
+++ b/src/gui/editors/notation/NotationToolBox.cpp
@@ -42,9 +42,9 @@
 namespace Rosegarden
 {
 
-NotationToolBox::NotationToolBox(NotationView *tqparent)
-        : EditToolBox(tqparent),
-        m_nParentView(tqparent)
+NotationToolBox::NotationToolBox(NotationView *parent)
+        : EditToolBox(parent),
+        m_nParentView(parent)
 {
     //m_tools.setAutoDelete(true);
 }
diff --git a/src/gui/editors/notation/NotationToolBox.h b/src/gui/editors/notation/NotationToolBox.h
index 5c15b2b..06ef576 100644
--- a/src/gui/editors/notation/NotationToolBox.h
+++ b/src/gui/editors/notation/NotationToolBox.h
@@ -49,7 +49,7 @@ class NotationToolBox : public EditToolBox
     Q_OBJECT
   TQ_OBJECT
 public:
-    NotationToolBox(NotationView* tqparent);
+    NotationToolBox(NotationView* parent);
 
 protected:
     virtual EditTool* createTool(const TQString& toolName);
diff --git a/src/gui/editors/notation/NotationVLayout.cpp b/src/gui/editors/notation/NotationVLayout.cpp
index 12979ea..55f4d76 100644
--- a/src/gui/editors/notation/NotationVLayout.cpp
+++ b/src/gui/editors/notation/NotationVLayout.cpp
@@ -55,8 +55,8 @@ using namespace BaseProperties;
 
 NotationVLayout::NotationVLayout(Composition *c, NotePixmapFactory *npf,
                                  const NotationProperties &properties,
-                                 TQObject* tqparent, const char* name) :
-        ProgressReporter(tqparent, name),
+                                 TQObject* parent, const char* name) :
+        ProgressReporter(parent, name),
         m_composition(c),
         m_npf(npf),
         m_notationQuantizer(c->getNotationQuantizer()),
@@ -490,7 +490,7 @@ NotationVLayout::positionSlur(NotationStaff &staff,
             if (!event->get
                     <Int>(m_properties.HEIGHT_ON_STAFF, h)) {
                 KMessageBox::sorry
-                ((TQWidget *)tqparent(), i18n("Spanned note at %1 has no HEIGHT_ON_STAFF property!\nThis is a bug (the program would previously have crashed by now)").tqarg((*scooter)->getViewAbsoluteTime()));
+                ((TQWidget *)parent(), i18n("Spanned note at %1 has no HEIGHT_ON_STAFF property!\nThis is a bug (the program would previously have crashed by now)").tqarg((*scooter)->getViewAbsoluteTime()));
                 event->dump(std::cerr);
             }
 
diff --git a/src/gui/editors/notation/NotationVLayout.h b/src/gui/editors/notation/NotationVLayout.h
index afddb0b..b69c06c 100644
--- a/src/gui/editors/notation/NotationVLayout.h
+++ b/src/gui/editors/notation/NotationVLayout.h
@@ -63,7 +63,7 @@ class NotationVLayout : public ProgressReporter,
 public:
     NotationVLayout(Composition *c, NotePixmapFactory *npf,
                     const NotationProperties &properties,
-                    TQObject* tqparent, const char* name = 0);
+                    TQObject* parent, const char* name = 0);
 
     virtual ~NotationVLayout();
 
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index 707e85c..0a471d5 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -346,9 +346,9 @@ public:
 
 NotationView::NotationView(RosegardenGUIDoc *doc,
                            std::vector<Segment *> segments,
-                           TQWidget *tqparent,
+                           TQWidget *parent,
                            bool showProgressive) :
-        EditView(doc, segments, 2, tqparent, "notationview"),
+        EditView(doc, segments, 2, parent, "notationview"),
         m_properties(getViewLocalPropertyPrefix()),
         m_selectionCounter(0),
         m_insertModeLabel(0),
@@ -768,10 +768,10 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
     (this, TQT_SIGNAL(renderComplete()),
      getCanvasView(), TQT_SLOT(slotRenderComplete()));
 
-    if (tqparent)
+    if (parent)
     {
         const TrackButtons * trackLabels =
-            ((RosegardenGUIView*)tqparent)->getTrackEditor()->getTrackButtons();
+            ((RosegardenGUIView*)parent)->getTrackEditor()->getTrackButtons();
         TQObject::connect
         (trackLabels, TQT_SIGNAL(nameChanged()),
          this, TQT_SLOT(slotUpdateStaffName()));
@@ -796,7 +796,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
 
 NotationView::NotationView(RosegardenGUIDoc *doc,
                            std::vector<Segment *> segments,
-                           TQWidget *tqparent,
+                           TQWidget *parent,
                            NotationView *referenceView)
         : EditView(doc, segments, 1, 0, "printview"),
         m_properties(getViewLocalPropertyPrefix()),
@@ -907,7 +907,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
 
     ProgressDialog* progressDlg = 0;
 
-    if (tqparent)
+    if (parent)
     {
 
         ProgressDialog::processEvents();
@@ -915,7 +915,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc,
         NOTATION_DEBUG << "NotationView : setting up progress dialog" << endl;
 
         progressDlg = new ProgressDialog(i18n("Preparing to print..."),
-                                         100, tqparent);
+                                         100, parent);
         progressDlg->setAutoClose(false);
         progressDlg->setAutoReset(true);
         progressDlg->setMinimumDuration(1000);
@@ -3541,7 +3541,7 @@ void NotationView::print(bool previewOnly)
 
     if (previewOnly)
         printer.setPreviewOnly(true);
-    else if (!printer.setup((TQWidget *)tqparent()))
+    else if (!printer.setup((TQWidget *)parent()))
         return ;
 
     TQPaintDeviceMetrics pdm(&printer);
@@ -4613,7 +4613,7 @@ NotationView::slotFilePrint()
 
     SetWaitCursor waitCursor;
     NotationView printingView(getDocument(), m_segments,
-                              (TQWidget *)tqparent(), this);
+                              (TQWidget *)parent(), this);
 
     if (!printingView.isOK()) {
         NOTATION_DEBUG << "Print : operation cancelled\n";
@@ -4630,7 +4630,7 @@ NotationView::slotFilePrintPreview()
 
     SetWaitCursor waitCursor;
     NotationView printingView(getDocument(), m_segments,
-                              (TQWidget *)tqparent(), this);
+                              (TQWidget *)parent(), this);
 
     if (!printingView.isOK()) {
         NOTATION_DEBUG << "Print preview : operation cancelled\n";
diff --git a/src/gui/editors/notation/NotationView.h b/src/gui/editors/notation/NotationView.h
index 236b89b..461d299 100644
--- a/src/gui/editors/notation/NotationView.h
+++ b/src/gui/editors/notation/NotationView.h
@@ -114,18 +114,18 @@ class NotationView : public EditView,
 public:
     explicit NotationView(RosegardenGUIDoc *doc,
                           std::vector<Segment *> segments,
-                          TQWidget *tqparent,
+                          TQWidget *parent,
                           bool showProgressive); // update during initial render?
 
     /**
-     * Constructor for printing only.  If tqparent is provided, a
+     * Constructor for printing only.  If parent is provided, a
      * progress dialog will be shown -- otherwise not.  If another
      * NotationView is provided, the fonts and other settings used
      * for printing will be taken from that view.
      */
     explicit NotationView(RosegardenGUIDoc *doc,
                           std::vector<Segment *> segments,
-                          TQWidget *tqparent,
+                          TQWidget *parent,
                           NotationView *referenceView);
 
     ~NotationView();
diff --git a/src/gui/editors/notation/NoteCharacter.cpp b/src/gui/editors/notation/NoteCharacter.cpp
index e3beed2..9f49131 100644
--- a/src/gui/editors/notation/NoteCharacter.cpp
+++ b/src/gui/editors/notation/NoteCharacter.cpp
@@ -125,8 +125,8 @@ NoteCharacter::draw(TQPainter *painter, int x, int y) const
 void
 NoteCharacter::drawMask(TQPainter *painter, int x, int y) const
 {
-    if (!m_rep && m_pixmap->tqmask()) {
-        painter->drawPixmap(x, y, *(m_pixmap->tqmask()));
+    if (!m_rep && m_pixmap->mask()) {
+        painter->drawPixmap(x, y, *(m_pixmap->mask()));
     }
 }
 
diff --git a/src/gui/editors/notation/NoteFont.cpp b/src/gui/editors/notation/NoteFont.cpp
index e494169..18f82f7 100644
--- a/src/gui/editors/notation/NoteFont.cpp
+++ b/src/gui/editors/notation/NoteFont.cpp
@@ -286,8 +286,8 @@ NoteFont::getPixmap(CharName charName, TQPixmap &pixmap, bool inverted) const
 
         if (!found->isNull()) {
 
-            if (found->tqmask() == 0) {
-                std::cerr << "NoteFont::getPixmap: Warning: No automatic tqmask "
+            if (found->mask() == 0) {
+                std::cerr << "NoteFont::getPixmap: Warning: No automatic mask "
                 << "for character \"" << charName << "\""
                 << (inverted ? " (inverted)" : "") << " in font \""
                 << m_fontMap.getName() << "-" << m_size
diff --git a/src/gui/editors/notation/NoteFontViewer.cpp b/src/gui/editors/notation/NoteFontViewer.cpp
index 918c7ac..d485244 100644
--- a/src/gui/editors/notation/NoteFontViewer.cpp
+++ b/src/gui/editors/notation/NoteFontViewer.cpp
@@ -81,9 +81,9 @@ NoteFontViewer::slotFontChanged(const TQString &s)
     slotViewChanged(m_view->currentItem());
 }
 
-NoteFontViewer::NoteFontViewer(TQWidget *tqparent, TQString noteFontName,
+NoteFontViewer::NoteFontViewer(TQWidget *parent, TQString noteFontName,
                                TQStringList fontNames, int pixelSize) :
-        KDialogBase(tqparent, 0, true,
+        KDialogBase(parent, 0, true,
                     i18n("Note Font Viewer: %1").tqarg(noteFontName), Close)
 {
     TQVBox *box = makeVBoxMainWidget();
diff --git a/src/gui/editors/notation/NoteFontViewer.h b/src/gui/editors/notation/NoteFontViewer.h
index 17b41a7..69c62c6 100644
--- a/src/gui/editors/notation/NoteFontViewer.h
+++ b/src/gui/editors/notation/NoteFontViewer.h
@@ -47,7 +47,7 @@ class NoteFontViewer : public KDialogBase
   TQ_OBJECT
 
 public:
-    NoteFontViewer(TQWidget *tqparent, TQString noteFontName,
+    NoteFontViewer(TQWidget *parent, TQString noteFontName,
                    TQStringList systemFontNames, int pixelSize);
 
 protected slots:
diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp
index e5f306b..ac9064a 100644
--- a/src/gui/editors/notation/NotePixmapFactory.cpp
+++ b/src/gui/editors/notation/NotePixmapFactory.cpp
@@ -1261,7 +1261,7 @@ NotePixmapFactory::drawFlags(int flagCount,
 
             } else {
 
-                // No problem with tqmask here
+                // No problem with mask here
                 m_p->drawNoteCharacter(m_left + s1.x() - hotspot.x(),
                                        y,
                                        flagChar);
@@ -2890,7 +2890,7 @@ NotePixmapFactory::drawOttavaAux(int length, int octavesUp,
         m_p->beginExternal(painter);
         painter->translate(x - backpedal, y - height);
     } else {
-        NOTATION_DEBUG << "NotePixmapFactory::drawOttavaAux: making pixmap and tqmask " << width << "x" << height << endl;
+        NOTATION_DEBUG << "NotePixmapFactory::drawOttavaAux: making pixmap and mask " << width << "x" << height << endl;
         createPixmapAndMask(width, height);
     }
 
@@ -3443,7 +3443,7 @@ NotePixmapFactory::createPixmapAndMask(int width, int height,
     total += width * height;
 //    NOTATION_DEBUG << "createPixmapAndMask: " << width << "x" << height << " (" << (width*height) << " px, " << total << " total)" << endl;
 
-    // clear up pixmap and tqmask
+    // clear up pixmap and mask
     m_generatedPixmap->fill();
     m_generatedMask->fill(TQt::color0);
 
diff --git a/src/gui/editors/notation/NotePixmapPainter.h b/src/gui/editors/notation/NotePixmapPainter.h
index 485f5a1..9b56052 100644
--- a/src/gui/editors/notation/NotePixmapPainter.h
+++ b/src/gui/editors/notation/NotePixmapPainter.h
@@ -33,7 +33,7 @@ namespace Rosegarden {
 class NotePixmapPainter
 {
     // Just a trivial class that instructs two painters to do the
-    // same thing (one for the pixmap, one for the tqmask).  We only
+    // same thing (one for the pixmap, one for the mask).  We only
     // duplicate those methods we actually use in NotePixmapFactory
 
 public:
@@ -55,13 +55,13 @@ public:
 	}
     }
 
-    bool begin(TQPaintDevice *device, TQPaintDevice *tqmask = 0, bool unclipped = false) {
+    bool begin(TQPaintDevice *device, TQPaintDevice *mask = 0, bool unclipped = false) {
 
 	m_externalPainter = 0;
 
-	if (tqmask) {
+	if (mask) {
 	    m_useMask = true;
-	    m_maskPainter.tqbegin(tqmask, unclipped);
+	    m_maskPainter.tqbegin(mask, unclipped);
 	} else {
 	    m_useMask = false;
 	}
@@ -117,7 +117,7 @@ public:
     void drawPixmap(int x, int y, const TQPixmap &pm,
 		    int sx = 0, int sy = 0, int sw = -1, int sh = -1) {
 	m_painter->tqdrawPixmap(x, y, pm, sx, sy, sw, sh);
-	if (m_useMask) m_maskPainter.tqdrawPixmap(x, y, *(pm.tqmask()), sx, sy, sw, sh);
+	if (m_useMask) m_maskPainter.tqdrawPixmap(x, y, *(pm.mask()), sx, sy, sw, sh);
     }
 
     void drawText(int x, int y, const TQString &string) {
diff --git a/src/gui/editors/notation/TrackHeader.cpp b/src/gui/editors/notation/TrackHeader.cpp
index de5bf5f..fa19ca5 100644
--- a/src/gui/editors/notation/TrackHeader.cpp
+++ b/src/gui/editors/notation/TrackHeader.cpp
@@ -75,8 +75,8 @@ const int TrackHeader::INCONSISTENT_TRANSPOSITIONS = 1 << 5;
 const int TrackHeader::BEFORE_FIRST_SEGMENT        = 1 << 6;
 
 
-TrackHeader::TrackHeader(TQWidget *tqparent, TrackId trackId, int height, int ypos) :
-        TQLabel(tqparent),
+TrackHeader::TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos) :
+        TQLabel(parent),
         m_track(trackId),
         m_height(height),
         m_ypos(ypos),
@@ -96,7 +96,7 @@ TrackHeader::TrackHeader(TQWidget *tqparent, TrackId trackId, int height, int yp
         m_current(false)
 {
 
-    m_notationView = static_cast<HeadersGroup *>(tqparent)->getNotationView();
+    m_notationView = static_cast<HeadersGroup *>(parent)->getNotationView();
 
     setFrameStyle(TQFrame::Box | TQFrame::Plain);
     setCurrent(false);
@@ -106,7 +106,7 @@ TrackHeader::TrackHeader(TQWidget *tqparent, TrackId trackId, int height, int yp
     // Tooltip text creation
 
     Composition *comp = 
-        static_cast<HeadersGroup *>(tqparent)->getComposition();
+        static_cast<HeadersGroup *>(parent)->getComposition();
     Track *track = comp->getTrackById(m_track);
     int trackPos = comp->getTrackPositionById(m_track);
 
@@ -274,7 +274,7 @@ TrackHeader::lookAtStaff(double x, int maxWidth)
     int staff;
 
     Composition *comp = 
-        static_cast<HeadersGroup *>(TQT_TQWIDGET(tqparent()))->getComposition();
+        static_cast<HeadersGroup *>(TQT_TQWIDGET(parent()))->getComposition();
     Track *track = comp->getTrackById(m_track);
     int trackPos = comp->getTrackPositionById(m_track);
 
diff --git a/src/gui/editors/notation/TrackHeader.h b/src/gui/editors/notation/TrackHeader.h
index 0b8a0a6..3f7029e 100644
--- a/src/gui/editors/notation/TrackHeader.h
+++ b/src/gui/editors/notation/TrackHeader.h
@@ -57,10 +57,10 @@ class TrackHeader : public TQLabel
 public:
     /**
      * Create a new track header for track of id trackId.
-     * *tqparent is the tqparent widget, height the height of staff and
+     * *parent is the parent widget, height the height of staff and
      * ypos is the staff y position on canvas.
      */
-    TrackHeader(TQWidget *tqparent, TrackId trackId, int height, int ypos);
+    TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos);
 
     /**
      * Draw a blue line around header when current is true