From bce8199ddac4feecdee9c094fb8f75863cfa9652 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/kdegraphics@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kolourpaint/pixmapfx/kpeffectreducecolors.cpp | 2 +- kolourpaint/pixmapfx/kpfloodfill.cpp | 22 +++++------ kolourpaint/pixmapfx/kppixmapfx.cpp | 54 +++++++++++++-------------- kolourpaint/pixmapfx/kppixmapfx.h | 2 +- 4 files changed, 40 insertions(+), 40 deletions(-) (limited to 'kolourpaint/pixmapfx') diff --git a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp index 80fadd8d..c89685da 100644 --- a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp +++ b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp @@ -240,7 +240,7 @@ void kpEffectReduceColorsCommand::apply (TQPixmap *destPixmapPtr, int depth, boo // HACK: The above "image.convertDepth()" erases the Alpha Channel // (at least for monochrome). - // tqpixmap.html says "alpha tqmasks on monochrome images are ignored." + // tqpixmap.html says "alpha masks on monochrome images are ignored." // // Put the tqmask back. // diff --git a/kolourpaint/pixmapfx/kpfloodfill.cpp b/kolourpaint/pixmapfx/kpfloodfill.cpp index 76731d23..eaf100ab 100644 --- a/kolourpaint/pixmapfx/kpfloodfill.cpp +++ b/kolourpaint/pixmapfx/kpfloodfill.cpp @@ -97,14 +97,14 @@ bool kpFloodFill::fill () { TQApplication::setOverrideCursor (TQt::waitCursor); - TQPainter painter, tqmaskPainter; - TQBitmap tqmaskBitmap; + TQPainter painter, maskPainter; + TQBitmap maskBitmap; if (m_pixmapPtr->tqmask () || m_color.isTransparent ()) { - tqmaskBitmap = kpPixmapFX::getNonNullMask (*m_pixmapPtr); - tqmaskPainter.begin (&tqmaskBitmap); - tqmaskPainter.setPen (m_color.tqmaskColor ()); + maskBitmap = kpPixmapFX::getNonNullMask (*m_pixmapPtr); + maskPainter.begin (&maskBitmap); + maskPainter.setPen (m_color.maskColor ()); } if (m_color.isOpaque ()) @@ -124,18 +124,18 @@ bool kpFloodFill::fill () if (painter.isActive ()) painter.drawLine (p1, p2); - if (tqmaskPainter.isActive ()) - tqmaskPainter.drawLine (p1, p2); + if (maskPainter.isActive ()) + maskPainter.drawLine (p1, p2); } if (painter.isActive ()) painter.end (); - if (tqmaskPainter.isActive ()) - tqmaskPainter.end (); + if (maskPainter.isActive ()) + maskPainter.end (); - if (!tqmaskBitmap.isNull ()) - m_pixmapPtr->setMask (tqmaskBitmap); + if (!maskBitmap.isNull ()) + m_pixmapPtr->setMask (maskBitmap); TQApplication::restoreOverrideCursor (); } diff --git a/kolourpaint/pixmapfx/kppixmapfx.cpp b/kolourpaint/pixmapfx/kppixmapfx.cpp index 1837a22e..e46f91cb 100644 --- a/kolourpaint/pixmapfx/kppixmapfx.cpp +++ b/kolourpaint/pixmapfx/kppixmapfx.cpp @@ -772,7 +772,7 @@ void kpPixmapFX::paintPixmapAt (TQPixmap *destPixmapPtr, const TQPoint &destAt, if (!destPixmapPtr) return; - // Copy src (tqmasked by src's tqmask) on top of dest. + // Copy src (masked by src's tqmask) on top of dest. bitBlt (destPixmapPtr, /* dest */ destAt.x (), destAt.y (), /* dest pt */ &srcPixmap, /* src */ @@ -856,10 +856,10 @@ TQBitmap kpPixmapFX::getNonNullMask (const TQPixmap &pm) return *pm.tqmask (); else { - TQBitmap tqmaskBitmap (pm.width (), pm.height ()); - tqmaskBitmap.fill (TQt::color1/*opaque*/); + TQBitmap maskBitmap (pm.width (), pm.height ()); + maskBitmap.fill (TQt::color1/*opaque*/); - return tqmaskBitmap; + return maskBitmap; } } @@ -870,9 +870,9 @@ void kpPixmapFX::ensureTransparentAt (TQPixmap *destPixmapPtr, const TQRect &des if (!destPixmapPtr) return; - TQBitmap tqmaskBitmap = getNonNullMask (*destPixmapPtr); + TQBitmap maskBitmap = getNonNullMask (*destPixmapPtr); - TQPainter p (&tqmaskBitmap); + TQPainter p (&maskBitmap); p.setPen (TQt::color0/*transparent*/); p.setBrush (TQt::color0/*transparent*/); @@ -881,7 +881,7 @@ void kpPixmapFX::ensureTransparentAt (TQPixmap *destPixmapPtr, const TQRect &des p.end (); - destPixmapPtr->setMask (tqmaskBitmap); + destPixmapPtr->setMask (maskBitmap); } @@ -937,9 +937,9 @@ void kpPixmapFX::ensureOpaqueAt (TQPixmap *destPixmapPtr, const TQRect &destRect if (!destPixmapPtr || !destPixmapPtr->tqmask ()/*already opaque*/) return; - TQBitmap tqmaskBitmap = *destPixmapPtr->tqmask (); + TQBitmap maskBitmap = *destPixmapPtr->tqmask (); - TQPainter p (&tqmaskBitmap); + TQPainter p (&maskBitmap); p.setPen (TQt::color1/*opaque*/); p.setBrush (TQt::color1/*opaque*/); @@ -948,7 +948,7 @@ void kpPixmapFX::ensureOpaqueAt (TQPixmap *destPixmapPtr, const TQRect &destRect p.end (); - destPixmapPtr->setMask (tqmaskBitmap); + destPixmapPtr->setMask (maskBitmap); } // public static @@ -1107,8 +1107,8 @@ void kpPixmapFX::resize (TQPixmap *destPixmapPtr, int w, int h, #if DEBUG_KP_PIXMAP_FX && 1 kdDebug () << "\tfilling in new areas" << endl; #endif - TQBitmap tqmaskBitmap; - TQPainter painter, tqmaskPainter; + TQBitmap maskBitmap; + TQPainter painter, maskPainter; if (backgroundColor.isOpaque ()) { @@ -1119,10 +1119,10 @@ void kpPixmapFX::resize (TQPixmap *destPixmapPtr, int w, int h, if (backgroundColor.isTransparent () || destPixmapPtr->tqmask ()) { - tqmaskBitmap = kpPixmapFX::getNonNullMask (*destPixmapPtr); - tqmaskPainter.begin (&tqmaskBitmap); - tqmaskPainter.setPen (backgroundColor.tqmaskColor ()); - tqmaskPainter.setBrush (backgroundColor.tqmaskColor ()); + maskBitmap = kpPixmapFX::getNonNullMask (*destPixmapPtr); + maskPainter.begin (&maskBitmap); + maskPainter.setPen (backgroundColor.maskColor ()); + maskPainter.setBrush (backgroundColor.maskColor ()); } #define PAINTER_CALL(cmd) \ @@ -1130,8 +1130,8 @@ void kpPixmapFX::resize (TQPixmap *destPixmapPtr, int w, int h, if (painter.isActive ()) \ painter . cmd ; \ \ - if (tqmaskPainter.isActive ()) \ - tqmaskPainter . cmd ; \ + if (maskPainter.isActive ()) \ + maskPainter . cmd ; \ } if (w > oldWidth) PAINTER_CALL (drawRect (oldWidth, 0, w - oldWidth, oldHeight)); @@ -1140,14 +1140,14 @@ void kpPixmapFX::resize (TQPixmap *destPixmapPtr, int w, int h, PAINTER_CALL (drawRect (0, oldHeight, w, h - oldHeight)); #undef PAINTER_CALL - if (tqmaskPainter.isActive ()) - tqmaskPainter.end (); + if (maskPainter.isActive ()) + maskPainter.end (); if (painter.isActive ()) painter.end (); - if (!tqmaskBitmap.isNull ()) - destPixmapPtr->setMask (tqmaskBitmap); + if (!maskBitmap.isNull ()) + destPixmapPtr->setMask (maskBitmap); } } @@ -1378,7 +1378,7 @@ static TQPixmap xForm (const TQPixmap &pm, const TQWMatrix &transformMatrix_, if (backgroundColor.isTransparent () || pm.tqmask ()) { newBitmapMask.resize (newPixmap.width (), newPixmap.height ()); - newBitmapMask.fill (backgroundColor.tqmaskColor ()); + newBitmapMask.fill (backgroundColor.maskColor ()); } TQPainter painter (&newPixmap); @@ -1416,10 +1416,10 @@ static TQPixmap xForm (const TQPixmap &pm, const TQWMatrix &transformMatrix_, if (!newBitmapMask.isNull ()) { - TQPainter tqmaskPainter (&newBitmapMask); - tqmaskPainter.setWorldMatrix (transformMatrix); - tqmaskPainter.drawPixmap (TQPoint (0, 0), kpPixmapFX::getNonNullMask (pm)); - tqmaskPainter.end (); + TQPainter maskPainter (&newBitmapMask); + maskPainter.setWorldMatrix (transformMatrix); + maskPainter.drawPixmap (TQPoint (0, 0), kpPixmapFX::getNonNullMask (pm)); + maskPainter.end (); newPixmap.setMask (newBitmapMask); } diff --git a/kolourpaint/pixmapfx/kppixmapfx.h b/kolourpaint/pixmapfx/kppixmapfx.h index 738d82fa..72882839 100644 --- a/kolourpaint/pixmapfx/kppixmapfx.h +++ b/kolourpaint/pixmapfx/kppixmapfx.h @@ -294,7 +294,7 @@ public: // // Removes <*destPixmapPtr>'s Alpha Channel and attempts to convert it // to a tqmask. KolourPaint - and TQPixmap to a great extent - does not - // support Alpha Channels - only tqmasks. Call this whenever you get + // support Alpha Channels - only masks. Call this whenever you get // a pixmap from a foreign source; else all KolourPaint code will // exhibit "undefined behaviour". // -- cgit v1.2.1