From 1905a36716979889e47bb0fdd7bf33c6204c5a6d Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/gui/editors/notation/NotePixmapPainter.h | 30 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/gui/editors/notation/NotePixmapPainter.h') diff --git a/src/gui/editors/notation/NotePixmapPainter.h b/src/gui/editors/notation/NotePixmapPainter.h index 51918ec..485f5a1 100644 --- a/src/gui/editors/notation/NotePixmapPainter.h +++ b/src/gui/editors/notation/NotePixmapPainter.h @@ -61,7 +61,7 @@ public: if (tqmask) { m_useMask = true; - m_tqmaskPainter.tqbegin(tqmask, unclipped); + m_maskPainter.tqbegin(tqmask, unclipped); } else { m_useMask = false; } @@ -71,7 +71,7 @@ public: } bool end() { - if (m_useMask) m_tqmaskPainter.end(); + if (m_useMask) m_maskPainter.end(); return m_painter->end(); } @@ -79,66 +79,66 @@ public: return *m_painter; } - TQPainter &tqmaskPainter() { - return m_tqmaskPainter; + TQPainter &maskPainter() { + return m_maskPainter; } void drawPoint(int x, int y) { m_painter->drawPoint(x, y); - if (m_useMask) m_tqmaskPainter.drawPoint(x, y); + if (m_useMask) m_maskPainter.drawPoint(x, y); } void drawLine(int x1, int y1, int x2, int y2) { m_painter->drawLine(x1, y1, x2, y2); - if (m_useMask) m_tqmaskPainter.drawLine(x1, y1, x2, y2); + if (m_useMask) m_maskPainter.drawLine(x1, y1, x2, y2); } void drawRect(int x, int y, int w, int h) { m_painter->drawRect(x, y, w, h); - if (m_useMask) m_tqmaskPainter.drawRect(x, y, w, h); + if (m_useMask) m_maskPainter.drawRect(x, y, w, h); } void drawArc(int x, int y, int w, int h, int a, int alen) { m_painter->drawArc(x, y, w, h, a, alen); - if (m_useMask) m_tqmaskPainter.drawArc(x, y, w, h, a, alen); + if (m_useMask) m_maskPainter.drawArc(x, y, w, h, a, alen); } void drawPolygon(const TQPointArray &a, bool winding = false, int index = 0, int n = -1) { m_painter->tqdrawPolygon(a, winding, index, n); - if (m_useMask) m_tqmaskPainter.tqdrawPolygon(a, winding, index, n); + if (m_useMask) m_maskPainter.tqdrawPolygon(a, winding, index, n); } void drawPolyline(const TQPointArray &a, int index = 0, int n = -1) { m_painter->tqdrawPolyline(a, index, n); - if (m_useMask) m_tqmaskPainter.tqdrawPolyline(a, index, n); + if (m_useMask) m_maskPainter.tqdrawPolyline(a, index, n); } 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_tqmaskPainter.tqdrawPixmap(x, y, *(pm.tqmask()), sx, sy, sw, sh); + if (m_useMask) m_maskPainter.tqdrawPixmap(x, y, *(pm.tqmask()), sx, sy, sw, sh); } void drawText(int x, int y, const TQString &string) { m_painter->drawText(x, y, string); - if (m_useMask) m_tqmaskPainter.drawText(x, y, string); + if (m_useMask) m_maskPainter.drawText(x, y, string); } void drawNoteCharacter(int x, int y, const NoteCharacter &character) { character.draw(m_painter, x, y); - if (m_useMask) character.drawMask(&m_tqmaskPainter, x, y); + if (m_useMask) character.drawMask(&m_maskPainter, x, y); } void drawEllipse(int x, int y, int w, int h) { m_painter->drawEllipse(x, y, w, h); - if (m_useMask) m_tqmaskPainter.drawEllipse(x, y, w, h); + if (m_useMask) m_maskPainter.drawEllipse(x, y, w, h); } private: bool m_useMask; TQPainter m_myPainter; - TQPainter m_tqmaskPainter; + TQPainter m_maskPainter; TQPainter *m_externalPainter; TQPainter *m_painter; }; -- cgit v1.2.1