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

1 files changed, 29 insertions, 29 deletions

diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp
index e02e14e..365478a 100644
--- a/src/gui/editors/notation/NotePixmapFactory.cpp
+++ b/src/gui/editors/notation/NotePixmapFactory.cpp
@@ -893,7 +893,7 @@ NotePixmapFactory::drawMarks(bool isStemmed,
 
             m_p->painter().setFont(m_textMarkFont);
             if (!m_inPrinterMethod)
-                m_p->tqmaskPainter().setFont(m_textMarkFont);
+                m_p->maskPainter().setFont(m_textMarkFont);
 
             int x = m_left + m_noteBodyWidth / 2 - bounds.width() / 2;
             int y = (normalMarksAreAbove ?
@@ -978,7 +978,7 @@ NotePixmapFactory::drawMarks(bool isStemmed,
 
             m_p->painter().setFont(m_fingeringFont);
             if (!m_inPrinterMethod)
-                m_p->tqmaskPainter().setFont(m_fingeringFont);
+                m_p->maskPainter().setFont(m_fingeringFont);
 
             int x = m_left + m_noteBodyWidth / 2 - bounds.width() / 2;
             int y = m_above - dy - 3;
@@ -1630,7 +1630,7 @@ NotePixmapFactory::drawTuplingLine(const NotePixmapParameters &params)
 
     m_p->painter().setFont(m_tupletCountFont);
     if (!m_inPrinterMethod)
-        m_p->tqmaskPainter().setFont(m_tupletCountFont);
+        m_p->maskPainter().setFont(m_tupletCountFont);
 
     int textX = endX + countSpace;
     int textY = endY + cr.height() / 2;
@@ -1894,7 +1894,7 @@ NotePixmapFactory::makeClefPixmap(const Clef &clef)
 
     m_p->painter().setFont(m_clefOttavaFont);
     if (!m_inPrinterMethod)
-        m_p->tqmaskPainter().setFont(m_clefOttavaFont);
+        m_p->maskPainter().setFont(m_clefOttavaFont);
 
     m_p->drawText(plain.getWidth() / 2 - rect.width() / 2,
                   oct < 0 ? plain.getHeight() + rect.height() - 1 :
@@ -2234,7 +2234,7 @@ NotePixmapFactory::makeTrackHeaderPixmap(
             m_p->painter().setPen(colour);
 
             m_p->painter().setFont(m_clefOttavaFont);
-            // m_p->tqmaskPainter().setFont(m_clefOttavaFont);
+            // m_p->maskPainter().setFont(m_clefOttavaFont);
             int xpos = maxDelta + clefChar.getWidth() / 2 - rect.width() / 2;
             int ypos = y - clefChar.getHotspot().y() + offset 
                          + (oct < 0 ? clefChar.getHeight() + rect.height() - 1 : - rect.height() / 3);
@@ -2273,7 +2273,7 @@ NotePixmapFactory::makeTrackHeaderPixmap(
     }
 
     m_p->painter().setFont(m_trackHeaderFont);
-    // m_p->tqmaskPainter().setFont(m_trackHeaderFont);
+    // m_p->maskPainter().setFont(m_trackHeaderFont);
 
     TQString text;
     TQString textLine;
@@ -2315,7 +2315,7 @@ NotePixmapFactory::makeTrackHeaderPixmap(
     // TODO : use colours from GUIPalette
     colour = header->isTransposeInconsistent() ? TQt::red : TQt::black;
     m_p->painter().setFont(m_trackHeaderBoldFont);
-     // m_p->tqmaskPainter().setFont(m_trackHeaderBoldFont);
+     // m_p->maskPainter().setFont(m_trackHeaderBoldFont);
     m_p->painter().setPen(colour);
 
     m_p->drawText(width - transposeWidth - charWidth / 4,
@@ -2329,7 +2329,7 @@ NotePixmapFactory::makeTrackHeaderPixmap(
     // TODO : use colours from GUIPalette
     colour = header->isLabelInconsistent() ? TQt::red : TQt::black;
     m_p->painter().setFont(m_trackHeaderFont);
-    // m_p->tqmaskPainter().setFont(m_trackHeaderFont);
+    // m_p->maskPainter().setFont(m_trackHeaderFont);
 
     m_p->painter().setPen(colour);
     text = header->getLowerText();
@@ -2759,12 +2759,12 @@ NotePixmapFactory::drawSlurAux(int length, int dy, bool above,
                         painter->rotate(theta);
                 } else {
                     m_p->painter().save();
-                    m_p->tqmaskPainter().save();
+                    m_p->maskPainter().save();
                     m_p->painter().translate(x, y);
-                    m_p->tqmaskPainter().translate(x, y);
+                    m_p->maskPainter().translate(x, y);
                     if (rotate) {
                         m_p->painter().rotate(theta);
-                        m_p->tqmaskPainter().rotate(theta);
+                        m_p->maskPainter().rotate(theta);
                     }
                 }
 
@@ -2780,7 +2780,7 @@ NotePixmapFactory::drawSlurAux(int length, int dy, bool above,
                     m.translate(hotspot.x(), hotspot.y());
                 m.rotate(theta);
                 m_p->painter().setWorldMatrix(m);
-                m_p->tqmaskPainter().setWorldMatrix(m);
+                m_p->maskPainter().setWorldMatrix(m);
             }
 
             if (m_selected)
@@ -2843,7 +2843,7 @@ NotePixmapFactory::drawSlurAux(int length, int dy, bool above,
     if (painter) {
         painter->restore();
         if (!m_inPrinterMethod)
-            m_p->tqmaskPainter().restore();
+            m_p->maskPainter().restore();
     }
 }
 
@@ -2907,12 +2907,12 @@ NotePixmapFactory::drawOttavaAux(int length, int octavesUp,
 
     m_p->painter().setFont(m_ottavaFont);
     if (!m_inPrinterMethod)
-        m_p->tqmaskPainter().setFont(m_ottavaFont);
+        m_p->maskPainter().setFont(m_ottavaFont);
 
     m_p->drawText(0, m_ottavaFontMetrics.ascent(), label);
 
     m_p->painter().setPen(pen);
-    //    if (!m_inPrinterMethod) m_p->tqmaskPainter().setPen(pen);
+    //    if (!m_inPrinterMethod) m_p->maskPainter().setPen(pen);
 
     int x0 = m_ottavaFontMetrics.width(label) + thickness;
     int x1 = width - thickness;
@@ -2925,7 +2925,7 @@ NotePixmapFactory::drawOttavaAux(int length, int octavesUp,
 
     pen.setStyle(Qt::SolidLine);
     m_p->painter().setPen(pen);
-    //    if (!m_inPrinterMethod) m_p->tqmaskPainter().setPen(pen);
+    //    if (!m_inPrinterMethod) m_p->maskPainter().setPen(pen);
 
     NOTATION_DEBUG << "NotePixmapFactory::drawOttavaAux: drawing " << x1 << "," << y0 << " to " << x1 << "," << y1 << ", thickness " << thickness << endl;
 
@@ -2933,7 +2933,7 @@ NotePixmapFactory::drawOttavaAux(int length, int octavesUp,
 
     m_p->painter().setPen(TQPen());
     if (!m_inPrinterMethod)
-        m_p->tqmaskPainter().setPen(TQPen());
+        m_p->maskPainter().setPen(TQPen());
 
     if (painter) {
         painter->restore();
@@ -3043,7 +3043,7 @@ NotePixmapFactory::makeTimeSigPixmap(const TimeSignature& sig)
 
         m_p->painter().setFont(m_bigTimeSigFont);
         if (!m_inPrinterMethod)
-            m_p->tqmaskPainter().setFont(m_bigTimeSigFont);
+            m_p->maskPainter().setFont(m_bigTimeSigFont);
 
         m_p->drawText(0, r.height() + dy, c);
 
@@ -3122,7 +3122,7 @@ NotePixmapFactory::makeTimeSigPixmap(const TimeSignature& sig)
 
         m_p->painter().setFont(m_timeSigFont);
         if (!m_inPrinterMethod)
-            m_p->tqmaskPainter().setFont(m_timeSigFont);
+            m_p->maskPainter().setFont(m_timeSigFont);
 
         x = (width - numR.width()) / 2 - 1;
         m_p->drawText(x, denomR.height(), numS);
@@ -3353,7 +3353,7 @@ NotePixmapFactory::drawTextAux(const Text &text,
 
     m_p->painter().setFont(textFont);
     if (!m_inPrinterMethod)
-        m_p->tqmaskPainter().setFont(textFont);
+        m_p->maskPainter().setFont(textFont);
 
     m_p->drawText(offset, textMetrics.ascent() + offset, s);
 
@@ -3400,7 +3400,7 @@ NotePixmapFactory::makeAnnotationPixmap(const Text &text, const bool isLilyPondD
 
     m_p->painter().setFont(textFont);
     if (!m_inPrinterMethod)
-        m_p->tqmaskPainter().setFont(textFont);
+        m_p->maskPainter().setFont(textFont);
 
     if (isLilyPondDirective) {
         m_p->painter().setBrush(GUIPalette::getColour(GUIPalette::TextLilyPondDirectiveBackground));
@@ -3427,17 +3427,17 @@ NotePixmapFactory::makeAnnotationPixmap(const Text &text, const bool isLilyPondD
 
 void
 NotePixmapFactory::createPixmapAndMask(int width, int height,
-                                       int tqmaskWidth, int tqmaskHeight)
+                                       int maskWidth, int maskHeight)
 {
-    if (tqmaskWidth < 0)
-        tqmaskWidth = width;
-    if (tqmaskHeight < 0)
-        tqmaskHeight = height;
+    if (maskWidth < 0)
+        maskWidth = width;
+    if (maskHeight < 0)
+        maskHeight = height;
 
     m_generatedWidth = width;
     m_generatedHeight = height;
     m_generatedPixmap = new TQPixmap(width, height);
-    m_generatedMask = new TQBitmap(tqmaskWidth, tqmaskHeight);
+    m_generatedMask = new TQBitmap(maskWidth, maskHeight);
 
     static unsigned long total = 0;
     total += width * height;
@@ -3452,8 +3452,8 @@ NotePixmapFactory::createPixmapAndMask(int width, int height,
 
     m_p->painter().setPen(TQt::black);
     m_p->painter().setBrush(TQt::black);
-    m_p->tqmaskPainter().setPen(TQt::white);
-    m_p->tqmaskPainter().setBrush(TQt::white);
+    m_p->maskPainter().setPen(TQt::white);
+    m_p->maskPainter().setBrush(TQt::white);
 }
 
 TQCanvasPixmap*