From e7366c97c998679efa80cf61c88e64a11a3d3c33 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kolourpaint/pixmapfx/kpcoloreffect.cpp | 4 +- kolourpaint/pixmapfx/kpcoloreffect.h | 2 +- kolourpaint/pixmapfx/kpeffectbalance.cpp | 4 +- kolourpaint/pixmapfx/kpeffectbalance.h | 2 +- kolourpaint/pixmapfx/kpeffectblursharpen.cpp | 12 ++--- kolourpaint/pixmapfx/kpeffectblursharpen.h | 2 +- kolourpaint/pixmapfx/kpeffectemboss.cpp | 12 ++--- kolourpaint/pixmapfx/kpeffectemboss.h | 2 +- kolourpaint/pixmapfx/kpeffectflatten.cpp | 4 +- kolourpaint/pixmapfx/kpeffectflatten.h | 2 +- kolourpaint/pixmapfx/kpeffectinvert.cpp | 12 ++--- kolourpaint/pixmapfx/kpeffectinvert.h | 2 +- kolourpaint/pixmapfx/kpeffectreducecolors.cpp | 10 ++--- kolourpaint/pixmapfx/kpeffectreducecolors.h | 4 +- kolourpaint/pixmapfx/kpeffectsdialog.cpp | 4 +- kolourpaint/pixmapfx/kpeffectsdialog.h | 2 +- kolourpaint/pixmapfx/kpfloodfill.cpp | 2 +- kolourpaint/pixmapfx/kppixmapfx.cpp | 64 +++++++++++++-------------- kolourpaint/pixmapfx/kppixmapfx.h | 30 ++++++------- 19 files changed, 88 insertions(+), 88 deletions(-) (limited to 'kolourpaint/pixmapfx') diff --git a/kolourpaint/pixmapfx/kpcoloreffect.cpp b/kolourpaint/pixmapfx/kpcoloreffect.cpp index 9b8262dd..85ba5927 100644 --- a/kolourpaint/pixmapfx/kpcoloreffect.cpp +++ b/kolourpaint/pixmapfx/kpcoloreffect.cpp @@ -133,8 +133,8 @@ void kpColorEffectCommand::unexecute () kpColorEffectWidget::kpColorEffectWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name) - : TQWidget (tqparent, name), + TQWidget *parent, const char *name) + : TQWidget (parent, name), m_actOnSelection (actOnSelection), m_mainWindow (mainWindow) { diff --git a/kolourpaint/pixmapfx/kpcoloreffect.h b/kolourpaint/pixmapfx/kpcoloreffect.h index 1286e794..5221757c 100644 --- a/kolourpaint/pixmapfx/kpcoloreffect.h +++ b/kolourpaint/pixmapfx/kpcoloreffect.h @@ -79,7 +79,7 @@ Q_OBJECT public: kpColorEffectWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name = 0); + TQWidget *parent, const char *name = 0); virtual ~kpColorEffectWidget (); signals: diff --git a/kolourpaint/pixmapfx/kpeffectbalance.cpp b/kolourpaint/pixmapfx/kpeffectbalance.cpp index 8f07a26e..946814d5 100644 --- a/kolourpaint/pixmapfx/kpeffectbalance.cpp +++ b/kolourpaint/pixmapfx/kpeffectbalance.cpp @@ -253,8 +253,8 @@ TQPixmap kpEffectBalanceCommand::applyColorEffect (const TQPixmap &pixmap) kpEffectBalanceWidget::kpEffectBalanceWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name) - : kpColorEffectWidget (actOnSelection, mainWindow, tqparent, name) + TQWidget *parent, const char *name) + : kpColorEffectWidget (actOnSelection, mainWindow, parent, name) { TQGridLayout *lay = new TQGridLayout (this, 5, 5, marginHint (), spacingHint ()); diff --git a/kolourpaint/pixmapfx/kpeffectbalance.h b/kolourpaint/pixmapfx/kpeffectbalance.h index f44004a2..ec065ee3 100644 --- a/kolourpaint/pixmapfx/kpeffectbalance.h +++ b/kolourpaint/pixmapfx/kpeffectbalance.h @@ -79,7 +79,7 @@ Q_OBJECT public: kpEffectBalanceWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name = 0); + TQWidget *parent, const char *name = 0); virtual ~kpEffectBalanceWidget (); virtual TQString caption () const; diff --git a/kolourpaint/pixmapfx/kpeffectblursharpen.cpp b/kolourpaint/pixmapfx/kpeffectblursharpen.cpp index 145ed78c..e1feaaa3 100644 --- a/kolourpaint/pixmapfx/kpeffectblursharpen.cpp +++ b/kolourpaint/pixmapfx/kpeffectblursharpen.cpp @@ -88,7 +88,7 @@ TQPixmap kpEffectBlurSharpenCommand::apply (const TQPixmap &pixmap, << endl; #endif - // (KImageEffect::(blur|sharpen)() ignores tqmask) + // (KImageEffect::(blur|sharpen)() ignores mask) TQPixmap usePixmap = kpPixmapFX::pixmapWithDefinedTransparentPixels ( pixmap, TQt::white/*arbitrarily chosen*/); @@ -107,9 +107,9 @@ TQPixmap kpEffectBlurSharpenCommand::apply (const TQPixmap &pixmap, TQPixmap retPixmap = kpPixmapFX::convertToPixmap (image); - // KImageEffect::(blur|sharpen)() nukes tqmask - restore it - if (usePixmap.tqmask ()) - retPixmap.setMask (*usePixmap.tqmask ()); + // KImageEffect::(blur|sharpen)() nukes mask - restore it + if (usePixmap.mask ()) + retPixmap.setMask (*usePixmap.mask ()); return retPixmap; @@ -125,8 +125,8 @@ TQPixmap kpEffectBlurSharpenCommand::applyColorEffect (const TQPixmap &pixmap) kpEffectBlurSharpenWidget::kpEffectBlurSharpenWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name) - : kpColorEffectWidget (actOnSelection, mainWindow, tqparent, name) + TQWidget *parent, const char *name) + : kpColorEffectWidget (actOnSelection, mainWindow, parent, name) { TQGridLayout *lay = new TQGridLayout (this, 4, 2, marginHint (), spacingHint ()); diff --git a/kolourpaint/pixmapfx/kpeffectblursharpen.h b/kolourpaint/pixmapfx/kpeffectblursharpen.h index e4db5f86..09c5ee4c 100644 --- a/kolourpaint/pixmapfx/kpeffectblursharpen.h +++ b/kolourpaint/pixmapfx/kpeffectblursharpen.h @@ -79,7 +79,7 @@ Q_OBJECT public: kpEffectBlurSharpenWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name = 0); + TQWidget *parent, const char *name = 0); virtual ~kpEffectBlurSharpenWidget (); virtual TQString caption () const; diff --git a/kolourpaint/pixmapfx/kpeffectemboss.cpp b/kolourpaint/pixmapfx/kpeffectemboss.cpp index 647794db..0783021d 100644 --- a/kolourpaint/pixmapfx/kpeffectemboss.cpp +++ b/kolourpaint/pixmapfx/kpeffectemboss.cpp @@ -75,7 +75,7 @@ TQPixmap kpEffectEmbossCommand::apply (const TQPixmap &pixmap, << endl; #endif - // (KImageEffect::emboss() ignores tqmask) + // (KImageEffect::emboss() ignores mask) TQPixmap usePixmap = kpPixmapFX::pixmapWithDefinedTransparentPixels ( pixmap, TQt::white/*arbitrarily chosen*/); @@ -91,9 +91,9 @@ TQPixmap kpEffectEmbossCommand::apply (const TQPixmap &pixmap, TQPixmap retPixmap = kpPixmapFX::convertToPixmap (image); - // KImageEffect::emboss() nukes tqmask - restore it - if (usePixmap.tqmask ()) - retPixmap.setMask (*usePixmap.tqmask ()); + // KImageEffect::emboss() nukes mask - restore it + if (usePixmap.mask ()) + retPixmap.setMask (*usePixmap.mask ()); return retPixmap; @@ -109,8 +109,8 @@ TQPixmap kpEffectEmbossCommand::applyColorEffect (const TQPixmap &pixmap) kpEffectEmbossWidget::kpEffectEmbossWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name) - : kpColorEffectWidget (actOnSelection, mainWindow, tqparent, name) + TQWidget *parent, const char *name) + : kpColorEffectWidget (actOnSelection, mainWindow, parent, name) { TQGridLayout *lay = new TQGridLayout (this, 4, 2, marginHint (), spacingHint ()); diff --git a/kolourpaint/pixmapfx/kpeffectemboss.h b/kolourpaint/pixmapfx/kpeffectemboss.h index 215a3cfa..18e4584a 100644 --- a/kolourpaint/pixmapfx/kpeffectemboss.h +++ b/kolourpaint/pixmapfx/kpeffectemboss.h @@ -71,7 +71,7 @@ Q_OBJECT public: kpEffectEmbossWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name = 0); + TQWidget *parent, const char *name = 0); virtual ~kpEffectEmbossWidget (); virtual TQString caption () const; diff --git a/kolourpaint/pixmapfx/kpeffectflatten.cpp b/kolourpaint/pixmapfx/kpeffectflatten.cpp index 4357e086..1768aa96 100644 --- a/kolourpaint/pixmapfx/kpeffectflatten.cpp +++ b/kolourpaint/pixmapfx/kpeffectflatten.cpp @@ -131,9 +131,9 @@ TQColor kpEffectFlattenWidget::s_lastColor2; kpEffectFlattenWidget::kpEffectFlattenWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, + TQWidget *parent, const char *name) - : kpColorEffectWidget (actOnSelection, mainWindow, tqparent, name) + : kpColorEffectWidget (actOnSelection, mainWindow, parent, name) { if (!s_lastColor1.isValid () || !s_lastColor2.isValid ()) { diff --git a/kolourpaint/pixmapfx/kpeffectflatten.h b/kolourpaint/pixmapfx/kpeffectflatten.h index 4bdf34d4..6eb6b07c 100644 --- a/kolourpaint/pixmapfx/kpeffectflatten.h +++ b/kolourpaint/pixmapfx/kpeffectflatten.h @@ -81,7 +81,7 @@ Q_OBJECT public: kpEffectFlattenWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name = 0); + TQWidget *parent, const char *name = 0); virtual ~kpEffectFlattenWidget (); diff --git a/kolourpaint/pixmapfx/kpeffectinvert.cpp b/kolourpaint/pixmapfx/kpeffectinvert.cpp index aaf2c5d7..ad05d013 100644 --- a/kolourpaint/pixmapfx/kpeffectinvert.cpp +++ b/kolourpaint/pixmapfx/kpeffectinvert.cpp @@ -86,13 +86,13 @@ TQPixmap kpEffectInvertCommand::apply (const TQPixmap &pm, int channels) // public static void kpEffectInvertCommand::apply (TQImage *destImagePtr, int channels) { - TQRgb tqmask = tqRgba ((channels & Red) ? 0xFF : 0, + TQRgb mask = tqRgba ((channels & Red) ? 0xFF : 0, (channels & Green) ? 0xFF : 0, (channels & Blue) ? 0xFF : 0, 0/*don't invert alpha*/); #if DEBUG_KP_EFFECT_INVERT kdDebug () << "kpEffectInvertCommand::apply(channels=" << channels - << ") tqmask=" << (int *) tqmask + << ") mask=" << (int *) mask << endl; #endif @@ -109,7 +109,7 @@ void kpEffectInvertCommand::apply (TQImage *destImagePtr, int channels) { for (int x = 0; x < destImagePtr->width (); x++) { - destImagePtr->setPixel (x, y, destImagePtr->pixel (x, y) ^ tqmask); + destImagePtr->setPixel (x, y, destImagePtr->pixel (x, y) ^ mask); } } #endif @@ -118,7 +118,7 @@ void kpEffectInvertCommand::apply (TQImage *destImagePtr, int channels) { for (int i = 0; i < destImagePtr->numColors (); i++) { - destImagePtr->setColor (i, destImagePtr->color (i) ^ tqmask); + destImagePtr->setColor (i, destImagePtr->color (i) ^ mask); } } } @@ -149,9 +149,9 @@ TQPixmap kpEffectInvertCommand::applyColorEffect (const TQPixmap &pixmap) kpEffectInvertWidget::kpEffectInvertWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, + TQWidget *parent, const char *name) - : kpColorEffectWidget (actOnSelection, mainWindow, tqparent, name) + : kpColorEffectWidget (actOnSelection, mainWindow, parent, name) { TQVBoxLayout *topLevelLay = new TQVBoxLayout (this, marginHint (), spacingHint ()); diff --git a/kolourpaint/pixmapfx/kpeffectinvert.h b/kolourpaint/pixmapfx/kpeffectinvert.h index 67277ac3..91be0fae 100644 --- a/kolourpaint/pixmapfx/kpeffectinvert.h +++ b/kolourpaint/pixmapfx/kpeffectinvert.h @@ -96,7 +96,7 @@ Q_OBJECT public: kpEffectInvertWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name = 0); + TQWidget *parent, const char *name = 0); virtual ~kpEffectInvertWidget (); diff --git a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp index c89685da..83dd997d 100644 --- a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp +++ b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp @@ -242,10 +242,10 @@ void kpEffectReduceColorsCommand::apply (TQPixmap *destPixmapPtr, int depth, boo // (at least for monochrome). // tqpixmap.html says "alpha masks on monochrome images are ignored." // - // Put the tqmask back. + // Put the mask back. // - if (destPixmapPtr->tqmask ()) - pixmap.setMask (*destPixmapPtr->tqmask ()); + if (destPixmapPtr->mask ()) + pixmap.setMask (*destPixmapPtr->mask ()); *destPixmapPtr = pixmap; } @@ -276,9 +276,9 @@ TQPixmap kpEffectReduceColorsCommand::applyColorEffect (const TQPixmap &pixmap) kpEffectReduceColorsWidget::kpEffectReduceColorsWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, + TQWidget *parent, const char *name) - : kpColorEffectWidget (actOnSelection, mainWindow, tqparent, name) + : kpColorEffectWidget (actOnSelection, mainWindow, parent, name) { TQVBoxLayout *lay = new TQVBoxLayout (this, marginHint (), spacingHint ()); diff --git a/kolourpaint/pixmapfx/kpeffectreducecolors.h b/kolourpaint/pixmapfx/kpeffectreducecolors.h index df4c0bc0..2109c8ca 100644 --- a/kolourpaint/pixmapfx/kpeffectreducecolors.h +++ b/kolourpaint/pixmapfx/kpeffectreducecolors.h @@ -53,7 +53,7 @@ public: TQString commandName (int depth, int dither) const; - // (always preserves tqmask) + // (always preserves mask) static void apply (TQPixmap *destPixmapPtr, int depth, bool dither); static TQPixmap apply (const TQPixmap &pm, int depth, bool dither); @@ -78,7 +78,7 @@ Q_OBJECT public: kpEffectReduceColorsWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name = 0); + TQWidget *parent, const char *name = 0); virtual ~kpEffectReduceColorsWidget (); diff --git a/kolourpaint/pixmapfx/kpeffectsdialog.cpp b/kolourpaint/pixmapfx/kpeffectsdialog.cpp index 80a242c3..098e0396 100644 --- a/kolourpaint/pixmapfx/kpeffectsdialog.cpp +++ b/kolourpaint/pixmapfx/kpeffectsdialog.cpp @@ -59,14 +59,14 @@ int kpEffectsDialog::s_lastHeight = 620; kpEffectsDialog::kpEffectsDialog (bool actOnSelection, - kpMainWindow *tqparent, + kpMainWindow *parent, const char *name) : kpToolPreviewDialog (kpToolPreviewDialog::Preview, true/*reserve top row*/, TQString()/*caption*/, TQString()/*afterActionText (no Dimensions Group Box)*/, actOnSelection, - tqparent, + parent, name), m_delayedUpdateTimer (new TQTimer (this)), m_effectsComboBox (0), diff --git a/kolourpaint/pixmapfx/kpeffectsdialog.h b/kolourpaint/pixmapfx/kpeffectsdialog.h index ddb3f8c2..94c4ebdc 100644 --- a/kolourpaint/pixmapfx/kpeffectsdialog.h +++ b/kolourpaint/pixmapfx/kpeffectsdialog.h @@ -52,7 +52,7 @@ Q_OBJECT public: kpEffectsDialog (bool actOnSelection, - kpMainWindow *tqparent, + kpMainWindow *parent, const char *name = 0); virtual ~kpEffectsDialog (); diff --git a/kolourpaint/pixmapfx/kpfloodfill.cpp b/kolourpaint/pixmapfx/kpfloodfill.cpp index 2b509cb1..3eef76c3 100644 --- a/kolourpaint/pixmapfx/kpfloodfill.cpp +++ b/kolourpaint/pixmapfx/kpfloodfill.cpp @@ -100,7 +100,7 @@ bool kpFloodFill::fill () TQPainter painter, maskPainter; TQBitmap maskBitmap; - if (m_pixmapPtr->tqmask () || m_color.isTransparent ()) + if (m_pixmapPtr->mask () || m_color.isTransparent ()) { maskBitmap = kpPixmapFX::getNonNullMask (*m_pixmapPtr); maskPainter.begin (&maskBitmap); diff --git a/kolourpaint/pixmapfx/kppixmapfx.cpp b/kolourpaint/pixmapfx/kppixmapfx.cpp index e46f91cb..5b281606 100644 --- a/kolourpaint/pixmapfx/kppixmapfx.cpp +++ b/kolourpaint/pixmapfx/kppixmapfx.cpp @@ -556,7 +556,7 @@ TQPixmap kpPixmapFX::convertToPixmapAsLosslessAsPossible (const TQImage &image, TQPixmap kpPixmapFX::pixmapWithDefinedTransparentPixels (const TQPixmap &pixmap, const TQColor &transparentColor) { - if (!pixmap.tqmask ()) + if (!pixmap.mask ()) return pixmap; TQPixmap retPixmap (pixmap.width (), pixmap.height ()); @@ -566,7 +566,7 @@ TQPixmap kpPixmapFX::pixmapWithDefinedTransparentPixels (const TQPixmap &pixmap, p.drawPixmap (TQPoint (0, 0), pixmap); p.end (); - retPixmap.setMask (*pixmap.tqmask ()); + retPixmap.setMask (*pixmap.mask ()); return retPixmap; } @@ -583,7 +583,7 @@ TQPixmap kpPixmapFX::getPixmapAt (const TQPixmap &pm, const TQRect &rect) #if DEBUG_KP_PIXMAP_FX && 0 kdDebug () << "kpPixmapFX::getPixmapAt(pm.hasMask=" - << (pm.tqmask () ? 1 : 0) + << (pm.mask () ? 1 : 0) << ",rect=" << rect << ")" @@ -614,14 +614,14 @@ TQPixmap kpPixmapFX::getPixmapAt (const TQPixmap &pm, const TQRect &rect) const TQPoint destTopLeft = validSrcRect.topLeft () - rect.topLeft (); - // copy data _and_ tqmask (if avail) + // copy data _and_ mask (if avail) copyBlt (&retPixmap, /* dest */ destTopLeft.x (), destTopLeft.y (), /* dest pt */ &pm, /* src */ validSrcRect.x (), validSrcRect.y (), /* src pt */ validSrcRect.width (), validSrcRect.height ()); - if (wouldHaveUndefinedPixels && retPixmap.tqmask () && !pm.tqmask ()) + if (wouldHaveUndefinedPixels && retPixmap.mask () && !pm.mask ()) { #if DEBUG_KP_PIXMAP_FX && 0 kdDebug () << "\tensure opaque in valid region" << endl; @@ -633,7 +633,7 @@ TQPixmap kpPixmapFX::getPixmapAt (const TQPixmap &pm, const TQRect &rect) #if DEBUG_KP_PIXMAP_FX && 0 kdDebug () << "\tretPixmap.hasMask=" - << (retPixmap.tqmask () ? 1 : 0) + << (retPixmap.mask () ? 1 : 0) << endl; #endif @@ -652,19 +652,19 @@ void kpPixmapFX::setPixmapAt (TQPixmap *destPixmapPtr, const TQRect &destRect, kdDebug () << "kpPixmapFX::setPixmapAt(destPixmap->rect=" << destPixmapPtr->rect () << ",destPixmap->hasMask=" - << (destPixmapPtr->tqmask () ? 1 : 0) + << (destPixmapPtr->mask () ? 1 : 0) << ",destRect=" << destRect << ",srcPixmap.rect=" << srcPixmap.rect () << ",srcPixmap.hasMask=" - << (srcPixmap.tqmask () ? 1 : 0) + << (srcPixmap.mask () ? 1 : 0) << ")" << endl; #endif #if DEBUG_KP_PIXMAP_FX && 0 - if (destPixmapPtr->tqmask ()) + if (destPixmapPtr->mask ()) { TQImage image = kpPixmapFX::convertToImage (*destPixmapPtr); int numTrans = 0; @@ -687,7 +687,7 @@ void kpPixmapFX::setPixmapAt (TQPixmap *destPixmapPtr, const TQRect &destRect, // result in a opaque image, except for that single transparent pixel??? // TQt bug on boundary case? - // copy data _and_ tqmask + // copy data _and_ mask copyBlt (destPixmapPtr, destAt.x (), destAt.y (), &srcPixmap, @@ -700,23 +700,23 @@ void kpPixmapFX::setPixmapAt (TQPixmap *destPixmapPtr, const TQRect &destRect, 0, 0, destRect.width (), destRect.height (), TQt::CopyROP, - true/*ignore tqmask*/); + true/*ignore mask*/); - if (srcPixmap.tqmask ()) + if (srcPixmap.mask ()) { - TQBitmap tqmask = getNonNullMask (*destPixmapPtr); - bitBlt (TQT_TQPAINTDEVICE(&tqmask), + TQBitmap mask = getNonNullMask (*destPixmapPtr); + bitBlt (TQT_TQPAINTDEVICE(&mask), destRect.x (), destRect.y (), - TQT_TQPAINTDEVICE(const_cast(srcPixmap.tqmask ())), + TQT_TQPAINTDEVICE(const_cast(srcPixmap.mask ())), 0, 0, destRect.width (), destRect.height (), TQt::CopyROP, - true/*ignore tqmask*/); - destPixmapPtr->setMask (tqmask); + true/*ignore mask*/); + destPixmapPtr->setMask (mask); } #endif - if (destPixmapPtr->tqmask () && !srcPixmap.tqmask ()) + if (destPixmapPtr->mask () && !srcPixmap.mask ()) { #if DEBUG_KP_PIXMAP_FX && 0 kdDebug () << "\t\topaque'ing dest rect" << endl; @@ -726,9 +726,9 @@ void kpPixmapFX::setPixmapAt (TQPixmap *destPixmapPtr, const TQRect &destRect, #if DEBUG_KP_PIXMAP_FX && 0 kdDebug () << "\tdestPixmap->hasMask=" - << (destPixmapPtr->tqmask () ? 1 : 0) + << (destPixmapPtr->mask () ? 1 : 0) << endl; - if (destPixmapPtr->tqmask ()) + if (destPixmapPtr->mask ()) { TQImage image = kpPixmapFX::convertToImage (*destPixmapPtr); int numTrans = 0; @@ -772,7 +772,7 @@ void kpPixmapFX::paintPixmapAt (TQPixmap *destPixmapPtr, const TQPoint &destAt, if (!destPixmapPtr) return; - // Copy src (masked by src's tqmask) on top of dest. + // Copy src (masked by src's mask) on top of dest. bitBlt (destPixmapPtr, /* dest */ destAt.x (), destAt.y (), /* dest pt */ &srcPixmap, /* src */ @@ -852,8 +852,8 @@ void kpPixmapFX::ensureNoAlphaChannel (TQPixmap *destPixmapPtr) // public static TQBitmap kpPixmapFX::getNonNullMask (const TQPixmap &pm) { - if (pm.tqmask ()) - return *pm.tqmask (); + if (pm.mask ()) + return *pm.mask (); else { TQBitmap maskBitmap (pm.width (), pm.height ()); @@ -934,10 +934,10 @@ void kpPixmapFX::paintMaskTransparentWithBrush (TQPixmap *destPixmapPtr, int des // public static void kpPixmapFX::ensureOpaqueAt (TQPixmap *destPixmapPtr, const TQRect &destRect) { - if (!destPixmapPtr || !destPixmapPtr->tqmask ()/*already opaque*/) + if (!destPixmapPtr || !destPixmapPtr->mask ()/*already opaque*/) return; - TQBitmap maskBitmap = *destPixmapPtr->tqmask (); + TQBitmap maskBitmap = *destPixmapPtr->mask (); TQPainter p (&maskBitmap); @@ -955,16 +955,16 @@ void kpPixmapFX::ensureOpaqueAt (TQPixmap *destPixmapPtr, const TQRect &destRect void kpPixmapFX::ensureOpaqueAt (TQPixmap *destPixmapPtr, const TQPoint &destAt, const TQPixmap &srcPixmap) { - if (!destPixmapPtr || !destPixmapPtr->tqmask ()/*already opaque*/) + if (!destPixmapPtr || !destPixmapPtr->mask ()/*already opaque*/) return; - TQBitmap destMask = *destPixmapPtr->tqmask (); + TQBitmap destMask = *destPixmapPtr->mask (); - if (srcPixmap.tqmask ()) + if (srcPixmap.mask ()) { bitBlt (&destMask, /* dest */ destAt, /* dest pt */ - srcPixmap.tqmask (), /* src */ + srcPixmap.mask (), /* src */ TQRect (0, 0, srcPixmap.width (), srcPixmap.height ()), /* src rect */ TQt::OrROP/*if either is opaque, it's opaque*/); } @@ -1064,7 +1064,7 @@ void kpPixmapFX::fill (TQPixmap *destPixmapPtr, const kpColor &color) if (color.isOpaque ()) { - destPixmapPtr->setMask (TQBitmap ()); // no tqmask = opaque + destPixmapPtr->setMask (TQBitmap ()); // no mask = opaque destPixmapPtr->fill (color.toTQColor ()); } else @@ -1117,7 +1117,7 @@ void kpPixmapFX::resize (TQPixmap *destPixmapPtr, int w, int h, painter.setBrush (backgroundColor.toTQColor ()); } - if (backgroundColor.isTransparent () || destPixmapPtr->tqmask ()) + if (backgroundColor.isTransparent () || destPixmapPtr->mask ()) { maskBitmap = kpPixmapFX::getNonNullMask (*destPixmapPtr); maskPainter.begin (&maskBitmap); @@ -1375,7 +1375,7 @@ static TQPixmap xForm (const TQPixmap &pm, const TQWMatrix &transformMatrix_, if (backgroundColor.isOpaque ()) newPixmap.fill (backgroundColor.toTQColor ()); - if (backgroundColor.isTransparent () || pm.tqmask ()) + if (backgroundColor.isTransparent () || pm.mask ()) { newBitmapMask.resize (newPixmap.width (), newPixmap.height ()); newBitmapMask.fill (backgroundColor.maskColor ()); diff --git a/kolourpaint/pixmapfx/kppixmapfx.h b/kolourpaint/pixmapfx/kppixmapfx.h index 72882839..e8758fc7 100644 --- a/kolourpaint/pixmapfx/kppixmapfx.h +++ b/kolourpaint/pixmapfx/kppixmapfx.h @@ -128,7 +128,7 @@ public: // // " contains translucency which is not fully" // " supported. The translucency data will be" - // " approximated with a 1-bit transparency tqmask.") + // " approximated with a 1-bit transparency mask.") // // : // i18n ("The (image \"example.jpg\"|image from the clipboard)" @@ -140,21 +140,21 @@ public: // i18n ("The (image \"example.jpg\"|image from the clipboard)" // " contains translucency which is not fully" // " supported. The translucency data will be" - // " approximated with a 1-bit transparency tqmask.") + // " approximated with a 1-bit transparency mask.") // // : // // Don'tAskAgain ID for dialog. // - // : + // : // - // Dialog tqparent + // Dialog parent // WarnAboutLossInfo (const TQString &moreColorsThanDisplayAndHasAlphaChannelMessage, const TQString &moreColorsThanDisplayMessage, const TQString &hasAlphaChannelMessage, const TQString &dontAskAgainPrefix, - TQWidget *tqparent) + TQWidget *parent) : m_moreColorsThanDisplayAndHasAlphaChannelMessage ( moreColorsThanDisplayAndHasAlphaChannelMessage), @@ -164,7 +164,7 @@ public: hasAlphaChannelMessage), m_dontAskAgainPrefix ( dontAskAgainPrefix), - m_parent (tqparent), + m_parent (parent), m_isValid (true) { } @@ -227,7 +227,7 @@ public: // Sets the RGB values of the pixels where is transparent to // . This has visually no effect on the - // unless the tqmask is lost. + // unless the mask is lost. static TQPixmap pixmapWithDefinedTransparentPixels (const TQPixmap &pixmap, const TQColor &transparentColor); @@ -238,19 +238,19 @@ public: // - // Returns the pixel and tqmask data found at the in . + // Returns the pixel and mask data found at the in . // static TQPixmap getPixmapAt (const TQPixmap &pm, const TQRect &rect); // - // Sets the pixel and tqmask data at in <*destPixmapPtr> + // Sets the pixel and mask data at in <*destPixmapPtr> // to . // static void setPixmapAt (TQPixmap *destPixmapPtr, const TQRect &destRect, const TQPixmap &srcPixmap); // - // Sets the pixel and tqmask data at the rectangle in <*destPixmapPtr>, + // Sets the pixel and mask data at the rectangle in <*destPixmapPtr>, // with the top-left and dimensions , // to . // @@ -261,7 +261,7 @@ public: // // Draws on top of <*destPixmapPtr> at . - // The tqmask of <*destPixmapPtr> is adjusted so that all opaque + // The mask of <*destPixmapPtr> is adjusted so that all opaque // pixels in will be opaque in <*destPixmapPtr>. // static void paintPixmapAt (TQPixmap *destPixmapPtr, const TQPoint &destAt, @@ -293,7 +293,7 @@ public: // // Removes <*destPixmapPtr>'s Alpha Channel and attempts to convert it - // to a tqmask. KolourPaint - and TQPixmap to a great extent - does not + // to a mask. KolourPaint - and TQPixmap to a great extent - does not // support Alpha Channels - only masks. Call this whenever you get // a pixmap from a foreign source; else all KolourPaint code will // exhibit "undefined behaviour". @@ -301,8 +301,8 @@ public: static void ensureNoAlphaChannel (TQPixmap *destPixmapPtr); // - // Returns 's tqmask or a fully opaque tqmask (with 's dimensions) - // if does not have a tqmask. + // Returns 's mask or a fully opaque mask (with 's dimensions) + // if does not have a mask. // static TQBitmap getNonNullMask (const TQPixmap &pm); @@ -312,7 +312,7 @@ public: static void ensureTransparentAt (TQPixmap *destPixmapPtr, const TQRect &destRect); // - // Sets the tqmask of <*destPixmapPtr> at the rectangle, with the + // Sets the mask of <*destPixmapPtr> at the rectangle, with the // top-left and dimensions , // to transparent where is opaque. // -- cgit v1.2.1