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

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) {