diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
| commit | 04766b207afba7961d4d802313e426f5a2fbef63 (patch) | |
| tree | c888ea1027c793e2d0386a7e5a1a0cd077b03cb3 /chalk | |
| parent | b6edfe41c9395f2e20784cbf0e630af6426950a3 (diff) | |
| download | koffice-04766b207afba7961d4d802313e426f5a2fbef63.tar.gz koffice-04766b207afba7961d4d802313e426f5a2fbef63.zip | |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'chalk')
535 files changed, 2779 insertions, 2779 deletions
diff --git a/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc b/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc index db50c7d97..c76160c54 100644 --- a/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc +++ b/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc @@ -38,9 +38,9 @@ namespace { const TQ_UINT8 PIXEL_MASK = 0; } -KisAlphaColorSpace::KisAlphaColorSpace(KisColorSpaceFactoryRegistry * tqparent, +KisAlphaColorSpace::KisAlphaColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) : - KisU8BaseColorSpace(KisID("ALPHA", i18n("Alpha tqmask")), TYPE_GRAY_8, icSigGrayData, tqparent, p) + KisU8BaseColorSpace(KisID("ALPHA", i18n("Alpha mask")), TYPE_GRAY_8, icSigGrayData, parent, p) { m_channels.push_back(new KisChannelInfo(i18n("Alpha"), i18n("A"), 0, KisChannelInfo::ALPHA, KisChannelInfo::UINT8)); m_alphaPos = 0; @@ -125,7 +125,7 @@ bool KisAlphaColorSpace::convertPixelsTo(const TQ_UINT8 *src, } -//XXX bitblt of ColorSpaceAlpha does not take tqmask into consideration as this is probably not +//XXX bitblt of ColorSpaceAlpha does not take mask into consideration as this is probably not // used ever void KisAlphaColorSpace::bitBlt(TQ_UINT8 *dst, TQ_INT32 dststride, diff --git a/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.h b/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.h index 173a809e3..c9deb496a 100644 --- a/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.h +++ b/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.h @@ -24,12 +24,12 @@ #include "kis_u8_base_colorspace.h" /** - * The alpha tqmask is a special color strategy that treats all pixels as - * alpha value with a colour common to the tqmask. The default color is white. + * The alpha mask is a special color strategy that treats all pixels as + * alpha value with a colour common to the mask. The default color is white. */ class KisAlphaColorSpace : public KisU8BaseColorSpace { public: - KisAlphaColorSpace(KisColorSpaceFactoryRegistry * tqparent, + KisAlphaColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p); virtual ~KisAlphaColorSpace(); diff --git a/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc b/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc index e8476d75b..e6b7f1511 100644 --- a/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc +++ b/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc @@ -33,10 +33,10 @@ #include "kis_color_conversions.h" #include "kis_integer_maths.h" -KisLabColorSpace::KisLabColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) +KisLabColorSpace::KisLabColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) : KisU16BaseColorSpace(KisID("LABA", i18n("L*a*b* (16-bit integer/channel)")), COLORSPACE_SH(PT_Lab)|CHANNELS_SH(3)|BYTES_SH(2)|EXTRA_SH(1), - icSigLabData, tqparent, p) + icSigLabData, parent, p) { m_channels.push_back(new KisChannelInfo(i18n("Lightness"), i18n("L"), CHANNEL_L * sizeof(TQ_UINT16), KisChannelInfo::COLOR, KisChannelInfo::UINT16, sizeof(TQ_UINT16), TQColor(100,100,100))); @@ -267,19 +267,19 @@ void KisLabColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid while (rows > 0) { const Pixel *src = reinterpret_cast<const Pixel *>(srcRowStart); Pixel *dst = reinterpret_cast<Pixel *>(dstRowStart); - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { TQ_UINT16 srcAlpha = src->alpha; - // apply the alphatqmask - if (tqmask != 0) { - if (*tqmask != OPACITY_OPAQUE) { - srcAlpha = UINT16_MULT(srcAlpha, *tqmask); + // apply the alphamask + if (mask != 0) { + if (*mask != OPACITY_OPAQUE) { + srcAlpha = UINT16_MULT(srcAlpha, *mask); } - tqmask++; + mask++; } if (srcAlpha != U16_OPACITY_TRANSPARENT) { @@ -351,20 +351,20 @@ void KisLabColorSpace::compositeErase(TQ_UINT8 *dst, { const Pixel *s = reinterpret_cast<const Pixel *>(src); Pixel *d = reinterpret_cast<Pixel *>(dst); - const TQ_UINT8 *tqmask = srcAlphaMask; + const TQ_UINT8 *mask = srcAlphaMask; for (TQ_INT32 i = cols; i > 0; i--, s++, d++) { TQ_UINT16 srcAlpha = s->alpha; - // apply the alphatqmask - if (tqmask != 0) { - TQ_UINT8 U8_tqmask = *tqmask; + // apply the alphamask + if (mask != 0) { + TQ_UINT8 U8_mask = *mask; - if (U8_tqmask != OPACITY_OPAQUE) { - srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_tqmask)); + if (U8_mask != OPACITY_OPAQUE) { + srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_mask)); } - tqmask++; + mask++; } d->alpha = UINT16_MULT(srcAlpha, d->alpha); } @@ -381,7 +381,7 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, - const TQ_UINT8 *tqmask, + const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_UINT8 U8_opacity, TQ_INT32 rows, @@ -395,7 +395,7 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst, // Undefined == no composition break; case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_IN: //compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -425,16 +425,16 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst, //compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_MULT: - //compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeMultiply(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DIVIDE: - //compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeDivide(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BUMPMAP: //compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: - compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, U8_opacity); break; case COMPOSITE_COPY_RED: //compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -469,22 +469,22 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst, // No composition. break; case COMPOSITE_DARKEN: - //compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_LIGHTEN: - //compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeLighten(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_HUE: - //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeHue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_SATURATION: - //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeSaturation(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_VALUE: - //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeValue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLOR: - //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeColor(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLORIZE: //compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -493,24 +493,24 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst, //compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_SCREEN: - //compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeScreen(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_OVERLAY: - //compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeOverlay(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ERASE: - compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DODGE: - //compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeDodge(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BURN: - //compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeBurn(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ALPHA_DARKEN: abstractCompositeAlphaDarken<TQ_UINT16, U16Mult, Uint8ToU16, U16OpacityTest, CHANNEL_ALPHA, NUM_COLOR_CHANNELS, NUM_CHANNELS>( - dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, + dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity, U16Mult(), Uint8ToU16(), U16OpacityTest()); break; default: diff --git a/chalk/chalkcolor/colorspaces/kis_lab_colorspace.h b/chalk/chalkcolor/colorspaces/kis_lab_colorspace.h index e85408f8e..77266dca7 100644 --- a/chalk/chalkcolor/colorspaces/kis_lab_colorspace.h +++ b/chalk/chalkcolor/colorspaces/kis_lab_colorspace.h @@ -29,7 +29,7 @@ class KisLabColorSpace : public KisU16BaseColorSpace { public: - KisLabColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p); + KisLabColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p); virtual ~KisLabColorSpace(); public: @@ -87,22 +87,22 @@ protected: TQ_INT32 cols, const KisCompositeOp& op); - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); /* - void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); */ - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); private: struct Pixel { @@ -145,7 +145,7 @@ public: virtual icColorSpaceSignature colorSpaceSignature() { return icSigLabData; }; - virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisLabColorSpace(tqparent, p); }; + virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisLabColorSpace(parent, p); }; virtual TQString defaultProfile() { return "Lab built-in - (lcms internal)"; }; }; diff --git a/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc b/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc index 7e765d7ab..d81c1fe65 100644 --- a/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc +++ b/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc @@ -39,9 +39,9 @@ // XXX: Maybe use TYPE_XYZ_DBL for an extra stimulating performance hit? People shouldn't depend // on this fallback... -KisXyzColorSpace::KisXyzColorSpace(KisColorSpaceFactoryRegistry * tqparent, +KisXyzColorSpace::KisXyzColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) : - KisU16BaseColorSpace(KisID("XYZA", i18n("XYZ/Alpha")), (COLORSPACE_SH(PT_XYZ)|CHANNELS_SH(3)|BYTES_SH(2)|EXTRA_SH(1)), icSigCmykData, tqparent, p) + KisU16BaseColorSpace(KisID("XYZA", i18n("XYZ/Alpha")), (COLORSPACE_SH(PT_XYZ)|CHANNELS_SH(3)|BYTES_SH(2)|EXTRA_SH(1)), icSigCmykData, parent, p) { m_channels.push_back(new KisChannelInfo(i18n("X"), i18n("X"), 0, KisChannelInfo::COLOR, KisChannelInfo::UINT8)); m_channels.push_back(new KisChannelInfo(i18n("Y"), i18n("Y"), 1, KisChannelInfo::COLOR, KisChannelInfo::UINT8)); @@ -125,21 +125,21 @@ void KisXyzColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart); TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart); - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { TQ_UINT16 srcAlpha = src[PIXEL_ALPHA]; - // apply the alphatqmask - if (tqmask != 0) { - TQ_UINT8 U8_tqmask = *tqmask; + // apply the alphamask + if (mask != 0) { + TQ_UINT8 U8_mask = *mask; - if (U8_tqmask != OPACITY_OPAQUE) { - srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_tqmask)); + if (U8_mask != OPACITY_OPAQUE) { + srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_mask)); } - tqmask++; + mask++; } if (srcAlpha != U16_OPACITY_TRANSPARENT) { @@ -198,7 +198,7 @@ void KisXyzColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart); \ TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart); \ TQ_INT32 columns = numColumns; \ - const TQ_UINT8 *tqmask = maskRowStart; \ + const TQ_UINT8 *mask = maskRowStart; \ \ while (columns > 0) { \ \ @@ -207,13 +207,13 @@ void KisXyzColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid \ srcAlpha = TQMIN(srcAlpha, dstAlpha); \ \ - if (tqmask != 0) { \ - TQ_UINT8 U8_tqmask = *tqmask; \ + if (mask != 0) { \ + TQ_UINT8 U8_mask = *mask; \ \ - if (U8_tqmask != OPACITY_OPAQUE) { \ - srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_tqmask)); \ + if (U8_mask != OPACITY_OPAQUE) { \ + srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_mask)); \ } \ - tqmask++; \ + mask++; \ } \ \ if (srcAlpha != U16_OPACITY_TRANSPARENT) { \ @@ -437,20 +437,20 @@ void KisXyzColorSpace::compositeErase(TQ_UINT8 *dst, { const Pixel *s = reinterpret_cast<const Pixel *>(src); Pixel *d = reinterpret_cast<Pixel *>(dst); - const TQ_UINT8 *tqmask = srcAlphaMask; + const TQ_UINT8 *mask = srcAlphaMask; for (TQ_INT32 i = cols; i > 0; i--, s++, d++) { TQ_UINT16 srcAlpha = s -> alpha; - // apply the alphatqmask - if (tqmask != 0) { - TQ_UINT8 U8_tqmask = *tqmask; + // apply the alphamask + if (mask != 0) { + TQ_UINT8 U8_mask = *mask; - if (U8_tqmask != OPACITY_OPAQUE) { - srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_tqmask)); + if (U8_mask != OPACITY_OPAQUE) { + srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_mask)); } - tqmask++; + mask++; } d -> alpha = UINT16_MULT(srcAlpha, d -> alpha); } @@ -467,7 +467,7 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, - const TQ_UINT8 *tqmask, + const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_UINT8 U8_opacity, TQ_INT32 rows, @@ -481,7 +481,7 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst, // Undefined == no composition break; case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_IN: //compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -510,16 +510,16 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst, //compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_MULT: - compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeMultiply(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DIVIDE: - compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDivide(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BUMPMAP: //compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: - compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, U8_opacity); break; case COMPOSITE_COPY_RED: //compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -554,22 +554,22 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst, // No composition. break; case COMPOSITE_DARKEN: - compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_LIGHTEN: - compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeLighten(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_HUE: - //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeHue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_SATURATION: - //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeSaturation(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_VALUE: - //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeValue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLOR: - //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeColor(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLORIZE: //compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -578,24 +578,24 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst, //compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_SCREEN: - compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeScreen(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_OVERLAY: - compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeOverlay(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ERASE: - compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DODGE: - compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDodge(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BURN: - compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeBurn(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ALPHA_DARKEN: abstractCompositeAlphaDarken<TQ_UINT16, U16Mult, Uint8ToU16, U16OpacityTest, PIXEL_ALPHA, xyz::MAX_CHANNEL_XYZ, xyz::MAX_CHANNEL_XYZA>( - dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, + dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity, U16Mult(), Uint8ToU16(), U16OpacityTest()); break; default: diff --git a/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.h b/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.h index 4a785825c..ae8aad866 100644 --- a/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.h +++ b/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.h @@ -43,7 +43,7 @@ public: }; public: - KisXyzColorSpace(KisColorSpaceFactoryRegistry * tqparent, + KisXyzColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p); virtual ~KisXyzColorSpace(); @@ -87,16 +87,16 @@ public: KisCompositeOpList userVisiblecompositeOps() const; protected: - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); private: diff --git a/chalk/chalkcolor/kis_abstract_colorspace.cc b/chalk/chalkcolor/kis_abstract_colorspace.cc index f532f18eb..f81d6b335 100644 --- a/chalk/chalkcolor/kis_abstract_colorspace.cc +++ b/chalk/chalkcolor/kis_abstract_colorspace.cc @@ -63,9 +63,9 @@ class KisColorAdjustmentImpl : public KisColorAdjustment KisAbstractColorSpace::KisAbstractColorSpace(const KisID& id, DWORD cmType, icColorSpaceSignature colorSpaceSignature, - KisColorSpaceFactoryRegistry * tqparent, + KisColorSpaceFactoryRegistry * parent, KisProfile *p) - : m_parent( tqparent ) + : m_parent( parent ) , m_profile( p ) , m_id( id ) , m_cmType( cmType ) diff --git a/chalk/chalkcolor/kis_abstract_colorspace.h b/chalk/chalkcolor/kis_abstract_colorspace.h index 732918d46..67f3c595b 100644 --- a/chalk/chalkcolor/kis_abstract_colorspace.h +++ b/chalk/chalkcolor/kis_abstract_colorspace.h @@ -53,13 +53,13 @@ public: * @param id The unique human and machine readable identifiation of this colorspace * @param cmType the lcms type indentification for this colorspace, may be 0 * @param colorSpaceSignature the icc identification for this colorspace, may be 0 - * @param tqparent the registry that owns this instance + * @param parent the registry that owns this instance * @param profile the profile this colorspace uses for transforms */ KisAbstractColorSpace(const KisID & id, DWORD cmType, icColorSpaceSignature colorSpaceSignature, - KisColorSpaceFactoryRegistry * tqparent, + KisColorSpaceFactoryRegistry * parent, KisProfile *profile); void init(); @@ -229,7 +229,7 @@ protected: const ColorType *src = reinterpret_cast<const ColorType*>(srcRowStart); ColorType *dst = reinterpret_cast<ColorType*>(dstRowStart); - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { @@ -237,12 +237,12 @@ protected: ColorType srcAlpha = src[AlphaPos]; ColorType dstAlpha = dst[AlphaPos]; - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = nativeMult(srcAlpha, uint8ToNative(*tqmask)); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = nativeMult(srcAlpha, uint8ToNative(*mask)); + mask++; } if (opacity != OPACITY_OPAQUE) { diff --git a/chalk/chalkcolor/kis_colorspace.h b/chalk/chalkcolor/kis_colorspace.h index 1ce2ac6a4..c1482df53 100644 --- a/chalk/chalkcolor/kis_colorspace.h +++ b/chalk/chalkcolor/kis_colorspace.h @@ -314,14 +314,14 @@ public: virtual void multiplyAlpha(TQ_UINT8 * pixels, TQ_UINT8 alpha, TQ_INT32 nPixels) = 0; /** - * Applies the specified 8-bit alpha tqmask to the pixels. We assume that there are just + * Applies the specified 8-bit alpha mask to the pixels. We assume that there are just * as many alpha values as pixels but we do not check this; the alpha values * are assumed to be 8-bits. */ virtual void applyAlphaU8Mask(TQ_UINT8 * pixels, TQ_UINT8 * alpha, TQ_INT32 nPixels) = 0; /** - * Applies the inverted 8-bit alpha tqmask to the pixels. We assume that there are just + * Applies the inverted 8-bit alpha mask to the pixels. We assume that there are just * as many alpha values as pixels but we do not check this; the alpha values * are assumed to be 8-bits. */ @@ -436,7 +436,7 @@ public: virtual icColorSpaceSignature colorSpaceSignature() = 0; - virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *) = 0; + virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *) = 0; /** * Returns the default icc profile for use with this colorspace. This may be "" diff --git a/chalk/chalkcolor/kis_colorspace_iface.cc b/chalk/chalkcolor/kis_colorspace_iface.cc index 6e6b3cb86..d2462c0c9 100644 --- a/chalk/chalkcolor/kis_colorspace_iface.cc +++ b/chalk/chalkcolor/kis_colorspace_iface.cc @@ -24,10 +24,10 @@ #include <dcopclient.h> -KisColorSpaceIface::KisColorSpaceIface( KisColorSpace * tqparent ) - : DCOPObject(tqparent->id().id().latin1()) +KisColorSpaceIface::KisColorSpaceIface( KisColorSpace * parent ) + : DCOPObject(parent->id().id().latin1()) { - m_parent = tqparent; + m_parent = parent; } TQByteArray KisColorSpaceIface::invertColor(TQByteArray src, TQ_INT32 nPixels) diff --git a/chalk/chalkcolor/kis_colorspace_iface.h b/chalk/chalkcolor/kis_colorspace_iface.h index ce52e8469..3c1321276 100644 --- a/chalk/chalkcolor/kis_colorspace_iface.h +++ b/chalk/chalkcolor/kis_colorspace_iface.h @@ -30,7 +30,7 @@ class KisColorSpaceIface : public DCOPObject { K_DCOP public: - KisColorSpaceIface( KisColorSpace * tqparent ); + KisColorSpaceIface( KisColorSpace * parent ); k_dcop: TQByteArray invertColor(TQByteArray src, TQ_INT32 nPixels); diff --git a/chalk/chalkcolor/kis_f16half_base_colorspace.h b/chalk/chalkcolor/kis_f16half_base_colorspace.h index ff1dbf8c5..802175ac6 100644 --- a/chalk/chalkcolor/kis_f16half_base_colorspace.h +++ b/chalk/chalkcolor/kis_f16half_base_colorspace.h @@ -63,9 +63,9 @@ class KisF16HalfBaseColorSpace : public KisAbstractColorSpace { public: KisF16HalfBaseColorSpace(const KisID & id, DWORD cmType, icColorSpaceSignature colorSpaceSignature, - KisColorSpaceFactoryRegistry * tqparent, + KisColorSpaceFactoryRegistry * parent, KisProfile *p) - : KisAbstractColorSpace(id, cmType, colorSpaceSignature, tqparent, p) + : KisAbstractColorSpace(id, cmType, colorSpaceSignature, parent, p) { m_alphaSize = sizeof(half); }; diff --git a/chalk/chalkcolor/kis_f32_base_colorspace.h b/chalk/chalkcolor/kis_f32_base_colorspace.h index 60ecb9aa6..06efa65fb 100644 --- a/chalk/chalkcolor/kis_f32_base_colorspace.h +++ b/chalk/chalkcolor/kis_f32_base_colorspace.h @@ -58,8 +58,8 @@ class KisF32BaseColorSpace : public KisAbstractColorSpace { public: - KisF32BaseColorSpace(const KisID & id, DWORD cmType, icColorSpaceSignature colorSpaceSignature, KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) - : KisAbstractColorSpace(id, cmType, colorSpaceSignature, tqparent, p) + KisF32BaseColorSpace(const KisID & id, DWORD cmType, icColorSpaceSignature colorSpaceSignature, KisColorSpaceFactoryRegistry * parent, KisProfile *p) + : KisAbstractColorSpace(id, cmType, colorSpaceSignature, parent, p) { m_alphaSize = sizeof(float); }; diff --git a/chalk/chalkcolor/kis_u16_base_colorspace.h b/chalk/chalkcolor/kis_u16_base_colorspace.h index 756ab9b53..46f0939d0 100644 --- a/chalk/chalkcolor/kis_u16_base_colorspace.h +++ b/chalk/chalkcolor/kis_u16_base_colorspace.h @@ -37,10 +37,10 @@ public: public: KisU16BaseColorSpace(const KisID & id, DWORD cmType, icColorSpaceSignature colorSpaceSignature, - KisColorSpaceFactoryRegistry * tqparent, + KisColorSpaceFactoryRegistry * parent, KisProfile *p) : KisAbstractColorSpace(id, cmType, colorSpaceSignature, - tqparent, + parent, p) { m_alphaSize = sizeof(TQ_UINT16); diff --git a/chalk/chalkcolor/kis_u8_base_colorspace.h b/chalk/chalkcolor/kis_u8_base_colorspace.h index 098a1f59c..997a0c839 100644 --- a/chalk/chalkcolor/kis_u8_base_colorspace.h +++ b/chalk/chalkcolor/kis_u8_base_colorspace.h @@ -34,9 +34,9 @@ class KisU8BaseColorSpace : public KisAbstractColorSpace { public: KisU8BaseColorSpace(const KisID & id, DWORD cmType, icColorSpaceSignature colorSpaceSignature, - KisColorSpaceFactoryRegistry * tqparent, + KisColorSpaceFactoryRegistry * parent, KisProfile *p) - : KisAbstractColorSpace(id, cmType, colorSpaceSignature, tqparent, p) + : KisAbstractColorSpace(id, cmType, colorSpaceSignature, parent, p) { m_alphaSize = sizeof(TQ_UINT8); }; diff --git a/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.cc b/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.cc index d694133e5..74c8f1656 100644 --- a/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.cc +++ b/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.cc @@ -34,14 +34,14 @@ typedef KGenericFactory<CMYKU16Plugin> CMYKU16PluginFactory; K_EXPORT_COMPONENT_FACTORY( chalk_cmyk_u16_plugin, CMYKU16PluginFactory( "chalk" ) ) -CMYKU16Plugin::CMYKU16Plugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +CMYKU16Plugin::CMYKU16Plugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(CMYKU16PluginFactory::instance()); - if ( tqparent->inherits("KisColorSpaceFactoryRegistry") ) + if ( parent->inherits("KisColorSpaceFactoryRegistry") ) { - KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( tqparent ); + KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( parent ); KisColorSpace * colorSpaceCMYKU16 = new KisCmykU16ColorSpace(f, 0); KisColorSpaceFactory * csf = new KisCmykU16ColorSpaceFactory(); diff --git a/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.h b/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.h index 07224a141..0a38b98ec 100644 --- a/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.h +++ b/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.h @@ -29,7 +29,7 @@ class CMYKU16Plugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - CMYKU16Plugin(TQObject *tqparent, const char *name, const TQStringList &); + CMYKU16Plugin(TQObject *parent, const char *name, const TQStringList &); virtual ~CMYKU16Plugin(); }; diff --git a/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc b/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc index 58ed38576..4799a92a2 100644 --- a/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc +++ b/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc @@ -40,8 +40,8 @@ namespace { const TQ_INT32 MAX_CHANNEL_CMYKA = 5; } -KisCmykU16ColorSpace::KisCmykU16ColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) : - KisU16BaseColorSpace(KisID("CMYKA16", i18n("CMYK (16-bit integer/channel)")), TYPE_CMYK5_16, icSigCmykData, tqparent, p) +KisCmykU16ColorSpace::KisCmykU16ColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) : + KisU16BaseColorSpace(KisID("CMYKA16", i18n("CMYK (16-bit integer/channel)")), TYPE_CMYK5_16, icSigCmykData, parent, p) { m_channels.push_back(new KisChannelInfo(i18n("Cyan"), i18n("C"), 0 * sizeof(TQ_UINT16), KisChannelInfo::COLOR, KisChannelInfo::UINT16, sizeof(TQ_UINT16), TQt::cyan)); m_channels.push_back(new KisChannelInfo(i18n("Magenta"), i18n("M"), 1 * sizeof(TQ_UINT16), KisChannelInfo::COLOR, KisChannelInfo::UINT16, sizeof(TQ_UINT16), TQt::magenta)); @@ -216,21 +216,21 @@ void KisCmykU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart); TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart); - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { TQ_UINT16 srcAlpha = src[PIXEL_ALPHA]; - // apply the alphatqmask - if (tqmask != 0) { - TQ_UINT8 U8_tqmask = *tqmask; + // apply the alphamask + if (mask != 0) { + TQ_UINT8 U8_mask = *mask; - if (U8_tqmask != OPACITY_OPAQUE) { - srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_tqmask)); + if (U8_mask != OPACITY_OPAQUE) { + srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_mask)); } - tqmask++; + mask++; } if (srcAlpha != U16_OPACITY_TRANSPARENT) { @@ -290,7 +290,7 @@ void KisCmykU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart); \ TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart); \ TQ_INT32 columns = numColumns; \ - const TQ_UINT8 *tqmask = maskRowStart; \ + const TQ_UINT8 *mask = maskRowStart; \ \ while (columns > 0) { \ \ @@ -299,13 +299,13 @@ void KisCmykU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS \ srcAlpha = TQMIN(srcAlpha, dstAlpha); \ \ - if (tqmask != 0) { \ - TQ_UINT8 U8_tqmask = *tqmask; \ + if (mask != 0) { \ + TQ_UINT8 U8_mask = *mask; \ \ - if (U8_tqmask != OPACITY_OPAQUE) { \ - srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_tqmask)); \ + if (U8_mask != OPACITY_OPAQUE) { \ + srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_mask)); \ } \ - tqmask++; \ + mask++; \ } \ \ if (srcAlpha != U16_OPACITY_TRANSPARENT) { \ @@ -528,20 +528,20 @@ void KisCmykU16ColorSpace::compositeErase(TQ_UINT8 *dst, { const Pixel *s = reinterpret_cast<const Pixel *>(src); Pixel *d = reinterpret_cast<Pixel *>(dst); - const TQ_UINT8 *tqmask = srcAlphaMask; + const TQ_UINT8 *mask = srcAlphaMask; for (TQ_INT32 i = cols; i > 0; i--, s++, d++) { TQ_UINT16 srcAlpha = s->alpha; - // apply the alphatqmask - if (tqmask != 0) { - TQ_UINT8 U8_tqmask = *tqmask; + // apply the alphamask + if (mask != 0) { + TQ_UINT8 U8_mask = *mask; - if (U8_tqmask != OPACITY_OPAQUE) { - srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_tqmask)); + if (U8_mask != OPACITY_OPAQUE) { + srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_mask)); } - tqmask++; + mask++; } d->alpha = UINT16_MULT(srcAlpha, d->alpha); } @@ -559,7 +559,7 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, - const TQ_UINT8 *tqmask, + const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_UINT8 U8_opacity, TQ_INT32 rows, @@ -573,7 +573,7 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst, // Undefined == no composition break; case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_IN: //compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -602,16 +602,16 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst, //compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_MULT: - compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeMultiply(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DIVIDE: - compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDivide(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BUMPMAP: //compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: - compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, U8_opacity); break; case COMPOSITE_COPY_CYAN: //compositeCopyCyan(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -646,22 +646,22 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst, // No composition. break; case COMPOSITE_DARKEN: - compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_LIGHTEN: - compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeLighten(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_HUE: - //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeHue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_SATURATION: - //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeSaturation(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_VALUE: - //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeValue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLOR: - //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeColor(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLORIZE: //compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -670,24 +670,24 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst, //compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_SCREEN: - compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeScreen(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_OVERLAY: - compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeOverlay(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ERASE: - compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DODGE: - compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDodge(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BURN: - compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeBurn(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ALPHA_DARKEN: abstractCompositeAlphaDarken<TQ_UINT16, U16Mult, Uint8ToU16, U16OpacityTest, PIXEL_ALPHA, MAX_CHANNEL_CMYK, MAX_CHANNEL_CMYKA>( - dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, + dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity, U16Mult(), Uint8ToU16(), U16OpacityTest()); break; default: diff --git a/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.h b/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.h index c617607c7..8acea2819 100644 --- a/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.h +++ b/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.h @@ -39,7 +39,7 @@ public: }; public: - KisCmykU16ColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p); + KisCmykU16ColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p); virtual ~KisCmykU16ColorSpace(); virtual bool willDegrade(ColorSpaceIndependence independence) @@ -78,16 +78,16 @@ protected: TQ_INT32 cols, const KisCompositeOp& op); - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); private: friend class KisCmykU16ColorSpaceTester; @@ -115,7 +115,7 @@ public: virtual icColorSpaceSignature colorSpaceSignature() { return icSigCmykData; }; - virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisCmykU16ColorSpace(tqparent, p); }; + virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisCmykU16ColorSpace(parent, p); }; virtual TQString defaultProfile() { return "Offset printing, according to ISO/DIS 12647-2:2004, OFCOM, paper type 1 or 2 = coated art, 115 g/m2, screen ruling 60 cm-1, positive-acting plates"; }; }; diff --git a/chalk/colorspaces/cmyk_u8/cmyk_plugin.cc b/chalk/colorspaces/cmyk_u8/cmyk_plugin.cc index 686a22bfa..6e349ad5c 100644 --- a/chalk/colorspaces/cmyk_u8/cmyk_plugin.cc +++ b/chalk/colorspaces/cmyk_u8/cmyk_plugin.cc @@ -39,13 +39,13 @@ typedef KGenericFactory<CMYKPlugin> CMYKPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkcmykplugin, CMYKPluginFactory( "chalk" ) ) -CMYKPlugin::CMYKPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +CMYKPlugin::CMYKPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(CMYKPluginFactory::instance()); - if ( tqparent->inherits("KisColorSpaceFactoryRegistry") ) + if ( parent->inherits("KisColorSpaceFactoryRegistry") ) { - KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( tqparent ); + KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( parent ); KisColorSpace * colorSpaceCMYK = new KisCmykColorSpace(f, 0); KisColorSpaceFactory * csf = new KisCmykColorSpaceFactory(); diff --git a/chalk/colorspaces/cmyk_u8/cmyk_plugin.h b/chalk/colorspaces/cmyk_u8/cmyk_plugin.h index 073a5e613..a43b04bb5 100644 --- a/chalk/colorspaces/cmyk_u8/cmyk_plugin.h +++ b/chalk/colorspaces/cmyk_u8/cmyk_plugin.h @@ -29,7 +29,7 @@ class CMYKPlugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - CMYKPlugin(TQObject *tqparent, const char *name, const TQStringList &); + CMYKPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~CMYKPlugin(); diff --git a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc index bfe85f0d8..359c22c5c 100644 --- a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc +++ b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc @@ -37,8 +37,8 @@ namespace cmyk { const TQ_INT32 MAX_CHANNEL_CMYKA = 5; } -KisCmykColorSpace::KisCmykColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) : - KisU8BaseColorSpace(KisID("CMYK", i18n("CMYK")), TYPE_CMYK5_8, icSigCmykData, tqparent, p) +KisCmykColorSpace::KisCmykColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) : + KisU8BaseColorSpace(KisID("CMYK", i18n("CMYK")), TYPE_CMYK5_8, icSigCmykData, parent, p) { m_channels.push_back(new KisChannelInfo(i18n("Cyan"), i18n("C"), 0, KisChannelInfo::COLOR, KisChannelInfo::UINT8, 1, TQt::cyan)); m_channels.push_back(new KisChannelInfo(i18n("Magenta"), i18n("M"), 1, KisChannelInfo::COLOR, KisChannelInfo::UINT8, 1, TQt::magenta)); @@ -214,21 +214,21 @@ void KisCmykColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { TQ_UINT8 srcAlpha = src[PIXEL_CMYK_ALPHA]; - // apply the alphatqmask - if (tqmask != 0) { - TQ_UINT8 U8_tqmask = *tqmask; + // apply the alphamask + if (mask != 0) { + TQ_UINT8 U8_mask = *mask; - if (U8_tqmask != OPACITY_OPAQUE) { - srcAlpha = UINT8_MULT(srcAlpha, U8_tqmask); + if (U8_mask != OPACITY_OPAQUE) { + srcAlpha = UINT8_MULT(srcAlpha, U8_mask); } - tqmask++; + mask++; } if (srcAlpha != OPACITY_TRANSPARENT) { @@ -288,7 +288,7 @@ void KisCmykColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri const TQ_UINT8 *src = srcRowStart; \ TQ_UINT8 *dst = dstRowStart; \ TQ_INT32 columns = numColumns; \ - const TQ_UINT8 *tqmask = maskRowStart; \ + const TQ_UINT8 *mask = maskRowStart; \ \ while (columns > 0) { \ \ @@ -297,13 +297,13 @@ void KisCmykColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri \ srcAlpha = TQMIN(srcAlpha, dstAlpha); \ \ - if (tqmask != 0) { \ - TQ_UINT8 U8_tqmask = *tqmask; \ + if (mask != 0) { \ + TQ_UINT8 U8_mask = *mask; \ \ - if (U8_tqmask != OPACITY_OPAQUE) { \ - srcAlpha = UINT8_MULT(srcAlpha, U8_tqmask); \ + if (U8_mask != OPACITY_OPAQUE) { \ + srcAlpha = UINT8_MULT(srcAlpha, U8_mask); \ } \ - tqmask++; \ + mask++; \ } \ \ if (srcAlpha != OPACITY_TRANSPARENT) { \ @@ -526,20 +526,20 @@ void KisCmykColorSpace::compositeErase(TQ_UINT8 *dst, { const Pixel *s = reinterpret_cast<const Pixel *>(src); Pixel *d = reinterpret_cast<Pixel *>(dst); - const TQ_UINT8 *tqmask = srcAlphaMask; + const TQ_UINT8 *mask = srcAlphaMask; for (TQ_INT32 i = cols; i > 0; i--, s++, d++) { TQ_UINT8 srcAlpha = s->alpha; - // apply the alphatqmask - if (tqmask != 0) { - TQ_UINT8 U8_tqmask = *tqmask; + // apply the alphamask + if (mask != 0) { + TQ_UINT8 U8_mask = *mask; - if (U8_tqmask != OPACITY_OPAQUE) { - srcAlpha = UINT8_BLEND(srcAlpha, OPACITY_OPAQUE, U8_tqmask); + if (U8_mask != OPACITY_OPAQUE) { + srcAlpha = UINT8_BLEND(srcAlpha, OPACITY_OPAQUE, U8_mask); } - tqmask++; + mask++; } d->alpha = UINT8_MULT(srcAlpha, d->alpha); } @@ -556,7 +556,7 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, - const TQ_UINT8 *tqmask, + const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, @@ -569,7 +569,7 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst, // Undefined == no composition break; case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_IN: //compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -598,16 +598,16 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst, //compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_MULT: - compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeMultiply(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DIVIDE: - compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDivide(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BUMPMAP: //compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: - compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COPY_CYAN: //compositeCopyCyan(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -642,22 +642,22 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst, // No composition. break; case COMPOSITE_DARKEN: - compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_LIGHTEN: - compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeLighten(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_HUE: - //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeHue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_SATURATION: - //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeSaturation(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_VALUE: - //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeValue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLOR: - //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeColor(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLORIZE: //compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -666,24 +666,24 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst, //compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_SCREEN: - compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeScreen(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_OVERLAY: - compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeOverlay(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ERASE: - compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DODGE: - compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDodge(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BURN: - compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeBurn(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ALPHA_DARKEN: abstractCompositeAlphaDarken<TQ_UINT8, U8Mult, Uint8ToU8, U8OpacityTest, PIXEL_CMYK_ALPHA, cmyk::MAX_CHANNEL_CMYK, cmyk::MAX_CHANNEL_CMYKA>( - dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, + dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity, U8Mult(), Uint8ToU8(), U8OpacityTest()); break; default: diff --git a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.h b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.h index a77239159..b3806bc44 100644 --- a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.h +++ b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.h @@ -37,7 +37,7 @@ public: TQ_UINT16 alpha; }; public: - KisCmykColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p); + KisCmykColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p); virtual ~KisCmykColorSpace(); @@ -80,16 +80,16 @@ protected: TQ_INT32 cols, const KisCompositeOp& op); - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); private: @@ -118,7 +118,7 @@ public: virtual icColorSpaceSignature colorSpaceSignature() { return icSigCmykData; }; - virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisCmykColorSpace(tqparent, p); }; + virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisCmykColorSpace(parent, p); }; virtual TQString defaultProfile() { return "Offset printing, according to ISO/DIS 12647-2:2004, OFCOM, paper type 1 or 2 = coated art, 115 g/m2, screen ruling 60 cm-1, positive-acting plates"; }; // Do not i18n -- this is from a data file }; diff --git a/chalk/colorspaces/gray_u16/gray_u16_plugin.cc b/chalk/colorspaces/gray_u16/gray_u16_plugin.cc index 436caf5db..bfb68e8cb 100644 --- a/chalk/colorspaces/gray_u16/gray_u16_plugin.cc +++ b/chalk/colorspaces/gray_u16/gray_u16_plugin.cc @@ -35,14 +35,14 @@ typedef KGenericFactory<GRAYU16Plugin> GRAYU16PluginFactory; K_EXPORT_COMPONENT_FACTORY( chalk_gray_u16_plugin, GRAYU16PluginFactory( "chalk" ) ) -GRAYU16Plugin::GRAYU16Plugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +GRAYU16Plugin::GRAYU16Plugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(GRAYU16PluginFactory::instance()); - if ( tqparent->inherits("KisColorSpaceFactoryRegistry") ) + if ( parent->inherits("KisColorSpaceFactoryRegistry") ) { - KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( tqparent ); + KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( parent ); KisColorSpace * colorSpaceGRAYU16 = new KisGrayU16ColorSpace(f, 0); KisColorSpaceFactory * csf = new KisGrayU16ColorSpaceFactory(); diff --git a/chalk/colorspaces/gray_u16/gray_u16_plugin.h b/chalk/colorspaces/gray_u16/gray_u16_plugin.h index 39ef6c2ac..3d16c1acd 100644 --- a/chalk/colorspaces/gray_u16/gray_u16_plugin.h +++ b/chalk/colorspaces/gray_u16/gray_u16_plugin.h @@ -29,7 +29,7 @@ class GRAYU16Plugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - GRAYU16Plugin(TQObject *tqparent, const char *name, const TQStringList &); + GRAYU16Plugin(TQObject *parent, const char *name, const TQStringList &); virtual ~GRAYU16Plugin(); }; diff --git a/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc b/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc index 4e50b1c20..34cf991ab 100644 --- a/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc +++ b/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc @@ -39,8 +39,8 @@ namespace { const TQ_INT32 MAX_CHANNEL_GRAYA = 2; } -KisGrayU16ColorSpace::KisGrayU16ColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) : - KisU16BaseColorSpace(KisID("GRAYA16", i18n("Grayscale (16-bit integer/channel)")), TYPE_GRAYA_16, icSigGrayData, tqparent, p) +KisGrayU16ColorSpace::KisGrayU16ColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) : + KisU16BaseColorSpace(KisID("GRAYA16", i18n("Grayscale (16-bit integer/channel)")), TYPE_GRAYA_16, icSigGrayData, parent, p) { m_channels.push_back(new KisChannelInfo(i18n("Gray"), i18n("G"), PIXEL_GRAY * sizeof(TQ_UINT16), KisChannelInfo::COLOR, KisChannelInfo::UINT16, sizeof(TQ_UINT16))); m_channels.push_back(new KisChannelInfo(i18n("Alpha"), i18n("A"), PIXEL_ALPHA * sizeof(TQ_UINT16), KisChannelInfo::ALPHA, KisChannelInfo::UINT16, sizeof(TQ_UINT16))); @@ -167,21 +167,21 @@ void KisGrayU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart); TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart); - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { TQ_UINT16 srcAlpha = src[PIXEL_ALPHA]; - // apply the alphatqmask - if (tqmask != 0) { - TQ_UINT8 U8_tqmask = *tqmask; + // apply the alphamask + if (mask != 0) { + TQ_UINT8 U8_mask = *mask; - if (U8_tqmask != OPACITY_OPAQUE) { - srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_tqmask)); + if (U8_mask != OPACITY_OPAQUE) { + srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_mask)); } - tqmask++; + mask++; } if (srcAlpha != U16_OPACITY_TRANSPARENT) { @@ -238,7 +238,7 @@ void KisGrayU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart); \ TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart); \ TQ_INT32 columns = numColumns; \ - const TQ_UINT8 *tqmask = maskRowStart; \ + const TQ_UINT8 *mask = maskRowStart; \ \ while (columns > 0) { \ \ @@ -247,13 +247,13 @@ void KisGrayU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS \ srcAlpha = TQMIN(srcAlpha, dstAlpha); \ \ - if (tqmask != 0) { \ - TQ_UINT8 U8_tqmask = *tqmask; \ + if (mask != 0) { \ + TQ_UINT8 U8_mask = *mask; \ \ - if (U8_tqmask != OPACITY_OPAQUE) { \ - srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_tqmask)); \ + if (U8_mask != OPACITY_OPAQUE) { \ + srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_mask)); \ } \ - tqmask++; \ + mask++; \ } \ \ if (srcAlpha != U16_OPACITY_TRANSPARENT) { \ @@ -473,20 +473,20 @@ void KisGrayU16ColorSpace::compositeErase(TQ_UINT8 *dst, { const Pixel *s = reinterpret_cast<const Pixel *>(src); Pixel *d = reinterpret_cast<Pixel *>(dst); - const TQ_UINT8 *tqmask = srcAlphaMask; + const TQ_UINT8 *mask = srcAlphaMask; for (TQ_INT32 i = cols; i > 0; i--, s++, d++) { TQ_UINT16 srcAlpha = s->alpha; - // apply the alphatqmask - if (tqmask != 0) { - TQ_UINT8 U8_tqmask = *tqmask; + // apply the alphamask + if (mask != 0) { + TQ_UINT8 U8_mask = *mask; - if (U8_tqmask != OPACITY_OPAQUE) { - srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_tqmask)); + if (U8_mask != OPACITY_OPAQUE) { + srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_mask)); } - tqmask++; + mask++; } d->alpha = UINT16_MULT(srcAlpha, d->alpha); } @@ -503,7 +503,7 @@ void KisGrayU16ColorSpace::bitBlt(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, - const TQ_UINT8 *tqmask, + const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_UINT8 U8_opacity, TQ_INT32 rows, @@ -517,7 +517,7 @@ void KisGrayU16ColorSpace::bitBlt(TQ_UINT8 *dst, // Undefined == no composition break; case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_IN: //compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -546,16 +546,16 @@ void KisGrayU16ColorSpace::bitBlt(TQ_UINT8 *dst, //compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_MULT: - compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeMultiply(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DIVIDE: - compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDivide(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BUMPMAP: //compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: - compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, U8_opacity); break; case COMPOSITE_COPY_RED: //compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -590,22 +590,22 @@ void KisGrayU16ColorSpace::bitBlt(TQ_UINT8 *dst, // No composition. break; case COMPOSITE_DARKEN: - compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_LIGHTEN: - compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeLighten(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_HUE: - //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeHue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_SATURATION: - //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeSaturation(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_VALUE: - //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeValue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLOR: - //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + //compositeColor(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLORIZE: //compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -614,24 +614,24 @@ void KisGrayU16ColorSpace::bitBlt(TQ_UINT8 *dst, //compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_SCREEN: - compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeScreen(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_OVERLAY: - compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeOverlay(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ERASE: - compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DODGE: - compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDodge(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BURN: - compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeBurn(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ALPHA_DARKEN: abstractCompositeAlphaDarken<TQ_UINT16, U16Mult, Uint8ToU16, U16OpacityTest, PIXEL_ALPHA, MAX_CHANNEL_GRAY, MAX_CHANNEL_GRAYA>( - dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, + dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity, U16Mult(), Uint8ToU16(), U16OpacityTest()); break; default: diff --git a/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.h b/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.h index eeec10a7c..0acecd0b1 100644 --- a/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.h +++ b/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.h @@ -46,7 +46,7 @@ public: public: - KisGrayU16ColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p); + KisGrayU16ColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p); virtual ~KisGrayU16ColorSpace(); public: @@ -76,16 +76,16 @@ protected: TQ_INT32 cols, const KisCompositeOp& op); - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); private: friend class KisGrayU16ColorSpaceTester; @@ -110,7 +110,7 @@ public: virtual icColorSpaceSignature colorSpaceSignature() { return icSigGrayData; }; - virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisGrayU16ColorSpace(tqparent, p); }; + virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisGrayU16ColorSpace(parent, p); }; virtual TQString defaultProfile() { return "gray built-in - (lcms internal)"; }; }; diff --git a/chalk/colorspaces/gray_u8/gray_plugin.cc b/chalk/colorspaces/gray_u8/gray_plugin.cc index 0028c5978..c0a207b38 100644 --- a/chalk/colorspaces/gray_u8/gray_plugin.cc +++ b/chalk/colorspaces/gray_u8/gray_plugin.cc @@ -37,16 +37,16 @@ typedef KGenericFactory<GrayPlugin> GrayPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkgrayplugin, GrayPluginFactory( "chalkcore" ) ) -GrayPlugin::GrayPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +GrayPlugin::GrayPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(GrayPluginFactory::instance()); // This is not a gui plugin; only load it when the doc is created. - if ( tqparent->inherits("KisColorSpaceFactoryRegistry") ) + if ( parent->inherits("KisColorSpaceFactoryRegistry") ) { - KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( tqparent ); + KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( parent ); // .22 gamma grayscale or something like that. Taken from the lcms tutorial... LPGAMMATABLE Gamma = cmsBuildGamma(256, 2.2); diff --git a/chalk/colorspaces/gray_u8/gray_plugin.h b/chalk/colorspaces/gray_u8/gray_plugin.h index f18bf77c5..b32609710 100644 --- a/chalk/colorspaces/gray_u8/gray_plugin.h +++ b/chalk/colorspaces/gray_u8/gray_plugin.h @@ -29,7 +29,7 @@ class GrayPlugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - GrayPlugin(TQObject *tqparent, const char *name, const TQStringList &); + GrayPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~GrayPlugin(); }; diff --git a/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc b/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc index 59b70f777..a913dc496 100644 --- a/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc +++ b/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc @@ -43,8 +43,8 @@ namespace { const TQ_INT32 MAX_CHANNEL_GRAYSCALEA = 2; } -KisGrayColorSpace::KisGrayColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) : - KisU8BaseColorSpace(KisID("GRAYA", i18n("Grayscale")), TYPE_GRAYA_8, icSigGrayData, tqparent, p) +KisGrayColorSpace::KisGrayColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) : + KisU8BaseColorSpace(KisID("GRAYA", i18n("Grayscale")), TYPE_GRAYA_8, icSigGrayData, parent, p) { m_channels.push_back(new KisChannelInfo(i18n("Gray"), i18n("G"), 0, KisChannelInfo::COLOR, KisChannelInfo::UINT8)); m_channels.push_back(new KisChannelInfo(i18n("Alpha"), i18n("A"), 1, KisChannelInfo::ALPHA, KisChannelInfo::UINT8)); @@ -199,7 +199,7 @@ void KisGrayColorSpace::bitBlt(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, - const TQ_UINT8 *tqmask, + const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, @@ -208,37 +208,37 @@ void KisGrayColorSpace::bitBlt(TQ_UINT8 *dst, { switch (op.op()) { case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_MULT: - compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeMultiply(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DIVIDE: - compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDivide(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DARKEN: - compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_LIGHTEN: - compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeLighten(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_SCREEN: - compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeScreen(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_OVERLAY: - compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeOverlay(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DODGE: - compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDodge(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BURN: - compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeBurn(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ERASE: - compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: - compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_CLEAR: { TQ_UINT8 *d; @@ -253,7 +253,7 @@ void KisGrayColorSpace::bitBlt(TQ_UINT8 *dst, } break; case COMPOSITE_ALPHA_DARKEN: - compositeAlphaDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeAlphaDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; default: @@ -285,18 +285,18 @@ void KisGrayColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; while (columns > 0) { TQ_UINT8 srcAlpha = src[PIXEL_GRAY_ALPHA]; - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_MULT(srcAlpha, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_MULT(srcAlpha, *mask); + mask++; } if (srcAlpha != OPACITY_TRANSPARENT) { @@ -353,7 +353,7 @@ void KisGrayColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; while (columns > 0) { @@ -362,12 +362,12 @@ void KisGrayColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow srcAlpha = TQMIN(srcAlpha, dstAlpha); - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_MULT(srcAlpha, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_MULT(srcAlpha, *mask); + mask++; } if (srcAlpha != OPACITY_TRANSPARENT) { @@ -419,7 +419,7 @@ void KisGrayColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; while (columns > 0) { @@ -428,12 +428,12 @@ void KisGrayColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt srcAlpha = TQMIN(srcAlpha, dstAlpha); - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_MULT(srcAlpha, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_MULT(srcAlpha, *mask); + mask++; } if (srcAlpha != OPACITY_TRANSPARENT) { @@ -490,7 +490,7 @@ void KisGrayColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; while (columns > 0) { @@ -499,12 +499,12 @@ void KisGrayColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt srcAlpha = TQMIN(srcAlpha, dstAlpha); - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_MULT(srcAlpha, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_MULT(srcAlpha, *mask); + mask++; } if (srcAlpha != OPACITY_TRANSPARENT) { @@ -561,7 +561,7 @@ void KisGrayColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; while (columns > 0) { @@ -570,12 +570,12 @@ void KisGrayColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS srcAlpha = TQMIN(srcAlpha, dstAlpha); - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_MULT(srcAlpha, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_MULT(srcAlpha, *mask); + mask++; } if (srcAlpha != OPACITY_TRANSPARENT) { @@ -632,7 +632,7 @@ void KisGrayColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; while (columns > 0) { @@ -641,12 +641,12 @@ void KisGrayColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr srcAlpha = TQMIN(srcAlpha, dstAlpha); - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_MULT(srcAlpha, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_MULT(srcAlpha, *mask); + mask++; } if (srcAlpha != OPACITY_TRANSPARENT) { @@ -703,7 +703,7 @@ void KisGrayColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; while (columns > 0) { @@ -712,12 +712,12 @@ void KisGrayColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri srcAlpha = TQMIN(srcAlpha, dstAlpha); - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_MULT(srcAlpha, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_MULT(srcAlpha, *mask); + mask++; } if (srcAlpha != OPACITY_TRANSPARENT) { @@ -775,7 +775,7 @@ void KisGrayColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; while (columns > 0) { @@ -784,12 +784,12 @@ void KisGrayColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt srcAlpha = TQMIN(srcAlpha, dstAlpha); - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_MULT(srcAlpha, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_MULT(srcAlpha, *mask); + mask++; } if (srcAlpha != OPACITY_TRANSPARENT) { @@ -846,7 +846,7 @@ void KisGrayColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; while (columns > 0) { @@ -855,12 +855,12 @@ void KisGrayColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS srcAlpha = TQMIN(srcAlpha, dstAlpha); - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_MULT(srcAlpha, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_MULT(srcAlpha, *mask); + mask++; } if (srcAlpha != OPACITY_TRANSPARENT) { @@ -927,17 +927,17 @@ void KisGrayColorSpace::compositeErase(TQ_UINT8 *dst, { const TQ_UINT8 *s = src; TQ_UINT8 *d = dst; - const TQ_UINT8 *tqmask = srcAlphaMask; + const TQ_UINT8 *mask = srcAlphaMask; for (i = cols; i > 0; i--, s+=MAX_CHANNEL_GRAYSCALEA, d+=MAX_CHANNEL_GRAYSCALEA) { srcAlpha = s[PIXEL_GRAY_ALPHA]; - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_BLEND(srcAlpha, OPACITY_OPAQUE, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_BLEND(srcAlpha, OPACITY_OPAQUE, *mask); + mask++; } d[PIXEL_GRAY_ALPHA] = UINT8_MULT(srcAlpha, d[PIXEL_GRAY_ALPHA]); } @@ -958,7 +958,7 @@ void KisGrayColorSpace::compositeAlphaDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dst const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { @@ -966,12 +966,12 @@ void KisGrayColorSpace::compositeAlphaDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dst TQ_UINT8 srcAlpha = src[PIXEL_GRAY_ALPHA]; TQ_UINT8 dstAlpha = dst[PIXEL_GRAY_ALPHA]; - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_MULT(srcAlpha, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_MULT(srcAlpha, *mask); + mask++; } if (opacity != OPACITY_OPAQUE) { diff --git a/chalk/colorspaces/gray_u8/kis_gray_colorspace.h b/chalk/colorspaces/gray_u8/kis_gray_colorspace.h index a46adcc0b..3f5724794 100644 --- a/chalk/colorspaces/gray_u8/kis_gray_colorspace.h +++ b/chalk/colorspaces/gray_u8/kis_gray_colorspace.h @@ -29,7 +29,7 @@ class KRITACORE_EXPORT KisGrayColorSpace : public KisU8BaseColorSpace { public: - KisGrayColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p); + KisGrayColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p); virtual ~KisGrayColorSpace(); virtual bool willDegrade(ColorSpaceIndependence /*independence*/) @@ -70,17 +70,17 @@ public: KisCompositeOpList userVisiblecompositeOps() const; protected: - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeAlphaDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeAlphaDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); private: @@ -106,7 +106,7 @@ public: virtual icColorSpaceSignature colorSpaceSignature() { return icSigGrayData; }; - virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisGrayColorSpace(tqparent, p); }; + virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisGrayColorSpace(parent, p); }; virtual TQString defaultProfile() { return "gray built-in - (lcms internal)"; }; }; diff --git a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc index 55054bc6c..ab4642ff1 100644 --- a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc +++ b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc @@ -48,8 +48,8 @@ namespace { #define F32_LCMS_TYPE TYPE_BGRA_16 // disable the lcms handling by setting profile=0 -KisLmsF32ColorSpace::KisLmsF32ColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile */*p*/) : - KisF32BaseColorSpace(KisID("LMSAF32", i18n("LMS (32-bit float/channel)")), F32_LCMS_TYPE, icSig3colorData, tqparent, 0) +KisLmsF32ColorSpace::KisLmsF32ColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile */*p*/) : + KisF32BaseColorSpace(KisID("LMSAF32", i18n("LMS (32-bit float/channel)")), F32_LCMS_TYPE, icSig3colorData, parent, 0) { m_channels.push_back(new KisChannelInfo(i18n("Long"), i18n("L"), PIXEL_LONGWAVE * sizeof(float), KisChannelInfo::COLOR, KisChannelInfo::FLOAT32, sizeof(float))); m_channels.push_back(new KisChannelInfo(i18n("Middle"), i18n("M"), PIXEL_MIDDLEWAVE * sizeof(float), KisChannelInfo::COLOR, KisChannelInfo::FLOAT32, sizeof(float))); @@ -226,21 +226,21 @@ void KisLmsF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt const float *src = reinterpret_cast<const float *>(srcRowStart); float *dst = reinterpret_cast<float *>(dstRowStart); - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { float srcAlpha = src[PIXEL_ALPHA]; - // apply the alphatqmask - if (tqmask != 0) { - TQ_UINT8 U8_tqmask = *tqmask; + // apply the alphamask + if (mask != 0) { + TQ_UINT8 U8_mask = *mask; - if (U8_tqmask != OPACITY_OPAQUE) { - srcAlpha *= UINT8_TO_FLOAT(U8_tqmask); + if (U8_mask != OPACITY_OPAQUE) { + srcAlpha *= UINT8_TO_FLOAT(U8_mask); } - tqmask++; + mask++; } if (srcAlpha > F32_OPACITY_TRANSPARENT + EPSILON) { @@ -307,20 +307,20 @@ void KisLmsF32ColorSpace::compositeErase(TQ_UINT8 *dst, { const Pixel *s = reinterpret_cast<const Pixel *>(src); Pixel *d = reinterpret_cast<Pixel *>(dst); - const TQ_UINT8 *tqmask = srcAlphaMask; + const TQ_UINT8 *mask = srcAlphaMask; for (TQ_INT32 i = cols; i > 0; i--, s++, d++) { float srcAlpha = s->alpha; - // apply the alphatqmask - if (tqmask != 0) { - TQ_UINT8 U8_tqmask = *tqmask; + // apply the alphamask + if (mask != 0) { + TQ_UINT8 U8_mask = *mask; - if (U8_tqmask != OPACITY_OPAQUE) { - srcAlpha = FLOAT_BLEND(srcAlpha, F32_OPACITY_OPAQUE, UINT8_TO_FLOAT(U8_tqmask)); + if (U8_mask != OPACITY_OPAQUE) { + srcAlpha = FLOAT_BLEND(srcAlpha, F32_OPACITY_OPAQUE, UINT8_TO_FLOAT(U8_mask)); } - tqmask++; + mask++; } d->alpha = srcAlpha * d->alpha; } @@ -348,7 +348,7 @@ void KisLmsF32ColorSpace::bitBlt(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, - const TQ_UINT8 *tqmask, + const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_UINT8 U8_opacity, TQ_INT32 rows, @@ -362,13 +362,13 @@ void KisLmsF32ColorSpace::bitBlt(TQ_UINT8 *dst, // Undefined == no composition break; case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: - compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ERASE: - compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; default: break; diff --git a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h index 468ac5e49..1c7666211 100644 --- a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h +++ b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h @@ -34,7 +34,7 @@ class KisColorSpaceFactoryRegistry; class KRITATOOL_EXPORT KisLmsF32ColorSpace : public KisF32BaseColorSpace { public: - KisLmsF32ColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p); + KisLmsF32ColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p); virtual ~KisLmsF32ColorSpace(); virtual bool willDegrade(ColorSpaceIndependence independence) @@ -87,9 +87,9 @@ protected: TQ_INT32 cols, const KisCompositeOp& op); - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); private: inline TQ_UINT8 computeRed(float l, float m, float s) const @@ -148,7 +148,7 @@ public: virtual icColorSpaceSignature colorSpaceSignature() { return icMaxEnumData; }; - virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisLmsF32ColorSpace(tqparent, p); }; + virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisLmsF32ColorSpace(parent, p); }; virtual TQString defaultProfile() { return "sRGB built-in - (lcms internal)"; }; }; diff --git a/chalk/colorspaces/lms_f32/lms_f32_plugin.cc b/chalk/colorspaces/lms_f32/lms_f32_plugin.cc index d137c8e82..f7e581ace 100644 --- a/chalk/colorspaces/lms_f32/lms_f32_plugin.cc +++ b/chalk/colorspaces/lms_f32/lms_f32_plugin.cc @@ -36,14 +36,14 @@ typedef KGenericFactory<LMSF32Plugin> LMSF32PluginFactory; K_EXPORT_COMPONENT_FACTORY( chalk_lms_f32_plugin, LMSF32PluginFactory( "chalk" ) ) -LMSF32Plugin::LMSF32Plugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +LMSF32Plugin::LMSF32Plugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(LMSF32PluginFactory::instance()); - if ( tqparent->inherits("KisColorSpaceFactoryRegistry") ) + if ( parent->inherits("KisColorSpaceFactoryRegistry") ) { - KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>(tqparent); + KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>(parent); KisColorSpace * colorSpaceLMSF32 = new KisLmsF32ColorSpace(f, 0); diff --git a/chalk/colorspaces/lms_f32/lms_f32_plugin.h b/chalk/colorspaces/lms_f32/lms_f32_plugin.h index 7d9229a69..6a2898824 100644 --- a/chalk/colorspaces/lms_f32/lms_f32_plugin.h +++ b/chalk/colorspaces/lms_f32/lms_f32_plugin.h @@ -31,7 +31,7 @@ class LMSF32Plugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - LMSF32Plugin(TQObject *tqparent, const char *name, const TQStringList &); + LMSF32Plugin(TQObject *parent, const char *name, const TQStringList &); virtual ~LMSF32Plugin(); }; diff --git a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc index 4ae8004b0..9e7f138ef 100644 --- a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc +++ b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc @@ -50,8 +50,8 @@ namespace { // FIXME: lcms doesn't support 16-bit float #define RGBAF16HALF_LCMS_TYPE TYPE_BGRA_16 -KisRgbF16HalfColorSpace::KisRgbF16HalfColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) : - KisF16HalfBaseColorSpace(KisID("RGBAF16HALF", i18n("RGB (16-bit float/channel)")), RGBAF16HALF_LCMS_TYPE, icSigRgbData, tqparent, p) +KisRgbF16HalfColorSpace::KisRgbF16HalfColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) : + KisF16HalfBaseColorSpace(KisID("RGBAF16HALF", i18n("RGB (16-bit float/channel)")), RGBAF16HALF_LCMS_TYPE, icSigRgbData, parent, p) { m_channels.push_back(new KisChannelInfo(i18n("Red"), i18n("R"), PIXEL_RED * sizeof(half), KisChannelInfo::COLOR, KisChannelInfo::FLOAT16, sizeof(half))); m_channels.push_back(new KisChannelInfo(i18n("Green"), i18n("G"), PIXEL_GREEN * sizeof(half), KisChannelInfo::COLOR, KisChannelInfo::FLOAT16, sizeof(half))); @@ -305,21 +305,21 @@ void KisRgbF16HalfColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstR const half *src = reinterpret_cast<const half *>(srcRowStart); half *dst = reinterpret_cast<half *>(dstRowStart); - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { half srcAlpha = src[PIXEL_ALPHA]; - // apply the alphatqmask - if (tqmask != 0) { - TQ_UINT8 U8_tqmask = *tqmask; + // apply the alphamask + if (mask != 0) { + TQ_UINT8 U8_mask = *mask; - if (U8_tqmask != OPACITY_OPAQUE) { - srcAlpha *= UINT8_TO_HALF(U8_tqmask); + if (U8_mask != OPACITY_OPAQUE) { + srcAlpha *= UINT8_TO_HALF(U8_mask); } - tqmask++; + mask++; } if (srcAlpha > F16HALF_OPACITY_TRANSPARENT + EPSILON) { @@ -378,7 +378,7 @@ void KisRgbF16HalfColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstR const half *src = reinterpret_cast<const half *>(srcRowStart); \ half *dst = reinterpret_cast<half *>(dstRowStart); \ TQ_INT32 columns = numColumns; \ - const TQ_UINT8 *tqmask = maskRowStart; \ + const TQ_UINT8 *mask = maskRowStart; \ \ while (columns > 0) { \ \ @@ -387,13 +387,13 @@ void KisRgbF16HalfColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstR \ srcAlpha = TQMIN(srcAlpha, dstAlpha); \ \ - if (tqmask != 0) { \ - TQ_UINT8 U8_tqmask = *tqmask; \ + if (mask != 0) { \ + TQ_UINT8 U8_mask = *mask; \ \ - if (U8_tqmask != OPACITY_OPAQUE) { \ - srcAlpha *= UINT8_TO_HALF(U8_tqmask); \ + if (U8_mask != OPACITY_OPAQUE) { \ + srcAlpha *= UINT8_TO_HALF(U8_mask); \ } \ - tqmask++; \ + mask++; \ } \ \ if (srcAlpha > F16HALF_OPACITY_TRANSPARENT + EPSILON) { \ @@ -761,20 +761,20 @@ void KisRgbF16HalfColorSpace::compositeErase(TQ_UINT8 *dst, { const Pixel *s = reinterpret_cast<const Pixel *>(src); Pixel *d = reinterpret_cast<Pixel *>(dst); - const TQ_UINT8 *tqmask = srcAlphaMask; + const TQ_UINT8 *mask = srcAlphaMask; for (TQ_INT32 i = cols; i > 0; i--, s++, d++) { half srcAlpha = s->alpha; - // apply the alphatqmask - if (tqmask != 0) { - TQ_UINT8 U8_tqmask = *tqmask; + // apply the alphamask + if (mask != 0) { + TQ_UINT8 U8_mask = *mask; - if (U8_tqmask != OPACITY_OPAQUE) { - srcAlpha = HALF_BLEND(srcAlpha, F16HALF_OPACITY_OPAQUE, UINT8_TO_HALF(U8_tqmask)); + if (U8_mask != OPACITY_OPAQUE) { + srcAlpha = HALF_BLEND(srcAlpha, F16HALF_OPACITY_OPAQUE, UINT8_TO_HALF(U8_mask)); } - tqmask++; + mask++; } d->alpha = srcAlpha * d->alpha; } @@ -791,7 +791,7 @@ void KisRgbF16HalfColorSpace::bitBlt(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, - const TQ_UINT8 *tqmask, + const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_UINT8 U8_opacity, TQ_INT32 rows, @@ -805,7 +805,7 @@ void KisRgbF16HalfColorSpace::bitBlt(TQ_UINT8 *dst, // Undefined == no composition break; case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_IN: //compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -834,16 +834,16 @@ void KisRgbF16HalfColorSpace::bitBlt(TQ_UINT8 *dst, //compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_MULT: - compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeMultiply(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DIVIDE: - compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDivide(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BUMPMAP: //compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: - compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, U8_opacity); break; case COMPOSITE_COPY_RED: //compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -878,22 +878,22 @@ void KisRgbF16HalfColorSpace::bitBlt(TQ_UINT8 *dst, // No composition. break; case COMPOSITE_DARKEN: - compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_LIGHTEN: - compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeLighten(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_HUE: - compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeHue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_SATURATION: - compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeSaturation(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_VALUE: - compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeValue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLOR: - compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeColor(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLORIZE: //compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -902,24 +902,24 @@ void KisRgbF16HalfColorSpace::bitBlt(TQ_UINT8 *dst, //compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_SCREEN: - compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeScreen(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_OVERLAY: - compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeOverlay(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ERASE: - compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DODGE: - compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDodge(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BURN: - compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeBurn(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ALPHA_DARKEN: abstractCompositeAlphaDarken<half, F16HalfMult, Uint8ToF16Half, F16HalfOpacityTest, PIXEL_ALPHA, MAX_CHANNEL_RGB, MAX_CHANNEL_RGBA>( - dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, + dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, U8_opacity, F16HalfMult(), Uint8ToF16Half(), F16HalfOpacityTest()); break; diff --git a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h index f965a7660..a8fde30d6 100644 --- a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h +++ b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h @@ -31,7 +31,7 @@ class KRITATOOL_EXPORT KisRgbF16HalfColorSpace : public KisF16HalfBaseColorSpace { public: - KisRgbF16HalfColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p); + KisRgbF16HalfColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p); virtual ~KisRgbF16HalfColorSpace(); virtual bool willDegrade(ColorSpaceIndependence independence) @@ -85,20 +85,20 @@ protected: TQ_INT32 cols, const KisCompositeOp& op); - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, half opacity); private: friend class KisRgbF16HalfColorSpaceTester; @@ -135,7 +135,7 @@ public: virtual icColorSpaceSignature colorSpaceSignature() { return icSigRgbData; }; - virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisRgbF16HalfColorSpace(tqparent, p); }; + virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisRgbF16HalfColorSpace(parent, p); }; virtual TQString defaultProfile() { return "sRGB built-in - (lcms internal)"; }; }; diff --git a/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.cc b/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.cc index f50672b9d..3f2b6a85f 100644 --- a/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.cc +++ b/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.cc @@ -35,14 +35,14 @@ typedef KGenericFactory<RGBF16HalfPlugin> RGBF16HalfPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalk_rgb_f16half_plugin, RGBF16HalfPluginFactory( "chalk" ) ) -RGBF16HalfPlugin::RGBF16HalfPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +RGBF16HalfPlugin::RGBF16HalfPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(RGBF16HalfPluginFactory::instance()); - if ( tqparent->inherits("KisColorSpaceFactoryRegistry") ) + if ( parent->inherits("KisColorSpaceFactoryRegistry") ) { - KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( tqparent ); + KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( parent ); KisColorSpace * colorSpaceRGBF16Half = new KisRgbF16HalfColorSpace(f, 0); KisColorSpaceFactory *csf = new KisRgbF16HalfColorSpaceFactory(); diff --git a/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.h b/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.h index a970247c2..d188f7ba8 100644 --- a/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.h +++ b/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.h @@ -30,7 +30,7 @@ class RGBF16HalfPlugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - RGBF16HalfPlugin(TQObject *tqparent, const char *name, const TQStringList &); + RGBF16HalfPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~RGBF16HalfPlugin(); }; diff --git a/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc b/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc index 59eb8e5f1..f5e39f84e 100644 --- a/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc +++ b/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc @@ -537,7 +537,7 @@ void KisRgbF16HalfColorSpaceTester::testCompositeOps() }; cs->compositeOver(reinterpret_cast<TQ_UINT8 *>(dstPixels), DST_ROW_STRIDE, reinterpret_cast<const TQ_UINT8 *>(srcPixels), - SRC_ROW_STRIDE, tqmask, MASK_ROW_STRIDE, NUM_ROWS, NUM_COLUMNS, opacity); + SRC_ROW_STRIDE, mask, MASK_ROW_STRIDE, NUM_ROWS, NUM_COLUMNS, opacity); */ delete cs; diff --git a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc index 1edd63f9f..86494de73 100644 --- a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc +++ b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc @@ -52,8 +52,8 @@ namespace { #define F32_LCMS_TYPE TYPE_BGRA_16 // disable the lcms handling by setting profile=0 -KisRgbF32ColorSpace::KisRgbF32ColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile */*p*/) : - KisF32BaseColorSpace(KisID("RGBAF32", i18n("RGB (32-bit float/channel)")), F32_LCMS_TYPE, icSigRgbData, tqparent, 0) +KisRgbF32ColorSpace::KisRgbF32ColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile */*p*/) : + KisF32BaseColorSpace(KisID("RGBAF32", i18n("RGB (32-bit float/channel)")), F32_LCMS_TYPE, icSigRgbData, parent, 0) { m_channels.push_back(new KisChannelInfo(i18n("Red"), i18n("R"), PIXEL_RED * sizeof(float), KisChannelInfo::COLOR, KisChannelInfo::FLOAT32, sizeof(float))); m_channels.push_back(new KisChannelInfo(i18n("Green"), i18n("G"), PIXEL_GREEN * sizeof(float), KisChannelInfo::COLOR, KisChannelInfo::FLOAT32, sizeof(float))); @@ -304,21 +304,21 @@ void KisRgbF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt const float *src = reinterpret_cast<const float *>(srcRowStart); float *dst = reinterpret_cast<float *>(dstRowStart); - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { float srcAlpha = src[PIXEL_ALPHA]; - // apply the alphatqmask - if (tqmask != 0) { - TQ_UINT8 U8_tqmask = *tqmask; + // apply the alphamask + if (mask != 0) { + TQ_UINT8 U8_mask = *mask; - if (U8_tqmask != OPACITY_OPAQUE) { - srcAlpha *= UINT8_TO_FLOAT(U8_tqmask); + if (U8_mask != OPACITY_OPAQUE) { + srcAlpha *= UINT8_TO_FLOAT(U8_mask); } - tqmask++; + mask++; } if (srcAlpha > F32_OPACITY_TRANSPARENT + EPSILON) { @@ -377,7 +377,7 @@ void KisRgbF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt const float *src = reinterpret_cast<const float *>(srcRowStart); \ float *dst = reinterpret_cast<float *>(dstRowStart); \ TQ_INT32 columns = numColumns; \ - const TQ_UINT8 *tqmask = maskRowStart; \ + const TQ_UINT8 *mask = maskRowStart; \ \ while (columns > 0) { \ \ @@ -386,13 +386,13 @@ void KisRgbF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt \ srcAlpha = TQMIN(srcAlpha, dstAlpha); \ \ - if (tqmask != 0) { \ - TQ_UINT8 U8_tqmask = *tqmask; \ + if (mask != 0) { \ + TQ_UINT8 U8_mask = *mask; \ \ - if (U8_tqmask != OPACITY_OPAQUE) { \ - srcAlpha *= UINT8_TO_FLOAT(U8_tqmask); \ + if (U8_mask != OPACITY_OPAQUE) { \ + srcAlpha *= UINT8_TO_FLOAT(U8_mask); \ } \ - tqmask++; \ + mask++; \ } \ \ if (srcAlpha > F32_OPACITY_TRANSPARENT + EPSILON) { \ @@ -760,20 +760,20 @@ void KisRgbF32ColorSpace::compositeErase(TQ_UINT8 *dst, { const Pixel *s = reinterpret_cast<const Pixel *>(src); Pixel *d = reinterpret_cast<Pixel *>(dst); - const TQ_UINT8 *tqmask = srcAlphaMask; + const TQ_UINT8 *mask = srcAlphaMask; for (TQ_INT32 i = cols; i > 0; i--, s++, d++) { float srcAlpha = s->alpha; - // apply the alphatqmask - if (tqmask != 0) { - TQ_UINT8 U8_tqmask = *tqmask; + // apply the alphamask + if (mask != 0) { + TQ_UINT8 U8_mask = *mask; - if (U8_tqmask != OPACITY_OPAQUE) { - srcAlpha = FLOAT_BLEND(srcAlpha, F32_OPACITY_OPAQUE, UINT8_TO_FLOAT(U8_tqmask)); + if (U8_mask != OPACITY_OPAQUE) { + srcAlpha = FLOAT_BLEND(srcAlpha, F32_OPACITY_OPAQUE, UINT8_TO_FLOAT(U8_mask)); } - tqmask++; + mask++; } d->alpha = srcAlpha * d->alpha; } @@ -790,7 +790,7 @@ void KisRgbF32ColorSpace::bitBlt(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, - const TQ_UINT8 *tqmask, + const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_UINT8 U8_opacity, TQ_INT32 rows, @@ -804,7 +804,7 @@ void KisRgbF32ColorSpace::bitBlt(TQ_UINT8 *dst, // Undefined == no composition break; case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_IN: //compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -833,16 +833,16 @@ void KisRgbF32ColorSpace::bitBlt(TQ_UINT8 *dst, //compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_MULT: - compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeMultiply(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DIVIDE: - compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDivide(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BUMPMAP: //compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: - compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, U8_opacity); break; case COMPOSITE_COPY_RED: //compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -877,22 +877,22 @@ void KisRgbF32ColorSpace::bitBlt(TQ_UINT8 *dst, // No composition. break; case COMPOSITE_DARKEN: - compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_LIGHTEN: - compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeLighten(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_HUE: - compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeHue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_SATURATION: - compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeSaturation(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_VALUE: - compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeValue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLOR: - compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeColor(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLORIZE: //compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -901,24 +901,24 @@ void KisRgbF32ColorSpace::bitBlt(TQ_UINT8 *dst, //compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_SCREEN: - compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeScreen(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_OVERLAY: - compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeOverlay(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ERASE: - compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DODGE: - compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDodge(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BURN: - compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeBurn(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ALPHA_DARKEN: abstractCompositeAlphaDarken<float, F32Mult, Uint8ToF32, F32OpacityTest, PIXEL_ALPHA, MAX_CHANNEL_RGB, MAX_CHANNEL_RGBA>( - dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, + dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, U8_opacity, F32Mult(), Uint8ToF32(), F32OpacityTest()); default: break; diff --git a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h index cfd930106..050c2ae5f 100644 --- a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h +++ b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h @@ -33,7 +33,7 @@ class KisColorSpaceFactoryRegistry; class KRITATOOL_EXPORT KisRgbF32ColorSpace : public KisF32BaseColorSpace { public: - KisRgbF32ColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p); + KisRgbF32ColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p); virtual ~KisRgbF32ColorSpace(); virtual bool willDegrade(ColorSpaceIndependence independence) @@ -89,20 +89,20 @@ protected: TQ_INT32 cols, const KisCompositeOp& op); - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, float opacity); private: friend class KisRgbF32ColorSpaceTester; @@ -156,7 +156,7 @@ public: virtual icColorSpaceSignature colorSpaceSignature() { return icSigRgbData; }; - virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisRgbF32ColorSpace(tqparent, p); }; + virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisRgbF32ColorSpace(parent, p); }; virtual TQString defaultProfile() { return "sRGB built-in - (lcms internal)"; }; }; diff --git a/chalk/colorspaces/rgb_f32/rgb_f32_plugin.cc b/chalk/colorspaces/rgb_f32/rgb_f32_plugin.cc index 4e11e36c6..7c1149711 100644 --- a/chalk/colorspaces/rgb_f32/rgb_f32_plugin.cc +++ b/chalk/colorspaces/rgb_f32/rgb_f32_plugin.cc @@ -35,14 +35,14 @@ typedef KGenericFactory<RGBF32Plugin> RGBF32PluginFactory; K_EXPORT_COMPONENT_FACTORY( chalk_rgb_f32_plugin, RGBF32PluginFactory( "chalk" ) ) -RGBF32Plugin::RGBF32Plugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +RGBF32Plugin::RGBF32Plugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(RGBF32PluginFactory::instance()); - if ( tqparent->inherits("KisColorSpaceFactoryRegistry") ) + if ( parent->inherits("KisColorSpaceFactoryRegistry") ) { - KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>(tqparent); + KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>(parent); KisColorSpace * colorSpaceRGBF32 = new KisRgbF32ColorSpace(f, 0); diff --git a/chalk/colorspaces/rgb_f32/rgb_f32_plugin.h b/chalk/colorspaces/rgb_f32/rgb_f32_plugin.h index 22ec674f1..75ae708ab 100644 --- a/chalk/colorspaces/rgb_f32/rgb_f32_plugin.h +++ b/chalk/colorspaces/rgb_f32/rgb_f32_plugin.h @@ -30,7 +30,7 @@ class RGBF32Plugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - RGBF32Plugin(TQObject *tqparent, const char *name, const TQStringList &); + RGBF32Plugin(TQObject *parent, const char *name, const TQStringList &); virtual ~RGBF32Plugin(); }; diff --git a/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cc b/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cc index b4ec34e9b..eb9f9637b 100644 --- a/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cc +++ b/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cc @@ -533,7 +533,7 @@ void KisRgbF32ColorSpaceTester::testCompositeOps() }; cs->compositeOver(reinterpret_cast<TQ_UINT8 *>(dstPixels), DST_ROW_STRIDE, reinterpret_cast<const TQ_UINT8 *>(srcPixels), - SRC_ROW_STRIDE, tqmask, MASK_ROW_STRIDE, NUM_ROWS, NUM_COLUMNS, opacity); + SRC_ROW_STRIDE, mask, MASK_ROW_STRIDE, NUM_ROWS, NUM_COLUMNS, opacity); */ delete cs; diff --git a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc index f792e8757..c3307aefe 100644 --- a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc +++ b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc @@ -44,8 +44,8 @@ namespace { //const TQ_UINT16 KisRgbU16ColorSpace::U16_OPACITY_OPAQUE; //const TQ_UINT16 KisRgbU16ColorSpace::U16_OPACITY_TRANSPARENT; -KisRgbU16ColorSpace::KisRgbU16ColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) : - KisU16BaseColorSpace(KisID("RGBA16", i18n("RGB (16-bit integer/channel)")), TYPE_BGRA_16, icSigRgbData, tqparent, p) +KisRgbU16ColorSpace::KisRgbU16ColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) : + KisU16BaseColorSpace(KisID("RGBA16", i18n("RGB (16-bit integer/channel)")), TYPE_BGRA_16, icSigRgbData, parent, p) { m_channels.push_back(new KisChannelInfo(i18n("Red"), i18n("R"), PIXEL_RED * sizeof(TQ_UINT16), KisChannelInfo::COLOR, KisChannelInfo::UINT16, sizeof(TQ_UINT16), TQColor(255,0,0))); m_channels.push_back(new KisChannelInfo(i18n("Green"), i18n("G"), PIXEL_GREEN * sizeof(TQ_UINT16), KisChannelInfo::COLOR, KisChannelInfo::UINT16, sizeof(TQ_UINT16), TQColor(0,255,0))); @@ -202,21 +202,21 @@ void KisRgbU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart); TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart); - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { TQ_UINT16 srcAlpha = src[PIXEL_ALPHA]; - // apply the alphatqmask - if (tqmask != 0) { - TQ_UINT8 U8_tqmask = *tqmask; + // apply the alphamask + if (mask != 0) { + TQ_UINT8 U8_mask = *mask; - if (U8_tqmask != OPACITY_OPAQUE) { - srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_tqmask)); + if (U8_mask != OPACITY_OPAQUE) { + srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_mask)); } - tqmask++; + mask++; } if (srcAlpha != U16_OPACITY_TRANSPARENT) { @@ -275,7 +275,7 @@ void KisRgbU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart); \ TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart); \ TQ_INT32 columns = numColumns; \ - const TQ_UINT8 *tqmask = maskRowStart; \ + const TQ_UINT8 *mask = maskRowStart; \ \ while (columns > 0) { \ \ @@ -284,13 +284,13 @@ void KisRgbU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt \ srcAlpha = TQMIN(srcAlpha, dstAlpha); \ \ - if (tqmask != 0) { \ - TQ_UINT8 U8_tqmask = *tqmask; \ + if (mask != 0) { \ + TQ_UINT8 U8_mask = *mask; \ \ - if (U8_tqmask != OPACITY_OPAQUE) { \ - srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_tqmask)); \ + if (U8_mask != OPACITY_OPAQUE) { \ + srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_mask)); \ } \ - tqmask++; \ + mask++; \ } \ \ if (srcAlpha != U16_OPACITY_TRANSPARENT) { \ @@ -680,20 +680,20 @@ void KisRgbU16ColorSpace::compositeErase(TQ_UINT8 *dst, { const Pixel *s = reinterpret_cast<const Pixel *>(src); Pixel *d = reinterpret_cast<Pixel *>(dst); - const TQ_UINT8 *tqmask = srcAlphaMask; + const TQ_UINT8 *mask = srcAlphaMask; for (TQ_INT32 i = cols; i > 0; i--, s++, d++) { TQ_UINT16 srcAlpha = s->alpha; - // apply the alphatqmask - if (tqmask != 0) { - TQ_UINT8 U8_tqmask = *tqmask; + // apply the alphamask + if (mask != 0) { + TQ_UINT8 U8_mask = *mask; - if (U8_tqmask != OPACITY_OPAQUE) { - srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_tqmask)); + if (U8_mask != OPACITY_OPAQUE) { + srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_mask)); } - tqmask++; + mask++; } d->alpha = UINT16_MULT(srcAlpha, d->alpha); } @@ -710,7 +710,7 @@ void KisRgbU16ColorSpace::bitBlt(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, - const TQ_UINT8 *tqmask, + const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_UINT8 U8_opacity, TQ_INT32 rows, @@ -724,7 +724,7 @@ void KisRgbU16ColorSpace::bitBlt(TQ_UINT8 *dst, // Undefined == no composition break; case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_IN: //compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -753,16 +753,16 @@ void KisRgbU16ColorSpace::bitBlt(TQ_UINT8 *dst, //compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_MULT: - compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeMultiply(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DIVIDE: - compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDivide(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BUMPMAP: //compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: - compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, U8_opacity); break; case COMPOSITE_COPY_RED: //compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -797,22 +797,22 @@ void KisRgbU16ColorSpace::bitBlt(TQ_UINT8 *dst, // No composition. break; case COMPOSITE_DARKEN: - compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_LIGHTEN: - compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeLighten(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_HUE: - compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeHue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_SATURATION: - compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeSaturation(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_VALUE: - compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeValue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLOR: - compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeColor(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLORIZE: //compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -821,24 +821,24 @@ void KisRgbU16ColorSpace::bitBlt(TQ_UINT8 *dst, //compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_SCREEN: - compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeScreen(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_OVERLAY: - compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeOverlay(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ERASE: - compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DODGE: - compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDodge(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BURN: - compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeBurn(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ALPHA_DARKEN: abstractCompositeAlphaDarken<TQ_UINT16, U16Mult, Uint8ToU16, U16OpacityTest, PIXEL_ALPHA, MAX_CHANNEL_RGB, MAX_CHANNEL_RGBA>( - dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, + dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity, U16Mult(), Uint8ToU16(), U16OpacityTest()); break; default: diff --git a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h index 5994921a5..fde72fea2 100644 --- a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h +++ b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h @@ -38,7 +38,7 @@ public: TQ_UINT16 alpha; }; public: - KisRgbU16ColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p); + KisRgbU16ColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p); virtual ~KisRgbU16ColorSpace(); virtual bool willDegrade(ColorSpaceIndependence independence) @@ -80,20 +80,20 @@ protected: TQ_INT32 cols, const KisCompositeOp& op); - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity); private: friend class KisRgbU16ColorSpaceTester; @@ -120,7 +120,7 @@ public: virtual icColorSpaceSignature colorSpaceSignature() { return icSigRgbData; }; - virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisRgbU16ColorSpace(tqparent, p); }; + virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisRgbU16ColorSpace(parent, p); }; virtual TQString defaultProfile() { return "sRGB built-in - (lcms internal)"; }; }; diff --git a/chalk/colorspaces/rgb_u16/rgb_u16_plugin.cc b/chalk/colorspaces/rgb_u16/rgb_u16_plugin.cc index 828298c34..bc362a83e 100644 --- a/chalk/colorspaces/rgb_u16/rgb_u16_plugin.cc +++ b/chalk/colorspaces/rgb_u16/rgb_u16_plugin.cc @@ -34,14 +34,14 @@ typedef KGenericFactory<RGBU16Plugin> RGBU16PluginFactory; K_EXPORT_COMPONENT_FACTORY( chalk_rgb_u16_plugin, RGBU16PluginFactory( "chalk" ) ) -RGBU16Plugin::RGBU16Plugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +RGBU16Plugin::RGBU16Plugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(RGBU16PluginFactory::instance()); - if ( tqparent->inherits("KisColorSpaceFactoryRegistry") ) + if ( parent->inherits("KisColorSpaceFactoryRegistry") ) { - KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry *>( tqparent ); + KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry *>( parent ); KisColorSpace * colorSpaceRGBU16 = new KisRgbU16ColorSpace(f, 0); KisColorSpaceFactory * csFactory = new KisRgbU16ColorSpaceFactory(); diff --git a/chalk/colorspaces/rgb_u16/rgb_u16_plugin.h b/chalk/colorspaces/rgb_u16/rgb_u16_plugin.h index d5cf4d140..4373a2050 100644 --- a/chalk/colorspaces/rgb_u16/rgb_u16_plugin.h +++ b/chalk/colorspaces/rgb_u16/rgb_u16_plugin.h @@ -29,7 +29,7 @@ class RGBU16Plugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - RGBU16Plugin(TQObject *tqparent, const char *name, const TQStringList &); + RGBU16Plugin(TQObject *parent, const char *name, const TQStringList &); virtual ~RGBU16Plugin(); }; diff --git a/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cc b/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cc index 7861b8e1a..e260b4d51 100644 --- a/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cc +++ b/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cc @@ -516,7 +516,7 @@ void KisRgbU16ColorSpaceTester::testCompositeOps() }; cs->compositeOver(reinterpret_cast<TQ_UINT8 *>(dstPixels), DST_ROW_STRIDE, reinterpret_cast<const TQ_UINT8 *>(srcPixels), - SRC_ROW_STRIDE, tqmask, MASK_ROW_STRIDE, NUM_ROWS, NUM_COLUMNS, opacity); + SRC_ROW_STRIDE, mask, MASK_ROW_STRIDE, NUM_ROWS, NUM_COLUMNS, opacity); */ delete cs; diff --git a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc index e4e181ca7..f15227982 100644 --- a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc +++ b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc @@ -44,8 +44,8 @@ namespace { const TQ_INT32 MAX_CHANNEL_RGBA = 4; } -KisRgbColorSpace::KisRgbColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) : - KisU8BaseColorSpace(KisID("RGBA", i18n("RGB (8-bit integer/channel)")), TYPE_BGRA_8, icSigRgbData, tqparent, p) +KisRgbColorSpace::KisRgbColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) : + KisU8BaseColorSpace(KisID("RGBA", i18n("RGB (8-bit integer/channel)")), TYPE_BGRA_8, icSigRgbData, parent, p) { m_channels.push_back(new KisChannelInfo(i18n("Red"), i18n("R"), 2, KisChannelInfo::COLOR, KisChannelInfo::UINT8, 1, TQColor(255,0,0))); m_channels.push_back(new KisChannelInfo(i18n("Green"), i18n("G"), 1, KisChannelInfo::COLOR, KisChannelInfo::UINT8, 1, TQColor(0,255,0))); @@ -272,19 +272,19 @@ void KisRgbColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { TQ_UINT8 srcAlpha = src[PIXEL_ALPHA]; - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_MULT(srcAlpha, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_MULT(srcAlpha, *mask); + mask++; } if (srcAlpha != OPACITY_TRANSPARENT) { @@ -346,7 +346,7 @@ void KisRgbColorSpace::compositeAlphaDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstR const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { @@ -354,12 +354,12 @@ void KisRgbColorSpace::compositeAlphaDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstR TQ_UINT8 srcAlpha = src[PIXEL_ALPHA]; TQ_UINT8 dstAlpha = dst[PIXEL_ALPHA]; - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_MULT(srcAlpha, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_MULT(srcAlpha, *mask); + mask++; } if (opacity != OPACITY_OPAQUE) { @@ -392,7 +392,7 @@ void KisRgbColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; while (columns > 0) { @@ -401,12 +401,12 @@ void KisRgbColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS srcAlpha = TQMIN(srcAlpha, dstAlpha); - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_MULT(srcAlpha, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_MULT(srcAlpha, *mask); + mask++; } @@ -473,7 +473,7 @@ void KisRgbColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; while (columns > 0) { @@ -482,12 +482,12 @@ void KisRgbColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr srcAlpha = TQMIN(srcAlpha, dstAlpha); - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_MULT(srcAlpha, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_MULT(srcAlpha, *mask); + mask++; } if (srcAlpha != OPACITY_TRANSPARENT) { @@ -544,7 +544,7 @@ void KisRgbColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; while (columns > 0) { @@ -553,12 +553,12 @@ void KisRgbColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr srcAlpha = TQMIN(srcAlpha, dstAlpha); - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_MULT(srcAlpha, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_MULT(srcAlpha, *mask); + mask++; } if (srcAlpha != OPACITY_TRANSPARENT) { @@ -615,7 +615,7 @@ void KisRgbColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; while (columns > 0) { @@ -624,12 +624,12 @@ void KisRgbColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt srcAlpha = TQMIN(srcAlpha, dstAlpha); - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_MULT(srcAlpha, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_MULT(srcAlpha, *mask); + mask++; } @@ -687,7 +687,7 @@ void KisRgbColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; while (columns > 0) { @@ -696,12 +696,12 @@ void KisRgbColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri srcAlpha = TQMIN(srcAlpha, dstAlpha); - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_MULT(srcAlpha, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_MULT(srcAlpha, *mask); + mask++; } @@ -759,7 +759,7 @@ void KisRgbColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; while (columns > 0) { @@ -768,12 +768,12 @@ void KisRgbColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid srcAlpha = TQMIN(srcAlpha, dstAlpha); - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_MULT(srcAlpha, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_MULT(srcAlpha, *mask); + mask++; } if (srcAlpha != OPACITY_TRANSPARENT) { @@ -831,7 +831,7 @@ void KisRgbColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; while (columns > 0) { @@ -840,12 +840,12 @@ void KisRgbColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr srcAlpha = TQMIN(srcAlpha, dstAlpha); - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_MULT(srcAlpha, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_MULT(srcAlpha, *mask); + mask++; } if (srcAlpha != OPACITY_TRANSPARENT) { @@ -902,7 +902,7 @@ void KisRgbColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; while (columns > 0) { @@ -911,12 +911,12 @@ void KisRgbColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt srcAlpha = TQMIN(srcAlpha, dstAlpha); - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_MULT(srcAlpha, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_MULT(srcAlpha, *mask); + mask++; } if (srcAlpha != OPACITY_TRANSPARENT) { @@ -973,7 +973,7 @@ void KisRgbColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; while (columns > 0) { @@ -982,12 +982,12 @@ void KisRgbColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride srcAlpha = TQMIN(srcAlpha, dstAlpha); - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_MULT(srcAlpha, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_MULT(srcAlpha, *mask); + mask++; } if (srcAlpha != OPACITY_TRANSPARENT) { @@ -1056,7 +1056,7 @@ void KisRgbColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; while (columns > 0) { @@ -1065,12 +1065,12 @@ void KisRgbColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo srcAlpha = TQMIN(srcAlpha, dstAlpha); - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_MULT(srcAlpha, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_MULT(srcAlpha, *mask); + mask++; } if (srcAlpha != OPACITY_TRANSPARENT) { @@ -1139,7 +1139,7 @@ void KisRgbColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; while (columns > 0) { @@ -1148,12 +1148,12 @@ void KisRgbColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri srcAlpha = TQMIN(srcAlpha, dstAlpha); - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_MULT(srcAlpha, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_MULT(srcAlpha, *mask); + mask++; } if (srcAlpha != OPACITY_TRANSPARENT) { @@ -1222,7 +1222,7 @@ void KisRgbColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; TQ_INT32 columns = numColumns; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; while (columns > 0) { @@ -1231,12 +1231,12 @@ void KisRgbColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri srcAlpha = TQMIN(srcAlpha, dstAlpha); - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_MULT(srcAlpha, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_MULT(srcAlpha, *mask); + mask++; } if (srcAlpha != OPACITY_TRANSPARENT) { @@ -1315,17 +1315,17 @@ void KisRgbColorSpace::compositeErase(TQ_UINT8 *dst, { const TQ_UINT8 *s = src; TQ_UINT8 *d = dst; - const TQ_UINT8 *tqmask = srcAlphaMask; + const TQ_UINT8 *mask = srcAlphaMask; for (i = cols; i > 0; i--, s+=MAX_CHANNEL_RGBA, d+=MAX_CHANNEL_RGBA) { srcAlpha = s[PIXEL_ALPHA]; - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_BLEND(srcAlpha, OPACITY_OPAQUE, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_BLEND(srcAlpha, OPACITY_OPAQUE, *mask); + mask++; } d[PIXEL_ALPHA] = UINT8_MULT(srcAlpha, d[PIXEL_ALPHA]); } @@ -1341,7 +1341,7 @@ void KisRgbColorSpace::bitBlt(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, - const TQ_UINT8 *tqmask, + const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, @@ -1354,10 +1354,10 @@ void KisRgbColorSpace::bitBlt(TQ_UINT8 *dst, // Undefined == no composition break; case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ALPHA_DARKEN: - compositeAlphaDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeAlphaDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_IN: compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -1387,16 +1387,16 @@ void KisRgbColorSpace::bitBlt(TQ_UINT8 *dst, compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_MULT: - compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeMultiply(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DIVIDE: - compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDivide(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BUMPMAP: compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: - compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COPY_RED: compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -1431,22 +1431,22 @@ void KisRgbColorSpace::bitBlt(TQ_UINT8 *dst, // No composition. break; case COMPOSITE_DARKEN: - compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_LIGHTEN: - compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeLighten(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_HUE: - compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeHue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_SATURATION: - compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeSaturation(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_VALUE: - compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeValue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLOR: - compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeColor(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COLORIZE: compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); @@ -1455,19 +1455,19 @@ void KisRgbColorSpace::bitBlt(TQ_UINT8 *dst, compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity); break; case COMPOSITE_SCREEN: - compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeScreen(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_OVERLAY: - compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeOverlay(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_ERASE: - compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_DODGE: - compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeDodge(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_BURN: - compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeBurn(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; default: break; diff --git a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h index 77628c31d..8fdfb355c 100644 --- a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h +++ b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h @@ -31,7 +31,7 @@ const TQ_UINT8 PIXEL_ALPHA = 3; class KRITATOOL_EXPORT KisRgbColorSpace : public KisU8BaseColorSpace { public: - KisRgbColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p); + KisRgbColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p); virtual ~KisRgbColorSpace(); virtual bool willDegrade(ColorSpaceIndependence) @@ -75,21 +75,21 @@ protected: TQ_INT32 cols, const KisCompositeOp& op); - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeAlphaDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeAlphaDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); }; class KisRgbColorSpaceFactory : public KisColorSpaceFactory @@ -108,7 +108,7 @@ public: virtual icColorSpaceSignature colorSpaceSignature() { return icSigRgbData; }; - virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile * p) { return new KisRgbColorSpace(tqparent, p); }; + virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile * p) { return new KisRgbColorSpace(parent, p); }; virtual TQString defaultProfile() { return "sRGB built-in - (lcms internal)"; }; }; diff --git a/chalk/colorspaces/rgb_u8/rgb_plugin.cc b/chalk/colorspaces/rgb_u8/rgb_plugin.cc index 0794456e2..f987e33f6 100644 --- a/chalk/colorspaces/rgb_u8/rgb_plugin.cc +++ b/chalk/colorspaces/rgb_u8/rgb_plugin.cc @@ -43,14 +43,14 @@ typedef KGenericFactory<RGBPlugin> RGBPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkrgbplugin, RGBPluginFactory( "chalk" ) ) -RGBPlugin::RGBPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +RGBPlugin::RGBPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(RGBPluginFactory::instance()); - if ( tqparent->inherits("KisColorSpaceFactoryRegistry") ) + if ( parent->inherits("KisColorSpaceFactoryRegistry") ) { - KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>(tqparent); + KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>(parent); KisProfile *defProfile = new KisProfile(cmsCreate_sRGBProfile()); f->addProfile(defProfile); diff --git a/chalk/colorspaces/rgb_u8/rgb_plugin.h b/chalk/colorspaces/rgb_u8/rgb_plugin.h index 08ccd8908..a3408c782 100644 --- a/chalk/colorspaces/rgb_u8/rgb_plugin.h +++ b/chalk/colorspaces/rgb_u8/rgb_plugin.h @@ -29,7 +29,7 @@ class RGBPlugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - RGBPlugin(TQObject *tqparent, const char *name, const TQStringList &); + RGBPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~RGBPlugin(); }; diff --git a/chalk/colorspaces/wet/kis_wet_colorspace.cc b/chalk/colorspaces/wet/kis_wet_colorspace.cc index 7d8d84abc..dbb6c3f9c 100644 --- a/chalk/colorspaces/wet/kis_wet_colorspace.cc +++ b/chalk/colorspaces/wet/kis_wet_colorspace.cc @@ -109,8 +109,8 @@ int getH(int r, int g, int b) return h; } -KisWetColorSpace::KisWetColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) : - KisAbstractColorSpace(KisID("WET", i18n("Watercolors")), 0, icMaxEnumData, tqparent, p) +KisWetColorSpace::KisWetColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) : + KisAbstractColorSpace(KisID("WET", i18n("Watercolors")), 0, icMaxEnumData, parent, p) { wet_init_render_tab(); diff --git a/chalk/colorspaces/wet/kis_wet_colorspace.h b/chalk/colorspaces/wet/kis_wet_colorspace.h index 25af68fde..dddbcf029 100644 --- a/chalk/colorspaces/wet/kis_wet_colorspace.h +++ b/chalk/colorspaces/wet/kis_wet_colorspace.h @@ -92,7 +92,7 @@ void wetPixFromDouble(WetPix * dst, WetPixDbl *src); class KisWetColorSpace : public KisAbstractColorSpace { public: - KisWetColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p); + KisWetColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p); virtual ~KisWetColorSpace(); @@ -211,7 +211,7 @@ public: virtual icColorSpaceSignature colorSpaceSignature() { return icMaxEnumData; }; - virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisWetColorSpace(tqparent, p); }; + virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisWetColorSpace(parent, p); }; virtual TQString defaultProfile() { return ""; }; }; diff --git a/chalk/colorspaces/wet/kis_wet_palette_widget.cc b/chalk/colorspaces/wet/kis_wet_palette_widget.cc index eb6556d27..901f29093 100644 --- a/chalk/colorspaces/wet/kis_wet_palette_widget.cc +++ b/chalk/colorspaces/wet/kis_wet_palette_widget.cc @@ -46,7 +46,7 @@ #include "kis_wet_colorspace.h" #include "kis_wet_palette_widget.h" -KisWetPaletteWidget::KisWetPaletteWidget(TQWidget *tqparent, const char *name) : super(tqparent, name) +KisWetPaletteWidget::KisWetPaletteWidget(TQWidget *parent, const char *name) : super(parent, name) { m_subject = 0; diff --git a/chalk/colorspaces/wet/kis_wet_palette_widget.h b/chalk/colorspaces/wet/kis_wet_palette_widget.h index 10c177e6a..60fd28e03 100644 --- a/chalk/colorspaces/wet/kis_wet_palette_widget.h +++ b/chalk/colorspaces/wet/kis_wet_palette_widget.h @@ -45,7 +45,7 @@ class KRITAUI_EXPORT KisWetPaletteWidget typedef TQWidget super; public: - KisWetPaletteWidget(TQWidget *tqparent = 0L, const char *name = 0); + KisWetPaletteWidget(TQWidget *parent = 0L, const char *name = 0); virtual ~KisWetPaletteWidget() {} protected slots: diff --git a/chalk/colorspaces/wet/kis_wetop.cc b/chalk/colorspaces/wet/kis_wetop.cc index 55f466faa..900fd7219 100644 --- a/chalk/colorspaces/wet/kis_wetop.cc +++ b/chalk/colorspaces/wet/kis_wetop.cc @@ -36,10 +36,10 @@ #include "kis_wetop.h" #include "kis_wet_colorspace.h" -KisWetOpSettings::KisWetOpSettings(TQWidget *tqparent) - : super(tqparent) +KisWetOpSettings::KisWetOpSettings(TQWidget *parent) + : super(parent) { - m_options = new WetPaintOptions(tqparent, "wet option widget"); + m_options = new WetPaintOptions(parent, "wet option widget"); } bool KisWetOpSettings::varySize() const @@ -67,13 +67,13 @@ KisPaintOp * KisWetOpFactory::createOp(const KisPaintOpSettings *settings, KisPa return op; } -KisPaintOpSettings* KisWetOpFactory::settings(TQWidget * tqparent, const KisInputDevice& inputDevice) +KisPaintOpSettings* KisWetOpFactory::settings(TQWidget * parent, const KisInputDevice& inputDevice) { if (inputDevice == KisInputDevice::mouse()) { // No options for mouse, only tablet devices return 0; } else { - return new KisWetOpSettings(tqparent); + return new KisWetOpSettings(parent); } } @@ -120,8 +120,8 @@ void KisWetOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) dab = brush->image(KisMetaRegistry::instance()->csRegistry()->getAlpha8(), inf); } else { - KisAlphaMaskSP tqmask = brush->tqmask(inf); - dab = computeDab(tqmask, KisMetaRegistry::instance()->csRegistry()->getAlpha8()); + KisAlphaMaskSP mask = brush->mask(inf); + dab = computeDab(mask, KisMetaRegistry::instance()->csRegistry()->getAlpha8()); } KisColorSpace * cs = device->colorSpace(); diff --git a/chalk/colorspaces/wet/kis_wetop.h b/chalk/colorspaces/wet/kis_wetop.h index 37cd594aa..85224f29b 100644 --- a/chalk/colorspaces/wet/kis_wetop.h +++ b/chalk/colorspaces/wet/kis_wetop.h @@ -36,13 +36,13 @@ public: virtual KisPaintOp * createOp(const KisPaintOpSettings *settings, KisPainter * painter); virtual KisID id() { return KisID("wetbrush", i18n("Watercolor Brush")); } virtual bool userVisible(KisColorSpace* cs) { return cs->id() == KisID("WET", ""); } - virtual KisPaintOpSettings *settings(TQWidget * tqparent, const KisInputDevice& inputDevice); + virtual KisPaintOpSettings *settings(TQWidget * parent, const KisInputDevice& inputDevice); }; class KisWetOpSettings : public KisPaintOpSettings { typedef KisPaintOpSettings super; public: - KisWetOpSettings(TQWidget *tqparent); + KisWetOpSettings(TQWidget *parent); bool varySize() const; bool varyWetness() const; diff --git a/chalk/colorspaces/wet/wet_plugin.cc b/chalk/colorspaces/wet/wet_plugin.cc index 1f65b83c9..df0666c4e 100644 --- a/chalk/colorspaces/wet/wet_plugin.cc +++ b/chalk/colorspaces/wet/wet_plugin.cc @@ -66,14 +66,14 @@ typedef KGenericFactory<WetPlugin> WetPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkwetplugin, WetPluginFactory( "chalkcore" ) ) -WetPlugin::WetPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +WetPlugin::WetPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(WetPluginFactory::instance()); // This is not a gui plugin; only load it when the doc is created. - if ( tqparent->inherits("KisColorSpaceFactoryRegistry") ) { - KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>(tqparent); + if ( parent->inherits("KisColorSpaceFactoryRegistry") ) { + KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>(parent); KisColorSpace* colorSpaceWet = new KisWetColorSpace(f, 0); @@ -97,12 +97,12 @@ WetPlugin::WetPlugin(TQObject *tqparent, const char *name, const TQStringList &) // Texture Action: f->addPaintDeviceAction(colorSpaceWet, new WetPaintDevAction); } - else if (tqparent->inherits("KisView")) + else if (parent->inherits("KisView")) { setInstance(WetPluginFactory::instance()); setXMLFile(locate("data","chalkplugins/wetplugin.rc"), true); - m_view = dynamic_cast<KisView*>(tqparent); + m_view = dynamic_cast<KisView*>(parent); // Wetness visualisation WetnessVisualisationFilter * wf = new WetnessVisualisationFilter(m_view); wf->setAction(new KToggleAction(i18n("Wetness Visualisation"), 0, 0, wf, diff --git a/chalk/colorspaces/wet/wet_plugin.h b/chalk/colorspaces/wet/wet_plugin.h index d2fdc0837..fa3bed064 100644 --- a/chalk/colorspaces/wet/wet_plugin.h +++ b/chalk/colorspaces/wet/wet_plugin.h @@ -34,7 +34,7 @@ class WetPlugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - WetPlugin(TQObject *tqparent, const char *name, const TQStringList &); + WetPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~WetPlugin(); private: diff --git a/chalk/colorspaces/wet/wetphysicsfilter.cc b/chalk/colorspaces/wet/wetphysicsfilter.cc index 11aaeb04e..5d789cf14 100644 --- a/chalk/colorspaces/wet/wetphysicsfilter.cc +++ b/chalk/colorspaces/wet/wetphysicsfilter.cc @@ -43,7 +43,7 @@ * [11:16] <CyrilleB> boud: which one then ? * [11:16] <pippin> the error is distributed to the neighbour pixels (to the right, down and down to the left in pixels which have not yet been processed * [11:16] <pippin> ) - * [11:16] <boud> CyrilleB: it's only aptqparent when you let something dry for some time, it looks like meandering snakes (like the old game "snake") + * [11:16] <boud> CyrilleB: it's only apparent when you let something dry for some time, it looks like meandering snakes (like the old game "snake") * [11:16] <CyrilleB> pippin: somehow yes * [11:16] <boud> pippin: that is possible * [11:17] <pippin> boud: this leads to "bleeding" of data to the right and down,.. @@ -55,7 +55,7 @@ * [11:27] <boud> Well, I don't have time to investigate right now, but it sounds very plausible. * [11:27] <CyrilleB> pippin: :) * [11:28] <boud> of course, the code _is_ available :-) - * [11:28] <pippin> if there is some form of diffusion matrix that is directional around the current pixel,. having that tqmask rotate depending on the modulus of the current iteration # should cancel such an effect out + * [11:28] <pippin> if there is some form of diffusion matrix that is directional around the current pixel,. having that mask rotate depending on the modulus of the current iteration # should cancel such an effect out */ WetPhysicsFilter::WetPhysicsFilter() : KisFilter(id(), "artistic", i18n("Dry the Paint")) diff --git a/chalk/colorspaces/wetsticky/brushop/kis_wsbrushop.cc b/chalk/colorspaces/wetsticky/brushop/kis_wsbrushop.cc index abcf2cec0..d1616bd61 100644 --- a/chalk/colorspaces/wetsticky/brushop/kis_wsbrushop.cc +++ b/chalk/colorspaces/wetsticky/brushop/kis_wsbrushop.cc @@ -52,13 +52,13 @@ void KisWSBrushOp::paintAt(const KisPoint &pos, { // Painting should be implemented according to the following algorithm: // retrieve brush - // if brush == tqmask - // retrieve tqmask + // if brush == mask + // retrieve mask // else if brush == image // retrieve image - // subsample (tqmask | image) for position -- pos should be double! - // apply filters to tqmask (colour | gradient | pattern | etc. - // composite filtered tqmask into temporary layer + // subsample (mask | image) for position -- pos should be double! + // apply filters to mask (colour | gradient | pattern | etc. + // composite filtered mask into temporary layer // composite temporary layer into target layer // @see: doc/brush.txt @@ -91,8 +91,8 @@ void KisWSBrushOp::paintAt(const KisPoint &pos, dab = brush -> image(device -> colorSpace(), pressure, xFraction, yFraction); } else { - KisAlphaMaskSP tqmask = brush -> tqmask(pressure, xFraction, yFraction); - dab = computeDab(tqmask); + KisAlphaMaskSP mask = brush -> mask(pressure, xFraction, yFraction); + dab = computeDab(mask); } m_painter -> setPressure(pressure); diff --git a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cc b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cc index 383bd9c54..b3e1ffa60 100644 --- a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cc +++ b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cc @@ -36,13 +36,13 @@ typedef KGenericFactory<WSBrushPaintOpPlugin> WSBrushPaintOpPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkwsbrushpaintop, WSBrushPaintOpPluginFactory( "chalkcore" ) ) -WSBrushPaintOpPlugin::WSBrushPaintOpPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +WSBrushPaintOpPlugin::WSBrushPaintOpPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(WSBrushPaintOpPluginFactory::instance()); // This is not a gui plugin; only load it when the doc is created. - if ( tqparent->inherits("KisFactory") ) + if ( parent->inherits("KisFactory") ) { KisPaintOpRegistry::instance() -> add ( new KisWSBrushOpFactory ); } diff --git a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.h b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.h index 7e77afec1..59d4ef153 100644 --- a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.h +++ b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.h @@ -33,7 +33,7 @@ class WSBrushPaintOpPlugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - WSBrushPaintOpPlugin(TQObject *tqparent, const char *name, const TQStringList &); + WSBrushPaintOpPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~WSBrushPaintOpPlugin(); private: diff --git a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc index b1e1ec825..22badb9c4 100644 --- a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc +++ b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc @@ -356,7 +356,7 @@ void KisWetStickyColorSpace::bitBlt(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, - const TQ_UINT8 *tqmask, + const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, @@ -368,11 +368,11 @@ void KisWetStickyColorSpace::bitBlt(TQ_UINT8 *dst, // Undefined == no composition break; case COMPOSITE_OVER: - compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; case COMPOSITE_COPY: default: - compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity); + compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity); break; } @@ -389,7 +389,7 @@ void KisWetStickyColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; TQ_INT32 columns = numColumns; @@ -410,12 +410,12 @@ void KisWetStickyColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo TQ_UINT8 srcAlpha = srcCell->alpha; - // apply the alphatqmask - if(tqmask != 0) + // apply the alphamask + if(mask != 0) { - if(*tqmask != OPACITY_OPAQUE) - srcAlpha = UINT8_MULT(srcAlpha, *tqmask); - tqmask++; + if(*mask != OPACITY_OPAQUE) + srcAlpha = UINT8_MULT(srcAlpha, *mask); + mask++; } if (srcAlpha != OPACITY_TRANSPARENT) { @@ -467,7 +467,7 @@ void KisWetStickyColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo } -void KisWetStickyColorSpace::compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity) +void KisWetStickyColorSpace::compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity) { TQ_INT32 linesize = sizeof(CELL) * columns; TQ_UINT8 *d; diff --git a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.h b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.h index 9ff6452b7..b9030039f 100644 --- a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.h +++ b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.h @@ -139,9 +139,9 @@ protected: private: - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeClear(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeClear(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); }; diff --git a/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cc b/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cc index 040d30023..192e8517d 100644 --- a/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cc +++ b/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cc @@ -153,9 +153,9 @@ void KisWSEngineFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisF } -KisFilterConfigWidget * KisWSEngineFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev) +KisFilterConfigWidget * KisWSEngineFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev) { -// KisWSEngineFilterConfigurationWidget* kefcw = new KisWSEngineFilterConfigurationWidget(this,tqparent, ""); +// KisWSEngineFilterConfigurationWidget* kefcw = new KisWSEngineFilterConfigurationWidget(this,parent, ""); // kdDebug(DBG_AREA_FILTERS) << kefcw << endl; // return kefcw ; return 0; diff --git a/chalk/colorspaces/wetsticky/kis_ws_engine_filter.h b/chalk/colorspaces/wetsticky/kis_ws_engine_filter.h index d1c23810c..e15998a06 100644 --- a/chalk/colorspaces/wetsticky/kis_ws_engine_filter.h +++ b/chalk/colorspaces/wetsticky/kis_ws_engine_filter.h @@ -59,7 +59,7 @@ public: virtual bool supportsIncrementalPainting() { return false; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*, KisPaintDeviceSP dev); diff --git a/chalk/colorspaces/wetsticky/wet_sticky_plugin.cc b/chalk/colorspaces/wetsticky/wet_sticky_plugin.cc index 525b18bb5..a5c12811e 100644 --- a/chalk/colorspaces/wetsticky/wet_sticky_plugin.cc +++ b/chalk/colorspaces/wetsticky/wet_sticky_plugin.cc @@ -37,13 +37,13 @@ typedef KGenericFactory<WetStickyPlugin> WetStickyPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkwsplugin, WetStickyPluginFactory( "chalkcore" ) ) -WetStickyPlugin::WetStickyPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +WetStickyPlugin::WetStickyPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(WetStickyPluginFactory::instance()); // This is not a gui plugin; only load it when the doc is created. - if ( tqparent->inherits("KisFactory") ) + if ( parent->inherits("KisFactory") ) { KisColorSpace * colorSpaceWS = new KisWetStickyColorSpace(); Q_CHECK_PTR(colorSpaceWS); diff --git a/chalk/colorspaces/wetsticky/wet_sticky_plugin.h b/chalk/colorspaces/wetsticky/wet_sticky_plugin.h index fe981a59b..e6749e7f9 100644 --- a/chalk/colorspaces/wetsticky/wet_sticky_plugin.h +++ b/chalk/colorspaces/wetsticky/wet_sticky_plugin.h @@ -34,7 +34,7 @@ class WetStickyPlugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - WetStickyPlugin(TQObject *tqparent, const char *name, const TQStringList &); + WetStickyPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~WetStickyPlugin(); }; diff --git a/chalk/colorspaces/wetsticky/ws/anim.c b/chalk/colorspaces/wetsticky/ws/anim.c index 995a3dffc..fed5379f5 100644 --- a/chalk/colorspaces/wetsticky/ws/anim.c +++ b/chalk/colorspaces/wetsticky/ws/anim.c @@ -53,7 +53,7 @@ static Pixmap colour_pm[FRAME_LIMIT]; static GC gc; static GC tmp_gc; -static long tqmask; +static long mask; static XGCValues values; Display *display; @@ -117,14 +117,14 @@ char *argv[]; XSynchronize(display, True); - tqmask = GCBackground| GCForeground| GCFunction; + mask = GCBackground| GCForeground| GCFunction; values.function = GXcopy; values.background = 0; values.foreground = 1; - gc = XtGetGC(colour_canvas, tqmask, &values); + gc = XtGetGC(colour_canvas, mask, &values); diff --git a/chalk/colorspaces/wetsticky/ws/cmap.c b/chalk/colorspaces/wetsticky/ws/cmap.c index 0f11eaf7a..9e53b0aef 100644 --- a/chalk/colorspaces/wetsticky/ws/cmap.c +++ b/chalk/colorspaces/wetsticky/ws/cmap.c @@ -59,7 +59,7 @@ static Pixmap dryness_pm; static GC gc; static GC tmp_gc; -static long tqmask; +static long mask; static XGCValues values; static Colormap cmap; @@ -216,7 +216,7 @@ Drawable win; /* Fill a window with a solid, white rectangle */ { XGCValues values; -long tqmask; +long mask; values.background = colours[0].pixel; values.foreground = colours[255].pixel;; @@ -224,9 +224,9 @@ long tqmask; values.function = GXclear; - tqmask = GCBackground| GCForeground| GCFillStyle | GCFunction; + mask = GCBackground| GCForeground| GCFillStyle | GCFunction; - tmp_gc = XtGetGC(top_level, tqmask, &values); + tmp_gc = XtGetGC(top_level, mask, &values); XFillRectangle(XtDisplay(top_level), win, tmp_gc, 0, 0, 300, 300); @@ -371,14 +371,14 @@ int height; XInstallColormap(display, cmap); - tqmask = GCBackground| GCForeground| GCFunction; + mask = GCBackground| GCForeground| GCFunction; values.function = GXcopy; values.background = colours[0].pixel; values.foreground = colours[255].pixel; - gc = XtGetGC(colour_canvas, tqmask, &values); + gc = XtGetGC(colour_canvas, mask, &values); colour_pm = XCreatePixmap(XtDisplay(top_level), XtWindow(colour_shell), width, height, diff --git a/chalk/colorspaces/wetsticky/ws/x_interface.c b/chalk/colorspaces/wetsticky/ws/x_interface.c index a8b54b3ea..7c36a303b 100644 --- a/chalk/colorspaces/wetsticky/ws/x_interface.c +++ b/chalk/colorspaces/wetsticky/ws/x_interface.c @@ -68,7 +68,7 @@ static Pixmap dryness_pm; static GC gc; static GC tmp_gc; -static long tqmask; +static long mask; static XGCValues values; static Colormap cmap; @@ -272,7 +272,7 @@ Drawable win; /* Fill a window with a solid, white rectangle */ { XGCValues values; -long tqmask; +long mask; values.background = colours[0].pixel; values.foreground = colours[255].pixel;; @@ -280,9 +280,9 @@ long tqmask; values.function = GXclear; - tqmask = GCBackground| GCForeground| GCFillStyle | GCFunction; + mask = GCBackground| GCForeground| GCFillStyle | GCFunction; - tmp_gc = XtGetGC(top_level, tqmask, &values); + tmp_gc = XtGetGC(top_level, mask, &values); XFillRectangle(XtDisplay(top_level), win, tmp_gc, 0, 0, 300, 300); @@ -423,14 +423,14 @@ int height; XInstallColormap(display, cmap); - tqmask = GCBackground| GCForeground| GCFunction; + mask = GCBackground| GCForeground| GCFunction; values.function = GXcopy; values.background = colours[0].pixel; values.foreground = colours[255].pixel; - gc = XtGetGC(colour_canvas, tqmask, &values); + gc = XtGetGC(colour_canvas, mask, &values); colour_pm = XCreatePixmap(XtDisplay(top_level), XtWindow(colour_shell), width, height, diff --git a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc index b19845b27..4d7493b27 100644 --- a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc +++ b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc @@ -26,8 +26,8 @@ const TQ_INT32 MAX_CHANNEL_YCbCr = 3; const TQ_INT32 MAX_CHANNEL_YCbCrA = 4; -KisYCbCrU16ColorSpace::KisYCbCrU16ColorSpace(KisColorSpaceFactoryRegistry* tqparent, KisProfile* /*p*/) - : KisU16BaseColorSpace(KisID("YCbCrAU16", i18n("YCbCr (16-bit integer/channel)")), TYPE_YCbCr_16, icSigYCbCrData, tqparent, 0) +KisYCbCrU16ColorSpace::KisYCbCrU16ColorSpace(KisColorSpaceFactoryRegistry* parent, KisProfile* /*p*/) + : KisU16BaseColorSpace(KisID("YCbCrAU16", i18n("YCbCr (16-bit integer/channel)")), TYPE_YCbCr_16, icSigYCbCrData, parent, 0) { m_channels.push_back(new KisChannelInfo(i18n("Y"), "Y", PIXEL_Y * sizeof(TQ_UINT16), KisChannelInfo::COLOR, KisChannelInfo::UINT16, sizeof(TQ_UINT16))); m_channels.push_back(new KisChannelInfo(i18n("Cb"), "Cb", PIXEL_Cb * sizeof(TQ_UINT16), KisChannelInfo::COLOR, KisChannelInfo::UINT16, sizeof(TQ_UINT16))); @@ -230,21 +230,21 @@ void KisYCbCrU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart); TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart); - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { TQ_UINT16 srcAlpha = src[PIXEL_ALPHA]; - // apply the alphatqmask - if (tqmask != 0) { - TQ_UINT8 U8_tqmask = *tqmask; + // apply the alphamask + if (mask != 0) { + TQ_UINT8 U8_mask = *mask; - if (U8_tqmask != OPACITY_OPAQUE) { - srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_tqmask)); + if (U8_mask != OPACITY_OPAQUE) { + srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_mask)); } - tqmask++; + mask++; } if (srcAlpha != U16_OPACITY_TRANSPARENT) { @@ -303,20 +303,20 @@ void KisYCbCrU16ColorSpace::compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowSize, c { const Pixel *s = reinterpret_cast<const Pixel *>(src); Pixel *d = reinterpret_cast<Pixel *>(dst); - const TQ_UINT8 *tqmask = srcAlphaMask; + const TQ_UINT8 *mask = srcAlphaMask; for (TQ_INT32 i = cols; i > 0; i--, s++, d++) { TQ_UINT16 srcAlpha = s->alpha; - // apply the alphatqmask - if (tqmask != 0) { - TQ_UINT8 U8_tqmask = *tqmask; + // apply the alphamask + if (mask != 0) { + TQ_UINT8 U8_mask = *mask; - if (U8_tqmask != OPACITY_OPAQUE) { - srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_tqmask)); + if (U8_mask != OPACITY_OPAQUE) { + srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_mask)); } - tqmask++; + mask++; } d->alpha = UINT16_MULT(srcAlpha, d->alpha); } diff --git a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h index d6ca157d0..d641f09e0 100644 --- a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h +++ b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h @@ -31,7 +31,7 @@ class KisYCbCrU16ColorSpace : public KisU16BaseColorSpace { public: - KisYCbCrU16ColorSpace(KisColorSpaceFactoryRegistry* tqparent, KisProfile* p); + KisYCbCrU16ColorSpace(KisColorSpaceFactoryRegistry* parent, KisProfile* p); ~KisYCbCrU16ColorSpace(); virtual bool willDegrade(ColorSpaceIndependence ) { @@ -75,8 +75,8 @@ class KisYCbCrU16ColorSpace : public KisU16BaseColorSpace TQ_INT32 cols, const KisCompositeOp& op); - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); private: #define CLAMP_TO_16BITCHANNEL(a) CLAMP(a, 0, TQ_UINT16_MAX) @@ -135,7 +135,7 @@ class KisYCbCrU16ColorSpaceFactory : public KisColorSpaceFactory virtual icColorSpaceSignature colorSpaceSignature() { return icSigYCbCrData; }; - virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisYCbCrU16ColorSpace(tqparent, p); }; + virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisYCbCrU16ColorSpace(parent, p); }; virtual TQString defaultProfile() { return ""; }; }; diff --git a/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cc b/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cc index d948097b7..7d926c480 100644 --- a/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cc +++ b/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cc @@ -33,14 +33,14 @@ typedef KGenericFactory<YCbCrU16Plugin> YCbCrU16PluginFactory; K_EXPORT_COMPONENT_FACTORY( chalk_ycbcr_u16_plugin, YCbCrU16PluginFactory( "chalk" ) ) -YCbCrU16Plugin::YCbCrU16Plugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +YCbCrU16Plugin::YCbCrU16Plugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(YCbCrU16PluginFactory::instance()); - if ( tqparent->inherits("KisColorSpaceFactoryRegistry") ) + if ( parent->inherits("KisColorSpaceFactoryRegistry") ) { - KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( tqparent ); + KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( parent ); KisColorSpace * colorSpaceYCbCrU16 = new KisYCbCrU16ColorSpace(f, 0); KisColorSpaceFactory * csf = new KisYCbCrU16ColorSpaceFactory(); diff --git a/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.h b/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.h index ceb8ec6f4..1e3b58127 100644 --- a/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.h +++ b/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.h @@ -29,7 +29,7 @@ class YCbCrU16Plugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - YCbCrU16Plugin(TQObject *tqparent, const char *name, const TQStringList &); + YCbCrU16Plugin(TQObject *parent, const char *name, const TQStringList &); virtual ~YCbCrU16Plugin(); }; diff --git a/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.cc b/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.cc index 389a91b91..5cd132319 100644 --- a/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.cc +++ b/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.cc @@ -26,8 +26,8 @@ const TQ_INT32 MAX_CHANNEL_YCbCr = 3; const TQ_INT32 MAX_CHANNEL_YCbCrA = 4; -KisYCbCrU8ColorSpace::KisYCbCrU8ColorSpace(KisColorSpaceFactoryRegistry* tqparent, KisProfile* /*p*/) - : KisU8BaseColorSpace(KisID("YCbCrAU8", i18n("YCbCr (8-bit integer/channel)")), TYPE_YCbCr_8, icSigYCbCrData, tqparent, 0) +KisYCbCrU8ColorSpace::KisYCbCrU8ColorSpace(KisColorSpaceFactoryRegistry* parent, KisProfile* /*p*/) + : KisU8BaseColorSpace(KisID("YCbCrAU8", i18n("YCbCr (8-bit integer/channel)")), TYPE_YCbCr_8, icSigYCbCrData, parent, 0) { m_channels.push_back(new KisChannelInfo(i18n("Y"), "Y", PIXEL_Y * sizeof(TQ_UINT8), KisChannelInfo::COLOR, KisChannelInfo::UINT8, sizeof(TQ_UINT8))); m_channels.push_back(new KisChannelInfo(i18n("Cb"), "Cb", PIXEL_Cb * sizeof(TQ_UINT8), KisChannelInfo::COLOR, KisChannelInfo::UINT8, sizeof(TQ_UINT8))); @@ -230,19 +230,19 @@ void KisYCbCrU8ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS const TQ_UINT8 *src = srcRowStart; TQ_UINT8 *dst = dstRowStart; - const TQ_UINT8 *tqmask = maskRowStart; + const TQ_UINT8 *mask = maskRowStart; TQ_INT32 columns = numColumns; while (columns > 0) { TQ_UINT8 srcAlpha = src[PIXEL_ALPHA]; - // apply the alphatqmask - if (tqmask != 0) { - if (*tqmask != OPACITY_OPAQUE) { - srcAlpha *= *tqmask; + // apply the alphamask + if (mask != 0) { + if (*mask != OPACITY_OPAQUE) { + srcAlpha *= *mask; } - tqmask++; + mask++; } if (srcAlpha > OPACITY_TRANSPARENT) { @@ -301,18 +301,18 @@ void KisYCbCrU8ColorSpace::compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowSize, co { const Pixel *s = reinterpret_cast<const Pixel *>(src); Pixel *d = reinterpret_cast<Pixel *>(dst); - const TQ_UINT8 *tqmask = srcAlphaMask; + const TQ_UINT8 *mask = srcAlphaMask; for (TQ_INT32 i = cols; i > 0; i--, s++, d++) { TQ_UINT8 srcAlpha = s -> alpha; - // apply the alphatqmask - if (tqmask != 0) { - if (*tqmask != OPACITY_OPAQUE) { - srcAlpha = *tqmask; + // apply the alphamask + if (mask != 0) { + if (*mask != OPACITY_OPAQUE) { + srcAlpha = *mask; } - tqmask++; + mask++; } d -> alpha = srcAlpha * d -> alpha; } @@ -325,7 +325,7 @@ void KisYCbCrU8ColorSpace::compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowSize, co } } -void KisYCbCrU8ColorSpace::compositeCopy(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 */*tqmask*/, TQ_INT32 /*maskRowStride*/, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 /*opacity*/) +void KisYCbCrU8ColorSpace::compositeCopy(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 */*mask*/, TQ_INT32 /*maskRowStride*/, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 /*opacity*/) { while (rows > 0) { memcpy(dstRowStart, srcRowStart, numColumns * sizeof(Pixel)); diff --git a/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h b/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h index 6c2b21c7f..7f22343d6 100644 --- a/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h +++ b/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h @@ -31,7 +31,7 @@ class KisYCbCrU8ColorSpace : public KisU8BaseColorSpace { public: - KisYCbCrU8ColorSpace(KisColorSpaceFactoryRegistry* tqparent, KisProfile* p); + KisYCbCrU8ColorSpace(KisColorSpaceFactoryRegistry* parent, KisProfile* p); ~KisYCbCrU8ColorSpace(); virtual bool willDegrade(ColorSpaceIndependence ) { @@ -75,9 +75,9 @@ class KisYCbCrU8ColorSpace : public KisU8BaseColorSpace TQ_INT32 cols, const KisCompositeOp& op); - void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); - void compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); + void compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity); private: #define CLAMP_TO_8BITCHANNEL(a) CLAMP(a, 0, TQ_UINT8_MAX) @@ -136,7 +136,7 @@ class KisYCbCrU8ColorSpaceFactory : public KisColorSpaceFactory virtual icColorSpaceSignature colorSpaceSignature() { return icSigYCbCrData; }; - virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisYCbCrU8ColorSpace(tqparent, p); }; + virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisYCbCrU8ColorSpace(parent, p); }; virtual TQString defaultProfile() { return ""; }; }; diff --git a/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.cc b/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.cc index d1d19c32a..00487ce42 100644 --- a/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.cc +++ b/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.cc @@ -35,14 +35,14 @@ typedef KGenericFactory<YCbCrU8Plugin> YCbCrU8PluginFactory; K_EXPORT_COMPONENT_FACTORY( chalk_ycbcr_u8_plugin, YCbCrU8PluginFactory( "chalk" ) ) -YCbCrU8Plugin::YCbCrU8Plugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +YCbCrU8Plugin::YCbCrU8Plugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(YCbCrU8PluginFactory::instance()); - if ( tqparent->inherits("KisColorSpaceFactoryRegistry") ) + if ( parent->inherits("KisColorSpaceFactoryRegistry") ) { - KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( tqparent ); + KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( parent ); KisColorSpace * colorSpaceYCbCrU8 = new KisYCbCrU8ColorSpace(f, 0); KisColorSpaceFactory * csf = new KisYCbCrU8ColorSpaceFactory(); diff --git a/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.h b/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.h index 982746144..85127380d 100644 --- a/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.h +++ b/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.h @@ -29,7 +29,7 @@ class YCbCrU8Plugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - YCbCrU8Plugin(TQObject *tqparent, const char *name, const TQStringList &); + YCbCrU8Plugin(TQObject *parent, const char *name, const TQStringList &); virtual ~YCbCrU8Plugin(); }; diff --git a/chalk/core/createdcop.py b/chalk/core/createdcop.py index de773270f..2356a8c4a 100755 --- a/chalk/core/createdcop.py +++ b/chalk/core/createdcop.py @@ -34,7 +34,7 @@ class %(classname)sIface : virtual public DCOPObject { K_DCOP public: - %(classname)sIface( %(classname)s * tqparent ); + %(classname)sIface( %(classname)s * parent ); k_dcop: private: @@ -73,10 +73,10 @@ dcopiface_template = """/* #include <dcopclient.h> -%(classname)sIface::%(classname)sIface( %(classname)s * tqparent ) +%(classname)sIface::%(classname)sIface( %(classname)s * parent ) : DCOPObject() { - m_parent = tqparent; + m_parent = parent; } """ diff --git a/chalk/core/kis_alpha_mask.cc b/chalk/core/kis_alpha_mask.cc index 1b40e806b..3f382c305 100644 --- a/chalk/core/kis_alpha_mask.cc +++ b/chalk/core/kis_alpha_mask.cc @@ -109,19 +109,19 @@ void KisAlphaMask::computeAlpha(const TQImage& img) } } -KisAlphaMaskSP KisAlphaMask::interpolate(KisAlphaMaskSP tqmask1, KisAlphaMaskSP tqmask2, double t) +KisAlphaMaskSP KisAlphaMask::interpolate(KisAlphaMaskSP mask1, KisAlphaMaskSP mask2, double t) { - Q_ASSERT((tqmask1->width() == tqmask2->width()) && (tqmask1->height() == tqmask2->height())); + Q_ASSERT((mask1->width() == mask2->width()) && (mask1->height() == mask2->height())); Q_ASSERT(t > -DBL_EPSILON && t < 1 + DBL_EPSILON); - int width = tqmask1->width(); - int height = tqmask1->height(); + int width = mask1->width(); + int height = mask1->height(); KisAlphaMaskSP outputMask = new KisAlphaMask(width, height); Q_CHECK_PTR(outputMask); for (int x = 0; x < width; x++) { for (int y = 0; y < height; y++) { - TQ_UINT8 d = static_cast<TQ_UINT8>((1 - t) * tqmask1->alphaAt(x, y) + t * tqmask2->alphaAt(x, y)); + TQ_UINT8 d = static_cast<TQ_UINT8>((1 - t) * mask1->alphaAt(x, y) + t * mask2->alphaAt(x, y)); outputMask->setAlphaAt(x, y, d); } } diff --git a/chalk/core/kis_alpha_mask.h b/chalk/core/kis_alpha_mask.h index 5573f5e6c..c19cae59a 100644 --- a/chalk/core/kis_alpha_mask.h +++ b/chalk/core/kis_alpha_mask.h @@ -28,15 +28,15 @@ /** * KisAlphaMask is intended to create alpha values from a TQImage for use - * in brush creation. It is not a generic alpha tqmask that can be used with + * in brush creation. It is not a generic alpha mask that can be used with * KisPaintDevices: use a KisSelection for that. */ class KisAlphaMask : public KShared { public: /** - Create an alpha tqmask based on the specified TQImage. If the image is - not a grayscale, the tqmask value is calculated from the effective grey + Create an alpha mask based on the specified TQImage. If the image is + not a grayscale, the mask value is calculated from the effective grey level and alpha value. */ KisAlphaMask(const TQImage& img); @@ -48,7 +48,7 @@ class KisAlphaMask : public KShared { KisAlphaMask(const TQImage& img, bool hasColor); /** - Create a transparent tqmask. + Create a transparent mask. */ KisAlphaMask(TQ_INT32 width, TQ_INT32 height); @@ -60,7 +60,7 @@ class KisAlphaMask : public KShared { TQ_INT32 height() const; /** - @return the number of lines in the tqmask. + @return the number of lines in the mask. */ TQ_INT32 width() const; @@ -68,14 +68,14 @@ class KisAlphaMask : public KShared { @return the alpha value at the specified position. Returns TQ_UINT8 OPACITY_TRANSPARENT if the value is - outside the bounds of the tqmask. + outside the bounds of the mask. XXX: this is, of course, not the best way of masking. Better would be to let KisAlphaMask fill a chunk of memory with the alpha values at the right position, something like void applyMask(TQ_UINT8 *pixeldata, TQ_INT32 pixelWidth, TQ_INT32 alphaPos). That would be fastest, or we could - provide an iterator over the tqmask, that would be nice, too. + provide an iterator over the mask, that would be nice, too. */ inline TQ_UINT8 alphaAt(TQ_INT32 x, TQ_INT32 y) const { @@ -89,9 +89,9 @@ class KisAlphaMask : public KShared { void setAlphaAt(TQ_INT32 x, TQ_INT32 y, TQ_UINT8 alpha); - // Create a new tqmask by interpolating between tqmask1 and tqmask2 as t + // Create a new mask by interpolating between mask1 and mask2 as t // goes from 0 to 1. - static KisAlphaMaskSP interpolate(KisAlphaMaskSP tqmask1, KisAlphaMaskSP tqmask2, double t); + static KisAlphaMaskSP interpolate(KisAlphaMaskSP mask1, KisAlphaMaskSP mask2, double t); private: void computeAlpha(const TQImage& img); diff --git a/chalk/core/kis_brush.cc b/chalk/core/kis_brush.cc index 60f475f0b..31ee9d181 100644 --- a/chalk/core/kis_brush.cc +++ b/chalk/core/kis_brush.cc @@ -375,7 +375,7 @@ TQImage KisBrush::img() return image; } -KisAlphaMaskSP KisBrush::tqmask(const KisPaintInformation& info, double subPixelX, double subPixelY) const +KisAlphaMaskSP KisBrush::mask(const KisPaintInformation& info, double subPixelX, double subPixelY) const { if (m_scaledBrushes.isEmpty()) { createScaledBrushes(); @@ -405,9 +405,9 @@ KisAlphaMaskSP KisBrush::tqmask(const KisPaintInformation& info, double subPixel // Exact match. outputMask = scaleMask(aboveBrush, scale, subPixelX, subPixelY); } else { - // We are smaller than the smallest tqmask, which is always 1x1. + // We are smaller than the smallest mask, which is always 1x1. double s = scale / aboveBrush->scale(); - outputMask = scaleSinglePixelMask(s, aboveBrush->tqmask()->alphaAt(0, 0), subPixelX, subPixelY); + outputMask = scaleSinglePixelMask(s, aboveBrush->mask()->alphaAt(0, 0), subPixelX, subPixelY); } } @@ -629,7 +629,7 @@ KisAlphaMaskSP KisBrush::scaleMask(const ScaledBrush *srcBrush, double scale, do KisAlphaMaskSP dstMask = new KisAlphaMask(dstWidth, dstHeight); Q_CHECK_PTR(dstMask); - KisAlphaMaskSP srcMask = srcBrush->tqmask(); + KisAlphaMaskSP srcMask = srcBrush->mask(); // Compute scales to map the scaled brush onto the required scale. double xScale = srcBrush->xScale() / scale; @@ -1167,7 +1167,7 @@ TQImage KisBrush::interpolate(const TQImage& image1, const TQImage& image2, doub KisBrush::ScaledBrush::ScaledBrush() { - m_tqmask = 0; + m_mask = 0; m_image = TQImage(); m_scale = 1; m_xScale = 1; @@ -1176,7 +1176,7 @@ KisBrush::ScaledBrush::ScaledBrush() KisBrush::ScaledBrush::ScaledBrush(KisAlphaMaskSP scaledMask, const TQImage& scaledImage, double scale, double xScale, double yScale) { - m_tqmask = scaledMask; + m_mask = scaledMask; m_image = scaledImage; m_scale = scale; m_xScale = xScale; @@ -1262,7 +1262,7 @@ void KisBrush::generateBoundary() { if (brushType() == IMAGE || brushType() == PIPE_IMAGE) { dev = image(KisMetaRegistry::instance()->csRegistry() ->getColorSpace(KisID("RGBA",""),""), KisPaintInformation()); } else { - KisAlphaMaskSP atqmask = tqmask(KisPaintInformation()); + KisAlphaMaskSP amask = mask(KisPaintInformation()); KisColorSpace* cs = KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA",""),""); dev = new KisPaintDevice(cs, "tmp for generateBoundary"); for (int y = 0; y < h; y++) { @@ -1270,7 +1270,7 @@ void KisBrush::generateBoundary() { int x = 0; while(!it.isDone()) { - cs->setAlpha(it.rawData(), atqmask->alphaAt(x++, y), 1); + cs->setAlpha(it.rawData(), amask->alphaAt(x++, y), 1); ++it; } } diff --git a/chalk/core/kis_brush.h b/chalk/core/kis_brush.h index 57dd9d9eb..9a7f3bb0a 100644 --- a/chalk/core/kis_brush.h +++ b/chalk/core/kis_brush.h @@ -77,10 +77,10 @@ public: virtual bool saveToDevice(TQIODevice* dev) const; /** - @return a tqmask computed from the grey-level values of the + @return a mask computed from the grey-level values of the pixels in the brush. */ - virtual KisAlphaMaskSP tqmask(const KisPaintInformation& info, + virtual KisAlphaMaskSP mask(const KisPaintInformation& info, double subPixelX = 0, double subPixelY = 0) const; // XXX: return non-tiled simple buffer virtual KisPaintDeviceSP image(KisColorSpace * colorSpace, const KisPaintInformation& info, @@ -94,7 +94,7 @@ public: double xSpacing(double pressure = PRESSURE_DEFAULT) const; double ySpacing(double pressure = PRESSURE_DEFAULT) const; - // Dimensions in pixels of the tqmask/image at a given pressure. + // Dimensions in pixels of the mask/image at a given pressure. TQ_INT32 maskWidth(const KisPaintInformation& info) const; TQ_INT32 maskHeight(const KisPaintInformation& info) const; @@ -135,11 +135,11 @@ private: double scale() const { return m_scale; } double xScale() const { return m_xScale; } double yScale() const { return m_yScale; } - KisAlphaMaskSP tqmask() const { return m_tqmask; } + KisAlphaMaskSP mask() const { return m_mask; } TQImage image() const { return m_image; } private: - KisAlphaMaskSP m_tqmask; + KisAlphaMaskSP m_mask; TQImage m_image; double m_scale; double m_xScale; diff --git a/chalk/core/kis_fill_painter.cc b/chalk/core/kis_fill_painter.cc index 5b8fdcc91..54e730a71 100644 --- a/chalk/core/kis_fill_painter.cc +++ b/chalk/core/kis_fill_painter.cc @@ -203,10 +203,10 @@ void KisFillPainter::genericFillEnd(KisPaintDeviceSP filled) { } struct FillSegment { - FillSegment(int x, int y/*, FillSegment* tqparent*/) : x(x), y(y)/*, tqparent(tqparent)*/ {} + FillSegment(int x, int y/*, FillSegment* parent*/) : x(x), y(y)/*, parent(parent)*/ {} int x; int y; -// FillSegment* tqparent; +// FillSegment* parent; }; typedef enum { None = 0, Added = 1, Checked = 2 } tqStatus; diff --git a/chalk/core/kis_fill_painter.h b/chalk/core/kis_fill_painter.h index da244a67d..12aa0c2ff 100644 --- a/chalk/core/kis_fill_painter.h +++ b/chalk/core/kis_fill_painter.h @@ -102,7 +102,7 @@ public: void fillPattern(int startX, int startY); /** - * Returns a selection tqmask for the floodfill starting at the specified position. + * Returns a selection mask for the floodfill starting at the specified position. **/ KisSelectionSP createFloodSelection(int startX, int startY); diff --git a/chalk/core/kis_filter.h b/chalk/core/kis_filter.h index 807ecff8b..193be6ced 100644 --- a/chalk/core/kis_filter.h +++ b/chalk/core/kis_filter.h @@ -158,12 +158,12 @@ public: /** * Create the configuration widget for this filter. * - * @param tqparent the TQt owner widget of this widget + * @param parent the TQt owner widget of this widget * @param dev the paintdevice this filter will act on * @return NULL if the filter does not use user-settable configuration settings. * else return a pointer to the new configuration widget */ - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget * tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget * parent, KisPaintDeviceSP dev); virtual void cancel() { m_cancelRequested = true; } diff --git a/chalk/core/kis_filter_config_widget.cc b/chalk/core/kis_filter_config_widget.cc index df7c13d5a..1df05f64d 100644 --- a/chalk/core/kis_filter_config_widget.cc +++ b/chalk/core/kis_filter_config_widget.cc @@ -19,8 +19,8 @@ #include "kis_filter_config_widget.h" -KisFilterConfigWidget::KisFilterConfigWidget(TQWidget * tqparent, const char * name, WFlags f) - : TQWidget(tqparent, name, f) +KisFilterConfigWidget::KisFilterConfigWidget(TQWidget * parent, const char * name, WFlags f) + : TQWidget(parent, name, f) { } diff --git a/chalk/core/kis_filter_config_widget.h b/chalk/core/kis_filter_config_widget.h index ddb600ab0..f893b1388 100644 --- a/chalk/core/kis_filter_config_widget.h +++ b/chalk/core/kis_filter_config_widget.h @@ -33,7 +33,7 @@ class KisFilterConfigWidget : public TQWidget { public: - KisFilterConfigWidget(TQWidget * tqparent, const char * name = 0, WFlags f = 0 ); + KisFilterConfigWidget(TQWidget * parent, const char * name = 0, WFlags f = 0 ); virtual ~KisFilterConfigWidget(); virtual void setConfiguration(KisFilterConfiguration * config) = 0; diff --git a/chalk/core/kis_group_layer.cc b/chalk/core/kis_group_layer.cc index ea8d02135..1f08dbddc 100644 --- a/chalk/core/kis_group_layer.cc +++ b/chalk/core/kis_group_layer.cc @@ -90,9 +90,9 @@ bool KisGroupLayer::paintLayerInducesProjectionOptimization(KisPaintLayer* l) { KisPaintDeviceSP KisGroupLayer::projection(const TQRect & rect) { - // We don't have a tqparent, and we've got only one child: abuse the child's + // We don't have a parent, and we've got only one child: abuse the child's // paint device as the projection if the child is visible and 100% opaque - if (tqparent() == 0 && childCount() == 1) { + if (parent() == 0 && childCount() == 1) { KisPaintLayerSP l = dynamic_cast<KisPaintLayer*>(firstChild().data()); if (paintLayerInducesProjectionOptimization(l)) { l->setClean(rect); @@ -146,14 +146,14 @@ KisLayerSP KisGroupLayer::at(int index) const int KisGroupLayer::index(KisLayerSP layer) const { - if (layer->tqparent().data() == this) + if (layer->parent().data() == this) return layer->index(); return -1; } void KisGroupLayer::setIndex(KisLayerSP layer, int index) { - if (layer->tqparent().data() != this) + if (layer->parent().data() != this) return; //TODO optimize removeLayer(layer); @@ -163,7 +163,7 @@ void KisGroupLayer::setIndex(KisLayerSP layer, int index) bool KisGroupLayer::addLayer(KisLayerSP newLayer, int x) { if (x < 0 || kClamp(uint(x), uint(0), childCount()) != uint(x) || - newLayer->tqparent() || m_layers.contains(newLayer)) + newLayer->parent() || m_layers.contains(newLayer)) { kdWarning() << "invalid input to KisGroupLayer::addLayer(KisLayerSP newLayer, int x)!" << endl; return false; @@ -185,7 +185,7 @@ bool KisGroupLayer::addLayer(KisLayerSP newLayer, int x) bool KisGroupLayer::addLayer(KisLayerSP newLayer, KisLayerSP aboveThis) { - if (aboveThis && aboveThis->tqparent().data() != this) + if (aboveThis && aboveThis->parent().data() != this) { kdWarning() << "invalid input to KisGroupLayer::addLayer(KisLayerSP newLayer, KisLayerSP aboveThis)!" << endl; return false; @@ -219,7 +219,7 @@ bool KisGroupLayer::removeLayer(int x) bool KisGroupLayer::removeLayer(KisLayerSP layer) { - if (layer->tqparent().data() != this) + if (layer->parent().data() != this) { kdWarning() << "invalid input to KisGroupLayer::removeLayer()!" << endl; return false; @@ -317,7 +317,7 @@ void KisGroupLayer::updateProjection(const TQRect & rc) // If this is the rootlayer, don't do anything with adj. layers that are below the // first paintlayer - bool gotPaintLayer = (tqparent() != 0); + bool gotPaintLayer = (parent() != 0); // Look through all the child layers, searching for the first dirty layer // if it's found, and if we have found an adj. layer before the the dirty layer, @@ -404,8 +404,8 @@ void KisGroupLayer::updateProjection(const TQRect & rc) const KisCompositeOp cop = child->compositeOp(); const bool block = child->signalsBlocked(); child->blockSignals(true); - // Composite op copy doesn't take a tqmask/selection into account, so we need - // to make a difference between a paintlayer with a tqmask, and one without + // Composite op copy doesn't take a mask/selection into account, so we need + // to make a difference between a paintlayer with a mask, and one without KisPaintLayer* l = dynamic_cast<KisPaintLayer*>(child.data()); if (l && l->hasMask()) child->m_compositeOp = COMPOSITE_OVER; diff --git a/chalk/core/kis_group_layer.h b/chalk/core/kis_group_layer.h index 3a2e042ad..a516ac723 100644 --- a/chalk/core/kis_group_layer.h +++ b/chalk/core/kis_group_layer.h @@ -48,14 +48,14 @@ public: public: /** - * Set the entire layer extent dirty; this percolates up to tqparent layers all the + * Set the entire layer extent dirty; this percolates up to parent layers all the * way to the root layer. */ virtual void setDirty(bool propagate = true); /** * Add the given rect to the set of dirty rects for this layer; - * this percolates up to tqparent layers all the way to the root + * this percolates up to parent layers all the way to the root * layer. */ virtual void setDirty(const TQRect & rect, bool propagate = true); diff --git a/chalk/core/kis_image.cc b/chalk/core/kis_image.cc index 30f3ad364..1efeb7152 100644 --- a/chalk/core/kis_image.cc +++ b/chalk/core/kis_image.cc @@ -258,12 +258,12 @@ namespace { typedef KisImageCommand super; public: - KisLayerPositionCommand(const TQString& name, KisImageSP image, KisLayerSP layer, KisGroupLayerSP tqparent, KisLayerSP aboveThis) : super(name, image) + KisLayerPositionCommand(const TQString& name, KisImageSP image, KisLayerSP layer, KisGroupLayerSP parent, KisLayerSP aboveThis) : super(name, image) { m_layer = layer; - m_oldParent = layer->tqparent(); + m_oldParent = layer->parent(); m_oldAboveThis = layer->nextSibling(); - m_newParent = tqparent; + m_newParent = parent; m_newAboveThis = aboveThis; } @@ -300,7 +300,7 @@ namespace { { m_img = img; m_layer = layer; - m_parent = layer->tqparent(); + m_parent = layer->parent(); m_aboveThis = layer->nextSibling(); } @@ -385,7 +385,7 @@ namespace { m_layer = layer; m_prevParent = wasParent; m_prevAbove = wasAbove; - m_newParent = layer->tqparent(); + m_newParent = layer->parent(); m_newAbove = layer->nextSibling(); } @@ -1048,7 +1048,7 @@ KisLayerSP KisImage::newLayer(const TQString& name, TQ_UINT8 opacity, const KisC layer->setVisible(true); if (m_activeLayer != 0) { - addLayer(layer, m_activeLayer->tqparent().data(), m_activeLayer->nextSibling()); + addLayer(layer, m_activeLayer->parent().data(), m_activeLayer->nextSibling()); } else { addLayer(layer, m_rootLayer, 0); @@ -1116,17 +1116,17 @@ KisLayerSP KisImage::findLayer(int id) const } -bool KisImage::addLayer(KisLayerSP layer, KisGroupLayerSP tqparent) +bool KisImage::addLayer(KisLayerSP layer, KisGroupLayerSP parent) { - return addLayer(layer, tqparent, tqparent->firstChild()); + return addLayer(layer, parent, parent->firstChild()); } -bool KisImage::addLayer(KisLayerSP layer, KisGroupLayerSP tqparent, KisLayerSP aboveThis) +bool KisImage::addLayer(KisLayerSP layer, KisGroupLayerSP parent, KisLayerSP aboveThis) { - if (!tqparent) + if (!parent) return false; - const bool success = tqparent->addLayer(layer, aboveThis); + const bool success = parent->addLayer(layer, aboveThis); if (success) { KisPaintLayerSP player = dynamic_cast<KisPaintLayer*>(layer.data()); @@ -1163,7 +1163,7 @@ bool KisImage::removeLayer(KisLayerSP layer) if (!layer || layer->image() != this) return false; - if (KisGroupLayerSP tqparent = layer->tqparent()) { + if (KisGroupLayerSP parent = layer->parent()) { // Adjustment layers should mark the layers underneath them, whose rendering // they have cached, diryt on removal. Otherwise, the group won't be re-rendered. KisAdjustmentLayer * al = dynamic_cast<KisAdjustmentLayer*>(layer.data()); @@ -1196,21 +1196,21 @@ bool KisImage::removeLayer(KisLayerSP layer) const bool wasActive = layer == activeLayer(); // sigLayerRemoved can set it to 0, we don't want that in the else of wasActive! KisLayerSP actLayer = activeLayer(); - const bool success = tqparent->removeLayer(layer); + const bool success = parent->removeLayer(layer); if (success) { layer->setImage(0); if (!layer->temporary() && undo()) { - m_adapter->addCommand(new LayerRmCmd(m_adapter, this, layer, tqparent, wasAbove)); + m_adapter->addCommand(new LayerRmCmd(m_adapter, this, layer, parent, wasAbove)); } if (!layer->temporary()) { - emit sigLayerRemoved(layer, tqparent, wasAbove); + emit sigLayerRemoved(layer, parent, wasAbove); if (wasActive) { if (wasBelow) activate(wasBelow); else if (wasAbove) activate(wasAbove); - else if (tqparent != rootLayer()) - activate(tqparent.data()); + else if (parent != rootLayer()) + activate(parent.data()); else activate(rootLayer()->firstChild()); } else { @@ -1228,7 +1228,7 @@ bool KisImage::raiseLayer(KisLayerSP layer) { if (!layer) return false; - return moveLayer(layer, layer->tqparent().data(), layer->prevSibling()); + return moveLayer(layer, layer->parent().data(), layer->prevSibling()); } bool KisImage::lowerLayer(KisLayerSP layer) @@ -1236,7 +1236,7 @@ bool KisImage::lowerLayer(KisLayerSP layer) if (!layer) return false; if (KisLayerSP next = layer->nextSibling()) - return moveLayer(layer, layer->tqparent().data(), next->nextSibling()); + return moveLayer(layer, layer->parent().data(), next->nextSibling()); return false; } @@ -1254,15 +1254,15 @@ bool KisImage::toBottom(KisLayerSP layer) return moveLayer(layer, rootLayer(), 0); } -bool KisImage::moveLayer(KisLayerSP layer, KisGroupLayerSP tqparent, KisLayerSP aboveThis) +bool KisImage::moveLayer(KisLayerSP layer, KisGroupLayerSP parent, KisLayerSP aboveThis) { - if (!tqparent) + if (!parent) return false; - KisGroupLayerSP wasParent = layer->tqparent(); + KisGroupLayerSP wasParent = layer->parent(); KisLayerSP wasAbove = layer->nextSibling(); - if (wasParent.data() == tqparent.data() && wasAbove.data() == aboveThis.data()) + if (wasParent.data() == parent.data() && wasAbove.data() == aboveThis.data()) return false; lock(); @@ -1272,7 +1272,7 @@ bool KisImage::moveLayer(KisLayerSP layer, KisGroupLayerSP tqparent, KisLayerSP return false; } - const bool success = tqparent->addLayer(layer, aboveThis); + const bool success = parent->addLayer(layer, aboveThis); layer->setDirty(); @@ -1357,7 +1357,7 @@ void KisImage::mergeLayer(KisLayerSP layer) layer->accept(visitor); removeLayer(layer->nextSibling()); - addLayer(player, layer->tqparent(), layer); + addLayer(player, layer->parent(), layer); removeLayer(layer); undoAdapter()->endMacro(); diff --git a/chalk/core/kis_image.h b/chalk/core/kis_image.h index 4db23d3c6..132505b29 100644 --- a/chalk/core/kis_image.h +++ b/chalk/core/kis_image.h @@ -248,23 +248,23 @@ public: KisLayerSP findLayer(int id) const; /// Move layer to specified position - bool moveLayer(KisLayerSP layer, KisGroupLayerSP tqparent, KisLayerSP aboveThis); + bool moveLayer(KisLayerSP layer, KisGroupLayerSP parent, KisLayerSP aboveThis); /** * Add an already existing layer to the image. The layer is put on top * of the layers in the specified layergroup * @param layer the layer to be added - * @param tqparent the tqparent layer + * @param parent the parent layer */ - bool addLayer(KisLayerSP layer, KisGroupLayerSP tqparent); + bool addLayer(KisLayerSP layer, KisGroupLayerSP parent); /** * Add already existing layer to image. * * @param layer the layer to be added - * @param tqparent the tqparent layer + * @param parent the parent layer * @param aboveThis in the list with child layers of the specified - * tqparent, add this layer above the specified sibling. + * parent, add this layer above the specified sibling. * if 0, the layer is put in the lowermost position in * its group. * @param notify If true, the image is immediately recomposited, if false, @@ -272,7 +272,7 @@ public: * * returns false if adding the layer didn't work, true if the layer got added */ - bool addLayer(KisLayerSP layer, KisGroupLayerSP tqparent, KisLayerSP aboveThis); + bool addLayer(KisLayerSP layer, KisGroupLayerSP parent, KisLayerSP aboveThis); /// Remove layer bool removeLayer(KisLayerSP layer); @@ -355,21 +355,21 @@ signals: /// Emitted after a different layer is made active. void sigLayerActivated(KisLayerSP layer); - /// Emitted after a layer is added: you can find out where by asking it for its tqparent(), et al. + /// Emitted after a layer is added: you can find out where by asking it for its parent(), et al. void sigLayerAdded(KisLayerSP layer); /** Emitted after a layer is removed. It's no longer in the image, but still exists, so @p layer is valid. @param layer the removed layer - @param tqparent the tqparent of the layer, before it was removed + @param parent the parent of the layer, before it was removed @param wasAboveThis the layer it was above, before it was removed. */ void sigLayerRemoved(KisLayerSP layer, KisGroupLayerSP wasParent, KisLayerSP wasAboveThis); - /** Emitted after a layer is moved to a different position under its tqparent layer, or its tqparent changes. + /** Emitted after a layer is moved to a different position under its parent layer, or its parent changes. - @param previousParent the tqparent of the layer, before it was moved + @param previousParent the parent of the layer, before it was moved @param wasAboveThis the layer it was above, before it was moved. */ void sigLayerMoved(KisLayerSP layer, KisGroupLayerSP previousParent, KisLayerSP wasAboveThis); @@ -409,7 +409,7 @@ signals: void sigColorSpaceChanged(KisColorSpace* cs); - /// Emitted when any layer's tqmask info got updated (or when the current layer changes) + /// Emitted when any layer's mask info got updated (or when the current layer changes) void sigMaskInfoChanged(); public slots: void slotSelectionChanged(); diff --git a/chalk/core/kis_imagepipe_brush.cc b/chalk/core/kis_imagepipe_brush.cc index 9b71c83df..726d0295f 100644 --- a/chalk/core/kis_imagepipe_brush.cc +++ b/chalk/core/kis_imagepipe_brush.cc @@ -318,11 +318,11 @@ TQImage KisImagePipeBrush::img() } } -KisAlphaMaskSP KisImagePipeBrush::tqmask(const KisPaintInformation& info, double subPixelX, double subPixelY) const +KisAlphaMaskSP KisImagePipeBrush::mask(const KisPaintInformation& info, double subPixelX, double subPixelY) const { if (m_brushes.isEmpty()) return 0; selectNextBrush(info); - return m_brushes.at(m_currentBrush)->tqmask(info, subPixelX, subPixelY); + return m_brushes.at(m_currentBrush)->mask(info, subPixelX, subPixelY); } KisPaintDeviceSP KisImagePipeBrush::image(KisColorSpace * colorSpace, const KisPaintInformation& info, double subPixelX, double subPixelY) const diff --git a/chalk/core/kis_imagepipe_brush.h b/chalk/core/kis_imagepipe_brush.h index bc54204b6..eea581945 100644 --- a/chalk/core/kis_imagepipe_brush.h +++ b/chalk/core/kis_imagepipe_brush.h @@ -125,9 +125,9 @@ public: virtual TQImage img(); /** - @return the next tqmask in the pipe. + @return the next mask in the pipe. */ - virtual KisAlphaMaskSP tqmask(const KisPaintInformation& info, + virtual KisAlphaMaskSP mask(const KisPaintInformation& info, double subPixelX = 0, double subPixelY = 0) const; virtual KisPaintDeviceSP image(KisColorSpace * colorSpace, const KisPaintInformation& info, double subPixelX = 0, double subPixelY = 0) const; diff --git a/chalk/core/kis_iteratorpixeltrait.h b/chalk/core/kis_iteratorpixeltrait.h index 5d2c957ff..2b047c0ec 100644 --- a/chalk/core/kis_iteratorpixeltrait.h +++ b/chalk/core/kis_iteratorpixeltrait.h @@ -103,7 +103,7 @@ public: }; /** - * Returns the selectiontqmask from the current point; this is guaranteed + * Returns the selectionmask from the current point; this is guaranteed * to have the same number of consecutive pixels that the iterator has * at a given point. It return a 0 if there is no selection. */ diff --git a/chalk/core/kis_iterators_pixel.h b/chalk/core/kis_iterators_pixel.h index bd82f856e..65ad78317 100644 --- a/chalk/core/kis_iterators_pixel.h +++ b/chalk/core/kis_iterators_pixel.h @@ -66,10 +66,10 @@ public: TQ_INT32 nConseqHPixels() const { if (m_selectionIterator) { - TQ_INT32 tqparent = KisHLineIteratorPixel::nConseqHPixels(); + TQ_INT32 parent = KisHLineIteratorPixel::nConseqHPixels(); TQ_INT32 selection = m_selectionIterator->nConseqHPixels(); - if (tqparent < selection) - return tqparent; + if (parent < selection) + return parent; return selection; } return KisHLineIteratorPixel::nConseqHPixels(); @@ -137,10 +137,10 @@ public: TQ_INT32 nConseqPixels() const { if (m_selectionIterator) { - TQ_INT32 tqparent = KisRectIterator::nConseqPixels(); + TQ_INT32 parent = KisRectIterator::nConseqPixels(); TQ_INT32 selection = m_selectionIterator->nConseqPixels(); - if (tqparent < selection) - return tqparent; + if (parent < selection) + return parent; return selection; } return KisRectIterator::nConseqPixels(); diff --git a/chalk/core/kis_layer.cc b/chalk/core/kis_layer.cc index 752159c08..2b7307e5f 100644 --- a/chalk/core/kis_layer.cc +++ b/chalk/core/kis_layer.cc @@ -341,7 +341,7 @@ void KisLayer::setDirty(bool propagate) if (rc.isValid()) m_dirtyRect = rc; - // If we're dirty, our tqparent is dirty, if we've got a tqparent + // If we're dirty, our parent is dirty, if we've got a parent if (propagate && m_parent && rc.isValid()) m_parent->setDirty(m_dirtyRect); if (m_image && rc.isValid()) { @@ -351,7 +351,7 @@ void KisLayer::setDirty(bool propagate) void KisLayer::setDirty(const TQRect & rc, bool propagate) { - // If we're dirty, our tqparent is dirty, if we've got a tqparent + // If we're dirty, our parent is dirty, if we've got a parent if (rc.isValid()) m_dirtyRect |= rc; @@ -364,23 +364,23 @@ void KisLayer::setDirty(const TQRect & rc, bool propagate) } } -KisGroupLayerSP KisLayer::tqparent() const +KisGroupLayerSP KisLayer::parent() const { return m_parent; } KisLayerSP KisLayer::prevSibling() const { - if (!tqparent()) + if (!parent()) return 0; - return tqparent()->at(index() - 1); + return parent()->at(index() - 1); } KisLayerSP KisLayer::nextSibling() const { - if (!tqparent()) + if (!parent()) return 0; - return tqparent()->at(index() + 1); + return parent()->at(index() + 1); } int KisLayer::index() const @@ -390,9 +390,9 @@ int KisLayer::index() const void KisLayer::setIndex(int i) { - if (!tqparent()) + if (!parent()) return; - tqparent()->setIndex(this, i); + parent()->setIndex(this, i); } KisLayerSP KisLayer::findLayer(const TQString& n) const diff --git a/chalk/core/kis_layer.h b/chalk/core/kis_layer.h index 09ecd2357..2cff4bc99 100644 --- a/chalk/core/kis_layer.h +++ b/chalk/core/kis_layer.h @@ -69,14 +69,14 @@ public: /** - * Set the entire layer extent dirty; this percolates up to tqparent layers all the + * Set the entire layer extent dirty; this percolates up to parent layers all the * way to the root layer. */ virtual void setDirty(bool propagate = true); /** * Add the given rect to the set of dirty rects for this layer; - * this percolates up to tqparent layers all the way to the root + * this percolates up to parent layers all the way to the root * layer. */ virtual void setDirty(const TQRect & rect, bool propagate = true); @@ -87,41 +87,41 @@ public: /// Returns the ID of the layer, which is guaranteed to be unique among all KisLayers. int id() const { return m_id; } - /* Returns the index of the layer in its tqparent's list of child layers. Indices + /* Returns the index of the layer in its parent's list of child layers. Indices * increase from 0, which is the topmost layer in the list, to the bottommost. */ virtual int index() const; - /// Moves this layer to the specified index within its tqparent's list of child layers. + /// Moves this layer to the specified index within its parent's list of child layers. virtual void setIndex(int index); /** - * Returns the tqparent layer of a layer. This is 0 only for a root layer; otherwise + * Returns the parent layer of a layer. This is 0 only for a root layer; otherwise * this will be an actual GroupLayer */ - virtual KisGroupLayerSP tqparent() const; + virtual KisGroupLayerSP parent() const; /** - * Returns the previous sibling of this layer in the tqparent's list. This is the layer - * *above* this layer. 0 is returned if there is no tqparent, or if this child has no more + * Returns the previous sibling of this layer in the parent's list. This is the layer + * *above* this layer. 0 is returned if there is no parent, or if this child has no more * previous siblings (== firstChild()) */ virtual KisLayerSP prevSibling() const; /** - * Returns the next sibling of this layer in the tqparent's list. This is the layer *below* - * this layer. 0 is returned if there is no tqparent, or if this child has no more next + * Returns the next sibling of this layer in the parent's list. This is the layer *below* + * this layer. 0 is returned if there is no parent, or if this child has no more next * siblings (== lastChild()) */ virtual KisLayerSP nextSibling() const; /** - * Returns the sibling above this layer in its tqparent's list. 0 is returned if there is no tqparent, + * Returns the sibling above this layer in its parent's list. 0 is returned if there is no parent, * or if this layer is the topmost layer in its group. This is the same as calling prevSibling(). */ KisLayerSP siblingAbove() const { return prevSibling(); } /** - * Returns the sibling below this layer in its tqparent's list. 0 is returned if there is no tqparent, + * Returns the sibling below this layer in its parent's list. 0 is returned if there is no parent, * or if this layer is the bottommost layer in its group. This is the same as calling nextSibling(). */ KisLayerSP siblingBelow() const { return nextSibling(); } @@ -197,7 +197,7 @@ public: KisUndoAdapter *undoAdapter() const; - /// paints a tqmask where the selection on this layer resides + /// paints a mask where the selection on this layer resides virtual void paintSelection(TQImage &img, TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32 h); virtual void paintSelection(TQImage &img, const TQRect& scaledImageRect, const TQSize& scaledImageSize, const TQSize& imageSize); diff --git a/chalk/core/kis_merge_visitor.h b/chalk/core/kis_merge_visitor.h index 721ce827e..afd8fb378 100644 --- a/chalk/core/kis_merge_visitor.h +++ b/chalk/core/kis_merge_visitor.h @@ -114,11 +114,11 @@ public: gc.bitBlt(dx, dy, layer->compositeOp(), source, layer->opacity(), sx, sy, w, h); } else { if (layer->renderMask()) { - // To display the tqmask, we don't do things with composite op and opacity + // To display the mask, we don't do things with composite op and opacity // This is like the gimp does it, I guess that's ok? // Note that here we'll use m_rc, because even if the extent of the device is - // empty, we want a full tqmask to be drawn! (we don't change rc, since + // empty, we want a full mask to be drawn! (we don't change rc, since // it'd mess with setClean). This is because KisPainter::bitBlt &'s with // the source device's extent. This is ok in normal circumstances, but // we changed the default tile. Fixing this properly would mean fixing it there. @@ -129,36 +129,36 @@ public: dx = sx; dy = sy; - // The problem is that the extent of the layer tqmask might not be extended + // The problem is that the extent of the layer mask might not be extended // enough. Check if that is the case - KisPaintDeviceSP tqmask = layer->getMask(); - TQRect mextent = tqmask->extent(); + KisPaintDeviceSP mask = layer->getMask(); + TQRect mextent = mask->extent(); if ((mextent & m_rc) != m_rc) { // Iterate over all pixels in the m_rc area. With just accessing the // tiles in read-write mode, we ensure that the tiles get created if they // do not exist. If they do, they'll remain untouched since we don't // actually write data to it. // XXX Admission: this is actually kind of a hack :-( - KisRectIteratorPixel it = tqmask->createRectIterator(sx, sy, w, h, true); + KisRectIteratorPixel it = mask->createRectIterator(sx, sy, w, h, true); while (!it.isDone()) ++it; } if (tempTarget) { KisPaintDeviceSP temp = new KisPaintDevice(source->colorSpace()); - tqmask = paintIndirect(tqmask, temp, layer, sx, sy, dx, dy, w, h); + mask = paintIndirect(mask, temp, layer, sx, sy, dx, dy, w, h); } - gc.bitBlt(dx, dy, COMPOSITE_OVER, tqmask, OPACITY_OPAQUE, sx, sy, w, h); + gc.bitBlt(dx, dy, COMPOSITE_OVER, mask, OPACITY_OPAQUE, sx, sy, w, h); } else { - KisSelectionSP tqmask = layer->getMaskAsSelection(); - // The indirect painting happens on the tqmask + KisSelectionSP mask = layer->getMaskAsSelection(); + // The indirect painting happens on the mask if (tempTarget && layer->editMask()) { KisPaintDeviceSP maskSrc = layer->getMask(); KisPaintDeviceSP temp = new KisPaintDevice(maskSrc->colorSpace()); temp = paintIndirect(maskSrc, temp, layer, sx, sy, dx, dy, w, h); // Blegh KisRectIteratorPixel srcIt = temp->createRectIterator(sx, sy, w, h, false); - KisRectIteratorPixel dstIt = tqmask->createRectIterator(sx, sy, w, h, true); + KisRectIteratorPixel dstIt = mask->createRectIterator(sx, sy, w, h, true); while(!dstIt.isDone()) { // Same as in convertMaskToSelection @@ -167,7 +167,7 @@ public: ++dstIt; } } else if (tempTarget) { - // We have a tqmask, and paint indirect, but not on the tqmask + // We have a mask, and paint indirect, but not on the mask KisPaintDeviceSP temp = new KisPaintDevice(source->colorSpace()); source = paintIndirect(source, temp, layer, sx, sy, dx, dy, w, h); } @@ -175,7 +175,7 @@ public: gc.bltSelection(dx, dy, layer->compositeOp(), source, - tqmask, + mask, layer->opacity(), sx, sy, w, h); } } diff --git a/chalk/core/kis_paint_device.cc b/chalk/core/kis_paint_device.cc index 59665829f..195364c6a 100644 --- a/chalk/core/kis_paint_device.cc +++ b/chalk/core/kis_paint_device.cc @@ -236,7 +236,7 @@ KisPaintDevice::KisPaintDevice(KisColorSpace * colorSpace, const char * name) : } -KisPaintDevice::KisPaintDevice(KisLayer *tqparent, KisColorSpace * colorSpace, const char * name) : +KisPaintDevice::KisPaintDevice(KisLayer *parent, KisColorSpace * colorSpace, const char * name) : TQObject(0, name), KShared(), m_exifInfo(0), m_lock( false ) { @@ -250,10 +250,10 @@ KisPaintDevice::KisPaintDevice(KisLayer *tqparent, KisColorSpace * colorSpace, c m_selectionDeselected = false; m_selection = 0; - m_parentLayer = tqparent; + m_parentLayer = parent; - if (colorSpace == 0 && tqparent != 0 && tqparent->image() != 0) { - m_colorSpace = tqparent->image()->colorSpace(); + if (colorSpace == 0 && parent != 0 && parent->image() != 0) { + m_colorSpace = parent->image()->colorSpace(); } else { m_colorSpace = colorSpace; @@ -1107,15 +1107,15 @@ void KisPaintDevice::clearSelection() } } -void KisPaintDevice::applySelectionMask(KisSelectionSP tqmask) +void KisPaintDevice::applySelectionMask(KisSelectionSP mask) { - TQRect r = tqmask->selectedRect(); + TQRect r = mask->selectedRect(); crop(r); for (TQ_INT32 y = r.top(); y <= r.bottom(); ++y) { KisHLineIterator pixelIt = createHLineIterator(r.x(), y, r.width(), true); - KisHLineIterator maskIt = tqmask->createHLineIterator(r.x(), y, r.width(), false); + KisHLineIterator maskIt = mask->createHLineIterator(r.x(), y, r.width(), false); while (!pixelIt.isDone()) { // XXX: Optimize by using stretches diff --git a/chalk/core/kis_paint_device.h b/chalk/core/kis_paint_device.h index 7fe6250bd..5e5dbb3f6 100644 --- a/chalk/core/kis_paint_device.h +++ b/chalk/core/kis_paint_device.h @@ -274,7 +274,7 @@ public: virtual TQImage convertToTQImage(KisProfile * dstProfile, TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32 h, float exposure = 0.0f); /** - * Create an RGBA TQImage from a rectangle in the paint device. The rectangle is defined by the tqparent image's bounds. + * Create an RGBA TQImage from a rectangle in the paint device. The rectangle is defined by the parent image's bounds. * * @param dstProfile RGB profile to use in conversion. May be 0, in which * case it's up to the colour strategy to choose a profile (most @@ -403,12 +403,12 @@ public: void setParentLayer(KisLayer *parentLayer); /** - * Add the specified rect top the tqparent layer (if present) + * Add the specified rect top the parent layer (if present) */ virtual void setDirty(const TQRect & rc); /** - * Set the tqparent layer completely dirty, if this paint device has one. + * Set the parent layer completely dirty, if this paint device has one. */ virtual void setDirty(); @@ -479,10 +479,10 @@ public: void clearSelection(); /** - * Apply a tqmask to the image data, i.e. multiply each pixel's opacity by its - * selectedness in the tqmask. + * Apply a mask to the image data, i.e. multiply each pixel's opacity by its + * selectedness in the mask. */ - void applySelectionMask(KisSelectionSP tqmask); + void applySelectionMask(KisSelectionSP mask); /** * Sets the selection of this paint device to the new selection, diff --git a/chalk/core/kis_paint_device_iface.cc b/chalk/core/kis_paint_device_iface.cc index 1aace538a..220c716b4 100644 --- a/chalk/core/kis_paint_device_iface.cc +++ b/chalk/core/kis_paint_device_iface.cc @@ -27,10 +27,10 @@ #include "kis_paint_device.h" -KisPaintDeviceIface::KisPaintDeviceIface( KisPaintDevice * tqparent ) +KisPaintDeviceIface::KisPaintDeviceIface( KisPaintDevice * parent ) : DCOPObject("paintdevice") { - m_parent = tqparent; + m_parent = parent; } TQ_INT32 KisPaintDeviceIface::pixelSize() const diff --git a/chalk/core/kis_paint_device_iface.h b/chalk/core/kis_paint_device_iface.h index df7c9372f..eee4d3f59 100644 --- a/chalk/core/kis_paint_device_iface.h +++ b/chalk/core/kis_paint_device_iface.h @@ -31,7 +31,7 @@ class KisPaintDeviceIface : virtual public DCOPObject { K_DCOP public: - KisPaintDeviceIface( KisPaintDevice * tqparent ); + KisPaintDeviceIface( KisPaintDevice * parent ); k_dcop: /** diff --git a/chalk/core/kis_paint_layer.cc b/chalk/core/kis_paint_layer.cc index 2df12e01d..a4c5412d5 100644 --- a/chalk/core/kis_paint_layer.cc +++ b/chalk/core/kis_paint_layer.cc @@ -39,7 +39,7 @@ KisPaintLayer::KisPaintLayer(KisImage *img, const TQString& name, TQ_UINT8 opaci Q_ASSERT(img); Q_ASSERT(dev); m_paintdev = dev; - m_tqmask = 0; + m_mask = 0; m_maskAsSelection = 0; m_paintdev->setParentLayer(this); m_renderMask = false; @@ -52,7 +52,7 @@ KisPaintLayer::KisPaintLayer(KisImage *img, const TQString& name, TQ_UINT8 opaci { Q_ASSERT(img); m_paintdev = new KisPaintDevice(this, img->colorSpace(), name.latin1()); - m_tqmask = 0; + m_mask = 0; m_maskAsSelection = 0; m_renderMask = false; m_editMask = true; @@ -64,7 +64,7 @@ KisPaintLayer::KisPaintLayer(KisImage *img, const TQString& name, TQ_UINT8 opaci Q_ASSERT(img); Q_ASSERT(colorSpace); m_paintdev = new KisPaintDevice(this, colorSpace, name.latin1()); - m_tqmask = 0; + m_mask = 0; m_maskAsSelection = 0; m_renderMask = false; m_editMask = true; @@ -76,8 +76,8 @@ KisPaintLayer::KisPaintLayer(const KisPaintLayer& rhs) : m_paintdev = new KisPaintDevice( *rhs.m_paintdev.data() ); m_paintdev->setParentLayer(this); if (rhs.hasMask()) { - m_tqmask = new KisPaintDevice(*rhs.m_tqmask.data()); - m_tqmask->setParentLayer(this); + m_mask = new KisPaintDevice(*rhs.m_mask.data()); + m_mask->setParentLayer(this); } m_renderMask = rhs.m_renderMask; m_editMask = rhs.m_editMask; @@ -93,8 +93,8 @@ KisPaintLayer::~KisPaintLayer() if (m_paintdev != 0) { m_paintdev->setParentLayer(0); } - if (m_tqmask != 0) { - m_tqmask->setParentLayer(0); + if (m_mask != 0) { + m_mask->setParentLayer(0); } } @@ -102,8 +102,8 @@ void KisPaintLayer::paintSelection(TQImage &img, TQ_INT32 x, TQ_INT32 y, TQ_INT3 { if (m_paintdev && m_paintdev->hasSelection()) { m_paintdev->selection()->paintSelection(img, x, y, w, h); - } else if (m_tqmask && m_editMask && m_tqmask->hasSelection()) { - m_tqmask->selection()->paintSelection(img, x, y, w, h); + } else if (m_mask && m_editMask && m_mask->hasSelection()) { + m_mask->selection()->paintSelection(img, x, y, w, h); } } @@ -111,8 +111,8 @@ void KisPaintLayer::paintSelection(TQImage &img, const TQRect& scaledImageRect, { if (m_paintdev && m_paintdev->hasSelection()) { m_paintdev->selection()->paintSelection(img, scaledImageRect, scaledImageSize, imageSize); - } else if (m_tqmask && m_editMask && m_tqmask->hasSelection()) { - m_tqmask->selection()->paintSelection(img, scaledImageRect, scaledImageSize, imageSize); + } else if (m_mask && m_editMask && m_mask->hasSelection()) { + m_mask->selection()->paintSelection(img, scaledImageRect, scaledImageSize, imageSize); } } @@ -191,15 +191,15 @@ void KisPaintLayer::removeMask() { if (!hasMask()) return; - m_tqmask->setParentLayer(0); - m_tqmask = 0; + m_mask->setParentLayer(0); + m_mask = 0; m_maskAsSelection = 0; setDirty(); emit sigMaskInfoChanged(); } -// ### XXX Do we apply the tqmask outside the image boundaries too? I'd say no, but I'm not sure +// ### XXX Do we apply the mask outside the image boundaries too? I'd say no, but I'm not sure void KisPaintLayer::applyMask() { if (!hasMask()) return; @@ -221,18 +221,18 @@ void KisPaintLayer::applyMask() { KisPaintDeviceSP KisPaintLayer::createMask() { if (hasMask()) - return m_tqmask; + return m_mask; kdDebug() << k_funcinfo << endl; // Grey8 nicely fits our needs of being intuitively comparable to other apps' - // tqmask layer interfaces. It does have an alpha component though, which is a bit + // mask layer interfaces. It does have an alpha component though, which is a bit // less appropriate in this context. - m_tqmask = new KisPaintDevice(KisMetaRegistry::instance()->csRegistry() + m_mask = new KisPaintDevice(KisMetaRegistry::instance()->csRegistry() ->getColorSpace(KisID("GRAYA"), 0)); genericMaskCreationHelper(); - return m_tqmask; + return m_mask; } // FIXME If from is a paint device is not grey8!! @@ -241,22 +241,22 @@ void KisPaintLayer::createMaskFromPaintDevice(KisPaintDeviceSP from) { return; // Or overwrite? XXX kdDebug() << k_funcinfo << endl; - m_tqmask = from; // KisPaintDevice(*from); XXX + m_mask = from; // KisPaintDevice(*from); XXX genericMaskCreationHelper(); } void KisPaintLayer::createMaskFromSelection(KisSelectionSP from) { kdDebug() << k_funcinfo << endl; - m_tqmask = new KisPaintDevice(KisMetaRegistry::instance()->csRegistry() + m_mask = new KisPaintDevice(KisMetaRegistry::instance()->csRegistry() ->getColorSpace(KisID("GRAYA"), 0)); - m_tqmask->setParentLayer(this); + m_mask->setParentLayer(this); m_maskAsSelection = new KisSelection(); // Anonymous selection is good enough - // Default pixel is opaque white == don't tqmask? + // Default pixel is opaque white == don't mask? TQ_UINT8 const defPixel[] = { 255, 255 }; - m_tqmask->dataManager()->setDefaultPixel(defPixel); + m_mask->dataManager()->setDefaultPixel(defPixel); if (from) { TQRect r(extent()); @@ -265,7 +265,7 @@ void KisPaintLayer::createMaskFromSelection(KisSelectionSP from) { int h = r.height(); for (int y = r.y(); y < h; y++) { KisHLineIteratorPixel srcIt = from->createHLineIterator(r.x(), y, w, false); - KisHLineIteratorPixel dstIt = m_tqmask->createHLineIterator(r.x(), y, w, true); + KisHLineIteratorPixel dstIt = m_mask->createHLineIterator(r.x(), y, w, true); while(!dstIt.isDone()) { // XXX same remark as in convertMaskToSelection @@ -286,7 +286,7 @@ void KisPaintLayer::createMaskFromSelection(KisSelectionSP from) { KisPaintDeviceSP KisPaintLayer::getMask() { createMask(); kdDebug() << k_funcinfo << endl; - return m_tqmask; + return m_mask; } KisSelectionSP KisPaintLayer::getMaskAsSelection() { @@ -310,7 +310,7 @@ void KisPaintLayer::setRenderMask(bool b) { } void KisPaintLayer::convertMaskToSelection(const TQRect& r) { - KisRectIteratorPixel srcIt = m_tqmask->createRectIterator(r.x(), r.y(), + KisRectIteratorPixel srcIt = m_mask->createRectIterator(r.x(), r.y(), r.width(), r.height(), false); KisRectIteratorPixel dstIt = m_maskAsSelection->createRectIterator(r.x(), r.y(), r.width(), r.height(), true); @@ -326,13 +326,13 @@ void KisPaintLayer::convertMaskToSelection(const TQRect& r) { } void KisPaintLayer::genericMaskCreationHelper() { - m_tqmask->setParentLayer(this); + m_mask->setParentLayer(this); m_maskAsSelection = new KisSelection(); // Anonymous selection is good enough - // Default pixel is opaque white == don't tqmask? + // Default pixel is opaque white == don't mask? TQ_UINT8 const defPixel[] = { 255, 255 }; - m_tqmask->dataManager()->setDefaultPixel(defPixel); + m_mask->dataManager()->setDefaultPixel(defPixel); setDirty(); emit sigMaskInfoChanged(); @@ -355,16 +355,16 @@ namespace { class KisCreateMaskCommand : public KNamedCommand { typedef KNamedCommand super; KisPaintLayerSP m_layer; - KisPaintDeviceSP m_tqmask; + KisPaintDeviceSP m_mask; public: KisCreateMaskCommand(const TQString& name, KisPaintLayer* layer) : super(name), m_layer(layer) {} virtual void execute() { kdDebug() << k_funcinfo << endl; - if (!m_tqmask) - m_tqmask = m_layer->createMask(); + if (!m_mask) + m_mask = m_layer->createMask(); else - m_layer->createMaskFromPaintDevice(m_tqmask); + m_layer->createMaskFromPaintDevice(m_mask); } virtual void unexecute() { m_layer->removeMask(); @@ -411,12 +411,12 @@ namespace { class KisMaskToSelectionCommand : public KNamedCommand { typedef KNamedCommand super; KisPaintLayerSP m_layer; - KisPaintDeviceSP m_tqmask; + KisPaintDeviceSP m_mask; KisSelectionSP m_selection; public: KisMaskToSelectionCommand(const TQString& name, KisPaintLayer* layer) : super(name), m_layer(layer) { - m_tqmask = m_layer->getMask(); + m_mask = m_layer->getMask(); if (m_layer->paintDevice()->hasSelection()) m_selection = m_layer->paintDevice()->selection(); else @@ -431,18 +431,18 @@ namespace { m_layer->paintDevice()->setSelection(m_selection); else m_layer->paintDevice()->deselect(); - m_layer->createMaskFromPaintDevice(m_tqmask); + m_layer->createMaskFromPaintDevice(m_mask); } }; class KisRemoveMaskCommand : public KNamedCommand { typedef KNamedCommand super; KisPaintLayerSP m_layer; - KisPaintDeviceSP m_tqmask; + KisPaintDeviceSP m_mask; public: KisRemoveMaskCommand(const TQString& name, KisPaintLayer* layer) : super(name), m_layer(layer) { - m_tqmask = m_layer->getMask(); + m_mask = m_layer->getMask(); } virtual void execute() { kdDebug() << k_funcinfo << endl; @@ -451,19 +451,19 @@ namespace { virtual void unexecute() { // I hope that if the undo stack unwinds, it will end up here in the right // state again; taking a deep-copy sounds like wasteful to me - m_layer->createMaskFromPaintDevice(m_tqmask); + m_layer->createMaskFromPaintDevice(m_mask); } }; class KisApplyMaskCommand : public KNamedCommand { typedef KNamedCommand super; KisPaintLayerSP m_layer; - KisPaintDeviceSP m_tqmask; + KisPaintDeviceSP m_mask; KisPaintDeviceSP m_original; public: KisApplyMaskCommand(const TQString& name, KisPaintLayer* layer) : super(name), m_layer(layer) { - m_tqmask = m_layer->getMask(); + m_mask = m_layer->getMask(); m_original = new KisPaintDevice(*m_layer->paintDevice()); } virtual void execute() { @@ -479,7 +479,7 @@ namespace { gc.bitBlt(x, y, COMPOSITE_COPY, m_original, OPACITY_OPAQUE, x, y, w, h); gc.end(); - m_layer->createMaskFromPaintDevice(m_tqmask); + m_layer->createMaskFromPaintDevice(m_mask); } }; } diff --git a/chalk/core/kis_paint_layer.h b/chalk/core/kis_paint_layer.h index 6319f9815..2cbd5e488 100644 --- a/chalk/core/kis_paint_layer.h +++ b/chalk/core/kis_paint_layer.h @@ -73,55 +73,55 @@ public: inline KisPaintDeviceSP paintDevice() const { return m_paintdev; } - /// Returns the paintDevice that accompanies this layer (or tqmask, see editMask) + /// Returns the paintDevice that accompanies this layer (or mask, see editMask) inline KisPaintDeviceSP paintDeviceOrMask() const { if (hasMask() && editMask()) - return m_tqmask; + return m_mask; return m_paintdev; } // Mask Layer - /// Does this layer have a layer tqmask? - bool hasMask() const { return m_tqmask != 0; } + /// Does this layer have a layer mask? + bool hasMask() const { return m_mask != 0; } // XXX TODO: Make these undo-able! - /// Create a tqmask if it does not yet exist, and return it + /// Create a mask if it does not yet exist, and return it KisPaintDeviceSP createMask(); - /// Convert the from argument to the tqmask + /// Convert the from argument to the mask void createMaskFromPaintDevice(KisPaintDeviceSP from); /** * Convert the from selection to a paint device (should convert the getMaskAsSelection - * result back to the tqmask). Overwrites the current tqmask, if any. Also removes the selection + * result back to the mask). Overwrites the current mask, if any. Also removes the selection */ void createMaskFromSelection(KisSelectionSP from); - /// Remove the layer tqmask + /// Remove the layer mask void removeMask(); - /// Apply the layer tqmask to the paint device, this removes the tqmask afterwards + /// Apply the layer mask to the paint device, this removes the mask afterwards void applyMask(); - /// Returns the layer tqmask's device. Creates one if there is currently none + /// Returns the layer mask's device. Creates one if there is currently none KisPaintDeviceSP getMask(); - /// Returns the layer tqmask's device, converted to a selection. Creates one if there is currently none + /// Returns the layer mask's device, converted to a selection. Creates one if there is currently none KisSelectionSP getMaskAsSelection(); /// Undoable version of createMask KNamedCommand* createMaskCommand(); /// Undoable version of createMaskFromSelection KNamedCommand* maskFromSelectionCommand(); - /// Undoable, removes the current tqmask, but converts it to the current selection + /// Undoable, removes the current mask, but converts it to the current selection KNamedCommand* maskToSelectionCommand(); /// Undoable version of removeMask KNamedCommand* removeMaskCommand(); /// Undoable version of applyMask KNamedCommand* applyMaskCommand(); - /// Returns true if the masked part of the tqmask will be rendered instead of being transparent + /// Returns true if the masked part of the mask will be rendered instead of being transparent bool renderMask() const { return m_renderMask; } /// Set the renderMask property void setRenderMask(bool b); /** * When this returns true, the KisPaintDevice returned in paintDevice will actually - * be the layer tqmask (if there is one). This is so that tools can draw on the tqmask + * be the layer mask (if there is one). This is so that tools can draw on the mask * without needing to know its existance. */ bool editMask() const { return m_editMask; } @@ -136,17 +136,17 @@ public: // KisLayerSupportsIndirectPainting virtual KisLayer* layer() { return this; } signals: - /// When the tqmask is created/destroyed or the edittqmask or rendertqmask is changed + /// When the mask is created/destroyed or the editmask or rendermask is changed void sigMaskInfoChanged(); private: void convertMaskToSelection(const TQRect& r); void genericMaskCreationHelper(); KisPaintDeviceSP m_paintdev; - // Layer tqmask related: + // Layer mask related: // XXX It would be nice to merge the next 2 devices... - KisPaintDeviceSP m_tqmask; // The tqmask that we can edit and display easily - KisSelectionSP m_maskAsSelection; // The tqmask as selection, to apply and render easily + KisPaintDeviceSP m_mask; // The mask that we can edit and display easily + KisSelectionSP m_maskAsSelection; // The mask as selection, to apply and render easily bool m_renderMask; bool m_editMask; }; diff --git a/chalk/core/kis_painter.cc b/chalk/core/kis_painter.cc index b83539189..c64935fc7 100644 --- a/chalk/core/kis_painter.cc +++ b/chalk/core/kis_painter.cc @@ -812,7 +812,7 @@ void KisPainter::fillPolygon(const vKisPoint& points, FillStyle fillStyle) } // Fill the polygon bounding rectangle with the required contents then we'll - // create a tqmask for the actual polygon coverage. + // create a mask for the actual polygon coverage. KisPaintDeviceSP polygon = new KisPaintDevice(m_device->colorSpace(), "polygon"); Q_CHECK_PTR(polygon); diff --git a/chalk/core/kis_painter.h b/chalk/core/kis_painter.h index abfd8b17e..9ca623f6b 100644 --- a/chalk/core/kis_painter.h +++ b/chalk/core/kis_painter.h @@ -123,7 +123,7 @@ public: TQ_INT32 sw, TQ_INT32 sh); /** - * A version of bitBlt that renders using an external tqmask, ignoring + * A version of bitBlt that renders using an external mask, ignoring * the src device's own selection, if it has one. */ void bltMask(TQ_INT32 dx, TQ_INT32 dy, @@ -135,7 +135,7 @@ public: TQ_INT32 sw, TQ_INT32 sh); /** - * A version of bitBlt that renders using an external selection tqmask, ignoring + * A version of bitBlt that renders using an external selection mask, ignoring * the src device's own selection, if it has one. */ void bltSelection(TQ_INT32 dx, TQ_INT32 dy, @@ -148,7 +148,7 @@ public: /** - * A version of bitBlt that renders using the src device's selection tqmask, if it has one. + * A version of bitBlt that renders using the src device's selection mask, if it has one. */ void bltSelection(TQ_INT32 dx, TQ_INT32 dy, const KisCompositeOp &op, diff --git a/chalk/core/kis_paintop.cc b/chalk/core/kis_paintop.cc index bff50cf5f..edb9faf64 100644 --- a/chalk/core/kis_paintop.cc +++ b/chalk/core/kis_paintop.cc @@ -42,11 +42,11 @@ KisPaintOp::~KisPaintOp() { } -KisPaintDeviceSP KisPaintOp::computeDab(KisAlphaMaskSP tqmask) { - return computeDab(tqmask, m_painter->device()->colorSpace()); +KisPaintDeviceSP KisPaintOp::computeDab(KisAlphaMaskSP mask) { + return computeDab(mask, m_painter->device()->colorSpace()); } -KisPaintDeviceSP KisPaintOp::computeDab(KisAlphaMaskSP tqmask, KisColorSpace *cs) +KisPaintDeviceSP KisPaintOp::computeDab(KisAlphaMaskSP mask, KisColorSpace *cs) { // XXX: According to the SeaShore source, the Gimp uses a // temporary layer the size of the layer that is being painted @@ -65,8 +65,8 @@ KisPaintDeviceSP KisPaintOp::computeDab(KisAlphaMaskSP tqmask, KisColorSpace *cs TQ_INT32 pixelSize = colorSpace->pixelSize(); - TQ_INT32 maskWidth = tqmask->width(); - TQ_INT32 maskHeight = tqmask->height(); + TQ_INT32 maskWidth = mask->width(); + TQ_INT32 maskHeight = mask->height(); // Convert the kiscolor to the right colorspace. kc.convertTo(colorSpace); @@ -77,8 +77,8 @@ KisPaintDeviceSP KisPaintOp::computeDab(KisAlphaMaskSP tqmask, KisColorSpace *cs int x=0; while(! hiter.isDone()) { - // XXX: Set tqmask - colorSpace->setAlpha(kc.data(), tqmask->alphaAt(x++, y), 1); + // XXX: Set mask + colorSpace->setAlpha(kc.data(), mask->alphaAt(x++, y), 1); memcpy(hiter.rawData(), kc.data(), pixelSize); ++hiter; } @@ -110,4 +110,4 @@ void KisPaintOp::setSource(KisPaintDeviceSP p) { } -KisPaintOpSettings* KisPaintOpFactory::settings(TQWidget* /*tqparent*/, const KisInputDevice& /*inputDevice*/) { return 0; } +KisPaintOpSettings* KisPaintOpFactory::settings(TQWidget* /*parent*/, const KisInputDevice& /*inputDevice*/) { return 0; } diff --git a/chalk/core/kis_paintop.h b/chalk/core/kis_paintop.h index 8e8587eab..668856f7c 100644 --- a/chalk/core/kis_paintop.h +++ b/chalk/core/kis_paintop.h @@ -79,8 +79,8 @@ public: protected: - virtual KisPaintDeviceSP computeDab(KisAlphaMaskSP tqmask); - virtual KisPaintDeviceSP computeDab(KisAlphaMaskSP tqmask, KisColorSpace *cs); + virtual KisPaintDeviceSP computeDab(KisAlphaMaskSP mask); + virtual KisPaintDeviceSP computeDab(KisAlphaMaskSP mask, KisColorSpace *cs); /** @@ -97,7 +97,7 @@ private: class KisPaintOpSettings { public: - KisPaintOpSettings(TQWidget *tqparent) { Q_UNUSED(tqparent); } + KisPaintOpSettings(TQWidget *parent) { Q_UNUSED(parent); } virtual ~KisPaintOpSettings() {} virtual TQWidget *widget() const { return 0; } @@ -135,7 +135,7 @@ public: * specified input device. Return 0 if there are no settings available for the given * device. */ - virtual KisPaintOpSettings* settings(TQWidget* tqparent, const KisInputDevice& inputDevice); + virtual KisPaintOpSettings* settings(TQWidget* parent, const KisInputDevice& inputDevice); }; #endif // KIS_PAINTOP_H_ diff --git a/chalk/core/kis_paintop_registry.cc b/chalk/core/kis_paintop_registry.cc index 3651f35da..012f20275 100644 --- a/chalk/core/kis_paintop_registry.cc +++ b/chalk/core/kis_paintop_registry.cc @@ -103,11 +103,11 @@ KisPaintOp * KisPaintOpRegistry::paintOp(const TQString & id, const KisPaintOpSe return paintOp(KisID(id, ""), settings, painter); } -KisPaintOpSettings * KisPaintOpRegistry::settings(const KisID& id, TQWidget * tqparent, const KisInputDevice& inputDevice) const +KisPaintOpSettings * KisPaintOpRegistry::settings(const KisID& id, TQWidget * parent, const KisInputDevice& inputDevice) const { KisPaintOpFactory* f = get(id); if (f) - return f->settings( tqparent, inputDevice ); + return f->settings( parent, inputDevice ); return 0; } diff --git a/chalk/core/kis_paintop_registry.h b/chalk/core/kis_paintop_registry.h index c61105b65..338b9f01e 100644 --- a/chalk/core/kis_paintop_registry.h +++ b/chalk/core/kis_paintop_registry.h @@ -56,10 +56,10 @@ public: /** * Create and return an (abstracted) configuration widget * for using the specified paintop with the specified input device, - * with the specified tqparent as widget tqparent. Returns 0 if there + * with the specified parent as widget parent. Returns 0 if there * are no settings available for the given device. */ - KisPaintOpSettings * settings(const KisID& id, TQWidget * tqparent, const KisInputDevice& inputDevice) const; + KisPaintOpSettings * settings(const KisID& id, TQWidget * parent, const KisInputDevice& inputDevice) const; // Whether we should show this paintop in the toolchest bool userVisible(const KisID & id, KisColorSpace* cs) const; diff --git a/chalk/core/kis_random_accessor.h b/chalk/core/kis_random_accessor.h index 6e2e10ad9..62d90e049 100644 --- a/chalk/core/kis_random_accessor.h +++ b/chalk/core/kis_random_accessor.h @@ -68,7 +68,7 @@ class KisRandomAccessorPixelTrait { }; /** - * Returns the selectiontqmask from the current point; this is guaranteed + * Returns the selectionmask from the current point; this is guaranteed * to have the same number of consecutive pixels that the iterator has * at a given point. It return a 0 if there is no selection. */ diff --git a/chalk/core/kis_selection.cc b/chalk/core/kis_selection.cc index b5cd8e6ee..03d766162 100644 --- a/chalk/core/kis_selection.cc +++ b/chalk/core/kis_selection.cc @@ -81,7 +81,7 @@ void KisSelection::setSelected(TQ_INT32 x, TQ_INT32 y, TQ_UINT8 s) TQImage KisSelection::maskImage() { - // If part of a KisAdjustmentLayer, there may be no tqparent device. + // If part of a KisAdjustmentLayer, there may be no parent device. TQImage img; TQRect bounds; if (m_parentPaintDevice) { diff --git a/chalk/core/kis_selection.h b/chalk/core/kis_selection.h index d53233376..ae21e696c 100644 --- a/chalk/core/kis_selection.h +++ b/chalk/core/kis_selection.h @@ -47,13 +47,13 @@ class KRITACORE_EXPORT KisSelection : public KisPaintDevice { public: /** * Create a new KisSelection - * @param dev the tqparent paint device. The selection will never be bigger than the tqparent + * @param dev the parent paint device. The selection will never be bigger than the parent * paint device. */ KisSelection(KisPaintDeviceSP dev); /** - * Create a new KisSelection. This selection will not have a tqparent paint device. + * Create a new KisSelection. This selection will not have a parent paint device. */ KisSelection(); @@ -108,7 +108,7 @@ public: void startCachingExactRect(); void stopCachingExactRect(); - // if the tqparent layer is interested in keeping up to date with the dirtyness + // if the parent layer is interested in keeping up to date with the dirtyness // of this layer, set to true void setInterestedInDirtyness(bool b) { m_dirty = b; } bool interestedInDirtyness() const { return m_dirty; } diff --git a/chalk/doc/DESIGN.obsolete b/chalk/doc/DESIGN.obsolete index 520d4058d..10ab8dbb6 100644 --- a/chalk/doc/DESIGN.obsolete +++ b/chalk/doc/DESIGN.obsolete @@ -67,7 +67,7 @@ Design Patterns * Addition of kis_types. Defines shared pointer pointers to core chalk objects: image, paintdevice, channel, - tqmask, layer etc. + mask, layer etc. * Tile architecture. There's Mediator and a Singleton pattern here at least. This stuff seems to work, doesn't @@ -141,7 +141,7 @@ Obsolete files core/helper/kis_timer core/helper/kis_scopedlock (Replaced with QMutexlocker) core/kis_krayon (was predecessor of kis_resource) - core/kis_tqmask + core/kis_mask core/kis_util ui/kis_krayon_widget @@ -151,7 +151,7 @@ Random head-scratchings - Why the QUANTUM redefinition: the number of bits per channel, 8 for 32-bit colour, 16 for 64-bit colour. - - is_tqmask unimplemented? What was it meant to do, or is it an + - is_mask unimplemented? What was it meant to do, or is it an interface? - nameserver presents unique numbers for new layers and images. diff --git a/chalk/doc/brush.txt b/chalk/doc/brush.txt index 739194c7a..e2373258f 100644 --- a/chalk/doc/brush.txt +++ b/chalk/doc/brush.txt @@ -13,7 +13,7 @@ sources: Chalk uses the gimp's brush file formats: .gbr and .gih, for singe and pipeline brushes, respectively. These brushes contain one or more grayscale or rgba images. If the image is grayscale, the gray image is -intended to be used as an alpha tqmask: each gray level corresponds to +intended to be used as an alpha mask: each gray level corresponds to a certain alpha level, and when painting the current painting colour is composited in the image with this level as its alpha component. The image brushes should be masked -- i.e., these are coloured images placed @@ -25,12 +25,12 @@ partly because I like that better, partly because until very recently there was no way of making out the difference between gray and rgb brushes because KisBrush didn't remember that bit of data. -Making the initial tqmask of a brush is however by now pretty well done; the next +Making the initial mask of a brush is however by now pretty well done; the next problem is painting with those masks. Here we have two situations, one easy, one difficult. The easy one is the single mouse click. If the user clicks or taps with his stylus, we can composite the -tqmask or the image at the pixel position of the mouse click. +mask or the image at the pixel position of the mouse click. The difficult situation is drawing a line. This line needs to be antialiased. diff --git a/chalk/doc/chalk.xmi b/chalk/doc/chalk.xmi index df763e021..36659dab7 100644 --- a/chalk/doc/chalk.xmi +++ b/chalk/doc/chalk.xmi @@ -66,7 +66,7 @@ </UML:Class> <UML:Class stereotype="class" visibility="public" xmi.id="44" name="KisBuilderMonitor" > <UML:Operation visibility="public" xmi.id="46" type="" name="KisBuilderMonitor" > - <UML:Parameter visibility="private" xmi.id="47" value="" type="QObject *" name="tqparent" /> + <UML:Parameter visibility="private" xmi.id="47" value="" type="QObject *" name="parent" /> <UML:Parameter visibility="private" xmi.id="48" value="" type="const char *" name="name" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="49" type="void" name="attach" > @@ -827,12 +827,12 @@ a part of a layer. Layers form an image." visibility="public" xmi.id="481" name <UML:Attribute visibility="private" xmi.id="614" value="" type="KisDoc *" name="m_doc" /> </UML:Class> <UML:Class stereotype="class" visibility="public" xmi.id="624" name="KisAlphaMask" > - <UML:Operation comment="Create an alpha tqmask based on the gray values of the + <UML:Operation comment="Create an alpha mask based on the gray values of the specified QImage. If the QImage is not grayscale, you're buggered." visibility="public" xmi.id="629" type="" name="KisAlphaMask" > <UML:Parameter visibility="private" xmi.id="630" value="" type="const QImage &" name="img" /> </UML:Operation> - <UML:Operation comment="Create an alpha tqmask based on the gray values of the + <UML:Operation comment="Create an alpha mask based on the gray values of the specified QImage. If the QImage is not grayscale, you're buggered. The QImage is scaled using QImage::smoothScale, where the target w and h are computed by taking scale as a @@ -842,13 +842,13 @@ percentage." visibility="public" xmi.id="631" type="" name="KisAlphaMask" > </UML:Operation> <UML:Operation comment="@return the alpha value at the specified position. Returns QUANTUM OPACITY_TRANSPARENT if the value is -outside the bounds of the tqmask. +outside the bounds of the mask. XXX: this is, of course, not the best way of masking. Better would be to let KisAlphaMask fill a chunk of memory with the alpha values at the right position, something like void applyMask(QUANTUM *pixeldata, Q_INT32 pixelWidth, Q_INT32 alphaPos). That would be fastest, or we could -provide an iterator over the tqmask, that would be nice, too." visibility="public" xmi.id="634" type="QUANTUM" name="alphaAt" > +provide an iterator over the mask, that would be nice, too." visibility="public" xmi.id="634" type="QUANTUM" name="alphaAt" > <UML:Parameter visibility="private" xmi.id="635" value="" type="Q_INT32" name="x" /> <UML:Parameter visibility="private" xmi.id="636" value="" type="Q_INT32" name="y" /> </UML:Operation> @@ -860,7 +860,7 @@ provide an iterator over the tqmask, that would be nice, too." visibility="publi </UML:Operation> <UML:Operation comment="@return the number of alpha values in a scanline." visibility="public" xmi.id="641" type="Q_INT32" name="height" /> <UML:Operation comment="@return the scale factor." visibility="public" xmi.id="642" type="double" name="scale" /> - <UML:Operation comment="@return the number of lines in the tqmask." visibility="public" xmi.id="643" type="Q_INT32" name="width" /> + <UML:Operation comment="@return the number of lines in the mask." visibility="public" xmi.id="643" type="Q_INT32" name="width" /> <UML:Operation visibility="public" xmi.id="644" type="virtual " name="~KisAlphaMask" /> <UML:Attribute visibility="private" xmi.id="625" value="" type="QValueVector" name="m_data" /> <UML:Attribute visibility="private" xmi.id="626" value="" type="double" name="m_scale" /> @@ -925,8 +925,8 @@ dcop." visibility="public" xmi.id="645" name="KRayonViewIface" > <UML:Operation visibility="public" xmi.id="702" type=TQPOINT_OBJECT_NAME_STRING name="hotSpot" /> <UML:Operation visibility="public" xmi.id="703" type="virtual QImage" name="img" /> <UML:Operation visibility="public" xmi.id="704" type="virtual bool" name="loadAsync" /> - <UML:Operation comment="@return a tqmask computed from the grey-level values of the -pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMask *" name="tqmask" > + <UML:Operation comment="@return a mask computed from the grey-level values of the +pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMask *" name="mask" > <UML:Parameter visibility="private" xmi.id="706" value="" type="Q_INT32" name="scale" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="707" type="virtual bool" name="saveAsync" /> @@ -1188,7 +1188,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas <UML:Operation visibility="public" xmi.id="914" type="" name="KisDoc" > <UML:Parameter visibility="private" xmi.id="915" value="" type="QWidget *" name="parentWidget" /> <UML:Parameter visibility="private" xmi.id="916" value="" type="const char *" name="widgetName" /> - <UML:Parameter visibility="private" xmi.id="917" value="" type="QObject *" name="tqparent" /> + <UML:Parameter visibility="private" xmi.id="917" value="" type="QObject *" name="parent" /> <UML:Parameter visibility="private" xmi.id="918" value="" type="const char *" name="name" /> <UML:Parameter visibility="private" xmi.id="919" value="" type="bool" name="singleViewMode" /> </UML:Operation> @@ -1212,7 +1212,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas <UML:Parameter visibility="private" xmi.id="932" value="" type="KisImageSP" name="img" /> </UML:Operation> <UML:Operation visibility="protected" xmi.id="933" type="virtual KoView *" name="createViewInstance" > - <UML:Parameter visibility="private" xmi.id="934" value="" type="QWidget *" name="tqparent" /> + <UML:Parameter visibility="private" xmi.id="934" value="" type="QWidget *" name="parent" /> <UML:Parameter visibility="private" xmi.id="935" value="" type="const char *" name="name" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="936" type="virtual DCOPObject *" name="dcopObject" /> @@ -1444,14 +1444,14 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas </UML:Class> <UML:Class stereotype="class" visibility="public" xmi.id="1110" name="KisFactory" > <UML:Operation visibility="public" xmi.id="1115" type="" name="KisFactory" > - <UML:Parameter visibility="private" xmi.id="1116" value="" type="QObject *" name="tqparent" /> + <UML:Parameter visibility="private" xmi.id="1116" value="" type="QObject *" name="parent" /> <UML:Parameter visibility="private" xmi.id="1117" value="" type="const char *" name="name" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="1118" type="KAboutData *" name="aboutData" ownerScope="classifier" /> <UML:Operation visibility="public" xmi.id="1119" type="virtual KParts :: Part *" name="createPartObject" > <UML:Parameter visibility="private" xmi.id="1120" value="" type="QWidget *" name="parentWidget" /> <UML:Parameter visibility="private" xmi.id="1121" value="" type="const char *" name="widgetName" /> - <UML:Parameter visibility="private" xmi.id="1122" value="" type="QObject *" name="tqparent" /> + <UML:Parameter visibility="private" xmi.id="1122" value="" type="QObject *" name="parent" /> <UML:Parameter visibility="private" xmi.id="1123" value="" type="const char *" name="name" /> <UML:Parameter visibility="private" xmi.id="1124" value="" type="const char *" name="classname" /> <UML:Parameter visibility="private" xmi.id="1125" value="" type="const QStringList &" name="args" /> @@ -1731,7 +1731,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas <UML:Operation visibility="public" xmi.id="1378" type="bool" name="lower" > <UML:Parameter visibility="private" xmi.id="1379" value="" type="KisLayerSP" name="layer" /> </UML:Operation> - <UML:Operation visibility="public" xmi.id="1380" type="KisChannelSP" name="tqmask" /> + <UML:Operation visibility="public" xmi.id="1380" type="KisChannelSP" name="mask" /> <UML:Operation visibility="public" xmi.id="1381" type=TQSTRING_OBJECT_NAME_STRING name="name" /> <UML:Operation visibility="public" xmi.id="1382" type="enumImgType" name="nativeImgType" /> <UML:Operation visibility="public" xmi.id="1383" type="Q_INT32" name="nchannels" /> @@ -2088,7 +2088,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility= </UML:Operation> <UML:Operation visibility="public" xmi.id="1646" type="void" name="addAlpha" /> <UML:Operation visibility="public" xmi.id="1647" type="KisMaskSP" name="addMask" > - <UML:Parameter visibility="private" xmi.id="1648" value="" type="KisMaskSP" name="tqmask" /> + <UML:Parameter visibility="private" xmi.id="1648" value="" type="KisMaskSP" name="mask" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="1649" type="void" name="applyMask" > <UML:Parameter visibility="private" xmi.id="1650" value="" type="Q_INT32" name="mode" /> @@ -2100,7 +2100,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility= <UML:Operation visibility="public" xmi.id="1654" type="void" name="linked" > <UML:Parameter visibility="private" xmi.id="1655" value="" type="bool" name="l" /> </UML:Operation> - <UML:Operation visibility="public" xmi.id="1656" type="KisMaskSP" name="tqmask" /> + <UML:Operation visibility="public" xmi.id="1656" type="KisMaskSP" name="mask" /> <UML:Operation visibility="public" xmi.id="1657" type="QUANTUM" name="opacity" /> <UML:Operation visibility="public" xmi.id="1658" type="void" name="setOpacity" > <UML:Parameter visibility="private" xmi.id="1659" value="" type="QUANTUM" name="val" /> @@ -2118,7 +2118,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility= <UML:Attribute visibility="private" xmi.id="1622" value="" type="Q_INT32" name="m_dy" /> <UML:Attribute visibility="private" xmi.id="1623" value="" type="bool" name="m_initial" /> <UML:Attribute visibility="private" xmi.id="1624" value="" type="bool" name="m_linked" /> - <UML:Attribute visibility="private" xmi.id="1625" value="" type="KisMaskSP" name="m_tqmask" /> + <UML:Attribute visibility="private" xmi.id="1625" value="" type="KisMaskSP" name="m_mask" /> <UML:Attribute visibility="private" xmi.id="1626" value="" type="QUANTUM" name="m_opacity" /> <UML:Attribute visibility="private" xmi.id="1627" value="" type="bool" name="m_preserveTransparency" /> </UML:Class> @@ -2208,7 +2208,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility= </UML:Operation> <UML:Operation visibility="public" xmi.id="1731" type="Q_INT32" name="apply" /> <UML:Operation visibility="public" xmi.id="1732" type="void" name="apply" > - <UML:Parameter visibility="private" xmi.id="1733" value="" type="Q_INT32" name="tqmask" /> + <UML:Parameter visibility="private" xmi.id="1733" value="" type="Q_INT32" name="mask" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="1734" type="bool" name="edit" /> <UML:Operation visibility="public" xmi.id="1735" type="void" name="edit" > @@ -2228,7 +2228,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility= <UML:Operation visibility="public" xmi.id="1753" type=TQPOINT_OBJECT_NAME_STRING name="hotSpot" /> <UML:Operation comment="@return the next image in the pipe." visibility="public" xmi.id="1754" type="virtual QImage" name="img" /> <UML:Operation visibility="public" xmi.id="1755" type="virtual bool" name="loadAsync" /> - <UML:Operation comment="@return the next tqmask in the pipe." visibility="public" xmi.id="1756" type="virtual KisAlphaMask *" name="tqmask" > + <UML:Operation comment="@return the next mask in the pipe." visibility="public" xmi.id="1756" type="virtual KisAlphaMask *" name="mask" > <UML:Parameter visibility="private" xmi.id="1757" value="" type="Q_INT32" name="scale" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="1758" type="virtual bool" name="saveAsync" /> @@ -2286,7 +2286,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility= <UML:Parameter visibility="private" xmi.id="1813" value="" type="Q_INT32" name="sh" /> </UML:Operation> <UML:Operation visibility="protected" xmi.id="1814" type="void" name="computeDab" > - <UML:Parameter visibility="private" xmi.id="1815" value="" type="KisAlphaMask *" name="tqmask" /> + <UML:Parameter visibility="private" xmi.id="1815" value="" type="KisAlphaMask *" name="mask" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="1816" type="KisPaintDeviceSP" name="device" /> <UML:Operation visibility="public" xmi.id="1817" type="QRect" name="dirtyRect" /> @@ -2411,7 +2411,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility= </UML:Class> <UML:Class stereotype="class" visibility="public" xmi.id="1903" name="KisSelection" > <UML:Operation visibility="public" xmi.id="1911" type="" name="KisSelection" > - <UML:Parameter visibility="private" xmi.id="1912" value="" type="KisPaintDeviceSP" name="tqparent" /> + <UML:Parameter visibility="private" xmi.id="1912" value="" type="KisPaintDeviceSP" name="parent" /> <UML:Parameter visibility="private" xmi.id="1913" value="" type="KisImageSP" name="img" /> <UML:Parameter visibility="private" xmi.id="1914" value="" type="const QString &" name="name" /> <UML:Parameter visibility="private" xmi.id="1915" value="" type="QUANTUM" name="opacity" /> @@ -2434,7 +2434,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility= <UML:Parameter visibility="private" xmi.id="1928" value="" type="Q_INT32" name="x" /> <UML:Parameter visibility="private" xmi.id="1929" value="" type="Q_INT32" name="y" /> </UML:Operation> - <UML:Operation visibility="public" xmi.id="1930" type="KisPaintDeviceSP" name="tqparent" /> + <UML:Operation visibility="public" xmi.id="1930" type="KisPaintDeviceSP" name="parent" /> <UML:Operation visibility="public" xmi.id="1931" type="void" name="setBounds" > <UML:Parameter visibility="private" xmi.id="1932" value="" type="Q_INT32" name="parentX" /> <UML:Parameter visibility="private" xmi.id="1933" value="" type="Q_INT32" name="parentY" /> @@ -2445,7 +2445,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility= <UML:Parameter visibility="private" xmi.id="1937" value="" type="const QRect &" name="rc" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="1938" type="void" name="setParent" > - <UML:Parameter visibility="private" xmi.id="1939" value="" type="KisPaintDeviceSP" name="tqparent" /> + <UML:Parameter visibility="private" xmi.id="1939" value="" type="KisPaintDeviceSP" name="parent" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="1940" type="virtual bool" name="shouldDrawBorder" /> <UML:Operation visibility="public" xmi.id="1941" type="QImage" name="toImage" /> @@ -2465,7 +2465,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility= <UML:Parameter visibility="private" xmi.id="1950" value="" type="const QString &" name="chooserCaption" /> <UML:Parameter visibility="private" xmi.id="1951" value="" type="QWidget *" name="chooserParent" /> <UML:Parameter visibility="private" xmi.id="1952" value="" type="const char *" name="chooserName" /> - <UML:Parameter visibility="private" xmi.id="1953" value="" type="QObject *" name="tqparent" /> + <UML:Parameter visibility="private" xmi.id="1953" value="" type="QObject *" name="parent" /> <UML:Parameter visibility="private" xmi.id="1954" value="" type="const char *" name="name" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="1955" type="QWidget *" name="chooserWidget" /> @@ -2735,7 +2735,7 @@ in the constructor, you have to call loadAsync. <UML:Parameter visibility="private" xmi.id="2159" value="" type="QMouseEvent *" name="e" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="2160" type="virtual KDialog *" isAbstract="true" name="options" > - <UML:Parameter visibility="private" xmi.id="2161" value="" type="QWidget *" name="tqparent" /> + <UML:Parameter visibility="private" xmi.id="2161" value="" type="QWidget *" name="parent" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="2162" type="virtual void" isAbstract="true" name="paint" > <UML:Parameter visibility="private" xmi.id="2163" value="" type="QPainter &" name="gc" /> @@ -2994,7 +2994,7 @@ in the constructor, you have to call loadAsync. <UML:Operation visibility="public" xmi.id="2448" type="" name="KisView" > <UML:Parameter visibility="private" xmi.id="2449" value="" type="KisDoc *" name="doc" /> <UML:Parameter visibility="private" xmi.id="2450" value="" type="KisUndoAdapter *" name="adapter" /> - <UML:Parameter visibility="private" xmi.id="2451" value="" type="QWidget *" name="tqparent" /> + <UML:Parameter visibility="private" xmi.id="2451" value="" type="QWidget *" name="parent" /> <UML:Parameter visibility="private" xmi.id="2452" value="" type="const char *" name="name" /> </UML:Operation> <UML:Operation visibility="protected" xmi.id="2453" type="virtual void" name="attach" > @@ -3218,16 +3218,16 @@ in the constructor, you have to call loadAsync. <UML:DataType stereotype="datatype" visibility="public" xmi.id="2570" name="vKisCanvasObserver_it" /> <UML:DataType stereotype="datatype" visibility="public" xmi.id="2571" name="vKisCanvasObserver" /> <UML:DataType stereotype="datatype" visibility="public" xmi.id="2572" name="vKisCanvasObserver_cit" /> - <UML:Generalization child="12" visibility="public" xmi.id="54" tqparent="9" /> + <UML:Generalization child="12" visibility="public" xmi.id="54" parent="9" /> <UML:Association visibility="public" xmi.id="194" > <UML:Association.connection> <UML:AssociationEndRole visibility="public" aggregation="none" type="193" /> <UML:AssociationEndRole visibility="private" type="193" name="m_singleton" /> </UML:Association.connection> </UML:Association> - <UML:Generalization child="81" visibility="public" xmi.id="276" tqparent="139" /> - <UML:Generalization child="206" visibility="public" xmi.id="277" tqparent="139" /> - <UML:Generalization child="266" visibility="public" xmi.id="278" tqparent="193" /> + <UML:Generalization child="81" visibility="public" xmi.id="276" parent="139" /> + <UML:Generalization child="206" visibility="public" xmi.id="277" parent="139" /> + <UML:Generalization child="266" visibility="public" xmi.id="278" parent="193" /> <UML:Association visibility="public" xmi.id="329" > <UML:Association.connection> <UML:AssociationEndRole visibility="public" aggregation="shared" type="325" /> @@ -3276,9 +3276,9 @@ in the constructor, you have to call loadAsync. <UML:AssociationEndRole visibility="private" type="720" name="m_brushType" /> </UML:Association.connection> </UML:Association> - <UML:Generalization child="1620" visibility="public" xmi.id="1764" tqparent="1453" /> - <UML:Generalization child="1722" visibility="public" xmi.id="1765" tqparent="1130" /> - <UML:Generalization child="1741" visibility="public" xmi.id="1766" tqparent="681" /> + <UML:Generalization child="1620" visibility="public" xmi.id="1764" parent="1453" /> + <UML:Generalization child="1722" visibility="public" xmi.id="1765" parent="1130" /> + <UML:Generalization child="1741" visibility="public" xmi.id="1766" parent="681" /> <UML:Association visibility="public" xmi.id="1769" > <UML:Association.connection> <UML:AssociationEndRole visibility="public" aggregation="shared" type="1767" /> @@ -3291,15 +3291,15 @@ in the constructor, you have to call loadAsync. <UML:AssociationEndRole visibility="private" type="856" name="m_gradient" /> </UML:Association.connection> </UML:Association> - <UML:Generalization child="1903" visibility="public" xmi.id="2127" tqparent="1620" /> - <UML:Generalization child="2109" visibility="public" xmi.id="2128" tqparent="2047" /> + <UML:Generalization child="1903" visibility="public" xmi.id="2127" parent="1620" /> + <UML:Generalization child="2109" visibility="public" xmi.id="2128" parent="2047" /> <UML:Association visibility="public" xmi.id="2191" > <UML:Association.connection> <UML:AssociationEndRole visibility="public" aggregation="none" type="2190" /> <UML:AssociationEndRole visibility="private" type="2190" name="m_singleton" /> </UML:Association.connection> </UML:Association> - <UML:Generalization child="2135" visibility="public" xmi.id="2326" tqparent="1101" /> + <UML:Generalization child="2135" visibility="public" xmi.id="2326" parent="1101" /> <UML:Association visibility="public" xmi.id="2366" > <UML:Association.connection> <UML:AssociationEndRole visibility="public" aggregation="shared" type="2365" /> @@ -3354,10 +3354,10 @@ in the constructor, you have to call loadAsync. <UML:AssociationEndRole visibility="private" type="2135" name="m_tool" /> </UML:Association.connection> </UML:Association> - <UML:Generalization child="2365" visibility="public" xmi.id="2567" tqparent="1170" /> - <UML:Generalization child="2365" visibility="public" xmi.id="2568" tqparent="750" /> - <UML:Generalization child="2365" visibility="public" xmi.id="2569" tqparent="2203" /> - <UML:Generalization child="681" visibility="public" xmi.id="2578" tqparent="2047" /> + <UML:Generalization child="2365" visibility="public" xmi.id="2567" parent="1170" /> + <UML:Generalization child="2365" visibility="public" xmi.id="2568" parent="750" /> + <UML:Generalization child="2365" visibility="public" xmi.id="2569" parent="2203" /> + <UML:Generalization child="681" visibility="public" xmi.id="2578" parent="2047" /> </UML:Model> <diagrams> <diagram snapgrid="1" showattsig="1" fillcolor="#ffffc0" zoom="75" showgrid="1" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="1285" snapy="10" showatts="1" xmi.id="1" documentation="" type="402" showops="1" showpackage="0" name="Chalk Core" localid="30000" showstereotype="0" showscope="1" snapcsgrid="1" font="Bitstream Vera Sans,14,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="1221" > @@ -3536,7 +3536,7 @@ in the constructor, you have to call loadAsync. <listitem open="0" type="815" id="702" label="hotSpot" /> <listitem open="0" type="815" id="703" label="img" /> <listitem open="0" type="815" id="704" label="loadAsync" /> - <listitem open="0" type="815" id="705" label="tqmask" /> + <listitem open="0" type="815" id="705" label="mask" /> <listitem open="0" type="815" id="707" label="saveAsync" /> <listitem open="0" type="815" id="708" label="setHotSpot" /> <listitem open="0" type="815" id="710" label="~KisBrush" /> @@ -3935,7 +3935,7 @@ in the constructor, you have to call loadAsync. <listitem open="0" type="815" id="1375" label="layers" /> <listitem open="0" type="815" id="1378" label="lower" /> <listitem open="0" type="815" id="1376" label="lower" /> - <listitem open="0" type="815" id="1380" label="tqmask" /> + <listitem open="0" type="815" id="1380" label="mask" /> <listitem open="0" type="815" id="1381" label="name" /> <listitem open="0" type="815" id="1382" label="nativeImgType" /> <listitem open="0" type="815" id="1383" label="nchannels" /> @@ -4008,7 +4008,7 @@ in the constructor, you have to call loadAsync. <listitem open="0" type="815" id="1753" label="hotSpot" /> <listitem open="0" type="815" id="1754" label="img" /> <listitem open="0" type="815" id="1755" label="loadAsync" /> - <listitem open="0" type="815" id="1756" label="tqmask" /> + <listitem open="0" type="815" id="1756" label="mask" /> <listitem open="0" type="815" id="1758" label="saveAsync" /> <listitem open="0" type="815" id="1759" label="setHotSpot" /> <listitem open="0" type="815" id="1761" label="setParasite" /> @@ -4019,7 +4019,7 @@ in the constructor, you have to call loadAsync. <listitem open="0" type="814" id="1622" label="m_dy" /> <listitem open="0" type="814" id="1623" label="m_initial" /> <listitem open="0" type="814" id="1624" label="m_linked" /> - <listitem open="0" type="814" id="1625" label="m_tqmask" /> + <listitem open="0" type="814" id="1625" label="m_mask" /> <listitem open="0" type="814" id="1626" label="m_opacity" /> <listitem open="0" type="814" id="1627" label="m_preserveTransparency" /> <listitem open="0" type="815" id="1644" label="KisLayer" /> @@ -4032,7 +4032,7 @@ in the constructor, you have to call loadAsync. <listitem open="0" type="815" id="1651" label="createMask" /> <listitem open="0" type="815" id="1654" label="linked" /> <listitem open="0" type="815" id="1653" label="linked" /> - <listitem open="0" type="815" id="1656" label="tqmask" /> + <listitem open="0" type="815" id="1656" label="mask" /> <listitem open="0" type="815" id="1657" label="opacity" /> <listitem open="0" type="815" id="1658" label="setOpacity" /> <listitem open="0" type="815" id="1660" label="translate" /> @@ -4359,7 +4359,7 @@ in the constructor, you have to call loadAsync. <listitem open="0" type="815" id="1924" label="commit" /> <listitem open="0" type="815" id="1925" label="fromImage" /> <listitem open="0" type="815" id="1927" label="move" /> - <listitem open="0" type="815" id="1930" label="tqparent" /> + <listitem open="0" type="815" id="1930" label="parent" /> <listitem open="0" type="815" id="1936" label="setBounds" /> <listitem open="0" type="815" id="1931" label="setBounds" /> <listitem open="0" type="815" id="1938" label="setParent" /> @@ -8752,7 +8752,7 @@ in the constructor, you have to call loadAsync. </codeclassfield> </classfields> </classifiercodedocument> - <classifiercodedocument writeOutCode="true" package="" id="624" parent_class="624" fileExt=".cpp" fileName="kisalphatqmask" > + <classifiercodedocument writeOutCode="true" package="" id="624" parent_class="624" fileExt=".cpp" fileName="kisalphamask" > <textblocks> <codeblockwithcomments tag="includes" text="#include "string"&#010;#include "double.h"&#010;#include "quantum.h"&#010;" > <header> @@ -8812,17 +8812,17 @@ in the constructor, you have to call loadAsync. </codeaccessormethod> <codeoperation parent_id="629" tag="operation_629" canDelete="false" role_id="-1" > <header> - <cppcodedocumentation tag="" text="Create an alpha tqmask based on the gray values of the&#010;specified QImage. If the QImage is not grayscale, you're&#010;buggered." /> + <cppcodedocumentation tag="" text="Create an alpha mask based on the gray values of the&#010;specified QImage. If the QImage is not grayscale, you're&#010;buggered." /> </header> </codeoperation> <codeoperation parent_id="631" tag="operation_631" canDelete="false" role_id="-1" > <header> - <cppcodedocumentation tag="" text="Create an alpha tqmask based on the gray values of the&#010;specified QImage. If the QImage is not grayscale, you're&#010;buggered. The QImage is scaled using QImage::smoothScale,&#010;where the target w and h are computed by taking scale as a&#010;percentage." /> + <cppcodedocumentation tag="" text="Create an alpha mask based on the gray values of the&#010;specified QImage. If the QImage is not grayscale, you're&#010;buggered. The QImage is scaled using QImage::smoothScale,&#010;where the target w and h are computed by taking scale as a&#010;percentage." /> </header> </codeoperation> <codeoperation parent_id="634" tag="operation_634" canDelete="false" role_id="-1" > <header> - <cppcodedocumentation tag="" text="@return the alpha value at the specified position.&#010;Returns QUANTUM OPACITY_TRANSPARENT if the value is&#010;outside the bounds of the tqmask.&#010;XXX: this is, of course, not the best way of masking.&#010;Better would be to let KisAlphaMask fill a chunk of memory&#010;with the alpha values at the right position, something like&#010;void applyMask(QUANTUM *pixeldata, Q_INT32 pixelWidth,&#010;Q_INT32 alphaPos). That would be fastest, or we could&#010;provide an iterator over the tqmask, that would be nice, too." /> + <cppcodedocumentation tag="" text="@return the alpha value at the specified position.&#010;Returns QUANTUM OPACITY_TRANSPARENT if the value is&#010;outside the bounds of the mask.&#010;XXX: this is, of course, not the best way of masking.&#010;Better would be to let KisAlphaMask fill a chunk of memory&#010;with the alpha values at the right position, something like&#010;void applyMask(QUANTUM *pixeldata, Q_INT32 pixelWidth,&#010;Q_INT32 alphaPos). That would be fastest, or we could&#010;provide an iterator over the mask, that would be nice, too." /> </header> </codeoperation> <codeoperation parent_id="637" tag="operation_637" canDelete="false" role_id="-1" > @@ -8847,7 +8847,7 @@ in the constructor, you have to call loadAsync. </codeoperation> <codeoperation parent_id="643" tag="operation_643" canDelete="false" role_id="-1" > <header> - <cppcodedocumentation tag="" text="@return the number of lines in the tqmask." /> + <cppcodedocumentation tag="" text="@return the number of lines in the mask." /> </header> </codeoperation> <codeoperation parent_id="644" tag="operation_644" canDelete="false" role_id="-1" > @@ -8859,7 +8859,7 @@ in the constructor, you have to call loadAsync. </hierarchicalcodeblock> </textblocks> <header> - <codecomment tag="" text="/************************************************************************&#010; kisalphatqmask.cpp - Copyright boud&#010;&#010;Here you can write a license for your code, some comments or any other&#010;information you want to have in your generated code. To to this simply&#010;configure the "headings" directory in uml to point to a directory&#010;where you have your heading files.&#010;&#010;or you can just replace the contents of this file with your own.&#010;If you want to do this, this file is located at&#010;&#010;/opt/kde3/share/apps/umbrello/headings/heading.cpp&#010;&#010;-->Code Generators searches for heading files based on the file extension&#010; i.e. it will look for a file name ending in ".h" to include in C++ header&#010; files, and for a file name ending in ".java" to include in all generated&#010; java code.&#010; If you name the file "heading.<extension>", Code Generator will always&#010; choose this file even if there are other files with the same extension in the&#010; directory. If you name the file something else, it must be the only one with that&#010; extension in the directory to guarantee that Code Generator will choose it.&#010;&#010;you can use variables in your heading files which are replaced at generation&#010;time. possible variables are : author, date, time, filename and filepath.&#010;just write %variable_name%&#010;&#010;This file was generated on Sun Feb 8 2004 at 16:52:01&#010;The original location of this file is &#010;**************************************************************************/&#010;" /> + <codecomment tag="" text="/************************************************************************&#010; kisalphamask.cpp - Copyright boud&#010;&#010;Here you can write a license for your code, some comments or any other&#010;information you want to have in your generated code. To to this simply&#010;configure the "headings" directory in uml to point to a directory&#010;where you have your heading files.&#010;&#010;or you can just replace the contents of this file with your own.&#010;If you want to do this, this file is located at&#010;&#010;/opt/kde3/share/apps/umbrello/headings/heading.cpp&#010;&#010;-->Code Generators searches for heading files based on the file extension&#010; i.e. it will look for a file name ending in ".h" to include in C++ header&#010; files, and for a file name ending in ".java" to include in all generated&#010; java code.&#010; If you name the file "heading.<extension>", Code Generator will always&#010; choose this file even if there are other files with the same extension in the&#010; directory. If you name the file something else, it must be the only one with that&#010; extension in the directory to guarantee that Code Generator will choose it.&#010;&#010;you can use variables in your heading files which are replaced at generation&#010;time. possible variables are : author, date, time, filename and filepath.&#010;just write %variable_name%&#010;&#010;This file was generated on Sun Feb 8 2004 at 16:52:01&#010;The original location of this file is &#010;**************************************************************************/&#010;" /> </header> <classfields> <codeclassfield parent_id="625" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" > @@ -9418,7 +9418,7 @@ in the constructor, you have to call loadAsync. </codeoperation> <codeoperation parent_id="705" tag="operation_705" canDelete="false" role_id="-1" > <header> - <cppcodedocumentation tag="" text="@return a tqmask computed from the grey-level values of the&#010;pixels in the brush." /> + <cppcodedocumentation tag="" text="@return a mask computed from the grey-level values of the&#010;pixels in the brush." /> </header> </codeoperation> <codeoperation parent_id="707" tag="operation_707" canDelete="false" role_id="-1" > @@ -15937,7 +15937,7 @@ in the constructor, you have to call loadAsync. </header> <classfields/> </classifiercodedocument> - <classifiercodedocument writeOutCode="true" package="" id="1722" parent_class="1722" fileExt=".cpp" fileName="kistqmask" > + <classifiercodedocument writeOutCode="true" package="" id="1722" parent_class="1722" fileExt=".cpp" fileName="kismask" > <textblocks> <codeblockwithcomments tag="includes" text="#include "string"&#010;#include "kisimagesp.h"&#010;#include "bool.h"&#010;#include "kislayersp.h"&#010;" > <header> @@ -16004,7 +16004,7 @@ in the constructor, you have to call loadAsync. </hierarchicalcodeblock> </textblocks> <header> - <codecomment tag="" text="/************************************************************************&#010; kistqmask.cpp - Copyright boud&#010;&#010;Here you can write a license for your code, some comments or any other&#010;information you want to have in your generated code. To to this simply&#010;configure the "headings" directory in uml to point to a directory&#010;where you have your heading files.&#010;&#010;or you can just replace the contents of this file with your own.&#010;If you want to do this, this file is located at&#010;&#010;/opt/kde3/share/apps/umbrello/headings/heading.cpp&#010;&#010;-->Code Generators searches for heading files based on the file extension&#010; i.e. it will look for a file name ending in ".h" to include in C++ header&#010; files, and for a file name ending in ".java" to include in all generated&#010; java code.&#010; If you name the file "heading.<extension>", Code Generator will always&#010; choose this file even if there are other files with the same extension in the&#010; directory. If you name the file something else, it must be the only one with that&#010; extension in the directory to guarantee that Code Generator will choose it.&#010;&#010;you can use variables in your heading files which are replaced at generation&#010;time. possible variables are : author, date, time, filename and filepath.&#010;just write %variable_name%&#010;&#010;This file was generated on Sun Feb 8 2004 at 16:45:17&#010;The original location of this file is &#010;**************************************************************************/&#010;" /> + <codecomment tag="" text="/************************************************************************&#010; kismask.cpp - Copyright boud&#010;&#010;Here you can write a license for your code, some comments or any other&#010;information you want to have in your generated code. To to this simply&#010;configure the "headings" directory in uml to point to a directory&#010;where you have your heading files.&#010;&#010;or you can just replace the contents of this file with your own.&#010;If you want to do this, this file is located at&#010;&#010;/opt/kde3/share/apps/umbrello/headings/heading.cpp&#010;&#010;-->Code Generators searches for heading files based on the file extension&#010; i.e. it will look for a file name ending in ".h" to include in C++ header&#010; files, and for a file name ending in ".java" to include in all generated&#010; java code.&#010; If you name the file "heading.<extension>", Code Generator will always&#010; choose this file even if there are other files with the same extension in the&#010; directory. If you name the file something else, it must be the only one with that&#010; extension in the directory to guarantee that Code Generator will choose it.&#010;&#010;you can use variables in your heading files which are replaced at generation&#010;time. possible variables are : author, date, time, filename and filepath.&#010;just write %variable_name%&#010;&#010;This file was generated on Sun Feb 8 2004 at 16:45:17&#010;The original location of this file is &#010;**************************************************************************/&#010;" /> </header> <classfields/> </classifiercodedocument> @@ -16148,7 +16148,7 @@ in the constructor, you have to call loadAsync. </codeoperation> <codeoperation parent_id="1756" tag="operation_1756" canDelete="false" role_id="-1" > <header> - <cppcodedocumentation tag="" text="@return the next tqmask in the pipe." /> + <cppcodedocumentation tag="" text="@return the next mask in the pipe." /> </header> </codeoperation> <codeoperation parent_id="1758" tag="operation_1758" canDelete="false" role_id="-1" > @@ -24174,7 +24174,7 @@ in the constructor, you have to call loadAsync. <textblocks> <codeoperation parent_id="46" tag="operation_46" canDelete="false" indentLevel="1" role_id="-1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param tqparent &#010;@param name " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param parent &#010;@param name " /> </header> </codeoperation> <codeoperation parent_id="49" tag="operation_49" canDelete="false" indentLevel="1" role_id="-1" > @@ -31756,7 +31756,7 @@ in the constructor, you have to call loadAsync. </codeclassfield> </classfields> </classifiercodedocument> - <classifiercodedocument writeOutCode="true" package="" id="cppheader624" parent_class="624" fileExt=".h" fileName="kisalphatqmask" > + <classifiercodedocument writeOutCode="true" package="" id="cppheader624" parent_class="624" fileExt=".h" fileName="kisalphamask" > <textblocks> <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISALPHAMASK_H&#010;#define KISALPHAMASK_H" > <header> @@ -31842,17 +31842,17 @@ in the constructor, you have to call loadAsync. <textblocks> <codeoperation parent_id="629" tag="operation_629" canDelete="false" indentLevel="1" role_id="-1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="Create an alpha tqmask based on the gray values of the&#010;specified QImage. If the QImage is not grayscale, you're&#010;buggered.&#010;@param img " /> + <cppcodedocumentation tag="" indentLevel="1" text="Create an alpha mask based on the gray values of the&#010;specified QImage. If the QImage is not grayscale, you're&#010;buggered.&#010;@param img " /> </header> </codeoperation> <codeoperation parent_id="631" tag="operation_631" canDelete="false" indentLevel="1" role_id="-1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="Create an alpha tqmask based on the gray values of the&#010;specified QImage. If the QImage is not grayscale, you're&#010;buggered. The QImage is scaled using QImage::smoothScale,&#010;where the target w and h are computed by taking scale as a&#010;percentage.&#010;@param img &#010;@param scale " /> + <cppcodedocumentation tag="" indentLevel="1" text="Create an alpha mask based on the gray values of the&#010;specified QImage. If the QImage is not grayscale, you're&#010;buggered. The QImage is scaled using QImage::smoothScale,&#010;where the target w and h are computed by taking scale as a&#010;percentage.&#010;@param img &#010;@param scale " /> </header> </codeoperation> <codeoperation parent_id="634" tag="operation_634" canDelete="false" indentLevel="1" role_id="-1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="@return the alpha value at the specified position.&#010;Returns QUANTUM OPACITY_TRANSPARENT if the value is&#010;outside the bounds of the tqmask.&#010;XXX: this is, of course, not the best way of masking.&#010;Better would be to let KisAlphaMask fill a chunk of memory&#010;with the alpha values at the right position, something like&#010;void applyMask(QUANTUM *pixeldata, Q_INT32 pixelWidth,&#010;Q_INT32 alphaPos). That would be fastest, or we could&#010;provide an iterator over the tqmask, that would be nice, too.&#010;@param x &#010;@param y " /> + <cppcodedocumentation tag="" indentLevel="1" text="@return the alpha value at the specified position.&#010;Returns QUANTUM OPACITY_TRANSPARENT if the value is&#010;outside the bounds of the mask.&#010;XXX: this is, of course, not the best way of masking.&#010;Better would be to let KisAlphaMask fill a chunk of memory&#010;with the alpha values at the right position, something like&#010;void applyMask(QUANTUM *pixeldata, Q_INT32 pixelWidth,&#010;Q_INT32 alphaPos). That would be fastest, or we could&#010;provide an iterator over the mask, that would be nice, too.&#010;@param x &#010;@param y " /> </header> </codeoperation> <codeoperation parent_id="641" tag="operation_641" canDelete="false" indentLevel="1" role_id="-1" > @@ -31867,7 +31867,7 @@ in the constructor, you have to call loadAsync. </codeoperation> <codeoperation parent_id="643" tag="operation_643" canDelete="false" indentLevel="1" role_id="-1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="@return the number of lines in the tqmask." /> + <cppcodedocumentation tag="" indentLevel="1" text="@return the number of lines in the mask." /> </header> </codeoperation> <codeoperation parent_id="644" tag="operation_644" canDelete="false" indentLevel="1" role_id="-1" > @@ -32067,7 +32067,7 @@ in the constructor, you have to call loadAsync. </codeblockwithcomments> </textblocks> <header> - <codecomment tag="" text="/************************************************************************&#010; kisalphatqmask.h - Copyright boud&#010;&#010;Here you can write a license for your code, some comments or any other&#010;information you want to have in your generated code. To to this simply&#010;configure the "headings" directory in uml to point to a directory&#010;where you have your heading files.&#010;&#010;or you can just replace the contents of this file with your own.&#010;If you want to do this, this file is located at&#010;&#010;/opt/kde3/share/apps/umbrello/headings/heading.h&#010;&#010;-->Code Generators searches for heading files based on the file extension&#010; i.e. it will look for a file name ending in ".h" to include in C++ header&#010; files, and for a file name ending in ".java" to include in all generated&#010; java code.&#010; If you name the file "heading.<extension>", Code Generator will always&#010; choose this file even if there are other files with the same extension in the&#010; directory. If you name the file something else, it must be the only one with that&#010; extension in the directory to guarantee that Code Generator will choose it.&#010;&#010;you can use variables in your heading files which are replaced at generation&#010;time. possible variables are : author, date, time, filename and filepath.&#010;just write %variable_name%&#010;&#010;This file was generated on Sun Feb 8 2004 at 16:52:01&#010;The original location of this file is &#010;**************************************************************************/&#010;" /> + <codecomment tag="" text="/************************************************************************&#010; kisalphamask.h - Copyright boud&#010;&#010;Here you can write a license for your code, some comments or any other&#010;information you want to have in your generated code. To to this simply&#010;configure the "headings" directory in uml to point to a directory&#010;where you have your heading files.&#010;&#010;or you can just replace the contents of this file with your own.&#010;If you want to do this, this file is located at&#010;&#010;/opt/kde3/share/apps/umbrello/headings/heading.h&#010;&#010;-->Code Generators searches for heading files based on the file extension&#010; i.e. it will look for a file name ending in ".h" to include in C++ header&#010; files, and for a file name ending in ".java" to include in all generated&#010; java code.&#010; If you name the file "heading.<extension>", Code Generator will always&#010; choose this file even if there are other files with the same extension in the&#010; directory. If you name the file something else, it must be the only one with that&#010; extension in the directory to guarantee that Code Generator will choose it.&#010;&#010;you can use variables in your heading files which are replaced at generation&#010;time. possible variables are : author, date, time, filename and filepath.&#010;just write %variable_name%&#010;&#010;This file was generated on Sun Feb 8 2004 at 16:52:01&#010;The original location of this file is &#010;**************************************************************************/&#010;" /> </header> <classfields> <codeclassfield parent_id="625" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" > @@ -32965,7 +32965,7 @@ in the constructor, you have to call loadAsync. </codeoperation> <codeoperation parent_id="705" tag="operation_705" canDelete="false" indentLevel="1" role_id="-1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="@return a tqmask computed from the grey-level values of the&#010;pixels in the brush.&#010;@param scale " /> + <cppcodedocumentation tag="" indentLevel="1" text="@return a mask computed from the grey-level values of the&#010;pixels in the brush.&#010;@param scale " /> </header> </codeoperation> <codeoperation parent_id="707" tag="operation_707" canDelete="false" indentLevel="1" role_id="-1" > @@ -36508,7 +36508,7 @@ in the constructor, you have to call loadAsync. <textblocks> <codeoperation parent_id="914" tag="operation_914" canDelete="false" indentLevel="1" role_id="-1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param parentWidget &#010;@param widgetName &#010;@param tqparent &#010;@param name &#010;@param singleViewMode " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param parentWidget &#010;@param widgetName &#010;@param parent &#010;@param name &#010;@param singleViewMode " /> </header> </codeoperation> <codeoperation parent_id="922" tag="operation_922" canDelete="false" indentLevel="1" role_id="-1" > @@ -36790,7 +36790,7 @@ in the constructor, you have to call loadAsync. </codeoperation> <codeoperation parent_id="933" tag="operation_933" canDelete="false" indentLevel="1" role_id="-1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param tqparent &#010;@param name " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param parent &#010;@param name " /> </header> </codeoperation> <codeoperation parent_id="938" tag="operation_938" canDelete="false" indentLevel="1" role_id="-1" > @@ -38310,7 +38310,7 @@ in the constructor, you have to call loadAsync. <textblocks> <codeoperation parent_id="1115" tag="operation_1115" canDelete="false" indentLevel="1" role_id="-1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param tqparent &#010;@param name " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param parent &#010;@param name " /> </header> </codeoperation> <codeoperation parent_id="1118" tag="operation_1118" canDelete="false" indentLevel="1" role_id="-1" > @@ -38320,7 +38320,7 @@ in the constructor, you have to call loadAsync. </codeoperation> <codeoperation parent_id="1119" tag="operation_1119" canDelete="false" indentLevel="1" role_id="-1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param parentWidget &#010;@param widgetName &#010;@param tqparent &#010;@param name &#010;@param classname &#010;@param args " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param parentWidget &#010;@param widgetName &#010;@param parent &#010;@param name &#010;@param classname &#010;@param args " /> </header> </codeoperation> <codeoperation parent_id="1126" tag="operation_1126" canDelete="false" indentLevel="1" role_id="-1" > @@ -43059,7 +43059,7 @@ in the constructor, you have to call loadAsync. </codeoperation> <codeoperation parent_id="1647" tag="operation_1647" canDelete="false" indentLevel="1" role_id="-1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param tqmask " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param mask " /> </header> </codeoperation> <codeoperation parent_id="1649" tag="operation_1649" canDelete="false" indentLevel="1" role_id="-1" > @@ -43204,7 +43204,7 @@ in the constructor, you have to call loadAsync. <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> </ccfdeclarationcodeblock> - <ccfdeclarationcodeblock parent_id="1625" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" KisMaskSP m_tqmask;" > + <ccfdeclarationcodeblock parent_id="1625" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" KisMaskSP m_mask;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -43430,7 +43430,7 @@ in the constructor, you have to call loadAsync. <header> <cppcodedocumentation tag="" /> </header> - <ccfdeclarationcodeblock parent_id="1625" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" KisMaskSP m_tqmask;" > + <ccfdeclarationcodeblock parent_id="1625" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" KisMaskSP m_mask;" > <header> <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" /> </header> @@ -44510,7 +44510,7 @@ in the constructor, you have to call loadAsync. </header> <classfields/> </classifiercodedocument> - <classifiercodedocument writeOutCode="true" package="" id="cppheader1722" parent_class="1722" fileExt=".h" fileName="kistqmask" > + <classifiercodedocument writeOutCode="true" package="" id="cppheader1722" parent_class="1722" fileExt=".h" fileName="kismask" > <textblocks> <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISMASK_H&#010;#define KISMASK_H" > <header> @@ -44611,7 +44611,7 @@ in the constructor, you have to call loadAsync. </codeoperation> <codeoperation parent_id="1732" tag="operation_1732" canDelete="false" indentLevel="1" role_id="-1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param tqmask " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param mask " /> </header> </codeoperation> <codeoperation parent_id="1734" tag="operation_1734" canDelete="false" indentLevel="1" role_id="-1" > @@ -44758,7 +44758,7 @@ in the constructor, you have to call loadAsync. </codeblockwithcomments> </textblocks> <header> - <codecomment tag="" text="/************************************************************************&#010; kistqmask.h - Copyright boud&#010;&#010;Here you can write a license for your code, some comments or any other&#010;information you want to have in your generated code. To to this simply&#010;configure the "headings" directory in uml to point to a directory&#010;where you have your heading files.&#010;&#010;or you can just replace the contents of this file with your own.&#010;If you want to do this, this file is located at&#010;&#010;/opt/kde3/share/apps/umbrello/headings/heading.h&#010;&#010;-->Code Generators searches for heading files based on the file extension&#010; i.e. it will look for a file name ending in ".h" to include in C++ header&#010; files, and for a file name ending in ".java" to include in all generated&#010; java code.&#010; If you name the file "heading.<extension>", Code Generator will always&#010; choose this file even if there are other files with the same extension in the&#010; directory. If you name the file something else, it must be the only one with that&#010; extension in the directory to guarantee that Code Generator will choose it.&#010;&#010;you can use variables in your heading files which are replaced at generation&#010;time. possible variables are : author, date, time, filename and filepath.&#010;just write %variable_name%&#010;&#010;This file was generated on Sun Feb 8 2004 at 16:45:18&#010;The original location of this file is &#010;**************************************************************************/&#010;" /> + <codecomment tag="" text="/************************************************************************&#010; kismask.h - Copyright boud&#010;&#010;Here you can write a license for your code, some comments or any other&#010;information you want to have in your generated code. To to this simply&#010;configure the "headings" directory in uml to point to a directory&#010;where you have your heading files.&#010;&#010;or you can just replace the contents of this file with your own.&#010;If you want to do this, this file is located at&#010;&#010;/opt/kde3/share/apps/umbrello/headings/heading.h&#010;&#010;-->Code Generators searches for heading files based on the file extension&#010; i.e. it will look for a file name ending in ".h" to include in C++ header&#010; files, and for a file name ending in ".java" to include in all generated&#010; java code.&#010; If you name the file "heading.<extension>", Code Generator will always&#010; choose this file even if there are other files with the same extension in the&#010; directory. If you name the file something else, it must be the only one with that&#010; extension in the directory to guarantee that Code Generator will choose it.&#010;&#010;you can use variables in your heading files which are replaced at generation&#010;time. possible variables are : author, date, time, filename and filepath.&#010;just write %variable_name%&#010;&#010;This file was generated on Sun Feb 8 2004 at 16:45:18&#010;The original location of this file is &#010;**************************************************************************/&#010;" /> </header> <classfields/> </classifiercodedocument> @@ -44905,7 +44905,7 @@ in the constructor, you have to call loadAsync. </codeoperation> <codeoperation parent_id="1756" tag="operation_1756" canDelete="false" indentLevel="1" role_id="-1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="@return the next tqmask in the pipe.&#010;@param scale " /> + <cppcodedocumentation tag="" indentLevel="1" text="@return the next mask in the pipe.&#010;@param scale " /> </header> </codeoperation> <codeoperation parent_id="1758" tag="operation_1758" canDelete="false" indentLevel="1" role_id="-1" > @@ -45685,7 +45685,7 @@ in the constructor, you have to call loadAsync. </codeoperation> <codeoperation parent_id="1814" tag="operation_1814" canDelete="false" indentLevel="1" role_id="-1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param tqmask " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param mask " /> </header> </codeoperation> <codeoperation parent_id="1885" tag="operation_1885" canDelete="false" indentLevel="1" role_id="-1" > @@ -46419,7 +46419,7 @@ in the constructor, you have to call loadAsync. <textblocks> <codeoperation parent_id="1911" tag="operation_1911" canDelete="false" indentLevel="1" role_id="-1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param tqparent &#010;@param img &#010;@param name &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param parent &#010;@param img &#010;@param name &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1916" tag="operation_1916" canDelete="false" indentLevel="1" role_id="-1" > @@ -46469,7 +46469,7 @@ in the constructor, you have to call loadAsync. </codeoperation> <codeoperation parent_id="1938" tag="operation_1938" canDelete="false" indentLevel="1" role_id="-1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param tqparent " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param parent " /> </header> </codeoperation> <codeoperation parent_id="1940" tag="operation_1940" canDelete="false" indentLevel="1" role_id="-1" > @@ -47006,7 +47006,7 @@ in the constructor, you have to call loadAsync. <textblocks> <codeoperation parent_id="1947" tag="operation_1947" canDelete="false" indentLevel="1" role_id="-1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param mediateOn &#010;@param rserver &#010;@param chooserCaption &#010;@param chooserParent &#010;@param chooserName &#010;@param tqparent &#010;@param name " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param mediateOn &#010;@param rserver &#010;@param chooserCaption &#010;@param chooserParent &#010;@param chooserName &#010;@param parent &#010;@param name " /> </header> </codeoperation> <codeoperation parent_id="1955" tag="operation_1955" canDelete="false" indentLevel="1" role_id="-1" > @@ -50831,7 +50831,7 @@ in the constructor, you have to call loadAsync. </codeoperation> <codeoperation parent_id="2160" tag="operation_2160" canDelete="false" indentLevel="1" role_id="-1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param tqparent " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param parent " /> </header> </codeoperation> <codeoperation parent_id="2162" tag="operation_2162" canDelete="false" indentLevel="1" role_id="-1" > @@ -53071,7 +53071,7 @@ in the constructor, you have to call loadAsync. <textblocks> <codeoperation parent_id="2448" tag="operation_2448" canDelete="false" indentLevel="1" role_id="-1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param doc &#010;@param adapter &#010;@param tqparent &#010;@param name " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param doc &#010;@param adapter &#010;@param parent &#010;@param name " /> </header> </codeoperation> <codeoperation parent_id="2458" tag="operation_2458" canDelete="false" indentLevel="1" role_id="-1" > diff --git a/chalk/doc/channels_masks_selections b/chalk/doc/channels_masks_selections index 665883637..837e154e0 100644 --- a/chalk/doc/channels_masks_selections +++ b/chalk/doc/channels_masks_selections @@ -1,6 +1,6 @@ We did a rethink on channels, selections and masks last summer. -Traditionally, a tqmask is seen as an extra channel for an image, analogous +Traditionally, a mask is seen as an extra channel for an image, analogous to the alpha channel. We want to do away with that idea. A layer can have a number of permanent selections associated with it. diff --git a/chalk/doc/colorspaces.xmi b/chalk/doc/colorspaces.xmi index c517ab0cb..78870c72c 100644 --- a/chalk/doc/colorspaces.xmi +++ b/chalk/doc/colorspaces.xmi @@ -344,7 +344,7 @@ XXX: Also add a function that modifies the current alpha with the given alpha, i <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="140" isRoot="false" value="" type="44" isAbstract="false" name="nPixels" /> </UML:BehavioralFeature.parameter> </UML:Operation> - <UML:Operation comment="Applies the specified 8-bit alpha tqmask to the pixels. We assume that there are just + <UML:Operation comment="Applies the specified 8-bit alpha mask to the pixels. We assume that there are just as many alpha values as pixels but we do not check this." isSpecification="false" isLeaf="false" visibility="public" xmi.id="141" isRoot="false" isAbstract="false" name="applyAphaU8Mask" > <UML:BehavioralFeature.parameter> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="142" isRoot="false" value="" type="78" isAbstract="false" name="pixels" /> @@ -352,7 +352,7 @@ as many alpha values as pixels but we do not check this." isSpecification="false <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="144" isRoot="false" value="" type="44" isAbstract="false" name="nPixels" /> </UML:BehavioralFeature.parameter> </UML:Operation> - <UML:Operation comment="Applies the inverted 8-bit alpha tqmask to the pixels. We assume that there are just + <UML:Operation comment="Applies the inverted 8-bit alpha mask to the pixels. We assume that there are just as many alpha values as pixels but we do not check this." isSpecification="false" isLeaf="false" visibility="public" xmi.id="145" isRoot="false" isAbstract="false" name="applyInverseAlphaU8Mask" > <UML:BehavioralFeature.parameter> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="146" isRoot="false" value="" type="78" isAbstract="false" name="pixels" /> @@ -560,8 +560,8 @@ This class is the base for all 8-bit/channel colorspaces" isSpecification="false along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. //** -The alpha tqmask is a special color strategy that treats all pixels as -alpha value with a colour common to the tqmask. The default color is white." isSpecification="false" isLeaf="false" visibility="public" xmi.id="255" isRoot="false" isAbstract="false" name="KisAlphaColorSpace" > +The alpha mask is a special color strategy that treats all pixels as +alpha value with a colour common to the mask. The default color is white." isSpecification="false" isLeaf="false" visibility="public" xmi.id="255" isRoot="false" isAbstract="false" name="KisAlphaColorSpace" > <UML:GeneralizableElement.generalization> <UML:Generalization xmi.idref="256" /> </UML:GeneralizableElement.generalization> @@ -991,7 +991,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="458" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="459" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="460" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="461" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="461" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="462" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="463" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="464" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1004,7 +1004,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="468" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="469" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="470" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="471" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="471" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="472" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="473" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="474" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1017,7 +1017,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="478" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="479" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="480" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="481" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="481" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="482" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="483" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="484" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1030,7 +1030,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="488" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="489" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="490" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="491" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="491" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="492" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="493" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="494" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1043,7 +1043,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="498" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="499" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="500" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="501" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="501" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="502" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="503" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="504" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1056,7 +1056,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="508" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="509" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="510" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="511" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="511" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="512" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="513" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="514" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1069,7 +1069,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="518" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="519" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="520" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="521" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="521" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="522" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="523" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="524" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1082,7 +1082,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="528" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="529" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="530" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="531" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="531" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="532" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="533" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="534" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1095,7 +1095,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="538" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="539" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="540" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="541" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="541" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="542" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="543" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="544" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1108,7 +1108,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="548" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="549" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="550" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="551" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="551" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="552" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="553" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="554" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1121,7 +1121,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="558" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="559" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="560" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="561" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="561" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="562" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="563" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="564" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1527,7 +1527,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="761" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="762" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="763" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="764" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="764" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="765" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="766" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="767" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1540,7 +1540,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="771" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="772" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="773" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="774" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="774" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="775" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="776" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="777" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1553,7 +1553,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="781" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="782" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="783" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="784" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="784" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="785" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="786" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="787" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1566,7 +1566,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="791" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="792" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="793" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="794" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="794" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="795" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="796" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="797" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1579,7 +1579,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="801" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="802" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="803" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="804" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="804" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="805" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="806" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="807" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1592,7 +1592,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="811" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="812" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="813" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="814" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="814" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="815" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="816" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="817" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1605,7 +1605,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="821" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="822" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="823" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="824" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="824" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="825" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="826" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="827" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1618,7 +1618,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="831" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="832" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="833" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="834" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="834" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="835" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="836" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="837" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1631,7 +1631,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="841" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="842" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="843" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="844" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="844" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="845" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="846" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="847" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1644,7 +1644,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="851" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="852" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="853" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="854" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="854" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="855" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="856" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="857" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1678,7 +1678,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="878" isRoot="false" initialValue="" type="126" isAbstract="false" name="m_ColorSpaceRGBF32" /> <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="869" isRoot="false" isAbstract="false" name="RGBF32Plugin" > <UML:BehavioralFeature.parameter> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="872" isRoot="false" value="" type="871" isAbstract="false" name="tqparent" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="872" isRoot="false" value="" type="871" isAbstract="false" name="parent" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="874" isRoot="false" value="" type="873" isAbstract="false" name="name" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="876" isRoot="false" value="" type="875" isAbstract="false" name="" /> </UML:BehavioralFeature.parameter> @@ -1894,7 +1894,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="976" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="977" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="978" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="979" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="979" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="980" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="981" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="982" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1907,7 +1907,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="986" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="987" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="988" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="989" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="989" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="990" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="991" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="992" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1920,7 +1920,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="996" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="997" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="998" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="999" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="999" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1000" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1001" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1002" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1933,7 +1933,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1006" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1007" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1008" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1009" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1009" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1010" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1011" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1012" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1946,7 +1946,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1016" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1017" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1018" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1019" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1019" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1020" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1021" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1022" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1959,7 +1959,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1026" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1027" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1028" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1029" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1029" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1030" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1031" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1032" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1972,7 +1972,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1036" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1037" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1038" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1039" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1039" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1040" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1041" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1042" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1985,7 +1985,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1046" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1047" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1048" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1049" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1049" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1050" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1051" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1052" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -1998,7 +1998,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1056" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1057" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1058" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1059" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1059" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1060" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1061" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1062" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2011,7 +2011,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1066" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1067" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1068" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1069" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1069" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1070" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1071" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1072" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2024,7 +2024,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1076" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1077" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1078" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1079" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1079" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1080" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1081" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1082" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2037,7 +2037,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1086" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1087" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1088" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1089" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1089" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1090" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1091" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1092" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2050,7 +2050,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1096" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1097" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1098" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1099" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1099" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1100" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1101" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1102" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2063,7 +2063,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1106" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1107" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1108" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1109" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1109" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1110" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1111" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1112" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2076,7 +2076,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1116" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1117" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1118" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1119" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1119" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1120" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1121" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1122" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2291,7 +2291,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1232" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1233" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1234" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1235" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1235" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1236" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1237" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1238" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2304,7 +2304,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1242" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1243" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1244" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1245" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1245" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1246" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1247" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1248" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2317,7 +2317,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1252" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1253" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1254" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1255" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1255" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1256" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1257" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1258" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2330,7 +2330,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1262" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1263" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1264" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1265" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1265" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1266" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1267" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1268" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2343,7 +2343,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1272" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1273" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1274" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1275" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1275" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1276" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1277" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1278" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2356,7 +2356,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1282" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1283" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1284" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1285" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1285" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1286" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1287" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1288" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2369,7 +2369,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1292" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1293" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1294" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1295" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1295" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1296" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1297" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1298" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2382,7 +2382,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1302" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1303" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1304" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1305" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1305" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1306" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1307" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1308" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2395,7 +2395,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1312" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1313" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1314" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1315" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1315" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1316" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1317" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1318" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2408,7 +2408,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1322" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1323" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1324" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1325" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1325" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1326" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1327" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1328" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2421,7 +2421,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1332" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1333" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1334" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1335" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1335" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1336" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1337" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1338" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2434,7 +2434,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1342" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1343" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1344" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1345" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1345" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1346" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1347" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1348" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2447,7 +2447,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1352" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1353" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1354" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1355" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1355" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1356" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1357" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1358" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2460,7 +2460,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1362" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1363" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1364" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1365" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1365" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1366" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1367" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1368" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2473,7 +2473,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1372" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1373" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1374" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1375" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1375" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1376" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1377" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1378" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2701,7 +2701,7 @@ the compensation factor will be used to limit the darkening. <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1500" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1501" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1502" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1503" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1503" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1504" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1505" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1506" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2714,7 +2714,7 @@ the compensation factor will be used to limit the darkening. <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1510" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1511" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1512" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1513" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1513" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1514" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1515" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1516" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2727,7 +2727,7 @@ the compensation factor will be used to limit the darkening. <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1520" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1521" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1522" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1523" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1523" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1524" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1525" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1526" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2740,7 +2740,7 @@ the compensation factor will be used to limit the darkening. <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1530" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1531" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1532" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1533" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1533" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1534" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1535" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1536" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2753,7 +2753,7 @@ the compensation factor will be used to limit the darkening. <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1540" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1541" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1542" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1543" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1543" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1544" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1545" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1546" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2766,7 +2766,7 @@ the compensation factor will be used to limit the darkening. <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1550" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1551" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1552" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1553" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1553" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1554" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1555" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1556" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2779,7 +2779,7 @@ the compensation factor will be used to limit the darkening. <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1560" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1561" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1562" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1563" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1563" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1564" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1565" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1566" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2792,7 +2792,7 @@ the compensation factor will be used to limit the darkening. <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1570" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1571" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1572" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1573" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1573" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1574" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1575" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1576" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2805,7 +2805,7 @@ the compensation factor will be used to limit the darkening. <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1580" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1581" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1582" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1583" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1583" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1584" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1585" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1586" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2818,7 +2818,7 @@ the compensation factor will be used to limit the darkening. <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1590" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1591" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1592" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1593" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1593" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1594" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1595" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1596" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2831,7 +2831,7 @@ the compensation factor will be used to limit the darkening. <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1600" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1601" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1602" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1603" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1603" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1604" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1605" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1606" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2844,7 +2844,7 @@ the compensation factor will be used to limit the darkening. <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1610" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1611" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1612" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1613" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1613" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1614" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1615" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1616" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2857,7 +2857,7 @@ the compensation factor will be used to limit the darkening. <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1620" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1621" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1622" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1623" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1623" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1624" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1625" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1626" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -2870,7 +2870,7 @@ the compensation factor will be used to limit the darkening. <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1630" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1631" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1632" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1633" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1633" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1634" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1635" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1636" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -3322,7 +3322,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1867" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1868" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1869" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1870" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1870" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1871" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1872" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1873" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -3335,7 +3335,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1877" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1878" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1879" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1880" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1880" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1881" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1882" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1883" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -3348,7 +3348,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1887" isRoot="false" value="" type="44" isAbstract="false" name="dstRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1888" isRoot="false" value="" type="54" isAbstract="false" name="src" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1889" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" /> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1890" isRoot="false" value="" type="54" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1890" isRoot="false" value="" type="54" isAbstract="false" name="mask" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1891" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1892" isRoot="false" value="" type="44" isAbstract="false" name="rows" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1893" isRoot="false" value="" type="44" isAbstract="false" name="columns" /> @@ -3358,20 +3358,20 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" </UML:Classifier.feature> </UML:Class> <UML:Interface stereotype="12051" isSpecification="false" isLeaf="false" visibility="public" xmi.id="12050" isRoot="false" isAbstract="true" name="KisColorSpaceDescriptor" /> - <UML:Generalization isSpecification="false" child="26" visibility="public" xmi.id="28" tqparent="27" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="247" visibility="public" xmi.id="248" tqparent="26" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="255" visibility="public" xmi.id="256" tqparent="247" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="350" visibility="public" xmi.id="351" tqparent="26" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="358" visibility="public" xmi.id="359" tqparent="26" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="369" visibility="public" xmi.id="370" tqparent="358" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="575" visibility="public" xmi.id="576" tqparent="247" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="669" visibility="public" xmi.id="670" tqparent="247" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="863" visibility="public" xmi.id="866" tqparent="865" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="879" visibility="public" xmi.id="880" tqparent="350" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="1134" visibility="public" xmi.id="1135" tqparent="358" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="1386" visibility="public" xmi.id="1387" tqparent="247" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="1663" visibility="public" xmi.id="1664" tqparent="26" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="1774" visibility="public" xmi.id="1775" tqparent="26" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="26" visibility="public" xmi.id="28" parent="27" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="247" visibility="public" xmi.id="248" parent="26" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="255" visibility="public" xmi.id="256" parent="247" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="350" visibility="public" xmi.id="351" parent="26" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="358" visibility="public" xmi.id="359" parent="26" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="369" visibility="public" xmi.id="370" parent="358" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="575" visibility="public" xmi.id="576" parent="247" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="669" visibility="public" xmi.id="670" parent="247" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="863" visibility="public" xmi.id="866" parent="865" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="879" visibility="public" xmi.id="880" parent="350" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="1134" visibility="public" xmi.id="1135" parent="358" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="1386" visibility="public" xmi.id="1387" parent="247" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="1663" visibility="public" xmi.id="1664" parent="26" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="1774" visibility="public" xmi.id="1775" parent="26" discriminator="" name="" /> </UML:Namespace.ownedElement> </UML:Model> </XMI.content> @@ -5951,12 +5951,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" </codeoperation> <codeoperation parent_id="141" tag="operation_141" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Applies the specified 8-bit alpha tqmask to the pixels. We assume that there are just&#010;as many alpha values as pixels but we do not check this." /> + <javacodedocumentation tag="" indentLevel="1" text="Applies the specified 8-bit alpha mask to the pixels. We assume that there are just&#010;as many alpha values as pixels but we do not check this." /> </header> </codeoperation> <codeoperation parent_id="145" tag="operation_145" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Applies the inverted 8-bit alpha tqmask to the pixels. We assume that there are just&#010;as many alpha values as pixels but we do not check this." /> + <javacodedocumentation tag="" indentLevel="1" text="Applies the inverted 8-bit alpha mask to the pixels. We assume that there are just&#010;as many alpha values as pixels but we do not check this." /> </header> </codeoperation> <codeoperation parent_id="149" tag="operation_149" canDelete="false" indentLevel="1" > @@ -9851,7 +9851,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" </codeblockwithcomments> <javaclassdeclarationblock parent_id="255" tag="ClassDeclBlock" canDelete="false" > <header> - <javacodedocumentation tag="" text="Class KisAlphaColorSpace&#010; Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>&#010;&#010; This program is free software; you can redistribute it and/or modify&#010; it under the terms of the GNU General Public License as published by&#010; the Free Software Foundation; either version 2 of the License, or&#010; (at your option) any later version.&#010;&#010; This program is distributed in the hope that it will be useful,&#010; but WITHOUT ANY WARRANTY; without even the implied warranty of&#010; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the&#010; GNU General Public License for more details.&#010;&#010; You should have received a copy of the GNU General Public License&#010; along with this program; if not, write to the Free Software&#010; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.&#010;//**&#010;The alpha tqmask is a special color strategy that treats all pixels as&#010;alpha value with a colour common to the tqmask. The default color is white." /> + <javacodedocumentation tag="" text="Class KisAlphaColorSpace&#010; Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>&#010;&#010; This program is free software; you can redistribute it and/or modify&#010; it under the terms of the GNU General Public License as published by&#010; the Free Software Foundation; either version 2 of the License, or&#010; (at your option) any later version.&#010;&#010; This program is distributed in the hope that it will be useful,&#010; but WITHOUT ANY WARRANTY; without even the implied warranty of&#010; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the&#010; GNU General Public License for more details.&#010;&#010; You should have received a copy of the GNU General Public License&#010; along with this program; if not, write to the Free Software&#010; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.&#010;//**&#010;The alpha mask is a special color strategy that treats all pixels as&#010;alpha value with a colour common to the mask. The default color is white." /> </header> <textblocks> <hierarchicalcodeblock tag="fieldsDecl" canDelete="false" indentLevel="1" > @@ -10987,57 +10987,57 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" </codeoperation> <codeoperation parent_id="456" tag="operation_456" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="466" tag="operation_466" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="476" tag="operation_476" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="486" tag="operation_486" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="496" tag="operation_496" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="506" tag="operation_506" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="516" tag="operation_516" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="526" tag="operation_526" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="536" tag="operation_536" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="546" tag="operation_546" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="556" tag="operation_556" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> </textblocks> @@ -12433,52 +12433,52 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" </codeoperation> <codeoperation parent_id="759" tag="operation_759" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="769" tag="operation_769" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="779" tag="operation_779" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="789" tag="operation_789" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="799" tag="operation_799" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="809" tag="operation_809" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="819" tag="operation_819" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="829" tag="operation_829" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="839" tag="operation_839" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="849" tag="operation_849" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> </textblocks> @@ -12747,7 +12747,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" <textblocks> <codeoperation parent_id="869" tag="operation_869" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param tqparent &#010;@param name &#010;@param &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param parent &#010;@param name &#010;@param &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="877" tag="operation_877" canDelete="false" indentLevel="1" > @@ -13577,77 +13577,77 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" </codeoperation> <codeoperation parent_id="974" tag="operation_974" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="984" tag="operation_984" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="994" tag="operation_994" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1004" tag="operation_1004" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1014" tag="operation_1014" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1024" tag="operation_1024" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1034" tag="operation_1034" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1044" tag="operation_1044" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1054" tag="operation_1054" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1064" tag="operation_1064" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1074" tag="operation_1074" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1084" tag="operation_1084" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1094" tag="operation_1094" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1104" tag="operation_1104" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1114" tag="operation_1114" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> </textblocks> @@ -14321,77 +14321,77 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" </codeoperation> <codeoperation parent_id="1230" tag="operation_1230" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1240" tag="operation_1240" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1250" tag="operation_1250" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1260" tag="operation_1260" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1270" tag="operation_1270" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1280" tag="operation_1280" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1290" tag="operation_1290" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1300" tag="operation_1300" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1310" tag="operation_1310" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1320" tag="operation_1320" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1330" tag="operation_1330" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1340" tag="operation_1340" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1350" tag="operation_1350" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1360" tag="operation_1360" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1370" tag="operation_1370" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> </textblocks> @@ -14885,72 +14885,72 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" </codeoperation> <codeoperation parent_id="1498" tag="operation_1498" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1508" tag="operation_1508" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1518" tag="operation_1518" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1528" tag="operation_1528" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1538" tag="operation_1538" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1548" tag="operation_1548" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1558" tag="operation_1558" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1568" tag="operation_1568" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1578" tag="operation_1578" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1588" tag="operation_1588" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1598" tag="operation_1598" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1608" tag="operation_1608" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1618" tag="operation_1618" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1628" tag="operation_1628" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> </textblocks> @@ -17422,17 +17422,17 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" </codeoperation> <codeoperation parent_id="1865" tag="operation_1865" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1875" tag="operation_1875" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1885" tag="operation_1885" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity &#010;@return void " /> </header> </codeoperation> </textblocks> @@ -18277,12 +18277,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" </codeoperation> <codeoperation parent_id="141" tag="operation_141" canDelete="false" writeOutText="false" > <header> - <cppcodedocumentation tag="" text="Applies the specified 8-bit alpha tqmask to the pixels. We assume that there are just&#010;as many alpha values as pixels but we do not check this." /> + <cppcodedocumentation tag="" text="Applies the specified 8-bit alpha mask to the pixels. We assume that there are just&#010;as many alpha values as pixels but we do not check this." /> </header> </codeoperation> <codeoperation parent_id="145" tag="operation_145" canDelete="false" writeOutText="false" > <header> - <cppcodedocumentation tag="" text="Applies the inverted 8-bit alpha tqmask to the pixels. We assume that there are just&#010;as many alpha values as pixels but we do not check this." /> + <cppcodedocumentation tag="" text="Applies the inverted 8-bit alpha mask to the pixels. We assume that there are just&#010;as many alpha values as pixels but we do not check this." /> </header> </codeoperation> <codeoperation parent_id="149" tag="operation_149" canDelete="false" writeOutText="false" > @@ -25935,12 +25935,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" </codeoperation> <codeoperation parent_id="141" tag="operation_141" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="Applies the specified 8-bit alpha tqmask to the pixels. We assume that there are just&#010;as many alpha values as pixels but we do not check this." /> + <cppcodedocumentation tag="" indentLevel="1" text="Applies the specified 8-bit alpha mask to the pixels. We assume that there are just&#010;as many alpha values as pixels but we do not check this." /> </header> </codeoperation> <codeoperation parent_id="145" tag="operation_145" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="Applies the inverted 8-bit alpha tqmask to the pixels. We assume that there are just&#010;as many alpha values as pixels but we do not check this." /> + <cppcodedocumentation tag="" indentLevel="1" text="Applies the inverted 8-bit alpha mask to the pixels. We assume that there are just&#010;as many alpha values as pixels but we do not check this." /> </header> </codeoperation> <codeoperation parent_id="149" tag="operation_149" canDelete="false" indentLevel="1" > @@ -31577,7 +31577,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" </codeblockwithcomments> <cppheaderclassdeclarationblock parent_id="255" tag="classDeclarationBlock" canDelete="false" > <header> - <cppcodedocumentation tag="" text="Class KisAlphaColorSpace&#010; Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>&#010;&#010; This program is free software; you can redistribute it and/or modify&#010; it under the terms of the GNU General Public License as published by&#010; the Free Software Foundation; either version 2 of the License, or&#010; (at your option) any later version.&#010;&#010; This program is distributed in the hope that it will be useful,&#010; but WITHOUT ANY WARRANTY; without even the implied warranty of&#010; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the&#010; GNU General Public License for more details.&#010;&#010; You should have received a copy of the GNU General Public License&#010; along with this program; if not, write to the Free Software&#010; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.&#010;//**&#010;The alpha tqmask is a special color strategy that treats all pixels as&#010;alpha value with a colour common to the tqmask. The default color is white." /> + <cppcodedocumentation tag="" text="Class KisAlphaColorSpace&#010; Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>&#010;&#010; This program is free software; you can redistribute it and/or modify&#010; it under the terms of the GNU General Public License as published by&#010; the Free Software Foundation; either version 2 of the License, or&#010; (at your option) any later version.&#010;&#010; This program is distributed in the hope that it will be useful,&#010; but WITHOUT ANY WARRANTY; without even the implied warranty of&#010; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the&#010; GNU General Public License for more details.&#010;&#010; You should have received a copy of the GNU General Public License&#010; along with this program; if not, write to the Free Software&#010; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.&#010;//**&#010;The alpha mask is a special color strategy that treats all pixels as&#010;alpha value with a colour common to the mask. The default color is white." /> </header> <textblocks> <hierarchicalcodeblock tag="publicBlock" canDelete="false" > @@ -32664,57 +32664,57 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" <textblocks> <codeoperation parent_id="456" tag="operation_456" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="466" tag="operation_466" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="476" tag="operation_476" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="486" tag="operation_486" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="496" tag="operation_496" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="506" tag="operation_506" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="516" tag="operation_516" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="526" tag="operation_526" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="536" tag="operation_536" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="546" tag="operation_546" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="556" tag="operation_556" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> </textblocks> @@ -34437,52 +34437,52 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" <textblocks> <codeoperation parent_id="759" tag="operation_759" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="769" tag="operation_769" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="779" tag="operation_779" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="789" tag="operation_789" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="799" tag="operation_799" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="809" tag="operation_809" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="819" tag="operation_819" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="829" tag="operation_829" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="839" tag="operation_839" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="849" tag="operation_849" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> </textblocks> @@ -34958,7 +34958,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" <textblocks> <codeoperation parent_id="869" tag="operation_869" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param tqparent &#010;@param name &#010;@param " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param parent &#010;@param name &#010;@param " /> </header> </codeoperation> <codeoperation parent_id="877" tag="operation_877" canDelete="false" indentLevel="1" > @@ -36008,77 +36008,77 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" </codeoperation> <codeoperation parent_id="974" tag="operation_974" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="984" tag="operation_984" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="994" tag="operation_994" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1004" tag="operation_1004" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1014" tag="operation_1014" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1024" tag="operation_1024" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1034" tag="operation_1034" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1044" tag="operation_1044" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1054" tag="operation_1054" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1064" tag="operation_1064" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1074" tag="operation_1074" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1084" tag="operation_1084" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1094" tag="operation_1094" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1104" tag="operation_1104" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1114" tag="operation_1114" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> </textblocks> @@ -37039,77 +37039,77 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" </codeoperation> <codeoperation parent_id="1230" tag="operation_1230" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1240" tag="operation_1240" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1250" tag="operation_1250" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1260" tag="operation_1260" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1270" tag="operation_1270" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1280" tag="operation_1280" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1290" tag="operation_1290" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1300" tag="operation_1300" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1310" tag="operation_1310" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1320" tag="operation_1320" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1330" tag="operation_1330" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1340" tag="operation_1340" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1350" tag="operation_1350" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1360" tag="operation_1360" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1370" tag="operation_1370" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> </textblocks> @@ -37892,72 +37892,72 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" </codeoperation> <codeoperation parent_id="1498" tag="operation_1498" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1508" tag="operation_1508" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1518" tag="operation_1518" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1528" tag="operation_1528" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1538" tag="operation_1538" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1548" tag="operation_1548" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1558" tag="operation_1558" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1568" tag="operation_1568" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1578" tag="operation_1578" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1588" tag="operation_1588" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1598" tag="operation_1598" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1608" tag="operation_1608" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1618" tag="operation_1618" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1628" tag="operation_1628" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> </textblocks> @@ -41703,17 +41703,17 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765" <textblocks> <codeoperation parent_id="1865" tag="operation_1865" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1875" tag="operation_1875" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> <codeoperation parent_id="1885" tag="operation_1885" canDelete="false" indentLevel="1" > <header> - <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param tqmask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> + <cppcodedocumentation tag="" indentLevel="1" text="&#010;@param dst &#010;@param dstRowStride &#010;@param src &#010;@param srcRowStride &#010;@param mask &#010;@param maskRowStride &#010;@param rows &#010;@param columns &#010;@param opacity " /> </header> </codeoperation> </textblocks> diff --git a/chalk/doc/colorstrategyAPI b/chalk/doc/colorstrategyAPI index faa5724e7..bb6e12675 100644 --- a/chalk/doc/colorstrategyAPI +++ b/chalk/doc/colorstrategyAPI @@ -3,7 +3,7 @@ This is a working document. It list the places where pixels are mangled and requ The purpose is to find out which functions an API in colorstrategy must have to support pixelmangling in a colorstretegy independent manner. -Requested function: apply an alpha tqmask to pixels +Requested function: apply an alpha mask to pixels Problem: alpha is hard-coded 8-bit in KisPixel, when it should be free void KisPaintDevice::clearSelection() @@ -33,20 +33,20 @@ void KisPaintDevice::clearSelection() } } -void KisPaintDevice::applySelectionMask(KisSelectionSP tqmask) +void KisPaintDevice::applySelectionMask(KisSelectionSP mask) { - QRect r = tqmask -> extent(); + QRect r = mask -> extent(); crop(r); for (Q_INT32 y = r.top(); y <= r.bottom(); ++y) { KisHLineIterator pixelIt = createHLineIterator(r.x(), y, r.width(), true); - KisHLineIterator maskIt = tqmask -> createHLineIterator(r.x(), y, r.width(), false); + KisHLineIterator maskIt = mask -> createHLineIterator(r.x(), y, r.width(), false); while (!pixelIt.isDone()) { KisPixel pixel = toPixel(pixelIt.rawData()); - KisPixel maskValue = tqmask -> toPixel(maskIt.rawData()); + KisPixel maskValue = mask -> toPixel(maskIt.rawData()); pixel.alpha() = (pixel.alpha() * maskValue.alpha()) / MAX_SELECTED; diff --git a/chalk/doc/controller.xmi b/chalk/doc/controller.xmi index 2f64556e9..7d2427134 100644 --- a/chalk/doc/controller.xmi +++ b/chalk/doc/controller.xmi @@ -284,7 +284,7 @@ All this functionality is centered around a view with a certain document and an XXX: Should this be the basis for simple scriptability? Have every controller register every action using a KisID and a parameter description list, and offer a queryActions() and an executeAction(KisID) method?" isSpecification="false" isLeaf="false" visibility="public" xmi.id="13" isRoot="false" isAbstract="true" name="KisMetaControllerInterface" > <UML:Classifier.feature> - <UML:Operation comment="Retrieve the view widget that is controlled by this controller; it can be used to tqparent dialogs." isSpecification="false" isLeaf="false" visibility="public" xmi.id="20" isRoot="false" isAbstract="false" name="getView" > + <UML:Operation comment="Retrieve the view widget that is controlled by this controller; it can be used to parent dialogs." isSpecification="false" isLeaf="false" visibility="public" xmi.id="20" isRoot="false" isAbstract="false" name="getView" > <UML:BehavioralFeature.parameter> <UML:Parameter kind="return" xmi.id="5323" type="22" /> </UML:BehavioralFeature.parameter> @@ -1376,7 +1376,7 @@ the value of a byte signifies whether a corresponding pixel is selected, or not. <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1666" isRoot="false" value="" type="475" isAbstract="false" name="r" /> </UML:BehavioralFeature.parameter> </UML:Operation> - <UML:Operation comment="// Keep the selection but set the tqmask to color c// Note: it is intentional to deep-copy the color// since the selection will want to own its own copy." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1667" isRoot="false" isAbstract="false" name="setMaskColor" > + <UML:Operation comment="// Keep the selection but set the mask to color c// Note: it is intentional to deep-copy the color// since the selection will want to own its own copy." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1667" isRoot="false" isAbstract="false" name="setMaskColor" > <UML:BehavioralFeature.parameter> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1669" isRoot="false" value="" type="1668" isAbstract="false" name="c" /> </UML:BehavioralFeature.parameter> @@ -2097,7 +2097,7 @@ and the clipboard." isSpecification="false" isLeaf="false" visibility="public" x <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1859" isRoot="false" initialValue="" type="1858" isAbstract="false" name="m_pluginActions" /> <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1801" isRoot="false" isAbstract="false" name="KisSelectionManager" > <UML:BehavioralFeature.parameter> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1802" isRoot="false" value="" type="1699" isAbstract="false" name="tqparent" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1802" isRoot="false" value="" type="1699" isAbstract="false" name="parent" /> <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1804" isRoot="false" value="" type="1803" isAbstract="false" name="doc" /> </UML:BehavioralFeature.parameter> </UML:Operation> @@ -3329,39 +3329,39 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1796" isRoot="false" isAbstract="false" name="KisDoc" /> <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1797" isRoot="false" isAbstract="false" name="KisClipboard" /> <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1858" isRoot="false" isAbstract="false" name="QPtrList" /> - <UML:Generalization isSpecification="false" child="363" visibility="public" xmi.id="366" tqparent="365" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="541" visibility="public" xmi.id="543" tqparent="542" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="445" visibility="public" xmi.id="656" tqparent="542" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="429" visibility="public" xmi.id="673" tqparent="542" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="781" visibility="public" xmi.id="782" tqparent="776" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="788" visibility="public" xmi.id="789" tqparent="776" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="795" visibility="public" xmi.id="796" tqparent="776" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="802" visibility="public" xmi.id="803" tqparent="776" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="809" visibility="public" xmi.id="810" tqparent="776" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="816" visibility="public" xmi.id="817" tqparent="776" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="825" visibility="public" xmi.id="826" tqparent="776" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="832" visibility="public" xmi.id="834" tqparent="833" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="868" visibility="public" xmi.id="870" tqparent="869" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="437" visibility="public" xmi.id="917" tqparent="868" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="437" visibility="public" xmi.id="920" tqparent="542" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="383" visibility="public" xmi.id="961" tqparent="869" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="383" visibility="public" xmi.id="964" tqparent="542" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="1168" visibility="public" xmi.id="1169" tqparent="1160" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="1177" visibility="public" xmi.id="1178" tqparent="1160" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="1260" visibility="public" xmi.id="1261" tqparent="1253" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="1268" visibility="public" xmi.id="1269" tqparent="1253" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="1276" visibility="public" xmi.id="1277" tqparent="1253" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="1284" visibility="public" xmi.id="1285" tqparent="1253" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="1292" visibility="public" xmi.id="1293" tqparent="1253" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="1300" visibility="public" xmi.id="1301" tqparent="1253" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="1310" visibility="public" xmi.id="1311" tqparent="1253" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="1318" visibility="public" xmi.id="1319" tqparent="833" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="423" visibility="public" xmi.id="1349" tqparent="1348" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="388" visibility="public" xmi.id="1433" tqparent="869" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="388" visibility="public" xmi.id="1436" tqparent="542" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="398" visibility="public" xmi.id="1649" tqparent="388" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="1694" visibility="public" xmi.id="1695" tqparent="869" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="577" visibility="public" xmi.id="1798" tqparent="869" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="363" visibility="public" xmi.id="366" parent="365" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="541" visibility="public" xmi.id="543" parent="542" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="445" visibility="public" xmi.id="656" parent="542" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="429" visibility="public" xmi.id="673" parent="542" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="781" visibility="public" xmi.id="782" parent="776" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="788" visibility="public" xmi.id="789" parent="776" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="795" visibility="public" xmi.id="796" parent="776" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="802" visibility="public" xmi.id="803" parent="776" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="809" visibility="public" xmi.id="810" parent="776" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="816" visibility="public" xmi.id="817" parent="776" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="825" visibility="public" xmi.id="826" parent="776" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="832" visibility="public" xmi.id="834" parent="833" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="868" visibility="public" xmi.id="870" parent="869" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="437" visibility="public" xmi.id="917" parent="868" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="437" visibility="public" xmi.id="920" parent="542" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="383" visibility="public" xmi.id="961" parent="869" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="383" visibility="public" xmi.id="964" parent="542" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="1168" visibility="public" xmi.id="1169" parent="1160" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="1177" visibility="public" xmi.id="1178" parent="1160" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="1260" visibility="public" xmi.id="1261" parent="1253" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="1268" visibility="public" xmi.id="1269" parent="1253" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="1276" visibility="public" xmi.id="1277" parent="1253" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="1284" visibility="public" xmi.id="1285" parent="1253" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="1292" visibility="public" xmi.id="1293" parent="1253" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="1300" visibility="public" xmi.id="1301" parent="1253" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="1310" visibility="public" xmi.id="1311" parent="1253" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="1318" visibility="public" xmi.id="1319" parent="833" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="423" visibility="public" xmi.id="1349" parent="1348" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="388" visibility="public" xmi.id="1433" parent="869" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="388" visibility="public" xmi.id="1436" parent="542" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="398" visibility="public" xmi.id="1649" parent="388" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="1694" visibility="public" xmi.id="1695" parent="869" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="577" visibility="public" xmi.id="1798" parent="869" discriminator="" name="" /> </UML:Namespace.ownedElement> </UML:Model> </XMI.content> @@ -5308,7 +5308,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <textblocks> <codeoperation parent_id="20" tag="operation_20" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="Retrieve the view widget that is controlled by this controller; it can be used to tqparent dialogs." /> + <javacodedocumentation tag="" indentLevel="1" text="Retrieve the view widget that is controlled by this controller; it can be used to parent dialogs." /> </header> </codeoperation> <codeoperation parent_id="25" tag="operation_25" canDelete="false" indentLevel="1" > @@ -10587,7 +10587,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f </codeoperation> <codeoperation parent_id="1667" tag="operation_1667" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="// Keep the selection but set the tqmask to color c// Note: it is intentional to deep-copy the color// since the selection will want to own its own copy." /> + <javacodedocumentation tag="" indentLevel="1" text="// Keep the selection but set the mask to color c// Note: it is intentional to deep-copy the color// since the selection will want to own its own copy." /> </header> </codeoperation> <codeoperation parent_id="1670" tag="operation_1670" canDelete="false" indentLevel="1" > @@ -19217,7 +19217,7 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f <textblocks> <codeoperation parent_id="1801" tag="operation_1801" canDelete="false" indentLevel="1" > <header> - <javacodedocumentation tag="" indentLevel="1" text="&#010;@param tqparent &#010;@param doc &#010;@return void " /> + <javacodedocumentation tag="" indentLevel="1" text="&#010;@param parent &#010;@param doc &#010;@return void " /> </header> </codeoperation> <codeoperation parent_id="1805" tag="operation_1805" canDelete="false" indentLevel="1" > diff --git a/chalk/doc/histograms.xmi b/chalk/doc/histograms.xmi index 5cd0f4840..3c2275d07 100644 --- a/chalk/doc/histograms.xmi +++ b/chalk/doc/histograms.xmi @@ -1380,7 +1380,7 @@ like sRGB). <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1257" isRoot="false" value="" type="6" isAbstract="false" name="exposure" /> </UML:BehavioralFeature.parameter> </UML:Operation> - <UML:Operation comment="Create an RGBA QImage from a rectangle in the paint device. The rectangle is defined by the tqparent image's bounds. + <UML:Operation comment="Create an RGBA QImage from a rectangle in the paint device. The rectangle is defined by the parent image's bounds. @param dstProfile RGB profile to use in conversion. May be 0, in which case it's up to the colour strategy to choose a profile (most @@ -1650,10 +1650,10 @@ bytes, bad things will happen. XXX: use vectors?" isSpecification="false" isLeaf </UML:Operation> <UML:Operation comment="Deselect the selection for this paintdevice." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1364" isRoot="false" isAbstract="false" name="deselect" /> <UML:Operation comment="Clear the selected pixels from the paint device" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1365" isRoot="false" isAbstract="false" name="clearSelection" /> - <UML:Operation comment="Apply a tqmask to the image data, i.e. multiply each pixel's opacity by its -selectedness in the tqmask." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1366" isRoot="false" isAbstract="false" name="applySelectionMask" > + <UML:Operation comment="Apply a mask to the image data, i.e. multiply each pixel's opacity by its +selectedness in the mask." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1366" isRoot="false" isAbstract="false" name="applySelectionMask" > <UML:BehavioralFeature.parameter> - <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1367" isRoot="false" value="" type="445" isAbstract="false" name="tqmask" /> + <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1367" isRoot="false" value="" type="445" isAbstract="false" name="mask" /> </UML:BehavioralFeature.parameter> </UML:Operation> <UML:Operation isSpecification="false" isLeaf="false" visibility="protected" xmi.id="1368" isRoot="false" isAbstract="false" name="visibilityChanged" > @@ -3171,33 +3171,33 @@ of choice, and rounded to a reasonable precision to avoid 0.999999" isSpecificat <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1147" isRoot="false" isAbstract="false" name="KisPaintDevice" /> <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1267" isRoot="false" isAbstract="false" name="QColor" /> <UML:Class isSpecification="false" isLeaf="false" visibility="public" xmi.id="1373" isRoot="false" isAbstract="false" name="Q_INT8" /> - <UML:Generalization isSpecification="false" child="14" visibility="public" xmi.id="16" tqparent="15" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="70" visibility="public" xmi.id="73" tqparent="72" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="89" visibility="public" xmi.id="90" tqparent="14" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="131" visibility="public" xmi.id="132" tqparent="89" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="144" visibility="public" xmi.id="145" tqparent="89" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="157" visibility="public" xmi.id="158" tqparent="89" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="170" visibility="public" xmi.id="172" tqparent="61" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="183" visibility="public" xmi.id="184" tqparent="89" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="196" visibility="public" xmi.id="197" tqparent="61" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="205" visibility="public" xmi.id="206" tqparent="89" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="218" visibility="public" xmi.id="219" tqparent="61" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="340" visibility="public" xmi.id="341" tqparent="263" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="340" visibility="public" xmi.id="344" tqparent="309" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="370" visibility="public" xmi.id="371" tqparent="288" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="370" visibility="public" xmi.id="374" tqparent="309" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="11" visibility="public" xmi.id="398" tqparent="234" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="11" visibility="public" xmi.id="401" tqparent="309" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="451" visibility="public" xmi.id="487" tqparent="15" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="560" visibility="public" xmi.id="562" tqparent="15" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="559" visibility="public" xmi.id="644" tqparent="15" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="233" visibility="public" xmi.id="780" tqparent="559" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="425" visibility="public" xmi.id="887" tqparent="886" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="425" visibility="public" xmi.id="890" tqparent="15" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="312" visibility="public" xmi.id="1144" tqparent="886" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="312" visibility="public" xmi.id="1148" tqparent="1147" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="312" visibility="public" xmi.id="1151" tqparent="15" discriminator="" name="" /> - <UML:Generalization isSpecification="false" child="434" visibility="public" xmi.id="1400" tqparent="312" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="14" visibility="public" xmi.id="16" parent="15" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="70" visibility="public" xmi.id="73" parent="72" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="89" visibility="public" xmi.id="90" parent="14" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="131" visibility="public" xmi.id="132" parent="89" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="144" visibility="public" xmi.id="145" parent="89" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="157" visibility="public" xmi.id="158" parent="89" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="170" visibility="public" xmi.id="172" parent="61" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="183" visibility="public" xmi.id="184" parent="89" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="196" visibility="public" xmi.id="197" parent="61" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="205" visibility="public" xmi.id="206" parent="89" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="218" visibility="public" xmi.id="219" parent="61" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="340" visibility="public" xmi.id="341" parent="263" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="340" visibility="public" xmi.id="344" parent="309" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="370" visibility="public" xmi.id="371" parent="288" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="370" visibility="public" xmi.id="374" parent="309" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="11" visibility="public" xmi.id="398" parent="234" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="11" visibility="public" xmi.id="401" parent="309" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="451" visibility="public" xmi.id="487" parent="15" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="560" visibility="public" xmi.id="562" parent="15" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="559" visibility="public" xmi.id="644" parent="15" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="233" visibility="public" xmi.id="780" parent="559" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="425" visibility="public" xmi.id="887" parent="886" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="425" visibility="public" xmi.id="890" parent="15" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="312" visibility="public" xmi.id="1144" parent="886" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="312" visibility="public" xmi.id="1148" parent="1147" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="312" visibility="public" xmi.id="1151" parent="15" discriminator="" name="" /> + <UML:Generalization isSpecification="false" child="434" visibility="public" xmi.id="1400" parent="312" discriminator="" name="" /> </UML:Namespace.ownedElement> </UML:Model> </XMI.content> diff --git a/chalk/doc/hooks b/chalk/doc/hooks index 83959a962..da3d4e534 100644 --- a/chalk/doc/hooks +++ b/chalk/doc/hooks @@ -13,7 +13,7 @@ Thus, if a paint device is of a certain color model, certain GUI things must be activated and deactived when that paint device becomes active. A paint op may need to knwo something about the layer it is going to paint -on: it is not sufficient to generate a tqmask and have that composited by +on: it is not sufficient to generate a mask and have that composited by the color strategy because the footprint may be determined by the deposit and height field that is already present. diff --git a/chalk/doc/sdk b/chalk/doc/sdk index b811d80a6..a8b310e62 100644 --- a/chalk/doc/sdk +++ b/chalk/doc/sdk @@ -6,5 +6,5 @@ not include anything from chalk/core, but only the headers from chalk/sdk. Problem: creating new paint devices, layers and images. You cannot, obviously, instantiate an interface, and we should not, equally obvious, code against implementations. The solution is a factory class that is made available to -the plugin when it is created -- i.e, the tqparent class of a plugin should +the plugin when it is created -- i.e, the parent class of a plugin should implement the various factory interfaces for paint devices, images and layers. diff --git a/chalk/doc/selections b/chalk/doc/selections index bdcdaa034..32bffe498 100644 --- a/chalk/doc/selections +++ b/chalk/doc/selections @@ -5,7 +5,7 @@ class and the associated rectangular marque rendering code. If you find anything connected with that after I finish coding the new selections scheme, it's something I forgot. -Selections in Chalk are special paint devices as big as their tqparent +Selections in Chalk are special paint devices as big as their parent layer. The selection has the alpha colour strategy. The alpha channel contains the selectedness of a pixel. It is not a binary value, but a scale, hardcoded to 8 bits unsigned @@ -34,7 +34,7 @@ selected. Values in between are semi selected Other representations of selections are possible: the selection for a particular rect is rendered as a separate step in -KisImage::renderToProjection. I like the tqmask type rendering, but +KisImage::renderToProjection. I like the mask type rendering, but someone else might want to provide an optional marque-rendering. TODO: * enable kconfig option to select between renderings. @@ -74,7 +74,7 @@ Use cases: fills (gradient, pattern, color), filtering. Fills are easiest implemented by creating a filled paint device for the rect covered by the selection, and then, while composting the fill -with the target layer, pass the tqmask to the compositing loop, and skip +with the target layer, pass the mask to the compositing loop, and skip un-selected pixels. XXX: Discuss whether this is true diff --git a/chalk/plugins/filters/blur/blur.cc b/chalk/plugins/filters/blur/blur.cc index bcf798b9e..69bac7b1d 100644 --- a/chalk/plugins/filters/blur/blur.cc +++ b/chalk/plugins/filters/blur/blur.cc @@ -27,8 +27,8 @@ typedef KGenericFactory<BlurFilterPlugin> BlurFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkblurfilter, BlurFilterPluginFactory( "chalk" ) ) -BlurFilterPlugin::BlurFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +BlurFilterPlugin::BlurFilterPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(BlurFilterPluginFactory::instance()); @@ -36,11 +36,11 @@ BlurFilterPlugin::BlurFilterPlugin(TQObject *tqparent, const char *name, const T kdDebug(41006) << "Extensions Convolution Filters plugin. Class: " << className() << ", Parent: " - << tqparent -> className() + << parent -> className() << "\n"; - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisBlurFilter()); } } diff --git a/chalk/plugins/filters/blur/blur.h b/chalk/plugins/filters/blur/blur.h index 8ce31706e..239d05d0b 100644 --- a/chalk/plugins/filters/blur/blur.h +++ b/chalk/plugins/filters/blur/blur.h @@ -30,7 +30,7 @@ class BlurFilterPlugin : public KParts::Plugin { public: - BlurFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); + BlurFilterPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~BlurFilterPlugin(); }; diff --git a/chalk/plugins/filters/blur/kis_blur_filter.cc b/chalk/plugins/filters/blur/kis_blur_filter.cc index 8709c073b..0217b7e17 100644 --- a/chalk/plugins/filters/blur/kis_blur_filter.cc +++ b/chalk/plugins/filters/blur/kis_blur_filter.cc @@ -56,9 +56,9 @@ KisBlurFilter::KisBlurFilter() : KisFilter(id(), "blur", i18n("&Blur...")) { } -KisFilterConfigWidget * KisBlurFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP ) +KisFilterConfigWidget * KisBlurFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP ) { - return new KisWdgBlur(this, tqparent, "configuration of color to alpha"); + return new KisWdgBlur(this, parent, "configuration of color to alpha"); } KisFilterConfiguration* KisBlurFilter::configuration(TQWidget* w) @@ -110,19 +110,19 @@ void KisBlurFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte kas = new KisAutobrushCircleShape(width, height, hFade, vFade); break; } - TQImage tqmask; - kas->createBrush(&tqmask); + TQImage mask; + kas->createBrush(&mask); - tqmask.convertDepth(1); + mask.convertDepth(1); if( rotate != 0) { TQWMatrix m; m.rotate( rotate ); - tqmask = tqmask.xForm( m ); - if( (tqmask.height() & 1) || tqmask.width() & 1) + mask = mask.xForm( m ); + if( (mask.height() & 1) || mask.width() & 1) { - tqmask.smoothScale( tqmask.width() + !(tqmask.width() & 1), tqmask.height() + !(tqmask.height() & 1) ); + mask.smoothScale( mask.width() + !(mask.width() & 1), mask.height() + !(mask.height() & 1) ); } } @@ -130,7 +130,7 @@ void KisBlurFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte if (m_progressDisplay) m_progressDisplay->setSubject( &painter, true, true ); - KisKernelSP kernel = kernelFromTQImage(tqmask); // TODO: for 1.6 reuse the chalk's core function for creating kernel : KisKernel::fromTQImage + KisKernelSP kernel = kernelFromTQImage(mask); // TODO: for 1.6 reuse the chalk's core function for creating kernel : KisKernel::fromTQImage painter.applyMatrix(kernel, rect.x(), rect.y(), rect.width(), rect.height(), BORDER_REPEAT, KisChannelInfo::FLAG_COLOR_AND_ALPHA); diff --git a/chalk/plugins/filters/blur/kis_blur_filter.h b/chalk/plugins/filters/blur/kis_blur_filter.h index 886551864..b1d2a65a1 100644 --- a/chalk/plugins/filters/blur/kis_blur_filter.h +++ b/chalk/plugins/filters/blur/kis_blur_filter.h @@ -42,7 +42,7 @@ class KisBlurFilter : public KisFilter virtual bool supportsThreading() { return false; } virtual ColorSpaceIndependence colorSpaceIndependence() { return FULLY_INDEPENDENT; }; public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); }; diff --git a/chalk/plugins/filters/blur/kis_wdg_blur.cc b/chalk/plugins/filters/blur/kis_wdg_blur.cc index bfed7474c..dc836971f 100644 --- a/chalk/plugins/filters/blur/kis_wdg_blur.cc +++ b/chalk/plugins/filters/blur/kis_wdg_blur.cc @@ -32,7 +32,7 @@ #include "wdgblur.h" -KisWdgBlur::KisWdgBlur( KisFilter* nfilter, TQWidget * tqparent, const char * name) : KisFilterConfigWidget ( tqparent, name ) +KisWdgBlur::KisWdgBlur( KisFilter* nfilter, TQWidget * parent, const char * name) : KisFilterConfigWidget ( parent, name ) { Q_UNUSED( nfilter ); diff --git a/chalk/plugins/filters/blur/kis_wdg_blur.h b/chalk/plugins/filters/blur/kis_wdg_blur.h index c0cc4834f..f305df252 100644 --- a/chalk/plugins/filters/blur/kis_wdg_blur.h +++ b/chalk/plugins/filters/blur/kis_wdg_blur.h @@ -35,7 +35,7 @@ class KisWdgBlur : public KisFilterConfigWidget Q_OBJECT TQ_OBJECT public: - KisWdgBlur( KisFilter* nfilter, TQWidget * tqparent, const char * name); + KisWdgBlur( KisFilter* nfilter, TQWidget * parent, const char * name); inline WdgBlur* widget() { return m_widget; }; virtual void setConfiguration(KisFilterConfiguration*); private slots: diff --git a/chalk/plugins/filters/bumpmap/bumpmap.cc b/chalk/plugins/filters/bumpmap/bumpmap.cc index 455889d5a..4ae92469c 100644 --- a/chalk/plugins/filters/bumpmap/bumpmap.cc +++ b/chalk/plugins/filters/bumpmap/bumpmap.cc @@ -72,14 +72,14 @@ typedef KGenericFactory<ChalkBumpmap> ChalkBumpmapFactory; K_EXPORT_COMPONENT_FACTORY( chalkbumpmap, ChalkBumpmapFactory( "chalk" ) ) -ChalkBumpmap::ChalkBumpmap(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ChalkBumpmap::ChalkBumpmap(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkBumpmapFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisFilterBumpmap()); } } @@ -347,9 +347,9 @@ void KisFilterBumpmap::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFi } -KisFilterConfigWidget * KisFilterBumpmap::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev) +KisFilterConfigWidget * KisFilterBumpmap::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev) { - KisBumpmapConfigWidget * w = new KisBumpmapConfigWidget(this, dev, tqparent); + KisBumpmapConfigWidget * w = new KisBumpmapConfigWidget(this, dev, parent); return w; @@ -456,8 +456,8 @@ TQString KisBumpmapConfiguration::toString() return KisFilterConfiguration::toString(); } -KisBumpmapConfigWidget::KisBumpmapConfigWidget(KisFilter *, KisPaintDeviceSP dev, TQWidget * tqparent, const char * name, WFlags f) - : KisFilterConfigWidget(tqparent, name, f) +KisBumpmapConfigWidget::KisBumpmapConfigWidget(KisFilter *, KisPaintDeviceSP dev, TQWidget * parent, const char * name, WFlags f) + : KisFilterConfigWidget(parent, name, f) { m_page = new WdgBumpmap(this); TQHBoxLayout * l = new TQHBoxLayout(this); diff --git a/chalk/plugins/filters/bumpmap/bumpmap.h b/chalk/plugins/filters/bumpmap/bumpmap.h index b1c16b1aa..efaf4058f 100644 --- a/chalk/plugins/filters/bumpmap/bumpmap.h +++ b/chalk/plugins/filters/bumpmap/bumpmap.h @@ -49,7 +49,7 @@ using namespace chalk; class ChalkBumpmap : public KParts::Plugin { public: - ChalkBumpmap(TQObject *tqparent, const char *name, const TQStringList &); + ChalkBumpmap(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkBumpmap(); }; @@ -76,7 +76,7 @@ public: virtual bool supportsAdjustmentLayers() { return false; } virtual bool supportsThreading() { return false; } - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration * configuration(TQWidget*); virtual KisFilterConfiguration * configuration(); @@ -116,7 +116,7 @@ class KisBumpmapConfigWidget : public KisFilterConfigWidget { TQ_OBJECT public: - KisBumpmapConfigWidget(KisFilter * filter, KisPaintDeviceSP dev, TQWidget * tqparent, const char * name = 0, WFlags f = 0 ); + KisBumpmapConfigWidget(KisFilter * filter, KisPaintDeviceSP dev, TQWidget * parent, const char * name = 0, WFlags f = 0 ); virtual ~KisBumpmapConfigWidget() {}; KisBumpmapConfiguration * config(); diff --git a/chalk/plugins/filters/cimg/CImg.h b/chalk/plugins/filters/cimg/CImg.h index 8d6a24f65..abd1bb66c 100644 --- a/chalk/plugins/filters/cimg/CImg.h +++ b/chalk/plugins/filters/cimg/CImg.h @@ -659,7 +659,7 @@ namespace cimg_library { - \b CImgDisplayException : Thrown when an error occured when trying to display an image in a window. This exception is thrown when image display request cannot be satisfied. - The tqparent class CImgException may be thrown itself when errors that cannot be classified in one of + The parent class CImgException may be thrown itself when errors that cannot be classified in one of the above type occur. It is recommended not to throw CImgExceptions yourself, since there are normally reserved to %CImg Library functions. \b CImgInstanceException, \b CImgArgumentException, \b CImgIOException and \b CImgDisplayException are simple @@ -4425,11 +4425,11 @@ namespace cimg_library { pthread_mutex_lock(cimg::X11attr().mutex); for (unsigned int i=0; i<cimg::X11attr().nb_wins; i++) { const unsigned int xevent_type = (cimg::X11attr().wins[i]->events)&3; - const unsigned int etqmask = + const unsigned int emask = ((xevent_type>=1)?ExposureMask|StructureNotifyMask:0)| ((xevent_type>=2)?ButtonPressMask|KeyPressMask|PointerMotionMask|LeaveWindowMask:0)| ((xevent_type>=3)?ButtonReleaseMask|KeyReleaseMask:0); - XSelectInput(cimg::X11attr().display,cimg::X11attr().wins[i]->window,etqmask); + XSelectInput(cimg::X11attr().display,cimg::X11attr().wins[i]->window,emask); } bool event_flag = XCheckTypedEvent(cimg::X11attr().display, ClientMessage, &event); if (!event_flag) event_flag = XCheckMaskEvent(cimg::X11attr().display, @@ -4599,10 +4599,10 @@ namespace cimg_library { do { pthread_mutex_lock(cimg::X11attr().mutex); const unsigned int - etqmask = ExposureMask|StructureNotifyMask| + emask = ExposureMask|StructureNotifyMask| ((events>=2)?ButtonPressMask|KeyPressMask|PointerMotionMask|LeaveWindowMask:0)| ((events>=3)?ButtonReleaseMask|KeyReleaseMask:0); - XSelectInput(cimg::X11attr().display,window,etqmask); + XSelectInput(cimg::X11attr().display,window,emask); XPeekEvent(cimg::X11attr().display,&event); cimg::X11attr().thread_finished = false; pthread_mutex_unlock(cimg::X11attr().mutex); @@ -7867,13 +7867,13 @@ namespace cimg_library { CImg get_resize_halfXY() const { typedef typename cimg::largest<T,float>::type ftype; if (is_empty()) return CImg<T>(); - CImg<ftype> tqmask = CImg<ftype>::matrix(0.07842776544f, 0.1231940459f, 0.07842776544f, + CImg<ftype> mask = CImg<ftype>::matrix(0.07842776544f, 0.1231940459f, 0.07842776544f, 0.1231940459f, 0.1935127547f, 0.1231940459f, 0.07842776544f, 0.1231940459f, 0.07842776544f); CImg_3x3x1(I,ftype); CImg dest(width/2,height/2,depth,dim); cimg_mapZV(*this,z,k) cimg_map3x3x1(*this,x,y,z,k,I) - if (x%2 && y%2) dest(x/2,y/2,z,k) = (T)cimg_conv3x3x1(I,tqmask); + if (x%2 && y%2) dest(x/2,y/2,z,k) = (T)cimg_conv3x3x1(I,mask); return dest; } @@ -8816,7 +8816,7 @@ namespace cimg_library { CImg_2x2x1(I,restype); cimg_mapZV(*this,z,k) cimg_map2x2x1(*this,x,y,z,k,I) { res[0](x,y,0,k) = Inc-Icc; res[1](x,y,z,k) = Icn-Icc; } } break; - case 2: { // using Sobel tqmask + case 2: { // using Sobel mask CImg_3x3x1(I,restype); const float a = 1, b = 2; cimg_mapZV(*this,z,k) cimg_map3x3x1(*this,x,y,z,k,I) { @@ -8824,7 +8824,7 @@ namespace cimg_library { res[1](x,y,z,k) = -a*Ipp-b*Icp-a*Inp+a*Ipn+b*Icn+a*Inn; } } break; - case 3: { // using rotation invariant tqmask + case 3: { // using rotation invariant mask CImg_3x3x1(I,restype); const float a = (float)(0.25*(2-std::sqrt(2.0))), b = (float)(0.5f*(std::sqrt(2.0)-1)); cimg_mapZV(*this,z,k) cimg_map3x3x1(*this,x,y,z,k,I) { @@ -9825,42 +9825,42 @@ namespace cimg_library { //! Draw a masked sprite image in the instance image, at coordinates (\c x0,\c y0,\c z0,\c v0). /** \param sprite = sprite image. - \param tqmask = tqmask image. + \param mask = mask image. \param x0 = X-coordinate of the sprite position in the instance image. \param y0 = Y-coordinate of the sprite position in the instance image. \param z0 = Z-coordinate of the sprite position in the instance image. \param v0 = V-coordinate of the sprite position in the instance image. - \param mask_valmax = Maximum pixel value of the tqmask image \c tqmask. + \param mask_valmax = Maximum pixel value of the mask image \c mask. \param opacity = opacity of the drawing. - \note Pixel values of \c tqmask set the opacity of the corresponding pixels in \c sprite. + \note Pixel values of \c mask set the opacity of the corresponding pixels in \c sprite. \note Clipping is supported. - \note Dimensions along x,y and z of \c sprite and \c tqmask must be the same. + \note Dimensions along x,y and z of \c sprite and \c mask must be the same. **/ - template<typename ti,typename tm> CImg& draw_image(const CImg<ti>& sprite,const CImg<tm>& tqmask, + template<typename ti,typename tm> CImg& draw_image(const CImg<ti>& sprite,const CImg<tm>& mask, const int x0=0,const int y0=0,const int z0=0,const int v0=0, const tm mask_valmax=1,const float opacity=1) { if (!is_empty()) { if (sprite.is_empty()) throw CImgArgumentException("CImg<%s>::draw_image() : Specified sprite image (%u,%u,%u,%u,%p) is empty.", pixel_type(),sprite.width,sprite.height,sprite.depth,sprite.dim,sprite.data); - if (tqmask.is_empty()) - throw CImgArgumentException("CImg<%s>::draw_image() : Specified tqmask image (%u,%u,%u,%u,%p) is empty.", - pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data); - if ((void*)this==(void*)&sprite) return draw_image(CImg<T>(sprite),tqmask,x0,y0,z0,v0); - if(tqmask.width!=sprite.width || tqmask.height!=sprite.height || tqmask.depth!=sprite.depth) + if (mask.is_empty()) + throw CImgArgumentException("CImg<%s>::draw_image() : Specified mask image (%u,%u,%u,%u,%p) is empty.", + pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data); + if ((void*)this==(void*)&sprite) return draw_image(CImg<T>(sprite),mask,x0,y0,z0,v0); + if(mask.width!=sprite.width || mask.height!=sprite.height || mask.depth!=sprite.depth) throw CImgArgumentException("CImg<%s>::draw_image() : Mask dimension is (%u,%u,%u,%u), while sprite is (%u,%u,%u,%u)", - pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,sprite.width,sprite.height,sprite.depth,sprite.dim); + pixel_type(),mask.width,mask.height,mask.depth,mask.dim,sprite.width,sprite.height,sprite.depth,sprite.dim); const bool bx=(x0<0), by=(y0<0), bz=(z0<0), bv=(v0<0); const int lX = sprite.dimx() - (x0+sprite.dimx()>dimx()?x0+sprite.dimx()-dimx():0) + (bx?x0:0), lY = sprite.dimy() - (y0+sprite.dimy()>dimy()?y0+sprite.dimy()-dimy():0) + (by?y0:0), lZ = sprite.dimz() - (z0+sprite.dimz()>dimz()?z0+sprite.dimz()-dimz():0) + (bz?z0:0), lV = sprite.dimv() - (v0+sprite.dimv()>dimv()?v0+sprite.dimv()-dimv():0) + (bv?v0:0); - const int coff = -(bx?x0:0)-(by?y0*tqmask.dimx():0)-(bz?z0*tqmask.dimx()*tqmask.dimy():0)- - (bv?v0*tqmask.dimx()*tqmask.dimy()*tqmask.dimz():0), - ssize = tqmask.dimx()*tqmask.dimy()*tqmask.dimz(); + const int coff = -(bx?x0:0)-(by?y0*mask.dimx():0)-(bz?z0*mask.dimx()*mask.dimy():0)- + (bv?v0*mask.dimx()*mask.dimy()*mask.dimz():0), + ssize = mask.dimx()*mask.dimy()*mask.dimz(); const ti *ptrs = sprite.ptr() + coff; - const tm *ptrm = tqmask.ptr() + coff; + const tm *ptrm = mask.ptr() + coff; const unsigned int offX = width-lX, soffX = sprite.width-lX, offY = width*(height-lY), soffY = sprite.width*(sprite.height-lY), @@ -9868,7 +9868,7 @@ namespace cimg_library { T *ptrd = ptr(x0<0?0:x0,y0<0?0:y0,z0<0?0:z0,v0<0?0:v0); if (lX>0 && lY>0 && lZ>0 && lV>0) for (int v=0; v<lV; v++) { - ptrm = tqmask.data + (ptrm - tqmask.data)%ssize; + ptrm = mask.data + (ptrm - mask.data)%ssize; for (int z=0; z<lZ; z++) { for (int y=0; y<lY; y++) { for (int x=0; x<lX; x++) { @@ -10785,12 +10785,12 @@ namespace cimg_library { case '\t': x+=4*font[' '].width; break; default: if (c<font.size) { letter = font[c]; - const CImg& tqmask = (c+256)<(int)font.size?font[c+256]:font[c]; + const CImg& mask = (c+256)<(int)font.size?font[c+256]:font[c]; if (fgcolor) for (unsigned int p=0; p<letter.width*letter.height; p++) - if (tqmask(p)) cimg_mapV(*this,k) letter(p,0,0,k)=(T)(letter(p,0,0,k)*fgcolor[k]); + if (mask(p)) cimg_mapV(*this,k) letter(p,0,0,k)=(T)(letter(p,0,0,k)*fgcolor[k]); if (bgcolor) for (unsigned int p=0; p<letter.width*letter.height; p++) - if (!tqmask(p)) cimg_mapV(*this,k) letter(p,0,0,k)=bgcolor[k]; - if (!bgcolor && font.size>=512) draw_image(letter,tqmask,x,y,0,0,(T)1,opacity); else draw_image(letter,x,y,0,0,opacity); + if (!mask(p)) cimg_mapV(*this,k) letter(p,0,0,k)=bgcolor[k]; + if (!bgcolor && font.size>=512) draw_image(letter,mask,x,y,0,0,(T)1,opacity); else draw_image(letter,x,y,0,0,opacity); x+=letter.width; } break; @@ -11163,11 +11163,11 @@ namespace cimg_library { \param y = Y-coordinate of the starting point of the region to fill. \param z = Z-coordinate of the starting point of the region to fill. \param color = an array of dimv() values of type \c T, defining the drawing color. - \param region = image that will contain the tqmask of the filled region tqmask, as an output. + \param region = image that will contain the mask of the filled region mask, as an output. \param sigma = tolerance concerning neighborhood values. \param opacity = opacity of the drawing. - \return \p region is initialized with the binary tqmask of the filled region. + \return \p region is initialized with the binary mask of the filled region. **/ template<typename t> CImg& draw_fill(const int x,const int y,const int z, const T *const color, CImg<t>& region,const float sigma=0, @@ -11963,107 +11963,107 @@ namespace cimg_library { //@{ //---------------------------- - //! Return the correlation of the image by a tqmask. + //! Return the correlation of the image by a mask. /** - The result \p res of the correlation of an image \p img by a tqmask \p tqmask is defined to be : + The result \p res of the correlation of an image \p img by a mask \p mask is defined to be : - res(x,y,z) = sum_{i,j,k} img(x+i,y+j,z+k)*tqmask(i,j,k) + res(x,y,z) = sum_{i,j,k} img(x+i,y+j,z+k)*mask(i,j,k) - \param tqmask = the correlation kernel. + \param mask = the correlation kernel. \param cond = the border condition type (0=zero, 1=dirichlet) \param weighted_correl = enable local normalization. **/ template<typename t> CImg<typename cimg::largest<T,t>::type> - get_correlate(const CImg<t>& tqmask,const unsigned int cond=1,const bool weighted_correl=false) const { + get_correlate(const CImg<t>& mask,const unsigned int cond=1,const bool weighted_correl=false) const { typedef typename cimg::largest<T,t>::type restype; typedef typename cimg::largest<t,float>::type fftype; typedef typename cimg::largest<T,fftype>::type ftype; if (is_empty()) return CImg<restype>(); - if (tqmask.is_empty() || tqmask.dim!=1) - throw CImgArgumentException("CImg<%s>::get_correlate() : Specified tqmask (%u,%u,%u,%u,%p) is not scalar.", - pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data); + if (mask.is_empty() || mask.dim!=1) + throw CImgArgumentException("CImg<%s>::get_correlate() : Specified mask (%u,%u,%u,%u,%p) is not scalar.", + pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data); CImg<restype> dest(*this,false); - if (cond && tqmask.width==tqmask.height && ((tqmask.depth==1 && tqmask.width<=5) || (tqmask.depth==tqmask.width && tqmask.width<=3))) { - // A special optimization is done for 2x2,3x3,4x4,5x5,2x2x2 and 3x3x3 tqmask (with cond=1) - switch (tqmask.depth) { + if (cond && mask.width==mask.height && ((mask.depth==1 && mask.width<=5) || (mask.depth==mask.width && mask.width<=3))) { + // A special optimization is done for 2x2,3x3,4x4,5x5,2x2x2 and 3x3x3 mask (with cond=1) + switch (mask.depth) { case 3: { CImg_3x3x3(I,T); - if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map3x3x3(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr3x3x3(I,tqmask); + if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map3x3x3(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr3x3x3(I,mask); else cimg_mapZV(*this,z,v) cimg_map3x3x3(*this,x,y,z,v,I) { const double norm = (double)cimg_squaresum3x3x3(I); - dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr3x3x3(I,tqmask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr3x3x3(I,mask)/std::sqrt(norm)):0; } } break; case 2: { CImg_2x2x2(I,T); - if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map2x2x2(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr2x2x2(I,tqmask); + if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map2x2x2(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr2x2x2(I,mask); else cimg_mapZV(*this,z,v) cimg_map2x2x2(*this,x,y,z,v,I) { const double norm = (double)cimg_squaresum2x2x2(I); - dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr2x2x2(I,tqmask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr2x2x2(I,mask)/std::sqrt(norm)):0; } } break; default: case 1: - switch (tqmask.width) { + switch (mask.width) { case 5: { CImg_5x5x1(I,T); - if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map5x5x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr5x5x1(I,tqmask); + if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map5x5x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr5x5x1(I,mask); else cimg_mapZV(*this,z,v) cimg_map5x5x1(*this,x,y,z,v,I) { const double norm = (double)cimg_squaresum5x5x1(I); - dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr5x5x1(I,tqmask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr5x5x1(I,mask)/std::sqrt(norm)):0; } } break; case 4: { CImg_4x4x1(I,T); - if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map4x4x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr4x4x1(I,tqmask); + if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map4x4x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr4x4x1(I,mask); else cimg_mapZV(*this,z,v) cimg_map4x4x1(*this,x,y,z,v,I) { const double norm = (double)cimg_squaresum4x4x1(I); - dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr4x4x1(I,tqmask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr4x4x1(I,mask)/std::sqrt(norm)):0; } } break; case 3: { CImg_3x3x1(I,T); - if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map3x3x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr3x3x1(I,tqmask); + if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map3x3x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr3x3x1(I,mask); else cimg_mapZV(*this,z,v) cimg_map3x3x1(*this,x,y,z,v,I) { const double norm = (double)cimg_squaresum3x3x1(I); - dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr3x3x1(I,tqmask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr3x3x1(I,mask)/std::sqrt(norm)):0; } } break; case 2: { CImg_2x2x1(I,T); - if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map2x2x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr2x2x1(I,tqmask); + if (!weighted_correl) cimg_mapZV(*this,z,v) cimg_map2x2x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_corr2x2x1(I,mask); else cimg_mapZV(*this,z,v) cimg_map2x2x1(*this,x,y,z,v,I) { const double norm = (double)cimg_squaresum2x2x1(I); - dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr2x2x1(I,tqmask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_corr2x2x1(I,mask)/std::sqrt(norm)):0; } } break; - case 1: dest = tqmask(0)*(*this); break; + case 1: dest = mask(0)*(*this); break; } } } else { // Generic version for other masks - const int cxm=tqmask.width/2, cym=tqmask.height/2, czm=tqmask.depth/2, fxm=cxm-1+(tqmask.width%2), fym=cym-1+(tqmask.height%2), fzm=czm-1+(tqmask.depth%2); + const int cxm=mask.width/2, cym=mask.height/2, czm=mask.depth/2, fxm=cxm-1+(mask.width%2), fym=cym-1+(mask.height%2), fzm=czm-1+(mask.depth%2); cimg_mapV(*this,v) if (!weighted_correl) { // Classical correlation for (int z=czm; z<dimz()-czm; z++) for (int y=cym; y<dimy()-cym; y++) for (int x=cxm; x<dimx()-cxm; x++) { ftype val = 0; for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - val+= (*this)(x+xm,y+ym,z+zm,v)*tqmask(cxm+xm,cym+ym,czm+zm,0); + val+= (*this)(x+xm,y+ym,z+zm,v)*mask(cxm+xm,cym+ym,czm+zm,0); dest(x,y,z,v)=(restype)val; } if (cond) cimg_mapYZV(*this,y,z,v) for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) { ftype val = 0; for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - val+= pix3d(x+xm,y+ym,z+zm,v)*tqmask(cxm+xm,cym+ym,czm+zm,0); + val+= pix3d(x+xm,y+ym,z+zm,v)*mask(cxm+xm,cym+ym,czm+zm,0); dest(x,y,z,v)=(restype)val; } else cimg_mapYZV(*this,y,z,v) for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) { ftype val = 0; for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - val+= pix3d(x+xm,y+ym,z+zm,v,0)*tqmask(cxm+xm,cym+ym,czm+zm,0); + val+= pix3d(x+xm,y+ym,z+zm,v,0)*mask(cxm+xm,cym+ym,czm+zm,0); dest(x,y,z,v)=(restype)val; } } else { // Weighted correlation @@ -12071,7 +12071,7 @@ namespace cimg_library { ftype val = 0, norm = 0; for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) { const T cval = (*this)(x+xm,y+ym,z+zm,v); - val+= cval*tqmask(cxm+xm,cym+ym,czm+zm,0); + val+= cval*mask(cxm+xm,cym+ym,czm+zm,0); norm+= cval*cval; } dest(x,y,z,v)=(norm!=0)?(restype)(val/std::sqrt((double)norm)):0; @@ -12081,7 +12081,7 @@ namespace cimg_library { ftype val = 0, norm = 0; for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) { const T cval = pix3d(x+xm,y+ym,z+zm,v); - val+= cval*tqmask(cxm+xm,cym+ym,czm+zm,0); + val+= cval*mask(cxm+xm,cym+ym,czm+zm,0); norm+=cval*cval; } dest(x,y,z,v)=(norm!=0)?(restype)(val/std::sqrt((double)norm)):0; @@ -12091,7 +12091,7 @@ namespace cimg_library { ftype val = 0, norm = 0; for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) { const T cval = pix3d(x+xm,y+ym,z+zm,v,0); - val+= cval*tqmask(cxm+xm,cym+ym,czm+zm,0); + val+= cval*mask(cxm+xm,cym+ym,czm+zm,0); norm+= cval*cval; } dest(x,y,z,v)=(norm!=0)?(restype)(val/std::sqrt((double)norm)):0; @@ -12102,115 +12102,115 @@ namespace cimg_library { } - //! Correlate the image by a tqmask + //! Correlate the image by a mask /** This is the in-place version of get_correlate. \see get_correlate **/ - template<typename t> CImg& correlate(const CImg<t>& tqmask,const unsigned int cond=1,const bool weighted_correl=false) { - return get_correlate(tqmask,cond,weighted_correl).swap(*this); + template<typename t> CImg& correlate(const CImg<t>& mask,const unsigned int cond=1,const bool weighted_correl=false) { + return get_correlate(mask,cond,weighted_correl).swap(*this); } - //! Return the convolution of the image by a tqmask + //! Return the convolution of the image by a mask /** - The result \p res of the convolution of an image \p img by a tqmask \p tqmask is defined to be : + The result \p res of the convolution of an image \p img by a mask \p mask is defined to be : - res(x,y,z) = sum_{i,j,k} img(x-i,y-j,z-k)*tqmask(i,j,k) + res(x,y,z) = sum_{i,j,k} img(x-i,y-j,z-k)*mask(i,j,k) - \param tqmask = the correlation kernel. + \param mask = the correlation kernel. \param cond = the border condition type (0=zero, 1=dirichlet) \param weighted_convol = enable local normalization. **/ template<typename t> CImg<typename cimg::largest<T,t>::type> - get_convolve(const CImg<t>& tqmask,const unsigned int cond=1,const bool weighted_convol=false) const { + get_convolve(const CImg<t>& mask,const unsigned int cond=1,const bool weighted_convol=false) const { typedef typename cimg::largest<T,t>::type restype; typedef typename cimg::largest<t,float>::type fftype; typedef typename cimg::largest<T,fftype>::type ftype; if (is_empty()) return CImg<restype>(); - if (tqmask.is_empty() || tqmask.dim!=1) - throw CImgArgumentException("CImg<%s>::get_convolve() : Specified tqmask (%u,%u,%u,%u,%p) is not scalar.", - pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data); + if (mask.is_empty() || mask.dim!=1) + throw CImgArgumentException("CImg<%s>::get_convolve() : Specified mask (%u,%u,%u,%u,%p) is not scalar.", + pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data); CImg<restype> dest(*this,false); - if (cond && tqmask.width==tqmask.height && ((tqmask.depth==1 && tqmask.width<=5) || (tqmask.depth==tqmask.width && tqmask.width<=3))) { // optimized version - switch (tqmask.depth) { + if (cond && mask.width==mask.height && ((mask.depth==1 && mask.width<=5) || (mask.depth==mask.width && mask.width<=3))) { // optimized version + switch (mask.depth) { case 3: { CImg_3x3x3(I,T); - if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map3x3x3(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_conv3x3x3(I,tqmask); + if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map3x3x3(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_conv3x3x3(I,mask); else cimg_mapZV(*this,z,v) cimg_map3x3x3(*this,x,y,z,v,I) { const double norm = (double)cimg_squaresum3x3x3(I); - dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv3x3x3(I,tqmask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv3x3x3(I,mask)/std::sqrt(norm)):0; } } break; case 2: { CImg_2x2x2(I,T); - if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map2x2x2(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_conv2x2x2(I,tqmask); + if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map2x2x2(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_conv2x2x2(I,mask); else cimg_mapZV(*this,z,v) cimg_map2x2x2(*this,x,y,z,v,I) { const double norm = (double)cimg_squaresum2x2x2(I); - dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv2x2x2(I,tqmask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv2x2x2(I,mask)/std::sqrt(norm)):0; } } break; default: case 1: - switch (tqmask.width) { + switch (mask.width) { case 5: { CImg_5x5x1(I,T); - if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map5x5x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_conv5x5x1(I,tqmask); + if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map5x5x1(*this,x,y,z,v,I) dest(x,y,z,v) = cimg_conv5x5x1(I,mask); else cimg_mapZV(*this,z,v) cimg_map5x5x1(*this,x,y,z,v,I) { const double norm = (double)cimg_squaresum5x5x1(I); - dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv5x5x1(I,tqmask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv5x5x1(I,mask)/std::sqrt(norm)):0; } } break; case 4: { CImg_4x4x1(I,T); - if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map4x4x1(*this,x,y,z,v,I) dest(x,y,z,v) = (T)cimg_conv4x4x1(I,tqmask); + if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map4x4x1(*this,x,y,z,v,I) dest(x,y,z,v) = (T)cimg_conv4x4x1(I,mask); else cimg_mapZV(*this,z,v) cimg_map4x4x1(*this,x,y,z,v,I) { const double norm = (double)cimg_squaresum4x4x1(I); - dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv4x4x1(I,tqmask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv4x4x1(I,mask)/std::sqrt(norm)):0; } } break; case 3: { CImg_3x3x1(I,T); - if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map3x3x1(*this,x,y,z,v,I) dest(x,y,z,v) = (T)cimg_conv3x3x1(I,tqmask); + if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map3x3x1(*this,x,y,z,v,I) dest(x,y,z,v) = (T)cimg_conv3x3x1(I,mask); else cimg_mapZV(*this,z,v) cimg_map3x3x1(*this,x,y,z,v,I) { const double norm = (double)cimg_squaresum3x3x1(I); - dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv3x3x1(I,tqmask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv3x3x1(I,mask)/std::sqrt(norm)):0; } } break; case 2: { CImg_2x2x1(I,T); - if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map2x2x1(*this,x,y,z,v,I) dest(x,y,z,v) = (T)cimg_conv2x2x1(I,tqmask); + if (!weighted_convol) cimg_mapZV(*this,z,v) cimg_map2x2x1(*this,x,y,z,v,I) dest(x,y,z,v) = (T)cimg_conv2x2x1(I,mask); else cimg_mapZV(*this,z,v) cimg_map2x2x1(*this,x,y,z,v,I) { const double norm = (double)cimg_squaresum2x2x1(I); - dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv2x2x1(I,tqmask)/std::sqrt(norm)):0; + dest(x,y,z,v) = (norm!=0)?(restype)(cimg_conv2x2x1(I,mask)/std::sqrt(norm)):0; } } break; - case 1: dest = tqmask(0)*(*this); break; + case 1: dest = mask(0)*(*this); break; } } } else { // generic version - const int cxm=tqmask.width/2, cym=tqmask.height/2, czm=tqmask.depth/2, fxm=cxm-1+(tqmask.width%2), fym=cym-1+(tqmask.height%2), fzm=czm-1+(tqmask.depth%2); + const int cxm=mask.width/2, cym=mask.height/2, czm=mask.depth/2, fxm=cxm-1+(mask.width%2), fym=cym-1+(mask.height%2), fzm=czm-1+(mask.depth%2); cimg_mapV(*this,v) if (!weighted_convol) { // Classical convolution for (int z=czm; z<dimz()-czm; z++) for (int y=cym; y<dimy()-cym; y++) for (int x=cxm; x<dimx()-cxm; x++) { ftype val = 0; for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - val+= (*this)(x-xm,y-ym,z-zm,v)*tqmask(cxm+xm,cym+ym,czm+zm,0); + val+= (*this)(x-xm,y-ym,z-zm,v)*mask(cxm+xm,cym+ym,czm+zm,0); dest(x,y,z,v)=(restype)val; } if (cond) cimg_mapYZV(*this,y,z,v) for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) { ftype val = 0; for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - val+= pix3d(x-xm,y-ym,z-zm,v)*tqmask(cxm+xm,cym+ym,czm+zm,0); + val+= pix3d(x-xm,y-ym,z-zm,v)*mask(cxm+xm,cym+ym,czm+zm,0); dest(x,y,z,v)=(restype)val; } else cimg_mapYZV(*this,y,z,v) for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) { ftype val = 0; for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - val+= pix3d(x-xm,y-ym,z-zm,v,0)*tqmask(cxm+xm,cym+ym,czm+zm,0); + val+= pix3d(x-xm,y-ym,z-zm,v,0)*mask(cxm+xm,cym+ym,czm+zm,0); dest(x,y,z,v)=(restype)val; } } else { // Weighted convolution @@ -12218,7 +12218,7 @@ namespace cimg_library { ftype val = 0, norm = 0; for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) { const T cval = (*this)(x-xm,y-ym,z-zm,v); - val+= cval*tqmask(cxm+xm,cym+ym,czm+zm,0); + val+= cval*mask(cxm+xm,cym+ym,czm+zm,0); norm+= cval*cval; } dest(x,y,z,v)=(norm!=0)?(restype)(val/std::sqrt(norm)):0; @@ -12228,7 +12228,7 @@ namespace cimg_library { ftype val = 0, norm = 0; for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) { const T cval = pix3d(x-xm,y-ym,z-zm,v); - val+= cval*tqmask(cxm+xm,cym+ym,czm+zm,0); + val+= cval*mask(cxm+xm,cym+ym,czm+zm,0); norm+=cval*cval; } dest(x,y,z,v)=(norm!=0)?(restype)(val/std::sqrt(norm)):0; @@ -12238,7 +12238,7 @@ namespace cimg_library { double val = 0, norm = 0; for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) { const T cval = pix3d(x-xm,y-ym,z-zm,v,0); - val+= cval*tqmask(cxm+xm,cym+ym,czm+zm,0); + val+= cval*mask(cxm+xm,cym+ym,czm+zm,0); norm+= cval*cval; } dest(x,y,z,v)=(norm!=0)?(restype)(val/std::sqrt(norm)):0; @@ -12248,46 +12248,46 @@ namespace cimg_library { return dest; } - //! Convolve the image by a tqmask + //! Convolve the image by a mask /** This is the in-place version of get_convolve(). \see get_convolve() **/ - template<typename t> CImg& convolve(const CImg<t>& tqmask,const unsigned int cond=1,const bool weighted_convol=false) { - return get_convolve(tqmask,cond,weighted_convol).swap(*this); + template<typename t> CImg& convolve(const CImg<t>& mask,const unsigned int cond=1,const bool weighted_convol=false) { + return get_convolve(mask,cond,weighted_convol).swap(*this); } //! Return the erosion of the image by a structuring element. template<typename t> CImg<typename cimg::largest<T,t>::type> - get_erode(const CImg<t>& tqmask, const unsigned int cond=1, const bool weighted_erosion=false) const { + get_erode(const CImg<t>& mask, const unsigned int cond=1, const bool weighted_erosion=false) const { typedef typename cimg::largest<T,t>::type restype; if (is_empty()) return CImg<restype>(); - if (tqmask.is_empty() || tqmask.dim!=1) - throw CImgArgumentException("CImg<%s>::get_erosion() : Specified tqmask (%u,%u,%u,%u,%p) is not a scalar image.", - pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data); + if (mask.is_empty() || mask.dim!=1) + throw CImgArgumentException("CImg<%s>::get_erosion() : Specified mask (%u,%u,%u,%u,%p) is not a scalar image.", + pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data); CImg<restype> dest(*this,false); - const int cxm=tqmask.width/2, cym=tqmask.height/2, czm=tqmask.depth/2, - fxm=cxm-1+(tqmask.width%2), fym=cym-1+(tqmask.height%2), fzm=czm-1+(tqmask.depth%2); + const int cxm=mask.width/2, cym=mask.height/2, czm=mask.depth/2, + fxm=cxm-1+(mask.width%2), fym=cym-1+(mask.height%2), fzm=czm-1+(mask.depth%2); cimg_mapV(*this,v) if (!weighted_erosion) { // Classical erosion for (int z=czm; z<dimz()-czm; z++) for (int y=cym; y<dimy()-cym; y++) for (int x=cxm; x<dimx()-cxm; x++) { restype foo, min_val = cimg::get_type_max(foo); for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - if (tqmask(cxm+xm,cym+ym,czm+zm,0)) min_val = cimg::min((restype)(*this)(x+xm,y+ym,z+zm,v),min_val); + if (mask(cxm+xm,cym+ym,czm+zm,0)) min_val = cimg::min((restype)(*this)(x+xm,y+ym,z+zm,v),min_val); dest(x,y,z,v)=min_val; } if (cond) cimg_mapYZV(*this,y,z,v) for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) { restype foo, min_val = cimg::get_type_max(foo); for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - if (tqmask(cxm+xm,cym+ym,czm+zm,0)) min_val = cimg::min((restype)pix3d(x+xm,y+ym,z+zm,v),min_val); + if (mask(cxm+xm,cym+ym,czm+zm,0)) min_val = cimg::min((restype)pix3d(x+xm,y+ym,z+zm,v),min_val); dest(x,y,z,v)=min_val; } else cimg_mapYZV(*this,y,z,v) for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) { restype foo, min_val = cimg::get_type_max(foo); for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - if (tqmask(cxm+xm,cym+ym,czm+zm,0)) min_val = cimg::min((restype)pix3d(x+xm,y+ym,z+zm,v,0),min_val); + if (mask(cxm+xm,cym+ym,czm+zm,0)) min_val = cimg::min((restype)pix3d(x+xm,y+ym,z+zm,v,0),min_val); dest(x,y,z,v)=min_val; } } else { // Weighted erosion @@ -12295,21 +12295,21 @@ namespace cimg_library { for (int z=czm; z<dimz()-czm; z++) for (int y=cym; y<dimy()-cym; y++) for (int x=cxm; x<dimx()-cxm; x++) { restype foo, min_val = cimg::get_type_max(foo); for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - if ((mval=tqmask(cxm+xm,cym+ym,czm+zm,0))!=0) min_val = cimg::min((restype)((*this)(x+xm,y+ym,z+zm,v)+mval),min_val); + if ((mval=mask(cxm+xm,cym+ym,czm+zm,0))!=0) min_val = cimg::min((restype)((*this)(x+xm,y+ym,z+zm,v)+mval),min_val); dest(x,y,z,v)=min_val; } if (cond) cimg_mapYZV(*this,y,z,v) for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) { restype foo, min_val = cimg::get_type_max(foo); for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - if ((mval=tqmask(cxm+xm,cym+ym,czm+zm,0))!=0) min_val = cimg::min((restype)(pix3d(x+xm,y+ym,z+zm,v)+mval),min_val); + if ((mval=mask(cxm+xm,cym+ym,czm+zm,0))!=0) min_val = cimg::min((restype)(pix3d(x+xm,y+ym,z+zm,v)+mval),min_val); dest(x,y,z,v)=min_val; } else cimg_mapYZV(*this,y,z,v) for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) { restype foo, min_val = cimg::get_type_max(foo); for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - if ((mval=tqmask(cxm+xm,cym+ym,czm+zm,0))!=0) min_val = cimg::min((restype)(pix3d(x+xm,y+ym,z+zm,v,0)+mval),min_val); + if ((mval=mask(cxm+xm,cym+ym,czm+zm,0))!=0) min_val = cimg::min((restype)(pix3d(x+xm,y+ym,z+zm,v,0)+mval),min_val); dest(x,y,z,v)=min_val; } } @@ -12321,14 +12321,14 @@ namespace cimg_library { This is the in-place version of get_erode(). \see get_erode() **/ - template<typename t> CImg& erode(const CImg<t>& tqmask,const unsigned int cond=1,const bool weighted_erosion=false) { - return get_erode(tqmask,cond,weighted_erosion).swap(*this); + template<typename t> CImg& erode(const CImg<t>& mask,const unsigned int cond=1,const bool weighted_erosion=false) { + return get_erode(mask,cond,weighted_erosion).swap(*this); } //! Erode the image by a square structuring element of size n CImg get_erode(const unsigned int n=1, const unsigned int cond=1) const { - static const CImg<T> tqmask(3,3,1,1,1); - return get_erode(tqmask,cond,false); + static const CImg<T> mask(3,3,1,1,1); + return get_erode(mask,cond,false); } //! Erode the image by a square structuring element of size n @@ -12338,35 +12338,35 @@ namespace cimg_library { //! Return the dilatation of the image by a structuring element. template<typename t> CImg<typename cimg::largest<T,t>::type> - get_dilate(const CImg<t>& tqmask, const unsigned int cond=1, const bool weighted_dilatation=false) const { + get_dilate(const CImg<t>& mask, const unsigned int cond=1, const bool weighted_dilatation=false) const { typedef typename cimg::largest<T,t>::type restype; if (is_empty()) return CImg<restype>(); - if (tqmask.is_empty() || tqmask.dim!=1) - throw CImgArgumentException("CImg<%s>::get_dilate() : Specified tqmask (%u,%u,%u,%u,%p) is not a scalar image.", - pixel_type(),tqmask.width,tqmask.height,tqmask.depth,tqmask.dim,tqmask.data); + if (mask.is_empty() || mask.dim!=1) + throw CImgArgumentException("CImg<%s>::get_dilate() : Specified mask (%u,%u,%u,%u,%p) is not a scalar image.", + pixel_type(),mask.width,mask.height,mask.depth,mask.dim,mask.data); CImg<restype> dest(*this,false); - const int cxm=tqmask.width/2, cym=tqmask.height/2, czm=tqmask.depth/2, - fxm=cxm-1+(tqmask.width%2), fym=cym-1+(tqmask.height%2), fzm=czm-1+(tqmask.depth%2); + const int cxm=mask.width/2, cym=mask.height/2, czm=mask.depth/2, + fxm=cxm-1+(mask.width%2), fym=cym-1+(mask.height%2), fzm=czm-1+(mask.depth%2); cimg_mapV(*this,v) if (!weighted_dilatation) { // Classical dilatation for (int z=czm; z<dimz()-czm; z++) for (int y=cym; y<dimy()-cym; y++) for (int x=cxm; x<dimx()-cxm; x++) { restype foo, max_val = cimg::get_type_min(foo); for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - if (tqmask(cxm+xm,cym+ym,czm+zm,0)) max_val = cimg::max((restype)(*this)(x+xm,y+ym,z+zm,v),max_val); + if (mask(cxm+xm,cym+ym,czm+zm,0)) max_val = cimg::max((restype)(*this)(x+xm,y+ym,z+zm,v),max_val); dest(x,y,z,v)=max_val; } if (cond) cimg_mapYZV(*this,y,z,v) for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) { restype foo, max_val = cimg::get_type_min(foo); for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - if (tqmask(cxm+xm,cym+ym,czm+zm,0)) max_val = cimg::max((restype)pix3d(x+xm,y+ym,z+zm,v),max_val); + if (mask(cxm+xm,cym+ym,czm+zm,0)) max_val = cimg::max((restype)pix3d(x+xm,y+ym,z+zm,v),max_val); dest(x,y,z,v)=max_val; } else cimg_mapYZV(*this,y,z,v) for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) { restype foo, max_val = cimg::get_type_min(foo); for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - if (tqmask(cxm+xm,cym+ym,czm+zm,0)) max_val = cimg::max((restype)pix3d(x+xm,y+ym,z+zm,v,0),max_val); + if (mask(cxm+xm,cym+ym,czm+zm,0)) max_val = cimg::max((restype)pix3d(x+xm,y+ym,z+zm,v,0),max_val); dest(x,y,z,v)=max_val; } } else { // Weighted dilatation @@ -12374,21 +12374,21 @@ namespace cimg_library { for (int z=czm; z<dimz()-czm; z++) for (int y=cym; y<dimy()-cym; y++) for (int x=cxm; x<dimx()-cxm; x++) { restype foo, max_val = cimg::get_type_min(foo); for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - if ((mval=tqmask(cxm+xm,cym+ym,czm+zm,0))!=0) max_val = cimg::max((restype)((*this)(x+xm,y+ym,z+zm,v)-mval),max_val); + if ((mval=mask(cxm+xm,cym+ym,czm+zm,0))!=0) max_val = cimg::max((restype)((*this)(x+xm,y+ym,z+zm,v)-mval),max_val); dest(x,y,z,v)=max_val; } if (cond) cimg_mapYZV(*this,y,z,v) for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) { restype foo, max_val = cimg::get_type_min(foo); for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - if ((mval=tqmask(cxm+xm,cym+ym,czm+zm,0))!=0) max_val = cimg::max((restype)(pix3d(x+xm,y+ym,z+zm,v)-mval),max_val); + if ((mval=mask(cxm+xm,cym+ym,czm+zm,0))!=0) max_val = cimg::max((restype)(pix3d(x+xm,y+ym,z+zm,v)-mval),max_val); dest(x,y,z,v)=max_val; } else cimg_mapYZV(*this,y,z,v) for (int x=0; x<dimx(); (y<cym || y>=dimy()-cym || z<czm || z>=dimz()-czm)?x++:((x<cxm-1 || x>=dimx()-cxm)?x++:(x=dimx()-cxm))) { restype foo, max_val = cimg::get_type_min(foo); for (int zm=-czm; zm<=fzm; zm++) for (int ym=-cym; ym<=fym; ym++) for (int xm=-cxm; xm<=fxm; xm++) - if ((mval=tqmask(cxm+xm,cym+ym,czm+zm,0))!=0) max_val = cimg::max((restype)(pix3d(x+xm,y+ym,z+zm,v,0)-mval),max_val); + if ((mval=mask(cxm+xm,cym+ym,czm+zm,0))!=0) max_val = cimg::max((restype)(pix3d(x+xm,y+ym,z+zm,v,0)-mval),max_val); dest(x,y,z,v)=max_val; } } @@ -12400,14 +12400,14 @@ namespace cimg_library { This is the in-place version of get_dilate(). \see get_dilate() **/ - template<typename t> CImg& dilate(const CImg<t>& tqmask,const unsigned int cond=1,const bool weighted_dilatation=false) { - return get_dilate(tqmask,cond,weighted_dilatation).swap(*this); + template<typename t> CImg& dilate(const CImg<t>& mask,const unsigned int cond=1,const bool weighted_dilatation=false) { + return get_dilate(mask,cond,weighted_dilatation).swap(*this); } //! Dilate the image by a square structuring element of size n CImg get_dilate(const unsigned int n=1, const unsigned int cond=1) const { - static const CImg<T> tqmask(3,3,1,1,1); - return get_dilate(tqmask,cond,false); + static const CImg<T> mask(3,3,1,1,1); + return get_dilate(mask,cond,false); } //! Dilate the image by a square structuring element of size n @@ -14723,27 +14723,27 @@ namespace cimg_library { switch (bpp) { case 1: { // Monochrome for (int y=res.height-1; y>=0; y--) { - unsigned char tqmask = 0x80, val = 0; + unsigned char mask = 0x80, val = 0; cimg_mapX(res,x) { - if (tqmask==0x80) val = *(ptrs++); - const unsigned char *col = (unsigned char*)(palette+(val&tqmask?1:0)); + if (mask==0x80) val = *(ptrs++); + const unsigned char *col = (unsigned char*)(palette+(val&mask?1:0)); res(x,y,2) = (T)*(col++); res(x,y,1) = (T)*(col++); res(x,y,0) = (T)*(col++); - tqmask = cimg::ror(tqmask); + mask = cimg::ror(mask); } ptrs+=align; } } break; case 4: { // 16 colors for (int y=res.height-1; y>=0; y--) { - unsigned char tqmask = 0xF0, val = 0; + unsigned char mask = 0xF0, val = 0; cimg_mapX(res,x) { - if (tqmask==0xF0) val = *(ptrs++); - const unsigned char color = (tqmask<16)?(val&tqmask):((val&tqmask)>>4); + if (mask==0xF0) val = *(ptrs++); + const unsigned char color = (mask<16)?(val&mask):((val&mask)>>4); unsigned char *col = (unsigned char*)(palette+color); res(x,y,2) = (T)*(col++); res(x,y,1) = (T)*(col++); res(x,y,0) = (T)*(col++); - tqmask = cimg::ror(tqmask,4); + mask = cimg::ror(mask,4); } ptrs+=align; } } break; case 8: { // 256 colors @@ -17670,9 +17670,9 @@ namespace cimg_library { for (unsigned int y=0; y<h; y++) for (unsigned int x=0; x<256*w; x++) { m>>=1; if (!m) { m=0x80000000; val = *(ptr++); } - CImg<T>& img = res[x/w], &tqmask = res[x/w+256]; + CImg<T>& img = res[x/w], &mask = res[x/w+256]; unsigned int xm = x%w; - img(xm,y,0) = img(xm,y,1) = img(xm,y,2) = tqmask(xm,y,0) = (T)((val&m)?1:0); + img(xm,y,0) = img(xm,y,1) = img(xm,y,2) = mask(xm,y,0) = (T)((val&m)?1:0); } if (variable_size) res.crop_font(); if (paddingx || paddingy) cimgl_map(res,l) res[l].resize(res[l].dimx()+paddingx, res[l].dimy()+paddingy,1,-100,0); diff --git a/chalk/plugins/filters/cimg/kis_cimg_filter.cc b/chalk/plugins/filters/cimg/kis_cimg_filter.cc index dc074e7b5..665dfc098 100644 --- a/chalk/plugins/filters/cimg/kis_cimg_filter.cc +++ b/chalk/plugins/filters/cimg/kis_cimg_filter.cc @@ -291,7 +291,7 @@ void get_geom(const char *geom, int &geom_w, int &geom_h) void KisCImgFilter::cleanup() { img0 = flow = G = dest = sum= W = CImg<>(); - tqmask = CImg<uchar> (); + mask = CImg<uchar> (); } //---------------------------------------------------------------------------- @@ -351,45 +351,45 @@ bool KisCImgFilter::prepare_restore() bool KisCImgFilter::prepare_inpaint() { - const char *file_m = NULL; //cimg_option("-m",(const char*)NULL,"Input inpainting tqmask"); + const char *file_m = NULL; //cimg_option("-m",(const char*)NULL,"Input inpainting mask"); if (!file_m) { // XXX: Do KDE messagebox - // g_message ("You need to specify an inpainting tqmask (option '-m') !"); + // g_message ("You need to specify an inpainting mask (option '-m') !"); return false; } - const unsigned int dilate = 0; //cimg_option("-dilate",0,"Inpainting tqmask dilatation"); + const unsigned int dilate = 0; //cimg_option("-dilate",0,"Inpainting mask dilatation"); const unsigned int ip_init = 3; //cimg_option("-init",3,"Inpainting init (0=black, 1=white, 2=noise, 3=unchanged, 4=interpol)"); if (cimg::strncasecmp("block",file_m,5)) - tqmask = CImg<uchar>(file_m); + mask = CImg<uchar>(file_m); else { int l=16; std::sscanf(file_m,"block%d",&l); - tqmask = CImg<uchar>(img.width/l,img.height/l); - cimg_mapXY(tqmask,x,y) tqmask(x,y)=(x+y)%2; + mask = CImg<uchar>(img.width/l,img.height/l); + cimg_mapXY(mask,x,y) mask(x,y)=(x+y)%2; } - tqmask.resize(img.width,img.height,1,1); - if (dilate) tqmask.dilate(dilate); + mask.resize(img.width,img.height,1,1); + if (dilate) mask.dilate(dilate); switch (ip_init) { - case 0 : { cimg_mapXYV(img,x,y,k) if (tqmask(x,y)) img(x,y,k) = 0; } break; - case 1 : { cimg_mapXYV(img,x,y,k) if (tqmask(x,y)) img(x,y,k) = 255; } break; - case 2 : { cimg_mapXYV(img,x,y,k) if (tqmask(x,y)) img(x,y,k) = (float)(255*cimg::rand()); } break; + case 0 : { cimg_mapXYV(img,x,y,k) if (mask(x,y)) img(x,y,k) = 0; } break; + case 1 : { cimg_mapXYV(img,x,y,k) if (mask(x,y)) img(x,y,k) = 255; } break; + case 2 : { cimg_mapXYV(img,x,y,k) if (mask(x,y)) img(x,y,k) = (float)(255*cimg::rand()); } break; case 3 : break; case 4 : { - CImg<uchar> ttqmask(tqmask),nttqmask(ttqmask); + CImg<uchar> tmask(mask),ntmask(tmask); CImg_3x3(M,uchar); CImg_3x3(I,float); - while (CImgStats(nttqmask,false).max>0) { - cimg_map3x3(ttqmask,x,y,0,0,M) if (Mcc && (!Mpc || !Mnc || !Mcp || !Mcn)) { + while (CImgStats(ntmask,false).max>0) { + cimg_map3x3(tmask,x,y,0,0,M) if (Mcc && (!Mpc || !Mnc || !Mcp || !Mcn)) { const float ccp = Mcp?0.0f:1.0f, cpc = Mpc?0.0f:1.0f, cnc = Mnc?0.0f:1.0f, ccn = Mcn?0.0f:1.0f, csum = ccp + cpc + cnc + ccn; cimg_mapV(img,k) { cimg_get3x3(img,x,y,0,k,I); img(x,y,k) = (ccp*Icp + cpc*Ipc + cnc*Inc + ccn*Icn)/csum; } - nttqmask(x,y) = 0; + ntmask(x,y) = 0; } - ttqmask = nttqmask; + tmask = ntmask; } } break; default: break; @@ -398,7 +398,7 @@ bool KisCImgFilter::prepare_inpaint() G = CImg<>(img.width,img.height,1,3,0); CImg_3x3(g,uchar); CImg_3x3(I,float); - cimg_map3x3(tqmask,x,y,0,0,g) if (!gcc && !(gnc-gcc) && !(gcc-gpc) && !(gcn-gcc) && !(gcc-gcp)) cimg_mapV(img,k) { + cimg_map3x3(mask,x,y,0,0,g) if (!gcc && !(gnc-gcc) && !(gcc-gpc) && !(gcn-gcc) && !(gcc-gcp)) cimg_mapV(img,k) { cimg_get3x3(img,x,y,0,k,I); const float ix = 0.5f*(Inc-Ipc), iy = 0.5f*(Icn-Icp); G(x,y,0)+= ix*ix; G(x,y,1)+= ix*iy; G(x,y,2)+= iy*iy; @@ -433,8 +433,8 @@ bool KisCImgFilter::prepare_resize() const bool anchor = true; //cimg_option("-anchor",true,"Anchor original pixels"); if (!geom) throw CImgArgumentException("You need to specify an output geomety (option -g)"); int w,h; get_geom(geom,w,h); - tqmask = CImg<uchar>(img.width,img.height,1,1,255); - if (!anchor) tqmask.resize(w,h,1,1,1); else tqmask = ~tqmask.resize(w,h,1,1,4); + mask = CImg<uchar>(img.width,img.height,1,1,255); + if (!anchor) mask.resize(w,h,1,1,1); else mask = ~mask.resize(w,h,1,1,4); img0 = img.get_resize(w,h,1,-100,1); img.resize(w,h,1,-100,3); G = CImg<>(img.width,img.height,1,3); @@ -618,7 +618,7 @@ void KisCImgFilter::compute_LIC(int &progressSteps) return; } - if (!tqmask.data || tqmask(x,y)) compute_LIC_back_forward(x,y); + if (!mask.data || mask(x,y)) compute_LIC_back_forward(x,y); } } @@ -680,9 +680,9 @@ bool KisCImgFilter::process() return true; } -KisFilterConfigWidget * KisCImgFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/) +KisFilterConfigWidget * KisCImgFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP /*dev*/) { - return new KisCImgconfigWidget(this, tqparent); + return new KisCImgconfigWidget(this, parent); } KisFilterConfiguration* KisCImgFilter::configuration(TQWidget* nwidget) diff --git a/chalk/plugins/filters/cimg/kis_cimg_filter.h b/chalk/plugins/filters/cimg/kis_cimg_filter.h index 3b7454761..965ecbd8b 100644 --- a/chalk/plugins/filters/cimg/kis_cimg_filter.h +++ b/chalk/plugins/filters/cimg/kis_cimg_filter.h @@ -60,7 +60,7 @@ public: virtual bool supportsPreview() { return false; } virtual ColorSpaceIndependence colorSpaceIndependence(); public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration * configuration(TQWidget*); virtual KisFilterConfiguration * configuration() { return new KisCImgFilterConfiguration();}; private: @@ -115,7 +115,7 @@ private: cimg_library::CImg<> dest, sum, W; cimg_library::CImg<> img, img0, flow,G; cimg_library::CImgl<> eigen; - cimg_library::CImg<unsigned char> tqmask; + cimg_library::CImg<unsigned char> mask; diff --git a/chalk/plugins/filters/cimg/kis_cimg_plugin.cc b/chalk/plugins/filters/cimg/kis_cimg_plugin.cc index 6c3e9522f..9ed82fe26 100644 --- a/chalk/plugins/filters/cimg/kis_cimg_plugin.cc +++ b/chalk/plugins/filters/cimg/kis_cimg_plugin.cc @@ -28,12 +28,12 @@ typedef KGenericFactory<KisCImgPlugin> KisCImgPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkcimg, KisCImgPluginFactory( "chalk" ) ) -KisCImgPlugin::KisCImgPlugin(TQObject *tqparent, const char *name, const TQStringList &) : KParts::Plugin(tqparent, name) +KisCImgPlugin::KisCImgPlugin(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name) { setInstance(KisCImgPluginFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisCImgFilter()); } } diff --git a/chalk/plugins/filters/cimg/kis_cimg_plugin.h b/chalk/plugins/filters/cimg/kis_cimg_plugin.h index 2d35bff43..d016abf15 100644 --- a/chalk/plugins/filters/cimg/kis_cimg_plugin.h +++ b/chalk/plugins/filters/cimg/kis_cimg_plugin.h @@ -25,7 +25,7 @@ class KisCImgPlugin : public KParts::Plugin { public: - KisCImgPlugin(TQObject *tqparent, const char *name, const TQStringList &); + KisCImgPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~KisCImgPlugin(); }; diff --git a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc index c12ebf5f1..b65a435f9 100644 --- a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc +++ b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc @@ -29,8 +29,8 @@ #include "kis_cimgconfig_widget.h" #include "kis_cimg_filter.h" -KisCImgconfigWidget::KisCImgconfigWidget(KisFilter* nfilter, TQWidget * tqparent, const char * name, WFlags f) - : KisFilterConfigWidget(tqparent, name, f) +KisCImgconfigWidget::KisCImgconfigWidget(KisFilter* nfilter, TQWidget * parent, const char * name, WFlags f) + : KisFilterConfigWidget(parent, name, f) { m_page = new WdgCImg(this); Q_CHECK_PTR(m_page); diff --git a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.h b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.h index aba373ca8..e95b34f0d 100644 --- a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.h +++ b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.h @@ -34,7 +34,7 @@ class KisCImgconfigWidget : public KisFilterConfigWidget { public: - KisCImgconfigWidget(KisFilter* nfilter, TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); + KisCImgconfigWidget(KisFilter* nfilter, TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); virtual ~KisCImgconfigWidget() {}; public: diff --git a/chalk/plugins/filters/colorify/Colorify.cpp b/chalk/plugins/filters/colorify/Colorify.cpp index 0b5010cfc..11f28d9a5 100644 --- a/chalk/plugins/filters/colorify/Colorify.cpp +++ b/chalk/plugins/filters/colorify/Colorify.cpp @@ -31,8 +31,8 @@ typedef KGenericFactory<ChalkColorify> ChalkColorifyFactory; K_EXPORT_COMPONENT_FACTORY( chalkcolorify, ChalkColorifyFactory( "chalk" ) ) -ChalkColorify::ChalkColorify(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ChalkColorify::ChalkColorify(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkColorifyFactory::instance()); @@ -40,11 +40,11 @@ ChalkColorify::ChalkColorify(TQObject *tqparent, const char *name, const TQStrin kdDebug(41006) << "Colorify Filter plugin. Class: " << className() << ", Parent: " - << tqparent -> className() + << parent -> className() << "\n"; - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisColorify()); } } @@ -59,9 +59,9 @@ KisColorify::KisColorify() : KisFilter(id(), "colors", i18n("&Colorify...")) { } -KisFilterConfigWidget * KisColorify::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP ) +KisFilterConfigWidget * KisColorify::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP ) { - return new KisWdgColorify(this, tqparent, "configuration of colorify"); + return new KisWdgColorify(this, parent, "configuration of colorify"); } KisFilterConfiguration* KisColorify::configuration(TQWidget* w) diff --git a/chalk/plugins/filters/colorify/Colorify.h b/chalk/plugins/filters/colorify/Colorify.h index 363785052..6a984134b 100644 --- a/chalk/plugins/filters/colorify/Colorify.h +++ b/chalk/plugins/filters/colorify/Colorify.h @@ -32,7 +32,7 @@ class ChalkColorify : public KParts::Plugin { public: - ChalkColorify(TQObject *tqparent, const char *name, const TQStringList &); + ChalkColorify(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkColorify(); }; @@ -49,7 +49,7 @@ class KisColorify : public KisFilter { virtual bool supportsAdjustmentLayers() { return false; } virtual ColorSpaceIndependence colorSpaceIndendendence() { return TO_LAB16; }; public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); }; diff --git a/chalk/plugins/filters/colorify/KisWdgColorify.cpp b/chalk/plugins/filters/colorify/KisWdgColorify.cpp index 3d1e2413c..5b03ad70d 100644 --- a/chalk/plugins/filters/colorify/KisWdgColorify.cpp +++ b/chalk/plugins/filters/colorify/KisWdgColorify.cpp @@ -30,7 +30,7 @@ #include "WdgColorifyBase.h" -KisWdgColorify::KisWdgColorify( KisFilter* nfilter, TQWidget * tqparent, const char * name) : KisFilterConfigWidget ( tqparent, name ) +KisWdgColorify::KisWdgColorify( KisFilter* nfilter, TQWidget * parent, const char * name) : KisFilterConfigWidget ( parent, name ) { TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgColorifyBase(this); diff --git a/chalk/plugins/filters/colorify/KisWdgColorify.h b/chalk/plugins/filters/colorify/KisWdgColorify.h index 662a24cd6..9e160fb78 100644 --- a/chalk/plugins/filters/colorify/KisWdgColorify.h +++ b/chalk/plugins/filters/colorify/KisWdgColorify.h @@ -35,7 +35,7 @@ class KisWdgColorify : public KisFilterConfigWidget Q_OBJECT TQ_OBJECT public: - KisWdgColorify( KisFilter* nfilter, TQWidget * tqparent, const char * name); + KisWdgColorify( KisFilter* nfilter, TQWidget * parent, const char * name); inline WdgColorifyBase* widget() { return m_widget; }; virtual void setConfiguration(KisFilterConfiguration*); private: diff --git a/chalk/plugins/filters/colors/colors.cc b/chalk/plugins/filters/colors/colors.cc index d9a421348..d3cadc68a 100644 --- a/chalk/plugins/filters/colors/colors.cc +++ b/chalk/plugins/filters/colors/colors.cc @@ -28,8 +28,8 @@ typedef KGenericFactory<ChalkExtensionsColors> ChalkExtensionsColorsFactory; K_EXPORT_COMPONENT_FACTORY( chalkextensioncolorsfilters, ChalkExtensionsColorsFactory( "chalk" ) ) -ChalkExtensionsColors::ChalkExtensionsColors(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ChalkExtensionsColors::ChalkExtensionsColors(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkExtensionsColorsFactory::instance()); @@ -37,11 +37,11 @@ ChalkExtensionsColors::ChalkExtensionsColors(TQObject *tqparent, const char *nam kdDebug(41006) << "Extensions Colors Filter plugin. Class: " << className() << ", Parent: " - << tqparent -> className() + << parent -> className() << "\n"; - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisFilterMax()); manager->add(new KisFilterMin()); manager->add(new KisFilterColorToAlpha()); diff --git a/chalk/plugins/filters/colors/colors.h b/chalk/plugins/filters/colors/colors.h index d93ae1cc6..dd27cc91b 100644 --- a/chalk/plugins/filters/colors/colors.h +++ b/chalk/plugins/filters/colors/colors.h @@ -30,7 +30,7 @@ class ChalkExtensionsColors : public KParts::Plugin { public: - ChalkExtensionsColors(TQObject *tqparent, const char *name, const TQStringList &); + ChalkExtensionsColors(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkExtensionsColors(); }; diff --git a/chalk/plugins/filters/colors/kis_color_to_alpha.cc b/chalk/plugins/filters/colors/kis_color_to_alpha.cc index 288149104..26f428448 100644 --- a/chalk/plugins/filters/colors/kis_color_to_alpha.cc +++ b/chalk/plugins/filters/colors/kis_color_to_alpha.cc @@ -34,9 +34,9 @@ KisFilterColorToAlpha::KisFilterColorToAlpha() : KisFilter(id(), "colors", i18n( { } -KisFilterConfigWidget * KisFilterColorToAlpha::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP ) +KisFilterConfigWidget * KisFilterColorToAlpha::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP ) { - return new KisWdgColorToAlpha(this, tqparent, "configuration of color to alpha"); + return new KisWdgColorToAlpha(this, parent, "configuration of color to alpha"); } KisFilterConfiguration* KisFilterColorToAlpha::configuration(TQWidget* w) diff --git a/chalk/plugins/filters/colors/kis_color_to_alpha.h b/chalk/plugins/filters/colors/kis_color_to_alpha.h index 9161b38e9..57f6ca7e1 100644 --- a/chalk/plugins/filters/colors/kis_color_to_alpha.h +++ b/chalk/plugins/filters/colors/kis_color_to_alpha.h @@ -39,7 +39,7 @@ class KisFilterColorToAlpha : public KisFilter { virtual bool supportsAdjustmentLayers() { return false; } virtual ColorSpaceIndependence colorSpaceIndependence() { return FULLY_INDEPENDENT; }; public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); }; diff --git a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc index e70fbc856..31b726bf0 100644 --- a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc +++ b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc @@ -30,7 +30,7 @@ #include "wdgcolortoalphabase.h" -KisWdgColorToAlpha::KisWdgColorToAlpha( KisFilter* nfilter, TQWidget * tqparent, const char * name) : KisFilterConfigWidget ( tqparent, name ) +KisWdgColorToAlpha::KisWdgColorToAlpha( KisFilter* nfilter, TQWidget * parent, const char * name) : KisFilterConfigWidget ( parent, name ) { TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgColorToAlphaBase(this); diff --git a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.h b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.h index d2b5c9b97..90d16ef2f 100644 --- a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.h +++ b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.h @@ -35,7 +35,7 @@ class KisWdgColorToAlpha : public KisFilterConfigWidget Q_OBJECT TQ_OBJECT public: - KisWdgColorToAlpha( KisFilter* nfilter, TQWidget * tqparent, const char * name); + KisWdgColorToAlpha( KisFilter* nfilter, TQWidget * parent, const char * name); inline WdgColorToAlphaBase* widget() { return m_widget; }; virtual void setConfiguration(KisFilterConfiguration*); private: diff --git a/chalk/plugins/filters/colorsfilters/colorsfilters.cc b/chalk/plugins/filters/colorsfilters/colorsfilters.cc index cdc7dedec..ae84bcaaa 100644 --- a/chalk/plugins/filters/colorsfilters/colorsfilters.cc +++ b/chalk/plugins/filters/colorsfilters/colorsfilters.cc @@ -54,13 +54,13 @@ typedef KGenericFactory<ColorsFilters> ColorsFiltersFactory; K_EXPORT_COMPONENT_FACTORY( chalkcolorsfilters, ColorsFiltersFactory( "chalk" ) ) -ColorsFilters::ColorsFilters(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ColorsFilters::ColorsFilters(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ColorsFiltersFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisBrightnessContrastFilter()); manager->add(new KisAutoContrast()); manager->add(new KisPerChannelFilter()); diff --git a/chalk/plugins/filters/colorsfilters/colorsfilters.h b/chalk/plugins/filters/colorsfilters/colorsfilters.h index ebf2dfebf..40dc8d747 100644 --- a/chalk/plugins/filters/colorsfilters/colorsfilters.h +++ b/chalk/plugins/filters/colorsfilters/colorsfilters.h @@ -29,7 +29,7 @@ class KisColorAdjustment; class ColorsFilters : public KParts::Plugin { public: - ColorsFilters(TQObject *tqparent, const char *name, const TQStringList &); + ColorsFilters(TQObject *parent, const char *name, const TQStringList &); virtual ~ColorsFilters(); }; diff --git a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc index e9280425c..a97f809bd 100644 --- a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc +++ b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc @@ -144,9 +144,9 @@ KisBrightnessContrastFilter::KisBrightnessContrastFilter() } -KisFilterConfigWidget * KisBrightnessContrastFilter::createConfigurationWidget(TQWidget *tqparent, KisPaintDeviceSP dev) +KisFilterConfigWidget * KisBrightnessContrastFilter::createConfigurationWidget(TQWidget *parent, KisPaintDeviceSP dev) { - return new KisBrightnessContrastConfigWidget(tqparent, dev); + return new KisBrightnessContrastConfigWidget(parent, dev); } KisFilterConfiguration* KisBrightnessContrastFilter::configuration(TQWidget *nwidget) @@ -252,8 +252,8 @@ void KisBrightnessContrastFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP setProgressDone(); } -KisBrightnessContrastConfigWidget::KisBrightnessContrastConfigWidget(TQWidget * tqparent, KisPaintDeviceSP dev, const char * name, WFlags f) - : KisFilterConfigWidget(tqparent, name, f) +KisBrightnessContrastConfigWidget::KisBrightnessContrastConfigWidget(TQWidget * parent, KisPaintDeviceSP dev, const char * name, WFlags f) + : KisFilterConfigWidget(parent, name, f) { int i; int height; diff --git a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.h b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.h index 598e4bcc1..fb80a302a 100644 --- a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.h +++ b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.h @@ -55,7 +55,7 @@ public: public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration * configuration(TQWidget *); virtual KisFilterConfiguration * configuration() { return new KisBrightnessContrastFilterConfiguration(); }; virtual void process(KisPaintDeviceSP, KisPaintDeviceSP, KisFilterConfiguration* , const TQRect&); @@ -73,7 +73,7 @@ public: class KisBrightnessContrastConfigWidget : public KisFilterConfigWidget { public: - KisBrightnessContrastConfigWidget(TQWidget * tqparent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 ); + KisBrightnessContrastConfigWidget(TQWidget * parent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 ); virtual ~KisBrightnessContrastConfigWidget() {}; KisBrightnessContrastFilterConfiguration * config(); diff --git a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc index 1eaa14170..928badedc 100644 --- a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc +++ b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc @@ -154,9 +154,9 @@ TQString KisPerChannelFilterConfiguration::toString() } -KisFilterConfigWidget * KisPerChannelFilter::createConfigurationWidget(TQWidget *tqparent, KisPaintDeviceSP dev) +KisFilterConfigWidget * KisPerChannelFilter::createConfigurationWidget(TQWidget *parent, KisPaintDeviceSP dev) { - return new KisPerChannelConfigWidget(tqparent, dev); + return new KisPerChannelConfigWidget(parent, dev); } KisFilterConfiguration* KisPerChannelFilter::configuration(TQWidget *nwidget) @@ -300,8 +300,8 @@ void KisPerChannelConfigWidget::setActiveChannel(int ch) m_page->kCurve->setPixmap(pix); } -KisPerChannelConfigWidget::KisPerChannelConfigWidget(TQWidget * tqparent, KisPaintDeviceSP dev, const char * name, WFlags f) - : KisFilterConfigWidget(tqparent, name, f) +KisPerChannelConfigWidget::KisPerChannelConfigWidget(TQWidget * parent, KisPaintDeviceSP dev, const char * name, WFlags f) + : KisFilterConfigWidget(parent, name, f) { int i; int height; diff --git a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.h b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.h index 6d11ab433..9497075af 100644 --- a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.h +++ b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.h @@ -59,7 +59,7 @@ class KisPerChannelFilter public: KisPerChannelFilter() : KisFilter( id(), "adjust", i18n("&Color Adjustment...")) {}; public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); virtual KisFilterConfiguration* configuration() { return new KisPerChannelFilterConfiguration(0); }; virtual void process(KisPaintDeviceSP, KisPaintDeviceSP, KisFilterConfiguration* , const TQRect&); @@ -80,7 +80,7 @@ class KisPerChannelConfigWidget : public KisFilterConfigWidget { TQ_OBJECT public: - KisPerChannelConfigWidget(TQWidget * tqparent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 ); + KisPerChannelConfigWidget(TQWidget * parent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 ); virtual ~KisPerChannelConfigWidget() {}; KisPerChannelFilterConfiguration * config(); diff --git a/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc b/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc index ddf2332f6..b3c73a924 100644 --- a/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc +++ b/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc @@ -60,13 +60,13 @@ KisKernelSP createKernel( TQ_INT32 i0, TQ_INT32 i1, TQ_INT32 i2, typedef KGenericFactory<ChalkConvolutionFilters> ChalkConvolutionFiltersFactory; K_EXPORT_COMPONENT_FACTORY( chalkconvolutionfilters, ChalkConvolutionFiltersFactory( "chalk" ) ) -ChalkConvolutionFilters::ChalkConvolutionFilters(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ChalkConvolutionFilters::ChalkConvolutionFilters(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkConvolutionFiltersFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisGaussianBlurFilter()); manager->add(new KisSharpenFilter()); manager->add(new KisMeanRemovalFilter()); diff --git a/chalk/plugins/filters/convolutionfilters/convolutionfilters.h b/chalk/plugins/filters/convolutionfilters/convolutionfilters.h index 94e4654c3..aa8dc7491 100644 --- a/chalk/plugins/filters/convolutionfilters/convolutionfilters.h +++ b/chalk/plugins/filters/convolutionfilters/convolutionfilters.h @@ -145,7 +145,7 @@ public: class ChalkConvolutionFilters : public KParts::Plugin { public: - ChalkConvolutionFilters(TQObject *tqparent, const char *name, const TQStringList &); + ChalkConvolutionFilters(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkConvolutionFilters(); }; diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.cc b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.cc index 8d48d25d2..39da5b188 100644 --- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.cc +++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.cc @@ -30,9 +30,9 @@ #include "kis_matrix_widget.h" -KisFilterConfigWidget * KisCustomConvolutionFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP) +KisFilterConfigWidget * KisCustomConvolutionFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP) { - KisCustomConvolutionFilterConfigurationWidget* ccfcw = new KisCustomConvolutionFilterConfigurationWidget(this,tqparent, "custom convolution config widget"); + KisCustomConvolutionFilterConfigurationWidget* ccfcw = new KisCustomConvolutionFilterConfigurationWidget(this,parent, "custom convolution config widget"); Q_CHECK_PTR(ccfcw); return ccfcw; } diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.h b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.h index cbfd375e3..60c009ce3 100644 --- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.h +++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.h @@ -39,7 +39,7 @@ public: virtual bool supportsIncrementalPainting() { return true; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration * configuration(TQWidget*); virtual KisFilterConfiguration * configuration() { return configuration(0); }; protected: diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc index b1905d300..2c1c87d9c 100644 --- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc +++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc @@ -34,8 +34,8 @@ #include "kis_custom_convolution_filter_configuration_base_widget.h" #include "kis_matrix_widget.h" -KisCustomConvolutionFilterConfigurationWidget::KisCustomConvolutionFilterConfigurationWidget( KisFilter* /*nfilter*/, TQWidget * tqparent, const char * name) - : KisFilterConfigWidget ( tqparent, name ) +KisCustomConvolutionFilterConfigurationWidget::KisCustomConvolutionFilterConfigurationWidget( KisFilter* /*nfilter*/, TQWidget * parent, const char * name) + : KisFilterConfigWidget ( parent, name ) { TQGridLayout *widgetLayout = new TQGridLayout(this, 2, 1); Q_CHECK_PTR(widgetLayout); diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.h b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.h index b5819e394..eb16e587a 100644 --- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.h +++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.h @@ -34,7 +34,7 @@ class KisCustomConvolutionFilterConfigurationWidget : public KisFilterConfigWidg public: - KisCustomConvolutionFilterConfigurationWidget( KisFilter* nfilter, TQWidget * tqparent, const char * name); + KisCustomConvolutionFilterConfigurationWidget( KisFilter* nfilter, TQWidget * parent, const char * name); inline KisCustomConvolutionFilterConfigurationBaseWidget* matrixWidget() { return m_ccfcws; }; void setConfiguration(KisFilterConfiguration * config); diff --git a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc index 1cd1aa8df..68f560c41 100644 --- a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc +++ b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc @@ -433,12 +433,12 @@ void KisCubismFilter::cubism(KisPaintDeviceSP src, KisPaintDeviceSP dst, const T setProgressDone(); } -KisFilterConfigWidget * KisCubismFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/) +KisFilterConfigWidget * KisCubismFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP /*dev*/) { vKisIntegerWidgetParam param; param.push_back( KisIntegerWidgetParam( 2, 40, 10, i18n("Tile size"), "tileSize" ) ); param.push_back( KisIntegerWidgetParam( 2, 40, 10, i18n("Tile saturation"), "tileSaturation" ) ); - return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); } KisFilterConfiguration* KisCubismFilter::configuration(TQWidget* nwidget) diff --git a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.h b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.h index f2624030c..332e5fd12 100644 --- a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.h +++ b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.h @@ -60,7 +60,7 @@ public: virtual bool workWith(KisColorSpace* cs); virtual ColorSpaceIndependence colorSpaceIndependence() { return TO_RGBA8; }; public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); virtual KisFilterConfiguration* configuration() { return new KisCubismFilterConfiguration( 10, 10); }; private: diff --git a/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.cc b/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.cc index 4e7dfa7d8..7215a2e3b 100644 --- a/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.cc +++ b/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.cc @@ -25,13 +25,13 @@ typedef KGenericFactory<KisCubismFilterPlugin> KisCubismFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkcubismfilter, KisCubismFilterPluginFactory( "chalk" ) ) -KisCubismFilterPlugin::KisCubismFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) : KParts::Plugin(tqparent, name) +KisCubismFilterPlugin::KisCubismFilterPlugin(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name) { setInstance(KisCubismFilterPluginFactory::instance()); - if ( tqparent->inherits("KisFilterRegistry") ) + if ( parent->inherits("KisFilterRegistry") ) { - KisFilterRegistry * r = dynamic_cast<KisFilterRegistry*>(tqparent); + KisFilterRegistry * r = dynamic_cast<KisFilterRegistry*>(parent); r->add(new KisCubismFilter()); } } diff --git a/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.h b/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.h index b37e40c1f..064c55e3c 100644 --- a/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.h +++ b/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.h @@ -25,7 +25,7 @@ class KisCubismFilterPlugin : public KParts::Plugin { public: - KisCubismFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); + KisCubismFilterPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~KisCubismFilterPlugin(); }; diff --git a/chalk/plugins/filters/embossfilter/kis_emboss_filter.cc b/chalk/plugins/filters/embossfilter/kis_emboss_filter.cc index f15b5952f..6e69761b6 100644 --- a/chalk/plugins/filters/embossfilter/kis_emboss_filter.cc +++ b/chalk/plugins/filters/embossfilter/kis_emboss_filter.cc @@ -158,11 +158,11 @@ int KisEmbossFilter::Lim_Max (int Now, int Up, int Max) return (Up); } -KisFilterConfigWidget * KisEmbossFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP) +KisFilterConfigWidget * KisEmbossFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP) { vKisIntegerWidgetParam param; param.push_back( KisIntegerWidgetParam( 10, 300, 30, i18n("Depth"), "depth" ) ); - KisFilterConfigWidget * w = new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); + KisFilterConfigWidget * w = new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); Q_CHECK_PTR(w); return w; } diff --git a/chalk/plugins/filters/embossfilter/kis_emboss_filter.h b/chalk/plugins/filters/embossfilter/kis_emboss_filter.h index fe4410ed5..1e46d21f1 100644 --- a/chalk/plugins/filters/embossfilter/kis_emboss_filter.h +++ b/chalk/plugins/filters/embossfilter/kis_emboss_filter.h @@ -50,7 +50,7 @@ public: virtual std::list<KisFilterConfiguration*> listOfExamplesConfiguration(KisPaintDeviceSP ) { std::list<KisFilterConfiguration*> list; list.insert(list.begin(), new KisEmbossFilterConfiguration(100)); return list; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); virtual KisFilterConfiguration* configuration() {return new KisEmbossFilterConfiguration( 30 );}; diff --git a/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.cc b/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.cc index 4aec1db6a..bd11b115b 100644 --- a/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.cc +++ b/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.cc @@ -25,12 +25,12 @@ typedef KGenericFactory<KisEmbossFilterPlugin> KisEmbossFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkembossfilter, KisEmbossFilterPluginFactory( "chalk" ) ) -KisEmbossFilterPlugin::KisEmbossFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) : KParts::Plugin(tqparent, name) +KisEmbossFilterPlugin::KisEmbossFilterPlugin(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name) { setInstance(KisEmbossFilterPluginFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisEmbossFilter()); } } diff --git a/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.h b/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.h index 39803418f..81312b014 100644 --- a/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.h +++ b/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.h @@ -24,7 +24,7 @@ class KisEmbossFilterPlugin : public KParts::Plugin { public: - KisEmbossFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); + KisEmbossFilterPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~KisEmbossFilterPlugin(); }; diff --git a/chalk/plugins/filters/example/example.cc b/chalk/plugins/filters/example/example.cc index 2e2fbc7c7..e1e33ade7 100644 --- a/chalk/plugins/filters/example/example.cc +++ b/chalk/plugins/filters/example/example.cc @@ -44,14 +44,14 @@ typedef KGenericFactory<ChalkExample> ChalkExampleFactory; K_EXPORT_COMPONENT_FACTORY( chalkexample, ChalkExampleFactory( "chalk" ) ) -ChalkExample::ChalkExample(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ChalkExample::ChalkExample(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkExampleFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisFilterInvert()); } } diff --git a/chalk/plugins/filters/example/example.h b/chalk/plugins/filters/example/example.h index df49d0366..4df6705c7 100644 --- a/chalk/plugins/filters/example/example.h +++ b/chalk/plugins/filters/example/example.h @@ -27,7 +27,7 @@ class ChalkExample : public KParts::Plugin { public: - ChalkExample(TQObject *tqparent, const char *name, const TQStringList &); + ChalkExample(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkExample(); }; diff --git a/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.cc b/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.cc index 10ef044d9..c43e56900 100644 --- a/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.cc +++ b/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.cc @@ -37,19 +37,19 @@ typedef KGenericFactory<FastColorTransferPlugin> ChalkFastColorTransferFactory; K_EXPORT_COMPONENT_FACTORY( chalkfastcolortransfer, ChalkFastColorTransferFactory( "chalk" ) ) -FastColorTransferPlugin::FastColorTransferPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +FastColorTransferPlugin::FastColorTransferPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkFastColorTransferFactory::instance()); kdDebug(41006) << "Color Transfer Filter plugin. Class: " << className() << ", Parent: " - << tqparent -> className() + << parent -> className() << "\n"; - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisFilterFastColorTransfer()); } } @@ -63,9 +63,9 @@ KisFilterFastColorTransfer::KisFilterFastColorTransfer() : KisFilter(id(), "colo } -KisFilterConfigWidget * KisFilterFastColorTransfer::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP ) +KisFilterConfigWidget * KisFilterFastColorTransfer::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP ) { - return new KisWdgFastColorTransfer(this, tqparent, "configuration of color to alpha"); + return new KisWdgFastColorTransfer(this, parent, "configuration of color to alpha"); } KisFilterConfiguration* KisFilterFastColorTransfer::configuration(TQWidget* w) diff --git a/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.h b/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.h index d8a3c8983..dbaee9f8d 100644 --- a/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.h +++ b/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.h @@ -31,7 +31,7 @@ class FastColorTransferPlugin : public KParts::Plugin { public: - FastColorTransferPlugin(TQObject *tqparent, const char *name, const TQStringList &); + FastColorTransferPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~FastColorTransferPlugin(); }; @@ -48,7 +48,7 @@ class KisFilterFastColorTransfer : public KisFilter virtual bool supportsIncrementalPainting() { return false; } virtual bool supportsAdjustmentLayers() { return false; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); }; diff --git a/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp b/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp index 3c08cac31..49826ccb9 100644 --- a/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp +++ b/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp @@ -26,7 +26,7 @@ #include "wdgfastcolortransfer.h" -KisWdgFastColorTransfer::KisWdgFastColorTransfer(KisFilter* nfilter, TQWidget * tqparent, const char * name) : KisFilterConfigWidget ( tqparent, name ) +KisWdgFastColorTransfer::KisWdgFastColorTransfer(KisFilter* nfilter, TQWidget * parent, const char * name) : KisFilterConfigWidget ( parent, name ) { TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgFastColorTransfer(this); diff --git a/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.h b/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.h index 0a29aef51..0e95e3194 100644 --- a/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.h +++ b/chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.h @@ -36,7 +36,7 @@ class WdgFastColorTransfer; class KisWdgFastColorTransfer : public KisFilterConfigWidget { public: - KisWdgFastColorTransfer(KisFilter* nfilter, TQWidget * tqparent, const char * name); + KisWdgFastColorTransfer(KisFilter* nfilter, TQWidget * parent, const char * name); ~KisWdgFastColorTransfer(); virtual void setConfiguration(KisFilterConfiguration*); inline WdgFastColorTransfer* widget() { return m_widget; } diff --git a/chalk/plugins/filters/halftone/kis_halftone.cpp b/chalk/plugins/filters/halftone/kis_halftone.cpp index 35e838ed2..c2c2f4631 100644 --- a/chalk/plugins/filters/halftone/kis_halftone.cpp +++ b/chalk/plugins/filters/halftone/kis_halftone.cpp @@ -36,21 +36,21 @@ typedef KGenericFactory<ChalkHalftone> ChalkHalftoneFactory; K_EXPORT_COMPONENT_FACTORY( chalkhalftone, ChalkHalftoneFactory( "chalk" ) ) - ChalkHalftone::ChalkHalftone(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) + ChalkHalftone::ChalkHalftone(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkHalftoneFactory::instance()); kdDebug(41006) << "Halftone filter plugin. Class: " << className() << ", Parent: " - << tqparent->className() + << parent->className() << "\n"; - if ( tqparent->inherits("KisFilterRegistry") ) + if ( parent->inherits("KisFilterRegistry") ) { - KisFilterRegistry * r = dynamic_cast<KisFilterRegistry*>(tqparent); + KisFilterRegistry * r = dynamic_cast<KisFilterRegistry*>(parent); r->add(new KisHalftoneReduction()); } } @@ -71,12 +71,12 @@ KisHalftoneReduction::~KisHalftoneReduction() { } -KisFilterConfigWidget * KisHalftoneReduction::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP ) +KisFilterConfigWidget * KisHalftoneReduction::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP ) { vKisIntegerWidgetParam param; param.push_back( KisIntegerWidgetParam( 0, 100, BEST_WAVELET_FREQUENCY_VALUE, i18n("Frequency"), "frequency" ) ); param.push_back( KisIntegerWidgetParam( 0, 100, 2, i18n("Half-size"), "halfsize" ) ); - return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); } KisFilterConfiguration* KisHalftoneReduction::configuration(TQWidget* nwidget ) @@ -121,11 +121,11 @@ void KisHalftoneReduction::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, K kdDebug(41005) << halfSize << endl; KisAutobrushShape* kas = new KisAutobrushCircleShape(2*halfSize+1, 2*halfSize+1 , halfSize, halfSize); - TQImage tqmask; - kas->createBrush(&tqmask); + TQImage mask; + kas->createBrush(&mask); - KisKernelSP kernel = KisKernel::fromTQImage(tqmask); // TODO: for 1.6 reuse the chalk's core function for creating kernel : KisKernel::fromTQImage - tqmask.save("testtqmask.png", "PNG"); + KisKernelSP kernel = KisKernel::fromTQImage(mask); // TODO: for 1.6 reuse the chalk's core function for creating kernel : KisKernel::fromTQImage + mask.save("testmask.png", "PNG"); KisPaintDeviceSP interm = new KisPaintDevice(*src); KisColorSpace * cs = src->colorSpace(); diff --git a/chalk/plugins/filters/halftone/kis_halftone.h b/chalk/plugins/filters/halftone/kis_halftone.h index 38842d311..96f22e8f0 100644 --- a/chalk/plugins/filters/halftone/kis_halftone.h +++ b/chalk/plugins/filters/halftone/kis_halftone.h @@ -32,7 +32,7 @@ class ChalkHalftone : public KParts::Plugin { public: - ChalkHalftone(TQObject *tqparent, const char *name, const TQStringList &); + ChalkHalftone(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkHalftone(); }; @@ -65,7 +65,7 @@ public: virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&); virtual KisFilterConfiguration * configuration(TQWidget* nwidget); virtual KisFilterConfiguration * configuration() {return new KisHalftoneReductionConfiguration( BEST_WAVELET_FREQUENCY_VALUE, 2 );}; - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); static inline KisID id() { return KisID("halftone", i18n("Halftone Reducer")); }; virtual bool supportsPainting() { return false; } diff --git a/chalk/plugins/filters/imageenhancement/imageenhancement.cpp b/chalk/plugins/filters/imageenhancement/imageenhancement.cpp index 8108a3d6b..78398157f 100644 --- a/chalk/plugins/filters/imageenhancement/imageenhancement.cpp +++ b/chalk/plugins/filters/imageenhancement/imageenhancement.cpp @@ -47,21 +47,21 @@ typedef KGenericFactory<ChalkImageEnhancement> ChalkImageEnhancementFactory; K_EXPORT_COMPONENT_FACTORY( chalkimageenhancement, ChalkImageEnhancementFactory( "chalk" ) ) - ChalkImageEnhancement::ChalkImageEnhancement(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) + ChalkImageEnhancement::ChalkImageEnhancement(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkImageEnhancementFactory::instance()); kdDebug(41006) << "Image enhancement filter plugin. Class: " << className() << ", Parent: " - << tqparent->className() + << parent->className() << "\n"; - if ( tqparent->inherits("KisFilterRegistry") ) + if ( parent->inherits("KisFilterRegistry") ) { - KisFilterRegistry * r = dynamic_cast<KisFilterRegistry*>(tqparent); + KisFilterRegistry * r = dynamic_cast<KisFilterRegistry*>(parent); r->add(new KisSimpleNoiseReducer()); r->add(new KisWaveletNoiseReduction()); } diff --git a/chalk/plugins/filters/imageenhancement/imageenhancement.h b/chalk/plugins/filters/imageenhancement/imageenhancement.h index b333e25ff..7a00f3526 100644 --- a/chalk/plugins/filters/imageenhancement/imageenhancement.h +++ b/chalk/plugins/filters/imageenhancement/imageenhancement.h @@ -27,7 +27,7 @@ class ChalkImageEnhancement : public KParts::Plugin { public: - ChalkImageEnhancement(TQObject *tqparent, const char *name, const TQStringList &); + ChalkImageEnhancement(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkImageEnhancement(); }; diff --git a/chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.cpp b/chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.cpp index 0ff7a9586..f38f364ce 100644 --- a/chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.cpp +++ b/chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.cpp @@ -37,12 +37,12 @@ KisSimpleNoiseReducer::~KisSimpleNoiseReducer() { } -KisFilterConfigWidget * KisSimpleNoiseReducer::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP) +KisFilterConfigWidget * KisSimpleNoiseReducer::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP) { vKisIntegerWidgetParam param; param.push_back( KisIntegerWidgetParam( 0, 255, 50, i18n("Threshold"), "threshold" ) ); param.push_back( KisIntegerWidgetParam( 0, 10, 1, i18n("Window size"), "windowsize") ); - return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); } KisFilterConfiguration* KisSimpleNoiseReducer::configuration(TQWidget* nwidget) @@ -77,13 +77,13 @@ void KisSimpleNoiseReducer::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisColorSpace* cs = src->colorSpace(); - // Compute the blur tqmask + // Compute the blur mask KisAutobrushShape* kas = new KisAutobrushCircleShape(2*windowsize+1, 2*windowsize+1, windowsize, windowsize); - TQImage tqmask; - kas->createBrush(&tqmask); + TQImage mask; + kas->createBrush(&mask); - KisKernelSP kernel = KisKernel::fromTQImage(tqmask); + KisKernelSP kernel = KisKernel::fromTQImage(mask); KisPaintDeviceSP interm = new KisPaintDevice(*src); KisConvolutionPainter painter( interm ); diff --git a/chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.h b/chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.h index a233bb854..620981c73 100644 --- a/chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.h +++ b/chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.h @@ -47,7 +47,7 @@ class KisSimpleNoiseReducer : public KisFilter virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&); virtual KisFilterConfiguration * configuration(TQWidget* nwidget); virtual KisFilterConfiguration * configuration() { return new KisSimpleNoiseReducerConfiguration( 50, 1); }; - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); static inline KisID id() { return KisID("gaussiannoisereducer", i18n("Gaussian Noise Reducer")); }; virtual bool supportsPainting() { return false; } diff --git a/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp b/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp index 021bf5c69..e5cca62ed 100644 --- a/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp +++ b/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp @@ -38,11 +38,11 @@ KisWaveletNoiseReduction::~KisWaveletNoiseReduction() { } -KisFilterConfigWidget * KisWaveletNoiseReduction::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP ) +KisFilterConfigWidget * KisWaveletNoiseReduction::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP ) { vKisDoubleWidgetParam param; param.push_back( KisDoubleWidgetParam( 0.0, 256.0, BEST_WAVELET_THRESHOLD_VALUE, i18n("Threshold"), "threshold" ) ); - return new KisMultiDoubleFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiDoubleFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); } KisFilterConfiguration* KisWaveletNoiseReduction::configuration(TQWidget* nwidget ) diff --git a/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.h b/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.h index 85a96ec81..b6da5773f 100644 --- a/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.h +++ b/chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.h @@ -54,7 +54,7 @@ public: virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&); virtual KisFilterConfiguration * configuration(TQWidget* nwidget); virtual KisFilterConfiguration * configuration() {return new KisWaveletNoiseReductionConfiguration( BEST_WAVELET_THRESHOLD_VALUE );}; - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); static inline KisID id() { return KisID("waveletnoisereducer", i18n("Wavelet Noise Reducer")); }; virtual bool supportsPainting() { return false; } diff --git a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp index f33681a57..b83baa116 100644 --- a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp +++ b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp @@ -26,8 +26,8 @@ #include "wdglenscorrectionoptions.h" -KisWdgLensCorrection::KisWdgLensCorrection(KisFilter* /*nfilter*/, TQWidget* tqparent, const char* name) - : KisFilterConfigWidget(tqparent,name) +KisWdgLensCorrection::KisWdgLensCorrection(KisFilter* /*nfilter*/, TQWidget* parent, const char* name) + : KisFilterConfigWidget(parent,name) { TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgLensCorrectionOptions(this); diff --git a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.h b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.h index 193aa5aac..d5d3ce96a 100644 --- a/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.h +++ b/chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.h @@ -31,7 +31,7 @@ class KisWdgLensCorrection : public KisFilterConfigWidget Q_OBJECT TQ_OBJECT public: - KisWdgLensCorrection(KisFilter* nfilter, TQWidget* tqparent = 0, const char* name = 0); + KisWdgLensCorrection(KisFilter* nfilter, TQWidget* parent = 0, const char* name = 0); ~KisWdgLensCorrection(); public: inline WdgLensCorrectionOptions* widget() { return m_widget; }; diff --git a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc index cd3627c5a..4fefb5970 100644 --- a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc +++ b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc @@ -52,14 +52,14 @@ typedef KGenericFactory<ChalkLensCorrectionFilter> ChalkLensCorrectionFilterFactory; K_EXPORT_COMPONENT_FACTORY( chalklenscorrectionfilter, ChalkLensCorrectionFilterFactory( "chalk" ) ) -ChalkLensCorrectionFilter::ChalkLensCorrectionFilter(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ChalkLensCorrectionFilter::ChalkLensCorrectionFilter(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkLensCorrectionFilterFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisFilterLensCorrection()); } } @@ -88,9 +88,9 @@ KisFilterConfiguration* KisFilterLensCorrection::configuration(TQWidget* w) return config; } -KisFilterConfigWidget * KisFilterLensCorrection::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/) +KisFilterConfigWidget * KisFilterLensCorrection::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP /*dev*/) { - return new KisWdgLensCorrection((KisFilter*)this, (TQWidget*)tqparent, i18n("Configuration of lens correction filter").ascii()); + return new KisWdgLensCorrection((KisFilter*)this, (TQWidget*)parent, i18n("Configuration of lens correction filter").ascii()); } void KisFilterLensCorrection::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rawrect) diff --git a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.h b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.h index f04012b6a..a54f11a99 100644 --- a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.h +++ b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.h @@ -29,7 +29,7 @@ class KisFilterConfigWidget; class ChalkLensCorrectionFilter : public KParts::Plugin { public: - ChalkLensCorrectionFilter(TQObject *tqparent, const char *name, const TQStringList &); + ChalkLensCorrectionFilter(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkLensCorrectionFilter(); }; @@ -46,7 +46,7 @@ class KisFilterLensCorrection : public KisFilter virtual bool supportsIncrementalPainting() { return false; } virtual bool supportsAdjustmentLayers() { return false; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); }; diff --git a/chalk/plugins/filters/levelfilter/kgradientslider.cc b/chalk/plugins/filters/levelfilter/kgradientslider.cc index 948fd277c..7b836436e 100644 --- a/chalk/plugins/filters/levelfilter/kgradientslider.cc +++ b/chalk/plugins/filters/levelfilter/kgradientslider.cc @@ -34,8 +34,8 @@ #include "kgradientslider.h" -KGradientSlider::KGradientSlider(TQWidget *tqparent, const char *name, WFlags f) - : TQWidget(tqparent, name, f) +KGradientSlider::KGradientSlider(TQWidget *parent, const char *name, WFlags f) + : TQWidget(parent, name, f) { m_dragging = false; diff --git a/chalk/plugins/filters/levelfilter/kgradientslider.h b/chalk/plugins/filters/levelfilter/kgradientslider.h index c8990c805..ad667ca27 100644 --- a/chalk/plugins/filters/levelfilter/kgradientslider.h +++ b/chalk/plugins/filters/levelfilter/kgradientslider.h @@ -40,7 +40,7 @@ Q_OBJECT } eCursor; public: - KGradientSlider(TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0); + KGradientSlider(TQWidget *parent = 0, const char *name = 0, WFlags f = 0); virtual ~KGradientSlider(); diff --git a/chalk/plugins/filters/levelfilter/kis_level_filter.cc b/chalk/plugins/filters/levelfilter/kis_level_filter.cc index fb437f269..b7c1cb00d 100644 --- a/chalk/plugins/filters/levelfilter/kis_level_filter.cc +++ b/chalk/plugins/filters/levelfilter/kis_level_filter.cc @@ -86,9 +86,9 @@ KisLevelFilter::KisLevelFilter() } -KisFilterConfigWidget * KisLevelFilter::createConfigurationWidget(TQWidget *tqparent, KisPaintDeviceSP dev) +KisFilterConfigWidget * KisLevelFilter::createConfigurationWidget(TQWidget *parent, KisPaintDeviceSP dev) { - return new KisLevelConfigWidget(tqparent, dev); + return new KisLevelConfigWidget(parent, dev); } KisFilterConfiguration* KisLevelFilter::configuration(TQWidget *nwidget) @@ -207,8 +207,8 @@ void KisLevelFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilt setProgressDone(); } -KisLevelConfigWidget::KisLevelConfigWidget(TQWidget * tqparent, KisPaintDeviceSP dev, const char * name, WFlags f) - : KisFilterConfigWidget(tqparent, name, f) +KisLevelConfigWidget::KisLevelConfigWidget(TQWidget * parent, KisPaintDeviceSP dev, const char * name, WFlags f) + : KisFilterConfigWidget(parent, name, f) { m_page = new WdgLevel(this); histogram = NULL; diff --git a/chalk/plugins/filters/levelfilter/kis_level_filter.h b/chalk/plugins/filters/levelfilter/kis_level_filter.h index 8f3d3591b..b2a385215 100644 --- a/chalk/plugins/filters/levelfilter/kis_level_filter.h +++ b/chalk/plugins/filters/levelfilter/kis_level_filter.h @@ -57,7 +57,7 @@ public: public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration * configuration(TQWidget *); virtual KisFilterConfiguration * configuration() { return new KisLevelFilterConfiguration(); }; virtual void process(KisPaintDeviceSP, KisPaintDeviceSP, KisFilterConfiguration* , const TQRect&); @@ -76,7 +76,7 @@ class KisLevelConfigWidget : public KisFilterConfigWidget { Q_OBJECT TQ_OBJECT public: - KisLevelConfigWidget(TQWidget * tqparent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 ); + KisLevelConfigWidget(TQWidget * parent, KisPaintDeviceSP dev, const char * name = 0, WFlags f = 0 ); virtual ~KisLevelConfigWidget(); KisLevelFilterConfiguration * config(); diff --git a/chalk/plugins/filters/levelfilter/levelfilter.cc b/chalk/plugins/filters/levelfilter/levelfilter.cc index 669775fbc..cabda0b5b 100644 --- a/chalk/plugins/filters/levelfilter/levelfilter.cc +++ b/chalk/plugins/filters/levelfilter/levelfilter.cc @@ -51,13 +51,13 @@ typedef KGenericFactory<LevelFilter> LevelFilterFactory; K_EXPORT_COMPONENT_FACTORY( chalklevelfilter, LevelFilterFactory( "chalk" ) ) -LevelFilter::LevelFilter(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +LevelFilter::LevelFilter(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(LevelFilterFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisLevelFilter()); } } diff --git a/chalk/plugins/filters/levelfilter/levelfilter.h b/chalk/plugins/filters/levelfilter/levelfilter.h index 69627ff7f..433a8d8ac 100644 --- a/chalk/plugins/filters/levelfilter/levelfilter.h +++ b/chalk/plugins/filters/levelfilter/levelfilter.h @@ -28,7 +28,7 @@ class KisColorAdjustment; class LevelFilter : public KParts::Plugin { public: - LevelFilter(TQObject *tqparent, const char *name, const TQStringList &); + LevelFilter(TQObject *parent, const char *name, const TQStringList &); virtual ~LevelFilter(); }; diff --git a/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp b/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp index 060418f3a..c13db9527 100644 --- a/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp +++ b/chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp @@ -26,8 +26,8 @@ #include "wdgnoiseoptions.h" -KisWdgNoise::KisWdgNoise(KisFilter* /*nfilter*/, TQWidget* tqparent, const char* name) - : KisFilterConfigWidget(tqparent,name) +KisWdgNoise::KisWdgNoise(KisFilter* /*nfilter*/, TQWidget* parent, const char* name) + : KisFilterConfigWidget(parent,name) { TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgNoiseOptions(this); diff --git a/chalk/plugins/filters/noisefilter/kis_wdg_noise.h b/chalk/plugins/filters/noisefilter/kis_wdg_noise.h index ca42ebd23..a9b347459 100644 --- a/chalk/plugins/filters/noisefilter/kis_wdg_noise.h +++ b/chalk/plugins/filters/noisefilter/kis_wdg_noise.h @@ -31,7 +31,7 @@ class KisWdgNoise : public KisFilterConfigWidget Q_OBJECT TQ_OBJECT public: - KisWdgNoise(KisFilter* nfilter, TQWidget* tqparent = 0, const char* name = 0); + KisWdgNoise(KisFilter* nfilter, TQWidget* parent = 0, const char* name = 0); ~KisWdgNoise(); public: inline WdgNoiseOptions* widget() { return m_widget; }; diff --git a/chalk/plugins/filters/noisefilter/noisefilter.cc b/chalk/plugins/filters/noisefilter/noisefilter.cc index af593703b..0f634eb89 100644 --- a/chalk/plugins/filters/noisefilter/noisefilter.cc +++ b/chalk/plugins/filters/noisefilter/noisefilter.cc @@ -48,14 +48,14 @@ typedef KGenericFactory<ChalkNoiseFilter> ChalkNoiseFilterFactory; K_EXPORT_COMPONENT_FACTORY( chalknoisefilter, ChalkNoiseFilterFactory( "chalk" ) ) -ChalkNoiseFilter::ChalkNoiseFilter(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ChalkNoiseFilter::ChalkNoiseFilter(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkNoiseFilterFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisFilterNoise()); } } @@ -80,9 +80,9 @@ KisFilterConfiguration* KisFilterNoise::configuration(TQWidget* w) return config; } -KisFilterConfigWidget * KisFilterNoise::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev) +KisFilterConfigWidget * KisFilterNoise::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev) { - return new KisWdgNoise((KisFilter*)this, (TQWidget*)tqparent, i18n("Configuration of noise filter").ascii()); + return new KisWdgNoise((KisFilter*)this, (TQWidget*)parent, i18n("Configuration of noise filter").ascii()); } void KisFilterNoise::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rect) diff --git a/chalk/plugins/filters/noisefilter/noisefilter.h b/chalk/plugins/filters/noisefilter/noisefilter.h index b73c761f4..c630e71fb 100644 --- a/chalk/plugins/filters/noisefilter/noisefilter.h +++ b/chalk/plugins/filters/noisefilter/noisefilter.h @@ -29,7 +29,7 @@ class KisFilterConfigWidget; class ChalkNoiseFilter : public KParts::Plugin { public: - ChalkNoiseFilter(TQObject *tqparent, const char *name, const TQStringList &); + ChalkNoiseFilter(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkNoiseFilter(); }; @@ -45,7 +45,7 @@ class KisFilterNoise : public KisFilter virtual bool supportsPreview() { return true; } virtual bool supportsIncrementalPainting() { return false; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); }; diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc index a658b863b..2909e8a16 100644 --- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc +++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc @@ -228,12 +228,12 @@ uint KisOilPaintFilter::MostFrequentColor (KisPaintDeviceSP src, const TQRect& b } -KisFilterConfigWidget * KisOilPaintFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/) +KisFilterConfigWidget * KisOilPaintFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP /*dev*/) { vKisIntegerWidgetParam param; param.push_back( KisIntegerWidgetParam( 1, 5, 1, i18n("Brush size"), "brushSize" ) ); param.push_back( KisIntegerWidgetParam( 10, 255, 30, i18n("Smooth"), "smooth" ) ); - return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); } KisFilterConfiguration* KisOilPaintFilter::configuration(TQWidget* nwidget) diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.h b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.h index fbc07a635..912f8b45b 100644 --- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.h +++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.h @@ -55,7 +55,7 @@ public: virtual bool supportsAdjustmentLayers() { return false; } virtual std::list<KisFilterConfiguration*> listOfExamplesConfiguration(KisPaintDeviceSP dev); public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration * configuration(TQWidget*); virtual KisFilterConfiguration * configuration() { return new KisOilPaintFilterConfiguration( 1, 30); }; private: diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cc b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cc index 7167b04d4..d9c9f3e6f 100644 --- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cc +++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cc @@ -26,12 +26,12 @@ typedef KGenericFactory<KisOilPaintFilterPlugin> KisOilPaintFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkoilpaintfilter, KisOilPaintFilterPluginFactory( "chalk" ) ) -KisOilPaintFilterPlugin::KisOilPaintFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) : KParts::Plugin(tqparent, name) +KisOilPaintFilterPlugin::KisOilPaintFilterPlugin(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name) { setInstance(KisOilPaintFilterPluginFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisOilPaintFilter()); } diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.h b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.h index 1f780918a..2900f59f1 100644 --- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.h +++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.h @@ -25,7 +25,7 @@ class KisOilPaintFilterPlugin : public KParts::Plugin { public: - KisOilPaintFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); + KisOilPaintFilterPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~KisOilPaintFilterPlugin(); }; diff --git a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc index 267b159b5..33886f2c1 100644 --- a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc +++ b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc @@ -163,12 +163,12 @@ void KisPixelizeFilter::pixelize(KisPaintDeviceSP src, KisPaintDeviceSP dst, int setProgressDone(); } -KisFilterConfigWidget * KisPixelizeFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/) +KisFilterConfigWidget * KisPixelizeFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP /*dev*/) { vKisIntegerWidgetParam param; param.push_back( KisIntegerWidgetParam( 2, 40, 10, i18n("Pixel width"), "pixelWidth" ) ); param.push_back( KisIntegerWidgetParam( 2, 40, 10, i18n("Pixel height"), "pixelHeight" ) ); - return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); } KisFilterConfiguration* KisPixelizeFilter::configuration(TQWidget* nwidget) diff --git a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.h b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.h index c7d8bb316..306921e81 100644 --- a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.h +++ b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.h @@ -51,7 +51,7 @@ public: virtual std::list<KisFilterConfiguration*> listOfExamplesConfiguration(KisPaintDeviceSP ) { std::list<KisFilterConfiguration*> list; list.insert(list.begin(), new KisPixelizeFilterConfiguration(10,10)); return list; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); virtual KisFilterConfiguration * configuration(); private: diff --git a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cc b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cc index 93309146f..d93cad4e1 100644 --- a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cc +++ b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cc @@ -26,13 +26,13 @@ typedef KGenericFactory<KisPixelizeFilterPlugin> KisPixelizeFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkpixelizefilter, KisPixelizeFilterPluginFactory( "chalk" ) ) -KisPixelizeFilterPlugin::KisPixelizeFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +KisPixelizeFilterPlugin::KisPixelizeFilterPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(KisPixelizeFilterPluginFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisPixelizeFilter()); } } diff --git a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.h b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.h index 25d8a62f6..f662cf9d4 100644 --- a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.h +++ b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.h @@ -25,7 +25,7 @@ class KisPixelizeFilterPlugin : public KParts::Plugin { public: - KisPixelizeFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); + KisPixelizeFilterPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~KisPixelizeFilterPlugin(); }; diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc index c208bb52a..81ee1448f 100644 --- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc +++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc @@ -418,13 +418,13 @@ uchar KisRainDropsFilter::LimitValues (int ColorValue) return ((uchar) ColorValue); } -KisFilterConfigWidget * KisRainDropsFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP) +KisFilterConfigWidget * KisRainDropsFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP) { vKisIntegerWidgetParam param; param.push_back( KisIntegerWidgetParam( 1, 200, 80, i18n("Drop size"), "dropsize" ) ); param.push_back( KisIntegerWidgetParam( 1, 500, 80, i18n("Number"), "number" ) ); param.push_back( KisIntegerWidgetParam( 1, 100, 30, i18n("Fish eyes"), "fishEyes" ) ); - return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); } KisFilterConfiguration* KisRainDropsFilter::configuration(TQWidget* nwidget) diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.h b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.h index 0d797d7d3..91a2963c7 100644 --- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.h +++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.h @@ -55,7 +55,7 @@ public: { std::list<KisFilterConfiguration*> list; list.insert(list.begin(), new KisRainDropsFilterConfiguration( 30, 80, 20)); return list; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); private: void rainDrops(KisPaintDeviceSP src, KisPaintDeviceSP dst, const TQRect& rect, int DropSize, int Amount, int Coeff); diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cc b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cc index 593311d50..f62196cb9 100644 --- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cc +++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cc @@ -29,12 +29,12 @@ typedef KGenericFactory<KisRainDropsFilterPlugin> KisRainDropsFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkraindropsfilter, KisRainDropsFilterPluginFactory( "chalk" ) ) -KisRainDropsFilterPlugin::KisRainDropsFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) : KParts::Plugin(tqparent, name) +KisRainDropsFilterPlugin::KisRainDropsFilterPlugin(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name) { setInstance(KisRainDropsFilterPluginFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisRainDropsFilter()); } } diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.h b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.h index ca4e05d37..edbf33bff 100644 --- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.h +++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.h @@ -26,7 +26,7 @@ class KisRainDropsFilterPlugin : public KParts::Plugin { public: - KisRainDropsFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); + KisRainDropsFilterPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~KisRainDropsFilterPlugin(); }; diff --git a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp index 044f9613b..ba157e14d 100644 --- a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp +++ b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp @@ -26,8 +26,8 @@ #include "wdgrandompickoptions.h" -KisWdgRandomPick::KisWdgRandomPick(KisFilter* /*nfilter*/, TQWidget* tqparent, const char* name) - : KisFilterConfigWidget(tqparent,name) +KisWdgRandomPick::KisWdgRandomPick(KisFilter* /*nfilter*/, TQWidget* parent, const char* name) + : KisFilterConfigWidget(parent,name) { TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgRandomPickOptions(this); diff --git a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.h b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.h index 54b46e204..761715307 100644 --- a/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.h +++ b/chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.h @@ -31,7 +31,7 @@ class KisWdgRandomPick : public KisFilterConfigWidget Q_OBJECT TQ_OBJECT public: - KisWdgRandomPick(KisFilter* nfilter, TQWidget* tqparent = 0, const char* name = 0); + KisWdgRandomPick(KisFilter* nfilter, TQWidget* parent = 0, const char* name = 0); ~KisWdgRandomPick(); public: inline WdgRandomPickOptions* widget() { return m_widget; }; diff --git a/chalk/plugins/filters/randompickfilter/randompickfilter.cc b/chalk/plugins/filters/randompickfilter/randompickfilter.cc index 3a645590c..54af3e7bd 100644 --- a/chalk/plugins/filters/randompickfilter/randompickfilter.cc +++ b/chalk/plugins/filters/randompickfilter/randompickfilter.cc @@ -49,14 +49,14 @@ typedef KGenericFactory<ChalkRandomPickFilter> ChalkRandomPickFilterFactory; K_EXPORT_COMPONENT_FACTORY( chalkrandompickfilter, ChalkRandomPickFilterFactory( "chalk" ) ) -ChalkRandomPickFilter::ChalkRandomPickFilter(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ChalkRandomPickFilter::ChalkRandomPickFilter(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkRandomPickFilterFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisFilterRandomPick()); } } @@ -82,9 +82,9 @@ KisFilterConfiguration* KisFilterRandomPick::configuration(TQWidget* w) return config; } -KisFilterConfigWidget * KisFilterRandomPick::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev) +KisFilterConfigWidget * KisFilterRandomPick::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev) { - return new KisWdgRandomPick((KisFilter*)this, (TQWidget*)tqparent, i18n("Configuration of random pick filter").ascii()); + return new KisWdgRandomPick((KisFilter*)this, (TQWidget*)parent, i18n("Configuration of random pick filter").ascii()); } void KisFilterRandomPick::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rect) diff --git a/chalk/plugins/filters/randompickfilter/randompickfilter.h b/chalk/plugins/filters/randompickfilter/randompickfilter.h index 4b50c215a..a4fa1da88 100644 --- a/chalk/plugins/filters/randompickfilter/randompickfilter.h +++ b/chalk/plugins/filters/randompickfilter/randompickfilter.h @@ -29,7 +29,7 @@ class KisFilterConfigWidget; class ChalkRandomPickFilter : public KParts::Plugin { public: - ChalkRandomPickFilter(TQObject *tqparent, const char *name, const TQStringList &); + ChalkRandomPickFilter(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkRandomPickFilter(); }; @@ -45,7 +45,7 @@ class KisFilterRandomPick : public KisFilter virtual bool supportsPreview() { return true; } virtual bool supportsIncrementalPainting() { return false; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); }; diff --git a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc index 3b8177d4d..a823f8120 100644 --- a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc +++ b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc @@ -139,11 +139,11 @@ void KisRoundCornersFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, setProgressDone(); } -KisFilterConfigWidget * KisRoundCornersFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/) +KisFilterConfigWidget * KisRoundCornersFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP /*dev*/) { vKisIntegerWidgetParam param; param.push_back( KisIntegerWidgetParam( 2, 100, 30, i18n("Radius"), "radius" ) ); - return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); } KisFilterConfiguration* KisRoundCornersFilter::configuration(TQWidget* nwidget) diff --git a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.h b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.h index ec5fb9fb5..3fdc83d02 100644 --- a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.h +++ b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.h @@ -49,7 +49,7 @@ public: virtual std::list<KisFilterConfiguration*> listOfExamplesConfiguration(KisPaintDeviceSP ) { std::list<KisFilterConfiguration*> list; list.insert(list.begin(), new KisRoundCornersFilterConfiguration(30)); return list; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); virtual KisFilterConfiguration * configuration() { return new KisRoundCornersFilterConfiguration( 30 ); }; private: diff --git a/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cc b/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cc index f53acf460..14610c8e5 100644 --- a/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cc +++ b/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cc @@ -26,13 +26,13 @@ typedef KGenericFactory<KisRoundCornersFilterPlugin> KisRoundCornersFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkroundcornersfilter, KisRoundCornersFilterPluginFactory( "chalk" ) ) -KisRoundCornersFilterPlugin::KisRoundCornersFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +KisRoundCornersFilterPlugin::KisRoundCornersFilterPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(KisRoundCornersFilterPluginFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisRoundCornersFilter()); } } diff --git a/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.h b/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.h index e55239e42..cbf871081 100644 --- a/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.h +++ b/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.h @@ -25,7 +25,7 @@ class KisRoundCornersFilterPlugin : public KParts::Plugin { public: - KisRoundCornersFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); + KisRoundCornersFilterPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~KisRoundCornersFilterPlugin(); }; diff --git a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc index 6c621e479..f1f9f5dfa 100644 --- a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc +++ b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc @@ -168,11 +168,11 @@ void KisSmallTilesFilter::createSmallTiles(KisPaintDeviceSP src, KisPaintDeviceS setProgressDone(); } -KisFilterConfigWidget * KisSmallTilesFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/) +KisFilterConfigWidget * KisSmallTilesFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP /*dev*/) { vKisIntegerWidgetParam param; param.push_back( KisIntegerWidgetParam( 2, 5, 1, i18n("Number of tiles"), "smalltiles" ) ); - return new KisMultiIntegerFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiIntegerFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); } KisFilterConfiguration* KisSmallTilesFilter::configuration(TQWidget* nwidget) diff --git a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.h b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.h index 8d82eda29..dee775bdc 100644 --- a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.h +++ b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.h @@ -59,7 +59,7 @@ public: { std::list<KisFilterConfiguration*> list; list.insert(list.begin(), new KisSmallTilesFilterConfiguration(2)); return list; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration * configuration(TQWidget*); virtual KisFilterConfiguration * configuration() { return new KisSmallTilesFilterConfiguration( 2 ); }; diff --git a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cc b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cc index 5283980c6..6a7fe9ea8 100644 --- a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cc +++ b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cc @@ -26,13 +26,13 @@ typedef KGenericFactory<KisSmallTilesFilterPlugin> KisSmallTilesFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalksmalltilesfilter, KisSmallTilesFilterPluginFactory( "chalk" ) ) -KisSmallTilesFilterPlugin::KisSmallTilesFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +KisSmallTilesFilterPlugin::KisSmallTilesFilterPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(KisSmallTilesFilterPluginFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisSmallTilesFilter()); } } diff --git a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.h b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.h index 601568f20..26c300128 100644 --- a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.h +++ b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.h @@ -25,7 +25,7 @@ class KisSmallTilesFilterPlugin : public KParts::Plugin { public: - KisSmallTilesFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); + KisSmallTilesFilterPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~KisSmallTilesFilterPlugin(); }; diff --git a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc index 9a2f56047..52424ce27 100644 --- a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc +++ b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc @@ -195,14 +195,14 @@ void KisSobelFilter::sobel(const TQRect & rc, KisPaintDeviceSP src, KisPaintDevi } -KisFilterConfigWidget * KisSobelFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP) +KisFilterConfigWidget * KisSobelFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP) { vKisBoolWidgetParam param; param.push_back( KisBoolWidgetParam( true, i18n("Sobel horizontally"), "doHorizontally" ) ); param.push_back( KisBoolWidgetParam( true, i18n("Sobel vertically"), "doVertically" ) ); param.push_back( KisBoolWidgetParam( true, i18n("Keep sign of result"), "keepSign" ) ); param.push_back( KisBoolWidgetParam( true, i18n("Make image opaque"), "makeOpaque" ) ); - return new KisMultiBoolFilterWidget(tqparent, id().id().ascii(), id().id().ascii(), param ); + return new KisMultiBoolFilterWidget(parent, id().id().ascii(), id().id().ascii(), param ); } KisFilterConfiguration* KisSobelFilter::configuration(TQWidget* nwidget) diff --git a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.h b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.h index 757757bc5..813f81721 100644 --- a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.h +++ b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.h @@ -64,7 +64,7 @@ public: virtual std::list<KisFilterConfiguration*> listOfExamplesConfiguration(KisPaintDeviceSP ) { std::list<KisFilterConfiguration*> list; list.insert(list.begin(), new KisSobelFilterConfiguration(true,true,true,true)); return list; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); virtual KisFilterConfiguration * configuration() { return new KisSobelFilterConfiguration( true, true, true, true); }; private: diff --git a/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cc b/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cc index e0ef8c808..3b21c5477 100644 --- a/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cc +++ b/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cc @@ -26,13 +26,13 @@ typedef KGenericFactory<KisSobelFilterPlugin> KisSobelFilterPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalksobelfilter, KisSobelFilterPluginFactory( "chalk" ) ) -KisSobelFilterPlugin::KisSobelFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +KisSobelFilterPlugin::KisSobelFilterPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(KisSobelFilterPluginFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisSobelFilter()); } } diff --git a/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.h b/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.h index 87564cfeb..a4cc323a0 100644 --- a/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.h +++ b/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.h @@ -25,7 +25,7 @@ class KisSobelFilterPlugin : public KParts::Plugin { public: - KisSobelFilterPlugin(TQObject *tqparent, const char *name, const TQStringList &); + KisSobelFilterPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~KisSobelFilterPlugin(); }; diff --git a/chalk/plugins/filters/threadtest/threadtest.cc b/chalk/plugins/filters/threadtest/threadtest.cc index f96a16167..1274c55f9 100644 --- a/chalk/plugins/filters/threadtest/threadtest.cc +++ b/chalk/plugins/filters/threadtest/threadtest.cc @@ -47,13 +47,13 @@ typedef KGenericFactory<ChalkThreadTest> ChalkThreadTestFactory; K_EXPORT_COMPONENT_FACTORY( chalkthreadtest, ChalkThreadTestFactory( "chalk" ) ) -ChalkThreadTest::ChalkThreadTest(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ChalkThreadTest::ChalkThreadTest(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkThreadTestFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * r = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * r = dynamic_cast<KisFilterRegistry *>(parent); r->add(new KisFilterInvert()); } } diff --git a/chalk/plugins/filters/threadtest/threadtest.h b/chalk/plugins/filters/threadtest/threadtest.h index 26c61a587..d7ebae7f6 100644 --- a/chalk/plugins/filters/threadtest/threadtest.h +++ b/chalk/plugins/filters/threadtest/threadtest.h @@ -27,7 +27,7 @@ class ChalkThreadTest : public KParts::Plugin { public: - ChalkThreadTest(TQObject *tqparent, const char *name, const TQStringList &); + ChalkThreadTest(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkThreadTest(); }; diff --git a/chalk/plugins/filters/unsharp/kis_unsharp_filter.cc b/chalk/plugins/filters/unsharp/kis_unsharp_filter.cc index d9539920e..845262b17 100644 --- a/chalk/plugins/filters/unsharp/kis_unsharp_filter.cc +++ b/chalk/plugins/filters/unsharp/kis_unsharp_filter.cc @@ -55,9 +55,9 @@ KisUnsharpFilter::KisUnsharpFilter() : KisFilter(id(), "enhance", i18n("&Unsharp { } -KisFilterConfigWidget * KisUnsharpFilter::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP ) +KisFilterConfigWidget * KisUnsharpFilter::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP ) { - return new KisWdgUnsharp(this, tqparent, "configuration of color to alpha"); + return new KisWdgUnsharp(this, parent, "configuration of color to alpha"); } KisFilterConfiguration* KisUnsharpFilter::configuration(TQWidget* w) @@ -92,10 +92,10 @@ void KisUnsharpFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFi kdDebug() << " brush size = " << size << " " << halfSize << endl; KisAutobrushShape* kas = new KisAutobrushCircleShape(size, size , halfSize, halfSize); - TQImage tqmask; - kas->createBrush(&tqmask); + TQImage mask; + kas->createBrush(&mask); - KisKernelSP kernel = kernelFromTQImage(tqmask); // TODO: for 1.6 reuse the chalk's core function for creating kernel : KisKernel::fromTQImage + KisKernelSP kernel = kernelFromTQImage(mask); // TODO: for 1.6 reuse the chalk's core function for creating kernel : KisKernel::fromTQImage KisPaintDeviceSP interm = new KisPaintDevice(*src); KisColorSpace * cs = src->colorSpace(); diff --git a/chalk/plugins/filters/unsharp/kis_unsharp_filter.h b/chalk/plugins/filters/unsharp/kis_unsharp_filter.h index 0f25f318f..9b92e009c 100644 --- a/chalk/plugins/filters/unsharp/kis_unsharp_filter.h +++ b/chalk/plugins/filters/unsharp/kis_unsharp_filter.h @@ -33,14 +33,14 @@ class KisUnsharpFilter : public KisFilter KisUnsharpFilter(); public: virtual void process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration*, const TQRect&); - static inline KisID id() { return KisID("unsharptqmask", i18n("Unsharp Mask")); }; + static inline KisID id() { return KisID("unsharpmask", i18n("Unsharp Mask")); }; virtual bool supportsPainting() { return true; } virtual bool supportsPreview() { return true; } virtual bool supportsIncrementalPainting() { return false; } virtual bool supportsAdjustmentLayers() { return false; } virtual ColorSpaceIndependence colorSpaceIndependence() { return FULLY_INDEPENDENT; }; public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); }; diff --git a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc index 4a59a2242..627d105cf 100644 --- a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc +++ b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc @@ -30,7 +30,7 @@ #include "wdgunsharp.h" -KisWdgUnsharp::KisWdgUnsharp( KisFilter* , TQWidget * tqparent, const char * name) : KisFilterConfigWidget ( tqparent, name ) +KisWdgUnsharp::KisWdgUnsharp( KisFilter* , TQWidget * parent, const char * name) : KisFilterConfigWidget ( parent, name ) { TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgUnsharp(this); diff --git a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.h b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.h index 52ffb5849..3b46ff1af 100644 --- a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.h +++ b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.h @@ -35,7 +35,7 @@ class KisWdgUnsharp : public KisFilterConfigWidget Q_OBJECT TQ_OBJECT public: - KisWdgUnsharp( KisFilter* nfilter, TQWidget * tqparent, const char * name); + KisWdgUnsharp( KisFilter* nfilter, TQWidget * parent, const char * name); inline WdgUnsharp* widget() { return m_widget; }; virtual void setConfiguration(KisFilterConfiguration*); private: diff --git a/chalk/plugins/filters/unsharp/unsharp.cc b/chalk/plugins/filters/unsharp/unsharp.cc index 60516f421..3d90d49ed 100644 --- a/chalk/plugins/filters/unsharp/unsharp.cc +++ b/chalk/plugins/filters/unsharp/unsharp.cc @@ -27,8 +27,8 @@ typedef KGenericFactory<UnsharpPlugin> UnsharpPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkunsharpfilter, UnsharpPluginFactory( "chalk" ) ) -UnsharpPlugin::UnsharpPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +UnsharpPlugin::UnsharpPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(UnsharpPluginFactory::instance()); @@ -36,11 +36,11 @@ UnsharpPlugin::UnsharpPlugin(TQObject *tqparent, const char *name, const TQStrin kdDebug(41006) << "Extensions Image enhancement Filters plugin. Class: " << className() << ", Parent: " - << tqparent -> className() + << parent -> className() << "\n"; - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisUnsharpFilter()); } } diff --git a/chalk/plugins/filters/unsharp/unsharp.h b/chalk/plugins/filters/unsharp/unsharp.h index 59a926940..5717cccc3 100644 --- a/chalk/plugins/filters/unsharp/unsharp.h +++ b/chalk/plugins/filters/unsharp/unsharp.h @@ -30,7 +30,7 @@ class UnsharpPlugin : public KParts::Plugin { public: - UnsharpPlugin(TQObject *tqparent, const char *name, const TQStringList &); + UnsharpPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~UnsharpPlugin(); }; diff --git a/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp b/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp index 374fc6c8c..e7537c277 100644 --- a/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp +++ b/chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp @@ -27,8 +27,8 @@ #include "wdgwaveoptions.h" -KisWdgWave::KisWdgWave(KisFilter* /*nfilter*/, TQWidget* tqparent, const char* name) - : KisFilterConfigWidget(tqparent,name) +KisWdgWave::KisWdgWave(KisFilter* /*nfilter*/, TQWidget* parent, const char* name) + : KisFilterConfigWidget(parent,name) { TQGridLayout *widgetLayout = new TQGridLayout(this, 1, 1); m_widget = new WdgWaveOptions(this); diff --git a/chalk/plugins/filters/wavefilter/kis_wdg_wave.h b/chalk/plugins/filters/wavefilter/kis_wdg_wave.h index 6f9b0744e..71732bf50 100644 --- a/chalk/plugins/filters/wavefilter/kis_wdg_wave.h +++ b/chalk/plugins/filters/wavefilter/kis_wdg_wave.h @@ -31,7 +31,7 @@ class KisWdgWave : public KisFilterConfigWidget Q_OBJECT TQ_OBJECT public: - KisWdgWave(KisFilter* nfilter, TQWidget* tqparent = 0, const char* name = 0); + KisWdgWave(KisFilter* nfilter, TQWidget* parent = 0, const char* name = 0); ~KisWdgWave(); public: inline WdgWaveOptions* widget() { return m_widget; }; diff --git a/chalk/plugins/filters/wavefilter/wavefilter.cc b/chalk/plugins/filters/wavefilter/wavefilter.cc index 1d78bafc7..ddcfc4bd4 100644 --- a/chalk/plugins/filters/wavefilter/wavefilter.cc +++ b/chalk/plugins/filters/wavefilter/wavefilter.cc @@ -83,14 +83,14 @@ class KisTriangleWaveCurve : public KisWaveCurve { -ChalkWaveFilter::ChalkWaveFilter(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ChalkWaveFilter::ChalkWaveFilter(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkWaveFilterFactory::instance()); - if (tqparent->inherits("KisFilterRegistry")) { - KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(tqparent); + if (parent->inherits("KisFilterRegistry")) { + KisFilterRegistry * manager = dynamic_cast<KisFilterRegistry *>(parent); manager->add(new KisFilterWave()); } } @@ -121,9 +121,9 @@ KisFilterConfiguration* KisFilterWave::configuration(TQWidget* w) return config; } -KisFilterConfigWidget * KisFilterWave::createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP /*dev*/) +KisFilterConfigWidget * KisFilterWave::createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP /*dev*/) { - return new KisWdgWave((KisFilter*)this, (TQWidget*)tqparent, i18n("Configuration of wave filter").ascii()); + return new KisWdgWave((KisFilter*)this, (TQWidget*)parent, i18n("Configuration of wave filter").ascii()); } void KisFilterWave::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilterConfiguration* config, const TQRect& rect) diff --git a/chalk/plugins/filters/wavefilter/wavefilter.h b/chalk/plugins/filters/wavefilter/wavefilter.h index 3397ab0bd..8493c4f83 100644 --- a/chalk/plugins/filters/wavefilter/wavefilter.h +++ b/chalk/plugins/filters/wavefilter/wavefilter.h @@ -29,7 +29,7 @@ class KisFilterConfigWidget; class ChalkWaveFilter : public KParts::Plugin { public: - ChalkWaveFilter(TQObject *tqparent, const char *name, const TQStringList &); + ChalkWaveFilter(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkWaveFilter(); }; @@ -46,7 +46,7 @@ class KisFilterWave : public KisFilter virtual bool supportsIncrementalPainting() { return false; } virtual bool supportsAdjustmentLayers() { return false; } public: - virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* tqparent, KisPaintDeviceSP dev); + virtual KisFilterConfigWidget * createConfigurationWidget(TQWidget* parent, KisPaintDeviceSP dev); virtual KisFilterConfiguration* configuration(TQWidget*); }; diff --git a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc index 5a267f57c..3b48e4396 100644 --- a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc +++ b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc @@ -42,15 +42,15 @@ typedef KGenericFactory<DefaultPaintOpsPlugin> DefaultPaintOpsPluginFactory; K_EXPORT_COMPONENT_FACTORY( chalkdefaultpaintops, DefaultPaintOpsPluginFactory( "chalkcore" ) ) -DefaultPaintOpsPlugin::DefaultPaintOpsPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +DefaultPaintOpsPlugin::DefaultPaintOpsPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(DefaultPaintOpsPluginFactory::instance()); // This is not a gui plugin; only load it when the doc is created. - if ( tqparent->inherits("KisPaintOpRegistry") ) + if ( parent->inherits("KisPaintOpRegistry") ) { - KisPaintOpRegistry * r = dynamic_cast<KisPaintOpRegistry*>(tqparent); + KisPaintOpRegistry * r = dynamic_cast<KisPaintOpRegistry*>(parent); // Add hard-coded paint ops. Plugin paintops will add // themselves in the plugin initialization code. r->add ( new KisAirbrushOpFactory ); diff --git a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h index d7afb9d0c..7c037c9ec 100644 --- a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h +++ b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h @@ -29,7 +29,7 @@ class DefaultPaintOpsPlugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - DefaultPaintOpsPlugin(TQObject *tqparent, const char *name, const TQStringList &); + DefaultPaintOpsPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~DefaultPaintOpsPlugin(); }; diff --git a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc index 1977d58b0..c5f938642 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc @@ -115,8 +115,8 @@ void KisAirbrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info dab = brush->image(device->colorSpace(), info, xFraction, yFraction); } else { - KisAlphaMaskSP tqmask = brush->tqmask(info, xFraction, yFraction); - dab = computeDab(tqmask); + KisAlphaMaskSP mask = brush->mask(info, xFraction, yFraction); + dab = computeDab(mask); } m_painter->setDab(dab); // Cache dab for future paints in the painter. diff --git a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc index ffa51114e..1ec165619 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc @@ -55,10 +55,10 @@ KisPaintOp * KisBrushOpFactory::createOp(const KisPaintOpSettings *settings, Kis return op; } -KisBrushOpSettings::KisBrushOpSettings(TQWidget *tqparent) - : super(tqparent) +KisBrushOpSettings::KisBrushOpSettings(TQWidget *parent) + : super(parent) { - m_optionsWidget = new TQWidget(tqparent, "brush option widget"); + m_optionsWidget = new TQWidget(parent, "brush option widget"); TQHBoxLayout * l = new TQHBoxLayout(m_optionsWidget); l->setAutoAdd(true); m_pressureVariation = new TQLabel(i18n("Pressure variation: "), m_optionsWidget); @@ -125,13 +125,13 @@ bool KisBrushOpSettings::varyDarken() const return m_darken->isChecked(); } -KisPaintOpSettings* KisBrushOpFactory::settings(TQWidget * tqparent, const KisInputDevice& inputDevice) +KisPaintOpSettings* KisBrushOpFactory::settings(TQWidget * parent, const KisInputDevice& inputDevice) { if (inputDevice == KisInputDevice::mouse()) { // No options for mouse, only tablet devices return 0; } else { - return new KisBrushOpSettings(tqparent); + return new KisBrushOpSettings(parent); } } @@ -180,13 +180,13 @@ void KisBrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) // Painting should be implemented according to the following algorithm: // retrieve brush - // if brush == tqmask - // retrieve tqmask + // if brush == mask + // retrieve mask // else if brush == image // retrieve image - // subsample (tqmask | image) for position -- pos should be double! - // apply filters to tqmask (colour | gradient | pattern | etc. - // composite filtered tqmask into temporary layer + // subsample (mask | image) for position -- pos should be double! + // apply filters to mask (colour | gradient | pattern | etc. + // composite filtered mask into temporary layer // composite temporary layer into target layer // @see: doc/brush.txt @@ -245,8 +245,8 @@ void KisBrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) dab = brush->image(device->colorSpace(), adjustedInfo, xFraction, yFraction); } else { - KisAlphaMaskSP tqmask = brush->tqmask(adjustedInfo, xFraction, yFraction); - dab = computeDab(tqmask); + KisAlphaMaskSP mask = brush->mask(adjustedInfo, xFraction, yFraction); + dab = computeDab(mask); } m_painter->setPressure(adjustedInfo.pressure); diff --git a/chalk/plugins/paintops/defaultpaintops/kis_brushop.h b/chalk/plugins/paintops/defaultpaintops/kis_brushop.h index 6475b3d74..4782efbd4 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_brushop.h +++ b/chalk/plugins/paintops/defaultpaintops/kis_brushop.h @@ -42,7 +42,7 @@ public: virtual KisPaintOp * createOp(const KisPaintOpSettings *settings, KisPainter * painter); virtual KisID id() { return KisID("paintbrush", i18n("Pixel Brush")); } virtual TQString pixmap() { return "paintbrush.png"; } - virtual KisPaintOpSettings *settings(TQWidget * tqparent, const KisInputDevice& inputDevice); + virtual KisPaintOpSettings *settings(TQWidget * parent, const KisInputDevice& inputDevice); }; class KisBrushOpSettings : public TQObject, public KisPaintOpSettings { @@ -50,7 +50,7 @@ class KisBrushOpSettings : public TQObject, public KisPaintOpSettings { TQ_OBJECT typedef KisPaintOpSettings super; public: - KisBrushOpSettings(TQWidget *tqparent); + KisBrushOpSettings(TQWidget *parent); bool varySize() const; bool varyOpacity() const; diff --git a/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc b/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc index 7ad4a4da8..3294d8469 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc @@ -125,8 +125,8 @@ void KisDuplicateOp::paintAt(const KisPoint &pos, const KisPaintInformation& inf dab->convertTo(KisMetaRegistry::instance()->csRegistry()->getAlpha8()); } else { - KisAlphaMaskSP tqmask = brush->tqmask(info, xFraction, yFraction); - dab = computeDab(tqmask, KisMetaRegistry::instance()->csRegistry()->getAlpha8()); + KisAlphaMaskSP mask = brush->mask(info, xFraction, yFraction); + dab = computeDab(mask, KisMetaRegistry::instance()->csRegistry()->getAlpha8()); } m_painter->setPressure(info.pressure); diff --git a/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc b/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc index 794923a4e..0bfc6fd28 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc @@ -94,20 +94,20 @@ void KisEraseOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) splitCoordinate(pt.x(), &destX, &xFraction); splitCoordinate(pt.y(), &destY, &yFraction); - KisAlphaMaskSP tqmask = brush->tqmask(info, xFraction, yFraction); + KisAlphaMaskSP mask = brush->mask(info, xFraction, yFraction); KisPaintDeviceSP dab = new KisPaintDevice(device->colorSpace(), "erase op dab"); Q_CHECK_PTR(dab); - TQ_INT32 maskWidth = tqmask->width(); - TQ_INT32 maskHeight = tqmask->height(); + TQ_INT32 maskWidth = mask->width(); + TQ_INT32 maskHeight = mask->height(); TQRect dstRect; KisRectIteratorPixel it = dab->createRectIterator(0, 0, maskWidth, maskHeight, true); KisColorSpace* cs = dab->colorSpace(); while (!it.isDone()) { - cs->setAlpha(it.rawData(), TQ_UINT8_MAX - tqmask->alphaAt(it.x(), it.y()), 1); + cs->setAlpha(it.rawData(), TQ_UINT8_MAX - mask->alphaAt(it.x(), it.y()), 1); ++it; } diff --git a/chalk/plugins/paintops/defaultpaintops/kis_penop.cc b/chalk/plugins/paintops/defaultpaintops/kis_penop.cc index e8780100f..41c2607eb 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_penop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_penop.cc @@ -79,9 +79,9 @@ void KisPenOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) dab = brush->image(device->colorSpace(), info); } else { - // Compute tqmask without sub-pixel positioning - KisAlphaMaskSP tqmask = brush->tqmask(info); - dab = computeDab(tqmask); + // Compute mask without sub-pixel positioning + KisAlphaMaskSP mask = brush->mask(info); + dab = computeDab(mask); } m_painter->setPressure(info.pressure); diff --git a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc index a493f132f..c5f4e6eb0 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc +++ b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc @@ -56,10 +56,10 @@ KisPaintOp * KisSmudgeOpFactory::createOp(const KisPaintOpSettings *settings, Ki return op; } -KisSmudgeOpSettings::KisSmudgeOpSettings(TQWidget *tqparent, bool isTablet) - : super(tqparent) +KisSmudgeOpSettings::KisSmudgeOpSettings(TQWidget *parent, bool isTablet) + : super(parent) { - m_optionsWidget = new TQWidget(tqparent, "brush option widget"); + m_optionsWidget = new TQWidget(parent, "brush option widget"); TQHBoxLayout * l = new TQHBoxLayout(m_optionsWidget); l->setAutoAdd(true); m_rateLabel = new TQLabel(i18n("Rate: "), m_optionsWidget); @@ -145,13 +145,13 @@ bool KisSmudgeOpSettings::varyOpacity() const return m_opacity ? m_opacity->isChecked() : false; } -KisPaintOpSettings* KisSmudgeOpFactory::settings(TQWidget * tqparent, const KisInputDevice& inputDevice) +KisPaintOpSettings* KisSmudgeOpFactory::settings(TQWidget * parent, const KisInputDevice& inputDevice) { if (inputDevice == KisInputDevice::mouse()) { // No options for mouse, only tablet devices - return new KisSmudgeOpSettings(tqparent, false); + return new KisSmudgeOpSettings(parent, false); } else { - return new KisSmudgeOpSettings(tqparent, true); + return new KisSmudgeOpSettings(parent, true); } } @@ -205,13 +205,13 @@ void KisSmudgeOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) // Painting should be implemented according to the following algorithm: // retrieve brush - // if brush == tqmask - // retrieve tqmask + // if brush == mask + // retrieve mask // else if brush == image // retrieve image - // subsample (tqmask | image) for position -- pos should be double! - // apply filters to tqmask (colour | gradient | pattern | etc. - // composite filtered tqmask into temporary layer + // subsample (mask | image) for position -- pos should be double! + // apply filters to mask (colour | gradient | pattern | etc. + // composite filtered mask into temporary layer // composite temporary layer into target layer // @see: doc/brush.txt @@ -256,8 +256,8 @@ void KisSmudgeOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) dab->convertTo(KisMetaRegistry::instance()->csRegistry()->getAlpha8()); } else { - KisAlphaMaskSP tqmask = brush->tqmask(adjustedInfo, xFraction, yFraction); - dab = computeDab(tqmask, KisMetaRegistry::instance()->csRegistry()->getAlpha8()); + KisAlphaMaskSP mask = brush->mask(adjustedInfo, xFraction, yFraction); + dab = computeDab(mask, KisMetaRegistry::instance()->csRegistry()->getAlpha8()); } diff --git a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.h b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.h index d9c8872d6..5fd732f56 100644 --- a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.h +++ b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.h @@ -40,7 +40,7 @@ public: virtual KisPaintOp * createOp(const KisPaintOpSettings *settings, KisPainter * painter); virtual KisID id() { return KisID("smudge", i18n("Smudge Brush")); } virtual TQString pixmap() { return "paintbrush.png"; } - virtual KisPaintOpSettings *settings(TQWidget * tqparent, const KisInputDevice& inputDevice); + virtual KisPaintOpSettings *settings(TQWidget * parent, const KisInputDevice& inputDevice); }; class KisSmudgeOpSettings : public TQObject, public KisPaintOpSettings { @@ -48,7 +48,7 @@ class KisSmudgeOpSettings : public TQObject, public KisPaintOpSettings { TQ_OBJECT typedef KisPaintOpSettings super; public: - KisSmudgeOpSettings(TQWidget *tqparent, bool isTablet); + KisSmudgeOpSettings(TQWidget *parent, bool isTablet); int rate() const; bool varyRate() const; diff --git a/chalk/plugins/tools/defaulttools/default_tools.cc b/chalk/plugins/tools/defaulttools/default_tools.cc index 61d06e982..0a9298dad 100644 --- a/chalk/plugins/tools/defaulttools/default_tools.cc +++ b/chalk/plugins/tools/defaulttools/default_tools.cc @@ -56,14 +56,14 @@ typedef KGenericFactory<DefaultTools> DefaultToolsFactory; K_EXPORT_COMPONENT_FACTORY( chalkdefaulttools, DefaultToolsFactory( "chalk" ) ) -DefaultTools::DefaultTools(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +DefaultTools::DefaultTools(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(DefaultToolsFactory::instance()); - if ( tqparent->inherits("KisToolRegistry") ) + if ( parent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); r->add(new KisToolFillFactory()); r->add(new KisToolGradientFactory()); diff --git a/chalk/plugins/tools/defaulttools/default_tools.h b/chalk/plugins/tools/defaulttools/default_tools.h index c50a9147b..891f2b9aa 100644 --- a/chalk/plugins/tools/defaulttools/default_tools.h +++ b/chalk/plugins/tools/defaulttools/default_tools.h @@ -36,7 +36,7 @@ class DefaultTools : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - DefaultTools(TQObject *tqparent, const char *name, const TQStringList &); + DefaultTools(TQObject *parent, const char *name, const TQStringList &); virtual ~DefaultTools(); }; diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc index 373e0a075..384e4e263 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc @@ -147,9 +147,9 @@ void KisToolBrush::slotSetPaintingMode( int mode ) } -TQWidget* KisToolBrush::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolBrush::createOptionWidget(TQWidget* parent) { - TQWidget *widget = super::createOptionWidget(tqparent); + TQWidget *widget = super::createOptionWidget(parent); m_chkDirect = new TQCheckBox(i18n("Paint direct"), widget, "chkDirect"); m_chkDirect->setChecked(true); connect(m_chkDirect, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotSetPaintingMode(int))); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.h b/chalk/plugins/tools/defaulttools/kis_tool_brush.h index a23e8d12a..cc40a8c0f 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_brush.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.h @@ -45,7 +45,7 @@ public: virtual void setup(KActionCollection *collection); virtual enumToolType toolType() { return TOOL_SHAPE; } virtual TQ_UINT32 priority() { return 0; } - TQWidget* createOptionWidget(TQWidget* tqparent); + TQWidget* createOptionWidget(TQWidget* parent); protected: diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc index b238e746d..6aff68c8d 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc @@ -221,9 +221,9 @@ void KisToolColorPicker::setup(KActionCollection *collection) } } -TQWidget* KisToolColorPicker::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolColorPicker::createOptionWidget(TQWidget* parent) { - m_optionsWidget = new ColorPickerOptionsWidget(tqparent); + m_optionsWidget = new ColorPickerOptionsWidget(parent); m_optionsWidget->cbUpdateCurrentColour->setChecked(m_updateColor); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h index ab59ef172..b6ee36d32 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h @@ -42,7 +42,7 @@ public: virtual void update(KisCanvasSubject *subject); virtual void setup(KActionCollection *collection); virtual void buttonPress(KisButtonPressEvent *e); - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); virtual enumToolType toolType() { return TOOL_FILL; } virtual TQ_UINT32 priority() { return 3; } diff --git a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc index 9619c6aea..341bbe9af 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc @@ -230,9 +230,9 @@ TQString KisToolDuplicate::quickHelp() const { return i18n("To start, shift-click on the place you want to duplicate from. Then you can start painting. An indication of where you are copying from will be displayed while drawing and moving the mouse."); } -TQWidget* KisToolDuplicate::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolDuplicate::createOptionWidget(TQWidget* parent) { - TQWidget* widget = KisToolPaint::createOptionWidget(tqparent); + TQWidget* widget = KisToolPaint::createOptionWidget(parent); m_healing = new TQCheckBox(widget); m_healing->setChecked( false); addOptionWidgetOption(m_healing, new TQLabel(i18n("Healing"), widget )); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h index 8a2983180..ec04a592b 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.h @@ -52,7 +52,7 @@ public: const double yTilt); virtual TQString quickHelp() const; - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); protected slots: virtual void activate(); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc index 5a919771d..f15bf7781 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc @@ -158,9 +158,9 @@ void KisToolFill::buttonRelease(KisButtonReleaseEvent *e) notifyModified(); } -TQWidget* KisToolFill::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolFill::createOptionWidget(TQWidget* parent) { - TQWidget *widget = super::createOptionWidget(tqparent); + TQWidget *widget = super::createOptionWidget(parent); m_lbThreshold = new TQLabel(i18n("Threshold: "), widget); m_slThreshold = new KIntNumInput( widget, "int_widget"); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.h b/chalk/plugins/tools/defaulttools/kis_tool_fill.h index 61087243c..01b1f139f 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_fill.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.h @@ -55,7 +55,7 @@ public: bool flood(int startX, int startY); - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); public slots: virtual void slotSetThreshold(int); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc index 4eb685a58..6df9f8da4 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc @@ -226,9 +226,9 @@ void KisToolGradient::paintLine(KisCanvasPainter& gc) } } -TQWidget* KisToolGradient::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolGradient::createOptionWidget(TQWidget* parent) { - TQWidget *widget = super::createOptionWidget(tqparent); + TQWidget *widget = super::createOptionWidget(parent); Q_CHECK_PTR(widget); m_lbShape = new TQLabel(i18n("Shape:"), widget); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.h b/chalk/plugins/tools/defaulttools/kis_tool_gradient.h index 59d78ad30..29df8bf7b 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.h @@ -67,7 +67,7 @@ public: virtual void paint(KisCanvasPainter& gc); virtual void paint(KisCanvasPainter& gc, const TQRect& rc); - TQWidget* createOptionWidget(TQWidget* tqparent); + TQWidget* createOptionWidget(TQWidget* parent); public slots: void slotSetShape(int); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.cc b/chalk/plugins/tools/defaulttools/kis_tool_text.cc index df2479172..bf23b4412 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_text.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_text.cc @@ -121,10 +121,10 @@ void KisToolText::buttonRelease(KisButtonReleaseEvent *e) TQ_INT32 height = boundingRect.height(); TQ_INT32 width = boundingRect.width(); KisPaintLayer *layer = new KisPaintLayer(img, '"' + text + '"', OPACITY_OPAQUE); - KisGroupLayerSP tqparent = img->rootLayer(); + KisGroupLayerSP parent = img->rootLayer(); if (img->activeLayer()) - tqparent = img->activeLayer()->tqparent(); - img->addLayer(layer, tqparent, img->activeLayer()); + parent = img->activeLayer()->parent(); + img->addLayer(layer, parent, img->activeLayer()); for (int y = 0; y < height; y++) { for (int x = 0; x < width; x++) { TQRgb pixel = image.pixel(x, y); @@ -155,13 +155,13 @@ void KisToolText::buttonRelease(KisButtonReleaseEvent *e) } void KisToolText::setFont() { - KFontDialog::getFont( m_font, false/*, TQWidget* tqparent! */ ); + KFontDialog::getFont( m_font, false/*, TQWidget* parent! */ ); m_lbFontName->setText(TQString(m_font.family() + ", %1").tqarg(m_font.pointSize())); } -TQWidget* KisToolText::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolText::createOptionWidget(TQWidget* parent) { - TQWidget *widget = super::createOptionWidget(tqparent); + TQWidget *widget = super::createOptionWidget(parent); m_lbFont = new TQLabel(i18n("Font: "), widget); diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.h b/chalk/plugins/tools/defaulttools/kis_tool_text.h index b2aa7e186..2625fb58d 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_text.h +++ b/chalk/plugins/tools/defaulttools/kis_tool_text.h @@ -47,7 +47,7 @@ public: virtual void buttonPress(KisButtonPressEvent*); virtual void buttonRelease(KisButtonReleaseEvent *e); - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); public slots: virtual void setFont(); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc index ff5242d65..4a59c3845 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc @@ -100,7 +100,7 @@ void KisToolSelectBrush::initPaint(KisEvent* /*e*/) KisPaintOp * op = KisPaintOpRegistry::instance()->paintOp("paintbrush", 0, painter()); painter()->setPaintOp(op); // And now the painter owns the op and will destroy it. - // Set the cursor -- ideally. this should be a tqmask created from the brush, + // Set the cursor -- ideally. this should be a mask created from the brush, // now that X11 can handle colored cursors. #if 0 // Setting cursors has no effect until the tool is selected again; this @@ -143,12 +143,12 @@ void KisToolSelectBrush::setup(KActionCollection *collection) } } -TQWidget* KisToolSelectBrush::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolSelectBrush::createOptionWidget(TQWidget* parent) { - Q_UNUSED(tqparent); + Q_UNUSED(parent); // Commented out due to the fact that this doesn't actually work if you change the action #if 0 - m_optWidget = new KisSelectionOptions(tqparent, m_subject); + m_optWidget = new KisSelectionOptions(parent, m_subject); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Selection Brush")); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h index 374050f67..faeb32d8b 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.h @@ -47,7 +47,7 @@ public: virtual void setup(KActionCollection *collection); virtual TQ_UINT32 priority() { return 1; } virtual enumToolType toolType() { return TOOL_SELECT; } - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); public slots: diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc index c4c908fc6..cc1646808 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc @@ -183,9 +183,9 @@ void KisToolSelectContiguous::slotSetAction(int action) } -TQWidget* KisToolSelectContiguous::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolSelectContiguous::createOptionWidget(TQWidget* parent) { - m_optWidget = new KisSelectionOptions(tqparent, m_subject); + m_optWidget = new KisSelectionOptions(parent, m_subject); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Contiguous Area Selection")); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h index e4beb6b7e..688276e0d 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h @@ -54,7 +54,7 @@ public: virtual TQ_UINT32 priority() { return 7; } virtual enumToolType toolType() { return TOOL_SELECT; }; - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); virtual void buttonPress(KisButtonPressEvent *event); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc index efdae2f32..d16ab740e 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc @@ -297,9 +297,9 @@ void KisToolSelectElliptical::setup(KActionCollection *collection) } } -TQWidget* KisToolSelectElliptical::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolSelectElliptical::createOptionWidget(TQWidget* parent) { - m_optWidget = new KisSelectionOptions(tqparent, m_subject); + m_optWidget = new KisSelectionOptions(parent, m_subject); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Elliptical Selection")); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h index f0d1a039c..4c21cfcdc 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h @@ -46,7 +46,7 @@ public: virtual void setup(KActionCollection *collection); virtual TQ_UINT32 priority() { return 4; } - virtual TQWidget * createOptionWidget(TQWidget* tqparent); + virtual TQWidget * createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); virtual enumToolType toolType() { return TOOL_SELECT; } diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc index 58a7778c0..118281e17 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc @@ -100,7 +100,7 @@ void KisToolSelectEraser::initPaint(KisEvent */*e*/) KisPaintOp * op = KisPaintOpRegistry::instance()->paintOp("eraser", 0, painter()); painter()->setPaintOp(op); // And now the painter owns the op and will destroy it. - // Set the cursor -- ideally. this should be a tqmask created from the brush, + // Set the cursor -- ideally. this should be a mask created from the brush, // now that X11 can handle colored cursors. #if 0 // Setting cursors has no effect until the tool is selected again; this @@ -130,12 +130,12 @@ void KisToolSelectEraser::setup(KActionCollection *collection) } } -TQWidget* KisToolSelectEraser::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolSelectEraser::createOptionWidget(TQWidget* parent) { - Q_UNUSED(tqparent); + Q_UNUSED(parent); // Commented out due to the fact that this doesn't actually work if you change the action #if 0 - m_optWidget = new KisSelectionOptions(tqparent, m_subject); + m_optWidget = new KisSelectionOptions(parent, m_subject); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Selection Eraser")); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h index 85bd55097..c796ec3c7 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h @@ -45,7 +45,7 @@ public: virtual void setup(KActionCollection *collection); virtual TQ_UINT32 priority() { return 2; } virtual enumToolType toolType() { return TOOL_SELECT; } - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); public slots: diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc index b81762fb4..8bac379ce 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc @@ -267,9 +267,9 @@ void KisToolSelectOutline::setup(KActionCollection *collection) } -TQWidget* KisToolSelectOutline::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolSelectOutline::createOptionWidget(TQWidget* parent) { - m_optWidget = new KisSelectionOptions(tqparent, m_subject); + m_optWidget = new KisSelectionOptions(parent, m_subject); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Outline Selection")); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h index 74ecab780..08119c96a 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.h @@ -52,7 +52,7 @@ public: virtual void move(KisMoveEvent *event); virtual void buttonRelease(KisButtonReleaseEvent *event); - TQWidget* createOptionWidget(TQWidget* tqparent); + TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); public slots: diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc index 7bac7cc32..85a53c94c 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc @@ -286,9 +286,9 @@ void KisToolSelectPolygonal::setup(KActionCollection *collection) } -TQWidget* KisToolSelectPolygonal::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolSelectPolygonal::createOptionWidget(TQWidget* parent) { - m_optWidget = new KisSelectionOptions(tqparent, m_subject); + m_optWidget = new KisSelectionOptions(parent, m_subject); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Polygonal Selection")); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h index 65a32ee6b..6e2d62fa8 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h @@ -58,7 +58,7 @@ public: virtual void doubleClick(KisDoubleClickEvent * event); void finish(); - TQWidget* createOptionWidget(TQWidget* tqparent); + TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); public slots: diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc index aa7052af3..54bfbdd6d 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc @@ -298,9 +298,9 @@ void KisToolSelectRectangular::setup(KActionCollection *collection) } } -TQWidget* KisToolSelectRectangular::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolSelectRectangular::createOptionWidget(TQWidget* parent) { - m_optWidget = new KisSelectionOptions(tqparent, m_subject); + m_optWidget = new KisSelectionOptions(parent, m_subject); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Rectangular Selection")); diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h index eb286ccad..b2f8ecad4 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h @@ -44,7 +44,7 @@ public: virtual void setup(KActionCollection *collection); virtual TQ_UINT32 priority() { return 3; } virtual enumToolType toolType() { return TOOL_SELECT; } - virtual TQWidget * createOptionWidget(TQWidget* tqparent); + virtual TQWidget * createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); virtual void paint(KisCanvasPainter& gc); diff --git a/chalk/plugins/tools/selectiontools/selection_tools.cc b/chalk/plugins/tools/selectiontools/selection_tools.cc index db4df1ab0..fb0e61912 100644 --- a/chalk/plugins/tools/selectiontools/selection_tools.cc +++ b/chalk/plugins/tools/selectiontools/selection_tools.cc @@ -51,14 +51,14 @@ typedef KGenericFactory<SelectionTools> SelectionToolsFactory; K_EXPORT_COMPONENT_FACTORY( chalkselectiontools, SelectionToolsFactory( "chalk" ) ) -SelectionTools::SelectionTools(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +SelectionTools::SelectionTools(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(SelectionToolsFactory::instance()); - if ( tqparent->inherits("KisToolRegistry") ) + if ( parent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); r->add(new KisToolSelectOutlineFactory()); r->add(new KisToolSelectPolygonalFactory()); r->add(new KisToolSelectRectangularFactory()); diff --git a/chalk/plugins/tools/selectiontools/selection_tools.h b/chalk/plugins/tools/selectiontools/selection_tools.h index 2e448e3ed..b3650ff2e 100644 --- a/chalk/plugins/tools/selectiontools/selection_tools.h +++ b/chalk/plugins/tools/selectiontools/selection_tools.h @@ -36,7 +36,7 @@ class SelectionTools : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - SelectionTools(TQObject *tqparent, const char *name, const TQStringList &); + SelectionTools(TQObject *parent, const char *name, const TQStringList &); virtual ~SelectionTools(); }; diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc index 0d7d9728e..8f5c9e5f8 100644 --- a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc +++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc @@ -698,9 +698,9 @@ void KisToolCrop::setOptionWidgetRatio(double ratio) } -TQWidget* KisToolCrop::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolCrop::createOptionWidget(TQWidget* parent) { - m_optWidget = new WdgToolCrop(tqparent); + m_optWidget = new WdgToolCrop(parent); Q_CHECK_PTR(m_optWidget); connect(m_optWidget->bnCrop, TQT_SIGNAL(clicked()), this, TQT_SLOT(crop())); diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.h b/chalk/plugins/tools/tool_crop/kis_tool_crop.h index 7ad7c9fdb..0f4f677ad 100644 --- a/chalk/plugins/tools/tool_crop/kis_tool_crop.h +++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.h @@ -50,7 +50,7 @@ public: virtual void update(KisCanvasSubject *subject); - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); virtual void setup(KActionCollection *collection); diff --git a/chalk/plugins/tools/tool_crop/tool_crop.cc b/chalk/plugins/tools/tool_crop/tool_crop.cc index 599c7562c..c624d62f8 100644 --- a/chalk/plugins/tools/tool_crop/tool_crop.cc +++ b/chalk/plugins/tools/tool_crop/tool_crop.cc @@ -42,14 +42,14 @@ typedef KGenericFactory<ToolCrop> ToolCropFactory; K_EXPORT_COMPONENT_FACTORY( chalktoolcrop, ToolCropFactory( "chalk" ) ) -ToolCrop::ToolCrop(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ToolCrop::ToolCrop(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ToolCropFactory::instance()); - if ( tqparent->inherits("KisToolRegistry") ) + if ( parent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); r->add(new KisToolCropFactory()); } diff --git a/chalk/plugins/tools/tool_crop/tool_crop.h b/chalk/plugins/tools/tool_crop/tool_crop.h index df5d7c28a..263fb1c29 100644 --- a/chalk/plugins/tools/tool_crop/tool_crop.h +++ b/chalk/plugins/tools/tool_crop/tool_crop.h @@ -31,7 +31,7 @@ class ToolCrop : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ToolCrop(TQObject *tqparent, const char *name, const TQStringList &); + ToolCrop(TQObject *parent, const char *name, const TQStringList &); virtual ~ToolCrop(); private: diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc index 08becf67c..d4a8605d8 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc @@ -552,12 +552,12 @@ void KisToolCurve::selectCurve() draw(false); } -TQWidget* KisToolCurve::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolCurve::createOptionWidget(TQWidget* parent) { if (toolType() == TOOL_SHAPE || toolType() == TOOL_FREEHAND) - return super::createOptionWidget(tqparent); + return super::createOptionWidget(parent); else if (toolType() == TOOL_SELECT) - return createSelectionOptionWidget(tqparent); + return createSelectionOptionWidget(parent); else kdDebug(0) << "NO SUPPORT FOR THIS TOOL TYPE" << endl; return 0; @@ -568,9 +568,9 @@ void KisToolCurve::slotSetAction(int action) { m_selectAction =(enumSelectionMode)action; } -TQWidget* KisToolCurve::createSelectionOptionWidget(TQWidget* tqparent) +TQWidget* KisToolCurve::createSelectionOptionWidget(TQWidget* parent) { - m_optWidget = new KisSelectionOptions(tqparent, m_subject); + m_optWidget = new KisSelectionOptions(parent, m_subject); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(m_UIName); diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.h b/chalk/plugins/tools/tool_curves/kis_tool_curve.h index 74d1ccda5..d1c0886c4 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_curve.h +++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.h @@ -51,7 +51,7 @@ public: virtual ~KisToolCurve(); virtual void update (KisCanvasSubject *subject); - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); virtual void buttonPress(KisButtonPressEvent *event); virtual void move(KisMoveEvent *event); @@ -179,7 +179,7 @@ public: /* * This initializes our Option Widget (called by createOptionWidget()) */ - virtual TQWidget* createSelectionOptionWidget(TQWidget* tqparent); + virtual TQWidget* createSelectionOptionWidget(TQWidget* parent); /* * This return our internal KisSelectionOptions if toolType() returns TOOL_SELECT diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc index 4b7e51d4b..42806771f 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc @@ -100,14 +100,14 @@ public: m_hCost = node.hCost(); m_tCost = node.tCost(); m_malus = node.malus(); - m_parent = node.tqparent(); + m_parent = node.parent(); } - Node(const TQPoint& tqparent, const TQPoint& pos, int g, int h, bool malus) + Node(const TQPoint& parent, const TQPoint& pos, int g, int h, bool malus) : m_pos(pos), m_hCost(h), m_malus(malus) { setGCost(g); - m_parent = tqparent; + m_parent = parent; } ~Node () { @@ -120,7 +120,7 @@ public: TQPoint pos () const {return m_pos;} int col () const {return m_pos.x();} int row () const {return m_pos.y();} - TQPoint tqparent () const {return m_parent;} + TQPoint parent () const {return m_parent;} void setGCost (int g) { @@ -230,8 +230,8 @@ KisKernelSP createKernel( TQ_INT32 i0, TQ_INT32 i1, TQ_INT32 i2, return kernel; } -KisCurveMagnetic::KisCurveMagnetic (KisToolMagnetic *tqparent) - : m_parent(tqparent) +KisCurveMagnetic::KisCurveMagnetic (KisToolMagnetic *parent) + : m_parent(parent) { m_standardkeepselected = false; } @@ -299,9 +299,9 @@ void KisCurveMagnetic::calculateCurve (KisCurve::iterator p1, KisCurve::iterator int col = (*i).col(); int row = (*i).row(); if ((*i) == endNode) { - while (current.tqparent() != TQPoint(-1,-1)) { + while (current.parent() != TQPoint(-1,-1)) { it = addPoint(it,KisPoint(tl+current.pos()),false,false,LINEHINT); - current = closedMatrix[current.tqparent().x()][current.tqparent().y()]; + current = closedMatrix[current.parent().x()][current.parent().y()]; } return; } @@ -759,9 +759,9 @@ void KisToolMagnetic::slotSetDistance (int dist) m_distance = dist; } -TQWidget* KisToolMagnetic::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolMagnetic::createOptionWidget(TQWidget* parent) { - m_optWidget = super::createOptionWidget(tqparent); + m_optWidget = super::createOptionWidget(parent); TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout()); TQGridLayout *box = new TQGridLayout(l, 2, 2, 3); box->setColStretch(0, 1); diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.h b/chalk/plugins/tools/tool_curves/kis_tool_moutline.h index ac7327fe8..ca15aaef0 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.h +++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.h @@ -53,7 +53,7 @@ class KisCurveMagnetic : public KisCurve { public: - KisCurveMagnetic (KisToolMagnetic *tqparent); + KisCurveMagnetic (KisToolMagnetic *parent); ~KisCurveMagnetic (); virtual KisCurve::iterator addPivot (iterator, const KisPoint&); @@ -88,7 +88,7 @@ public: virtual KisCurve::iterator selectByMouse(KisCurve::iterator it); bool editingMode() {return m_editingMode;} - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); public slots: diff --git a/chalk/plugins/tools/tool_curves/tool_curves.cc b/chalk/plugins/tools/tool_curves/tool_curves.cc index f9f5be337..d941c2dc0 100644 --- a/chalk/plugins/tools/tool_curves/tool_curves.cc +++ b/chalk/plugins/tools/tool_curves/tool_curves.cc @@ -45,14 +45,14 @@ typedef KGenericFactory<ToolCurves> ToolCurvesFactory; K_EXPORT_COMPONENT_FACTORY( chalktoolcurves, ToolCurvesFactory( "chalk" ) ) -ToolCurves::ToolCurves(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ToolCurves::ToolCurves(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ToolCurvesFactory::instance()); - if ( tqparent->inherits("KisToolRegistry") ) + if ( parent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( tqparent ); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( parent ); r->add(new KisToolBezierPaintFactory()); r->add(new KisToolBezierSelectFactory()); r->add(new KisToolMagneticFactory()); diff --git a/chalk/plugins/tools/tool_curves/tool_curves.h b/chalk/plugins/tools/tool_curves/tool_curves.h index 82199e48b..64bd1507f 100644 --- a/chalk/plugins/tools/tool_curves/tool_curves.h +++ b/chalk/plugins/tools/tool_curves/tool_curves.h @@ -28,7 +28,7 @@ class ToolCurves : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ToolCurves(TQObject *tqparent, const char *name, const TQStringList &); + ToolCurves(TQObject *parent, const char *name, const TQStringList &); virtual ~ToolCurves(); }; diff --git a/chalk/plugins/tools/tool_filter/kis_filterop.cc b/chalk/plugins/tools/tool_filter/kis_filterop.cc index 2296965c2..3c34abcec 100644 --- a/chalk/plugins/tools/tool_filter/kis_filterop.cc +++ b/chalk/plugins/tools/tool_filter/kis_filterop.cc @@ -82,14 +82,14 @@ void KisFilterOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) splitCoordinate(pt.x(), &x, &xFraction); splitCoordinate(pt.y(), &y, &yFraction); - // Filters always work with a tqmask, never with an image; that + // Filters always work with a mask, never with an image; that // wouldn't be useful at all. - KisAlphaMaskSP tqmask = brush->tqmask(info, xFraction, yFraction); + KisAlphaMaskSP mask = brush->mask(info, xFraction, yFraction); m_painter->setPressure(info.pressure); - TQ_INT32 maskWidth = tqmask->width(); - TQ_INT32 maskHeight = tqmask->height(); + TQ_INT32 maskWidth = mask->width(); + TQ_INT32 maskHeight = mask->height(); // Create a temporary paint device KisPaintDeviceSP tmpDev = new KisPaintDevice(colorSpace, "filterop tmpdev"); @@ -105,14 +105,14 @@ void KisFilterOp::paintAt(const KisPoint &pos, const KisPaintInformation& info) filter->process( tmpDev, tmpDev, m_filterConfiguration, TQRect( 0, 0, maskWidth, maskHeight )); filter->enableProgress(); - // Apply the tqmask on the paint device (filter before tqmask because edge pixels may be important) + // Apply the mask on the paint device (filter before mask because edge pixels may be important) for (int y = 0; y < maskHeight; y++) { KisHLineIterator hiter = tmpDev->createHLineIterator(0, y, maskWidth, false); int x=0; while(! hiter.isDone()) { - TQ_UINT8 alpha = tqmask->alphaAt( x++, y ); + TQ_UINT8 alpha = mask->alphaAt( x++, y ); colorSpace->setAlpha(hiter.rawData(), alpha, 1); ++hiter; diff --git a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc index e9fdad9ec..e53c96da8 100644 --- a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc +++ b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc @@ -96,9 +96,9 @@ void KisToolFilter::initPaint(KisEvent *e) dynamic_cast<KisFilterOp *>(op)->setFilterConfiguration( m_filter->configuration( m_filterConfigurationWidget) ); } -TQWidget* KisToolFilter::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolFilter::createOptionWidget(TQWidget* parent) { - TQWidget *widget = super::createOptionWidget(tqparent); + TQWidget *widget = super::createOptionWidget(parent); m_cbFilter = new KisCmbIDList(widget); Q_CHECK_PTR(m_cbFilter); diff --git a/chalk/plugins/tools/tool_filter/kis_tool_filter.h b/chalk/plugins/tools/tool_filter/kis_tool_filter.h index e8b5e86b7..651fbfb89 100644 --- a/chalk/plugins/tools/tool_filter/kis_tool_filter.h +++ b/chalk/plugins/tools/tool_filter/kis_tool_filter.h @@ -46,7 +46,7 @@ public: virtual void setup(KActionCollection *collection); virtual enumToolType toolType() { return TOOL_FREEHAND; } virtual TQ_UINT32 priority() { return 1; } - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); public slots: void changeFilter( const KisID & filter); diff --git a/chalk/plugins/tools/tool_filter/tool_filter.cc b/chalk/plugins/tools/tool_filter/tool_filter.cc index 484ed39ac..b5d7c4b56 100644 --- a/chalk/plugins/tools/tool_filter/tool_filter.cc +++ b/chalk/plugins/tools/tool_filter/tool_filter.cc @@ -44,14 +44,14 @@ typedef KGenericFactory<ToolFilter> ToolFilterFactory; K_EXPORT_COMPONENT_FACTORY( chalktoolfilter, ToolFilterFactory( "chalk" ) ) -ToolFilter::ToolFilter(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ToolFilter::ToolFilter(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ToolFilterFactory::instance()); - if ( tqparent->inherits("KisToolRegistry") ) + if ( parent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); r->add( new KisToolFilterFactory()); // XXX: Put this in a separate plugin? diff --git a/chalk/plugins/tools/tool_filter/tool_filter.h b/chalk/plugins/tools/tool_filter/tool_filter.h index 7bf33dca5..fba259c73 100644 --- a/chalk/plugins/tools/tool_filter/tool_filter.h +++ b/chalk/plugins/tools/tool_filter/tool_filter.h @@ -31,7 +31,7 @@ class ToolFilter : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ToolFilter(TQObject *tqparent, const char *name, const TQStringList &); + ToolFilter(TQObject *parent, const char *name, const TQStringList &); virtual ~ToolFilter(); private: diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc index 061db8815..ae07e5895 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc +++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc @@ -485,7 +485,7 @@ void KisToolPerspectiveGrid::setup(KActionCollection *collection) } -// TQWidget* KisToolPerspectiveGrid::createOptionWidget(TQWidget* tqparent) +// TQWidget* KisToolPerspectiveGrid::createOptionWidget(TQWidget* parent) // { // return 0; // } diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h index 69f6407ab..f7415f630 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h +++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h @@ -56,7 +56,7 @@ public: virtual void move(KisMoveEvent *event); virtual void buttonRelease(KisButtonReleaseEvent *event); -// TQWidget* createOptionWidget(TQWidget* tqparent); +// TQWidget* createOptionWidget(TQWidget* parent); // virtual TQWidget* optionWidget(); public slots: diff --git a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc index 69158e21f..12615387f 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc +++ b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc @@ -42,14 +42,14 @@ typedef KGenericFactory<ToolPerspectiveGrid> ToolPerspectiveGridFactory; K_EXPORT_COMPONENT_FACTORY( chalktoolperspectivegrid, ToolPerspectiveGridFactory( "chalk" ) ) -ToolPerspectiveGrid::ToolPerspectiveGrid(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ToolPerspectiveGrid::ToolPerspectiveGrid(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ToolPerspectiveGridFactory::instance()); - if ( tqparent->inherits("KisToolRegistry") ) + if ( parent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); r->add(new KisToolPerspectiveGridFactory()); } diff --git a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h index aed4a60cd..aeb99c746 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h +++ b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h @@ -31,7 +31,7 @@ class ToolPerspectiveGrid : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ToolPerspectiveGrid(TQObject *tqparent, const char *name, const TQStringList &); + ToolPerspectiveGrid(TQObject *parent, const char *name, const TQStringList &); virtual ~ToolPerspectiveGrid(); private: diff --git a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc index dbcfd74c0..07598b7de 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc +++ b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc @@ -681,10 +681,10 @@ void KisToolPerspectiveTransform::slotLayerActivated(KisLayerSP) } -TQWidget* KisToolPerspectiveTransform::createOptionWidget(TQWidget* /*tqparent*/) +TQWidget* KisToolPerspectiveTransform::createOptionWidget(TQWidget* /*parent*/) { #if 0 - m_optWidget = new WdgToolPerspectiveTransform(tqparent); + m_optWidget = new WdgToolPerspectiveTransform(parent); Q_CHECK_PTR(m_optWidget); m_optWidget->cmbFilter->clear(); diff --git a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h index 5d637ae54..690e356ca 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h +++ b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h @@ -53,7 +53,7 @@ public: KisToolPerspectiveTransform(); virtual ~KisToolPerspectiveTransform(); - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); virtual void setup(KActionCollection *collection); diff --git a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc index 2c3c85d48..24d716201 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc +++ b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc @@ -42,15 +42,15 @@ typedef KGenericFactory<ToolPerspectiveTransform> ToolPerspectiveTransformFactor K_EXPORT_COMPONENT_FACTORY( chalktoolperspectivetransform, ToolPerspectiveTransformFactory( "chalk" ) ) -ToolPerspectiveTransform::ToolPerspectiveTransform(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ToolPerspectiveTransform::ToolPerspectiveTransform(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ToolPerspectiveTransformFactory::instance()); - if ( tqparent->inherits("KisToolRegistry") ) + if ( parent->inherits("KisToolRegistry") ) { kdDebug() << " add perspective transform tool to the registry" << endl; - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); r->add(new KisToolPerspectiveTransformFactory()); } diff --git a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h index 1cbeadee3..af412a587 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h +++ b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h @@ -31,7 +31,7 @@ class ToolPerspectiveTransform : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ToolPerspectiveTransform(TQObject *tqparent, const char *name, const TQStringList &); + ToolPerspectiveTransform(TQObject *parent, const char *name, const TQStringList &); virtual ~ToolPerspectiveTransform(); private: diff --git a/chalk/plugins/tools/tool_polygon/tool_polygon.cc b/chalk/plugins/tools/tool_polygon/tool_polygon.cc index 3dbd15d62..5ace60794 100644 --- a/chalk/plugins/tools/tool_polygon/tool_polygon.cc +++ b/chalk/plugins/tools/tool_polygon/tool_polygon.cc @@ -42,14 +42,14 @@ typedef KGenericFactory<ToolPolygon> ToolPolygonFactory; K_EXPORT_COMPONENT_FACTORY( chalktoolpolygon, ToolPolygonFactory( "chalk" ) ) -ToolPolygon::ToolPolygon(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ToolPolygon::ToolPolygon(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ToolPolygonFactory::instance()); - if ( tqparent->inherits("KisToolRegistry") ) + if ( parent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( tqparent ); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( parent ); r->add(new KisToolPolygonFactory()); } diff --git a/chalk/plugins/tools/tool_polygon/tool_polygon.h b/chalk/plugins/tools/tool_polygon/tool_polygon.h index ec816736c..b6f35bc66 100644 --- a/chalk/plugins/tools/tool_polygon/tool_polygon.h +++ b/chalk/plugins/tools/tool_polygon/tool_polygon.h @@ -31,7 +31,7 @@ class ToolPolygon : public KParts::Plugin public: - ToolPolygon(TQObject *tqparent, const char *name, const TQStringList &); + ToolPolygon(TQObject *parent, const char *name, const TQStringList &); virtual ~ToolPolygon(); }; diff --git a/chalk/plugins/tools/tool_polyline/tool_polyline.cc b/chalk/plugins/tools/tool_polyline/tool_polyline.cc index 369169c9f..fe9eb0024 100644 --- a/chalk/plugins/tools/tool_polyline/tool_polyline.cc +++ b/chalk/plugins/tools/tool_polyline/tool_polyline.cc @@ -43,14 +43,14 @@ typedef KGenericFactory<ToolPolyline> ToolPolylineFactory; K_EXPORT_COMPONENT_FACTORY( chalktoolpolyline, ToolPolylineFactory( "chalk" ) ) -ToolPolyline::ToolPolyline(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ToolPolyline::ToolPolyline(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ToolPolylineFactory::instance()); - if ( tqparent->inherits("KisToolRegistry") ) + if ( parent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); r->add(new KisToolPolylineFactory()); } diff --git a/chalk/plugins/tools/tool_polyline/tool_polyline.h b/chalk/plugins/tools/tool_polyline/tool_polyline.h index 9f483363f..fdfa5427b 100644 --- a/chalk/plugins/tools/tool_polyline/tool_polyline.h +++ b/chalk/plugins/tools/tool_polyline/tool_polyline.h @@ -31,7 +31,7 @@ class ToolPolyline : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ToolPolyline(TQObject *tqparent, const char *name, const TQStringList &); + ToolPolyline(TQObject *parent, const char *name, const TQStringList &); virtual ~ToolPolyline(); private: diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc index 2dfe40f14..700efa4b6 100644 --- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc +++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc @@ -226,9 +226,9 @@ void KisToolSelectSimilar::slotSetAction(int action) m_defaultSelectAction = (enumSelectionMode)action; } -TQWidget* KisToolSelectSimilar::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolSelectSimilar::createOptionWidget(TQWidget* parent) { - m_optWidget = new TQWidget(tqparent); + m_optWidget = new TQWidget(parent); Q_CHECK_PTR(m_optWidget); m_optWidget->setCaption(i18n("Similar Selection")); diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.h b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.h index d98659d05..d29750408 100644 --- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.h +++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.h @@ -61,7 +61,7 @@ public slots: virtual void slotSetAction(int); private: - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); virtual void buttonPress(KisButtonPressEvent *e); diff --git a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc index 539f534a0..95c315d80 100644 --- a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc +++ b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc @@ -41,14 +41,14 @@ typedef KGenericFactory<SelectSimilar> SelectSimilarFactory; K_EXPORT_COMPONENT_FACTORY( chalktoolselectsimilar, SelectSimilarFactory( "chalk" ) ) -SelectSimilar::SelectSimilar(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +SelectSimilar::SelectSimilar(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(SelectSimilarFactory::instance()); - if ( tqparent->inherits("KisToolRegistry") ) + if ( parent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); r->add(new KisToolSelectSimilarFactory()); } } diff --git a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.h b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.h index a0588bfb9..a858b3365 100644 --- a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.h +++ b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.h @@ -26,7 +26,7 @@ class SelectSimilar : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - SelectSimilar(TQObject *tqparent, const char *name, const TQStringList &); + SelectSimilar(TQObject *parent, const char *name, const TQStringList &); virtual ~SelectSimilar(); diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.cc b/chalk/plugins/tools/tool_star/kis_tool_star.cc index 3a804f890..037f6bb52 100644 --- a/chalk/plugins/tools/tool_star/kis_tool_star.cc +++ b/chalk/plugins/tools/tool_star/kis_tool_star.cc @@ -225,9 +225,9 @@ vKisPoint KisToolStar::starCoordinates(int N, double mx, double my, double x, do return starCoordinatesArray; } -TQWidget* KisToolStar::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolStar::createOptionWidget(TQWidget* parent) { - TQWidget *widget = super::createOptionWidget(tqparent); + TQWidget *widget = super::createOptionWidget(parent); m_optWidget = new WdgToolStar(widget); Q_CHECK_PTR(m_optWidget); diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.h b/chalk/plugins/tools/tool_star/kis_tool_star.h index 3bd8df2ba..947dae25c 100644 --- a/chalk/plugins/tools/tool_star/kis_tool_star.h +++ b/chalk/plugins/tools/tool_star/kis_tool_star.h @@ -46,7 +46,7 @@ public: virtual void update (KisCanvasSubject *subject); - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); // // KisToolPaint interface diff --git a/chalk/plugins/tools/tool_star/tool_star.cc b/chalk/plugins/tools/tool_star/tool_star.cc index e399fafa6..dc40edf9f 100644 --- a/chalk/plugins/tools/tool_star/tool_star.cc +++ b/chalk/plugins/tools/tool_star/tool_star.cc @@ -42,14 +42,14 @@ typedef KGenericFactory<ToolStar> ToolStarFactory; K_EXPORT_COMPONENT_FACTORY( chalktoolstar, ToolStarFactory( "chalk" ) ) -ToolStar::ToolStar(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ToolStar::ToolStar(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ToolStarFactory::instance()); - if ( tqparent->inherits("KisToolRegistry") ) + if ( parent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( tqparent ); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>( parent ); r->add(new KisToolStarFactory()); } diff --git a/chalk/plugins/tools/tool_star/tool_star.h b/chalk/plugins/tools/tool_star/tool_star.h index 36172dd6c..7ac973a2f 100644 --- a/chalk/plugins/tools/tool_star/tool_star.h +++ b/chalk/plugins/tools/tool_star/tool_star.h @@ -31,7 +31,7 @@ class ToolStar : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ToolStar(TQObject *tqparent, const char *name, const TQStringList &); + ToolStar(TQObject *parent, const char *name, const TQStringList &); virtual ~ToolStar(); private: diff --git a/chalk/plugins/tools/tool_transform/kis_tool_transform.cc b/chalk/plugins/tools/tool_transform/kis_tool_transform.cc index 5b828122c..d6759dca2 100644 --- a/chalk/plugins/tools/tool_transform/kis_tool_transform.cc +++ b/chalk/plugins/tools/tool_transform/kis_tool_transform.cc @@ -856,10 +856,10 @@ void KisToolTransform::slotLayerActivated(KisLayerSP) } -TQWidget* KisToolTransform::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolTransform::createOptionWidget(TQWidget* parent) { - m_optWidget = new WdgToolTransform(tqparent); + m_optWidget = new WdgToolTransform(parent); Q_CHECK_PTR(m_optWidget); m_optWidget->cmbFilter->clear(); diff --git a/chalk/plugins/tools/tool_transform/kis_tool_transform.h b/chalk/plugins/tools/tool_transform/kis_tool_transform.h index a98cd4f72..70502d605 100644 --- a/chalk/plugins/tools/tool_transform/kis_tool_transform.h +++ b/chalk/plugins/tools/tool_transform/kis_tool_transform.h @@ -48,7 +48,7 @@ public: KisToolTransform(); virtual ~KisToolTransform(); - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); virtual void setup(KActionCollection *collection); diff --git a/chalk/plugins/tools/tool_transform/tool_transform.cc b/chalk/plugins/tools/tool_transform/tool_transform.cc index 2ee002ded..b50499f06 100644 --- a/chalk/plugins/tools/tool_transform/tool_transform.cc +++ b/chalk/plugins/tools/tool_transform/tool_transform.cc @@ -42,14 +42,14 @@ typedef KGenericFactory<ToolTransform> ToolTransformFactory; K_EXPORT_COMPONENT_FACTORY( chalktooltransform, ToolTransformFactory( "chalk" ) ) -ToolTransform::ToolTransform(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ToolTransform::ToolTransform(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ToolTransformFactory::instance()); - if ( tqparent->inherits("KisToolRegistry") ) + if ( parent->inherits("KisToolRegistry") ) { - KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(tqparent); + KisToolRegistry * r = dynamic_cast<KisToolRegistry*>(parent); KisToolTransformFactory * f = new KisToolTransformFactory(); Q_CHECK_PTR(f); r->add(f); diff --git a/chalk/plugins/tools/tool_transform/tool_transform.h b/chalk/plugins/tools/tool_transform/tool_transform.h index 04bfbaa90..9c4025630 100644 --- a/chalk/plugins/tools/tool_transform/tool_transform.h +++ b/chalk/plugins/tools/tool_transform/tool_transform.h @@ -31,7 +31,7 @@ class ToolTransform : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ToolTransform(TQObject *tqparent, const char *name, const TQStringList &); + ToolTransform(TQObject *parent, const char *name, const TQStringList &); virtual ~ToolTransform(); private: diff --git a/chalk/plugins/viewplugins/colorrange/colorrange.cc b/chalk/plugins/viewplugins/colorrange/colorrange.cc index 1bf90bbc9..9a2ab407d 100644 --- a/chalk/plugins/viewplugins/colorrange/colorrange.cc +++ b/chalk/plugins/viewplugins/colorrange/colorrange.cc @@ -50,14 +50,14 @@ typedef KGenericFactory<ColorRange> ColorRangeFactory; K_EXPORT_COMPONENT_FACTORY( chalkcolorrange, ColorRangeFactory( "chalk" ) ) -ColorRange::ColorRange(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ColorRange::ColorRange(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if (tqparent->inherits("KisView")) { + if (parent->inherits("KisView")) { setInstance(ColorRangeFactory::instance()); setXMLFile(locate("data","chalkplugins/colorrange.rc"), true); - m_view = dynamic_cast<KisView*>(tqparent); + m_view = dynamic_cast<KisView*>(parent); m_view->canvasSubject()->selectionManager()->addSelectionAction( new KAction(i18n("&Color Range..."), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "colorrange") ); } diff --git a/chalk/plugins/viewplugins/colorrange/colorrange.h b/chalk/plugins/viewplugins/colorrange/colorrange.h index 38e008d9d..2cedfe7cc 100644 --- a/chalk/plugins/viewplugins/colorrange/colorrange.h +++ b/chalk/plugins/viewplugins/colorrange/colorrange.h @@ -30,7 +30,7 @@ class ColorRange : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ColorRange(TQObject *tqparent, const char *name, const TQStringList &); + ColorRange(TQObject *parent, const char *name, const TQStringList &); virtual ~ColorRange(); private slots: diff --git a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc index 22a82e554..1d2c4d611 100644 --- a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc +++ b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc @@ -174,8 +174,8 @@ TQ_UINT32 matchColors(const TQColor & c, enumAction action) -DlgColorRange::DlgColorRange( KisView * view, KisPaintDeviceSP dev, TQWidget * tqparent, const char * name) - : super (tqparent, name, true, i18n("Color Range"), Ok | Cancel, Ok) +DlgColorRange::DlgColorRange( KisView * view, KisPaintDeviceSP dev, TQWidget * parent, const char * name) + : super (parent, name, true, i18n("Color Range"), Ok | Cancel, Ok) { m_dev = dev; m_view = view; diff --git a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.h b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.h index ce39ebd2f..6ee21c7d0 100644 --- a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.h +++ b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.h @@ -51,7 +51,7 @@ enum enumAction { /** - * This dialog allows the user to create a selection tqmask based + * This dialog allows the user to create a selection mask based * on a (range of) colors. */ class DlgColorRange: public KDialogBase { @@ -63,7 +63,7 @@ class DlgColorRange: public KDialogBase { public: - DlgColorRange(KisView * view, KisPaintDeviceSP layer, TQWidget * tqparent = 0, const char* name = 0); + DlgColorRange(KisView * view, KisPaintDeviceSP layer, TQWidget * parent = 0, const char* name = 0); ~DlgColorRange(); private slots: diff --git a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc index 10479a3cf..0498505d1 100644 --- a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc +++ b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc @@ -58,13 +58,13 @@ typedef KGenericFactory<ColorSpaceConversion> ColorSpaceConversionFactory; K_EXPORT_COMPONENT_FACTORY( chalkcolorspaceconversion, ColorSpaceConversionFactory( "chalk" ) ) -ColorSpaceConversion::ColorSpaceConversion(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ColorSpaceConversion::ColorSpaceConversion(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) + if ( parent->inherits("KisView") ) { - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; setInstance(ColorSpaceConversionFactory::instance()); setXMLFile(locate("data","chalkplugins/colorspaceconversion.rc"), true); diff --git a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h index a1f7f5c08..17722871d 100644 --- a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h +++ b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h @@ -33,7 +33,7 @@ class ColorSpaceConversion : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ColorSpaceConversion(TQObject *tqparent, const char *name, const TQStringList &); + ColorSpaceConversion(TQObject *parent, const char *name, const TQStringList &); virtual ~ColorSpaceConversion(); private slots: diff --git a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc index 616b17149..6f9af1c60 100644 --- a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc +++ b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc @@ -39,9 +39,9 @@ #include "wdgconvertcolorspace.h" #include "dlg_colorspaceconversion.h" -DlgColorSpaceConversion::DlgColorSpaceConversion( TQWidget * tqparent, +DlgColorSpaceConversion::DlgColorSpaceConversion( TQWidget * parent, const char * name) - : super (tqparent, name, true, i18n("Image Size"), Ok | Cancel, Ok) + : super (parent, name, true, i18n("Image Size"), Ok | Cancel, Ok) { m_page = new WdgConvertColorSpace(this, "colorspace_conversion"); Q_CHECK_PTR(m_page); diff --git a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.h b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.h index 608989abd..472cbeaf6 100644 --- a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.h +++ b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.h @@ -36,7 +36,7 @@ class DlgColorSpaceConversion: public KDialogBase { public: - DlgColorSpaceConversion(TQWidget * tqparent = 0, const char* name = 0); + DlgColorSpaceConversion(TQWidget * parent = 0, const char* name = 0); ~DlgColorSpaceConversion(); WdgConvertColorSpace * m_page; diff --git a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc index 797fc0983..fedb1fd17 100644 --- a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc +++ b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc @@ -39,9 +39,9 @@ DlgDropshadow::DlgDropshadow( const TQString & /*imageCS*/, const TQString & /*layerCS*/, - TQWidget * tqparent, + TQWidget * parent, const char * name) - : super (tqparent, name, true, i18n("Drop Shadow"), Ok | Cancel, Ok) + : super (parent, name, true, i18n("Drop Shadow"), Ok | Cancel, Ok) { m_page = new WdgDropshadow(this, "dropshadow"); Q_CHECK_PTR(m_page); diff --git a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.h b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.h index 9f3ca469d..c48a9ea1b 100644 --- a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.h +++ b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.h @@ -37,7 +37,7 @@ class DlgDropshadow: public KDialogBase { public: - DlgDropshadow(const TQString & imageCS, const TQString & layerCS, TQWidget * tqparent = 0, + DlgDropshadow(const TQString & imageCS, const TQString & layerCS, TQWidget * parent = 0, const char* name = 0); ~DlgDropshadow(); diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc index 15e21400f..30339d6e1 100644 --- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc +++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc @@ -122,12 +122,12 @@ void KisDropshadow::dropshadow(KisProgressDisplayInterface * progress, TQ_INT32 if (!m_cancelRequested) { shadowDev->move (xoffset,yoffset); - KisGroupLayerSP tqparent = image->rootLayer(); + KisGroupLayerSP parent = image->rootLayer(); if (image->activeLayer()) - tqparent = image->activeLayer()->tqparent().data(); + parent = image->activeLayer()->parent().data(); KisPaintLayerSP l = new KisPaintLayer(image, i18n("Drop Shadow"), opacity, shadowDev); - image->addLayer( l.data(), tqparent, src->siblingBelow() ); + image->addLayer( l.data(), parent, src->siblingBelow() ); if (allowResize) { diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc index 5dc190f12..f9b5ad26f 100644 --- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc +++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc @@ -39,15 +39,15 @@ K_EXPORT_COMPONENT_FACTORY( chalkdropshadow, KGenericFactory<KisDropshadowPlugin>( "chalk" ) ) -KisDropshadowPlugin::KisDropshadowPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +KisDropshadowPlugin::KisDropshadowPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) { + if ( parent->inherits("KisView") ) { setInstance(KGenericFactory<KisDropshadowPlugin>::instance()); setXMLFile(locate("data","chalkplugins/dropshadow.rc"), true); - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; (void) new KAction(i18n("Add Drop Shadow..."), 0, 0, this, TQT_SLOT(slotDropshadow()), actionCollection(), "dropshadow"); } } diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h index e2641ed28..5bb92da68 100644 --- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h +++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h @@ -31,7 +31,7 @@ class KisDropshadowPlugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - KisDropshadowPlugin(TQObject *tqparent, const char *name, const TQStringList &); + KisDropshadowPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~KisDropshadowPlugin(); private slots: diff --git a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cc b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cc index 8f70b8f71..a23acb6d0 100644 --- a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cc +++ b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cc @@ -48,16 +48,16 @@ namespace FiltersGallery { typedef KGenericFactory<ChalkFiltersGallery> ChalkFiltersGalleryFactory; K_EXPORT_COMPONENT_FACTORY( chalkfiltersgallery, ChalkFiltersGalleryFactory( "chalk" ) ) -ChalkFiltersGallery::ChalkFiltersGallery(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ChalkFiltersGallery::ChalkFiltersGallery(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) + if ( parent->inherits("KisView") ) { setInstance(ChalkFiltersGallery::instance()); setXMLFile(locate("data","chalkplugins/chalkfiltersgallery.rc"), true); - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; (void) new KAction(i18n("&Filters Gallery"), 0, 0, this, TQT_SLOT(showFiltersGalleryDialog()), actionCollection(), "chalk_filters_gallery"); diff --git a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.h b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.h index 89fed3862..bfc89f81e 100644 --- a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.h +++ b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.h @@ -34,7 +34,7 @@ namespace FiltersGallery { Q_OBJECT TQ_OBJECT public: - ChalkFiltersGallery(TQObject *tqparent, const char *name, const TQStringList &); + ChalkFiltersGallery(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkFiltersGallery(); public slots: void showFiltersGalleryDialog(); diff --git a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc index 766761779..60313cb22 100644 --- a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc +++ b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc @@ -43,8 +43,8 @@ namespace Plugins { namespace FiltersGallery { -KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* tqparent,const char *name) - : KDialogBase(tqparent,name, true,i18n("Filters Gallery"), Ok | Cancel), m_view(view),m_currentConfigWidget(0), m_currentFilter(0) +KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* parent,const char *name) + : KDialogBase(parent,name, true,i18n("Filters Gallery"), Ok | Cancel), m_view(view),m_currentConfigWidget(0), m_currentFilter(0) { // Initialize main widget m_widget = new KisWdgFiltersGallery(this); diff --git a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.h b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.h index 09e5cb1fc..406b834d1 100644 --- a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.h +++ b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.h @@ -45,7 +45,7 @@ class KisDlgFiltersGallery : public KDialogBase Q_OBJECT TQ_OBJECT public: - KisDlgFiltersGallery(KisView* view, TQWidget* tqparent,const char *name = ""); + KisDlgFiltersGallery(KisView* view, TQWidget* parent,const char *name = ""); ~KisDlgFiltersGallery(); public: inline KisFilter* currentFilter() { return m_currentFilter; }; diff --git a/chalk/plugins/viewplugins/histogram/dlg_histogram.cc b/chalk/plugins/viewplugins/histogram/dlg_histogram.cc index 4b781c17a..90acf1309 100644 --- a/chalk/plugins/viewplugins/histogram/dlg_histogram.cc +++ b/chalk/plugins/viewplugins/histogram/dlg_histogram.cc @@ -39,8 +39,8 @@ #include "kis_histogram_widget.h" -DlgHistogram::DlgHistogram( TQWidget * tqparent, const char * name) - : super (tqparent, name, true, i18n("Histogram"), Ok | Cancel, Ok) +DlgHistogram::DlgHistogram( TQWidget * parent, const char * name) + : super (parent, name, true, i18n("Histogram"), Ok | Cancel, Ok) { m_page = new KisHistogramWidget(this, "histogram"); Q_CHECK_PTR(m_page); diff --git a/chalk/plugins/viewplugins/histogram/dlg_histogram.h b/chalk/plugins/viewplugins/histogram/dlg_histogram.h index d2568f7a0..b97bf30f8 100644 --- a/chalk/plugins/viewplugins/histogram/dlg_histogram.h +++ b/chalk/plugins/viewplugins/histogram/dlg_histogram.h @@ -39,7 +39,7 @@ class DlgHistogram: public KDialogBase { public: - DlgHistogram(TQWidget * tqparent = 0, + DlgHistogram(TQWidget * parent = 0, const char* name = 0); ~DlgHistogram(); diff --git a/chalk/plugins/viewplugins/histogram/histogram.cc b/chalk/plugins/viewplugins/histogram/histogram.cc index 8e6968b90..82d31ec06 100644 --- a/chalk/plugins/viewplugins/histogram/histogram.cc +++ b/chalk/plugins/viewplugins/histogram/histogram.cc @@ -52,18 +52,18 @@ typedef KGenericFactory<Histogram> HistogramFactory; K_EXPORT_COMPONENT_FACTORY( chalkhistogram, HistogramFactory( "chalk" ) ) -Histogram::Histogram(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +Histogram::Histogram(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) { + if ( parent->inherits("KisView") ) { setInstance(HistogramFactory::instance()); setXMLFile(locate("data","chalkplugins/histogram.rc"), true); m_action = new KAction(i18n("&Histogram"), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "histogram"); - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; if (KisImageSP img = m_view->canvasSubject()->currentImg()) { connect(img, TQT_SIGNAL(sigLayersChanged(KisGroupLayerSP)), this, TQT_SLOT(slotLayersChanged())); connect(img, TQT_SIGNAL(sigLayerAdded(KisLayerSP)), this, TQT_SLOT(slotLayersChanged())); diff --git a/chalk/plugins/viewplugins/histogram/histogram.h b/chalk/plugins/viewplugins/histogram/histogram.h index 2425c0c65..ca32db1a0 100644 --- a/chalk/plugins/viewplugins/histogram/histogram.h +++ b/chalk/plugins/viewplugins/histogram/histogram.h @@ -32,7 +32,7 @@ class Histogram : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - Histogram(TQObject *tqparent, const char *name, const TQStringList &); + Histogram(TQObject *parent, const char *name, const TQStringList &); virtual ~Histogram(); private slots: diff --git a/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cc b/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cc index 12005e05d..c49838706 100644 --- a/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cc +++ b/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cc @@ -39,8 +39,8 @@ #include "kis_colorspace.h" -KisHistogramWidget::KisHistogramWidget(TQWidget *tqparent, const char *name) - : super(tqparent, name) +KisHistogramWidget::KisHistogramWidget(TQWidget *parent, const char *name) + : super(parent, name) { m_from = 0.0; m_width = 0.0; diff --git a/chalk/plugins/viewplugins/histogram/kis_histogram_widget.h b/chalk/plugins/viewplugins/histogram/kis_histogram_widget.h index f83394e7d..53fd174a6 100644 --- a/chalk/plugins/viewplugins/histogram/kis_histogram_widget.h +++ b/chalk/plugins/viewplugins/histogram/kis_histogram_widget.h @@ -33,7 +33,7 @@ class KisHistogramWidget : public WdgHistogram { TQ_OBJECT public: - KisHistogramWidget(TQWidget *tqparent, const char *name); + KisHistogramWidget(TQWidget *parent, const char *name); virtual ~KisHistogramWidget(); void setPaintDevice(KisPaintDeviceSP dev); diff --git a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc index df5de24ab..9c6795072 100644 --- a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc +++ b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc @@ -46,12 +46,12 @@ typedef KGenericFactory<ChalkHistogramDocker> ChalkHistogramDockerFactory; K_EXPORT_COMPONENT_FACTORY( chalkhistogramdocker, ChalkHistogramDockerFactory( "chalk" ) ) -ChalkHistogramDocker::ChalkHistogramDocker(TQObject *tqparent, const char *name, const TQStringList&) - : KParts::Plugin(tqparent, name) +ChalkHistogramDocker::ChalkHistogramDocker(TQObject *parent, const char *name, const TQStringList&) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) { - m_view = dynamic_cast<KisView*>(tqparent); + if ( parent->inherits("KisView") ) { + m_view = dynamic_cast<KisView*>(parent); setInstance(ChalkHistogramDockerFactory::instance()); setXMLFile(locate("data","chalkplugins/chalkhistogramdocker.rc"), true); @@ -171,7 +171,7 @@ void ChalkHistogramDocker::colorSpaceChanged(KisColorSpace* cs) producerChanged(0); } -HistogramDockerUpdater::HistogramDockerUpdater(TQObject* /*tqparent*/, KisHistogramSP h, KisHistogramView* v, +HistogramDockerUpdater::HistogramDockerUpdater(TQObject* /*parent*/, KisHistogramSP h, KisHistogramView* v, KisAccumulatingHistogramProducer* p) : m_histogram(h), m_view(v), m_producer(p) { diff --git a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.h b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.h index ade0650fb..ba571a2ab 100644 --- a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.h +++ b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.h @@ -41,7 +41,7 @@ class ChalkHistogramDocker : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ChalkHistogramDocker(TQObject *tqparent, const char *name, const TQStringList &); + ChalkHistogramDocker(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkHistogramDocker(); private slots: void producerChanged(int pos); @@ -66,7 +66,7 @@ class HistogramDockerUpdater : public TQObject { Q_OBJECT TQ_OBJECT public: - HistogramDockerUpdater(TQObject* tqparent, KisHistogramSP h, KisHistogramView* v, + HistogramDockerUpdater(TQObject* parent, KisHistogramSP h, KisHistogramView* v, KisAccumulatingHistogramProducer* p); public slots: void updated(); diff --git a/chalk/plugins/viewplugins/history_docker/historydocker.cc b/chalk/plugins/viewplugins/history_docker/historydocker.cc index e4f368139..128770065 100644 --- a/chalk/plugins/viewplugins/history_docker/historydocker.cc +++ b/chalk/plugins/viewplugins/history_docker/historydocker.cc @@ -37,13 +37,13 @@ typedef KGenericFactory<ChalkHistoryDocker> ChalkHistoryDockerFactory; K_EXPORT_COMPONENT_FACTORY( chalkhistorydocker, ChalkHistoryDockerFactory( "chalk" ) ) -ChalkHistoryDocker::ChalkHistoryDocker(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ChalkHistoryDocker::ChalkHistoryDocker(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) + if ( parent->inherits("KisView") ) { setInstance(ChalkHistoryDockerFactory::instance()); // Create history docker diff --git a/chalk/plugins/viewplugins/history_docker/historydocker.h b/chalk/plugins/viewplugins/history_docker/historydocker.h index 82aee9bf1..217b882d3 100644 --- a/chalk/plugins/viewplugins/history_docker/historydocker.h +++ b/chalk/plugins/viewplugins/history_docker/historydocker.h @@ -26,7 +26,7 @@ class ChalkHistoryDocker : public KParts::Plugin { public: - ChalkHistoryDocker(TQObject *tqparent, const char *name, const TQStringList &); + ChalkHistoryDocker(TQObject *parent, const char *name, const TQStringList &); virtual ~ChalkHistoryDocker(); }; diff --git a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc index a1eba4f31..8a6567528 100644 --- a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc +++ b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc @@ -45,9 +45,9 @@ using namespace std; // XXX: I'm really real bad at arithmetic, let alone math. Here // be rounding errors. (Boudewijn) -DlgImageSize::DlgImageSize( TQWidget * tqparent, +DlgImageSize::DlgImageSize( TQWidget * parent, const char * name) - : super (tqparent, name, true, i18n("Image Size"), Ok | Cancel, Ok) + : super (parent, name, true, i18n("Image Size"), Ok | Cancel, Ok) { m_lock = false; diff --git a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.h b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.h index 7983e1120..df643f999 100644 --- a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.h +++ b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.h @@ -26,7 +26,7 @@ class KisFilterStrategy; class WdgImageSize; /** - * This dialog allows the user to create a selection tqmask based + * This dialog allows the user to create a selection mask based * on a (range of) colors. */ class DlgImageSize: public KDialogBase { @@ -36,7 +36,7 @@ class DlgImageSize: public KDialogBase { public: - DlgImageSize(TQWidget * tqparent = 0, + DlgImageSize(TQWidget * parent = 0, const char* name = 0); ~DlgImageSize(); diff --git a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc index 8289d693e..6d24d60ac 100644 --- a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc +++ b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc @@ -46,9 +46,9 @@ using namespace std; // XXX: I'm really real bad at arithmetic, let alone math. Here // be rounding errors. (Boudewijn) -DlgLayerSize::DlgLayerSize( TQWidget * tqparent, +DlgLayerSize::DlgLayerSize( TQWidget * parent, const char * name) - : super (tqparent, name, true, i18n("Scale Layer"), Ok | Cancel, Ok) + : super (parent, name, true, i18n("Scale Layer"), Ok | Cancel, Ok) { m_lock = false; diff --git a/chalk/plugins/viewplugins/imagesize/dlg_layersize.h b/chalk/plugins/viewplugins/imagesize/dlg_layersize.h index 0aaf84459..2edc45c9f 100644 --- a/chalk/plugins/viewplugins/imagesize/dlg_layersize.h +++ b/chalk/plugins/viewplugins/imagesize/dlg_layersize.h @@ -33,7 +33,7 @@ class DlgLayerSize: public KDialogBase { public: - DlgLayerSize(TQWidget * tqparent = 0, + DlgLayerSize(TQWidget * parent = 0, const char* name = 0); ~DlgLayerSize(); diff --git a/chalk/plugins/viewplugins/imagesize/imagesize.cc b/chalk/plugins/viewplugins/imagesize/imagesize.cc index c23d27176..76ac2328c 100644 --- a/chalk/plugins/viewplugins/imagesize/imagesize.cc +++ b/chalk/plugins/viewplugins/imagesize/imagesize.cc @@ -58,10 +58,10 @@ typedef KGenericFactory<ImageSize> ImageSizeFactory; K_EXPORT_COMPONENT_FACTORY( chalkimagesize, ImageSizeFactory( "chalk" ) ) -ImageSize::ImageSize(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ImageSize::ImageSize(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) + if ( parent->inherits("KisView") ) { setInstance(ImageSizeFactory::instance()); setXMLFile(locate("data","chalkplugins/imagesize.rc"), true); @@ -70,7 +70,7 @@ ImageSize::ImageSize(TQObject *tqparent, const char *name, const TQStringList &) (void) new KAction(i18n("&Scale Layer..."), 0, 0, this, TQT_SLOT(slotLayerSize()), actionCollection(), "layerscale"); - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; // Selection manager takes ownership? KAction * a = new KAction(i18n("&Scale Selection..."), 0, 0, this, TQT_SLOT(slotSelectionScale()), actionCollection(), "selectionscale"); Q_CHECK_PTR(a); diff --git a/chalk/plugins/viewplugins/imagesize/imagesize.h b/chalk/plugins/viewplugins/imagesize/imagesize.h index 989a603f5..9fd9d28ea 100644 --- a/chalk/plugins/viewplugins/imagesize/imagesize.h +++ b/chalk/plugins/viewplugins/imagesize/imagesize.h @@ -30,7 +30,7 @@ class ImageSize : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ImageSize(TQObject *tqparent, const char *name, const TQStringList &); + ImageSize(TQObject *parent, const char *name, const TQStringList &); virtual ~ImageSize(); private slots: diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc index dcda5c7e3..bb21f6f77 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc +++ b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc @@ -39,7 +39,7 @@ using namespace std; #include "dlg_border_selection.h" #include "wdg_border_selection.h" -DlgBorderSelection::DlgBorderSelection( TQWidget * tqparent, const char * name) : super (tqparent, name, true, i18n("Border Selection"), Ok | Cancel, Ok) +DlgBorderSelection::DlgBorderSelection( TQWidget * parent, const char * name) : super (parent, name, true, i18n("Border Selection"), Ok | Cancel, Ok) { m_page = new WdgBorderSelection(this, "border_selection"); Q_CHECK_PTR(m_page); diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.h b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.h index 472f01ef3..396b0573b 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.h +++ b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.h @@ -31,7 +31,7 @@ class DlgBorderSelection: public KDialogBase { public: - DlgBorderSelection(TQWidget * tqparent = 0, const char* name = 0); + DlgBorderSelection(TQWidget * parent = 0, const char* name = 0); ~DlgBorderSelection(); TQ_INT32 xradius(); diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc index b889ccde5..5e327aa8b 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc +++ b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc @@ -39,7 +39,7 @@ using namespace std; #include "dlg_grow_selection.h" #include "wdg_grow_selection.h" -DlgGrowSelection::DlgGrowSelection( TQWidget * tqparent, const char * name) : super (tqparent, name, true, i18n("Grow Selection"), Ok | Cancel, Ok) +DlgGrowSelection::DlgGrowSelection( TQWidget * parent, const char * name) : super (parent, name, true, i18n("Grow Selection"), Ok | Cancel, Ok) { m_page = new WdgGrowSelection(this, "grow_selection"); Q_CHECK_PTR(m_page); diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.h b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.h index 61785b20e..0893033d7 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.h +++ b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.h @@ -31,7 +31,7 @@ class DlgGrowSelection: public KDialogBase { public: - DlgGrowSelection(TQWidget * tqparent = 0, const char* name = 0); + DlgGrowSelection(TQWidget * parent = 0, const char* name = 0); ~DlgGrowSelection(); TQ_INT32 xradius(); diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc index eb50c6cf3..b69b998fa 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc +++ b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc @@ -39,7 +39,7 @@ using namespace std; #include "dlg_shrink_selection.h" #include "wdg_shrink_selection.h" -DlgShrinkSelection::DlgShrinkSelection( TQWidget * tqparent, const char * name) : super (tqparent, name, true, i18n("Shrink Selection"), Ok | Cancel, Ok) +DlgShrinkSelection::DlgShrinkSelection( TQWidget * parent, const char * name) : super (parent, name, true, i18n("Shrink Selection"), Ok | Cancel, Ok) { m_page = new WdgShrinkSelection(this, "shrink_selection"); Q_CHECK_PTR(m_page); diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.h b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.h index 53ce386bf..01ea44696 100644 --- a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.h +++ b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.h @@ -31,7 +31,7 @@ class DlgShrinkSelection: public KDialogBase { public: - DlgShrinkSelection(TQWidget * tqparent = 0, const char* name = 0); + DlgShrinkSelection(TQWidget * parent = 0, const char* name = 0); ~DlgShrinkSelection(); TQ_INT32 xradius(); diff --git a/chalk/plugins/viewplugins/modify_selection/modify_selection.cc b/chalk/plugins/viewplugins/modify_selection/modify_selection.cc index 78a757789..46536e4fc 100644 --- a/chalk/plugins/viewplugins/modify_selection/modify_selection.cc +++ b/chalk/plugins/viewplugins/modify_selection/modify_selection.cc @@ -55,15 +55,15 @@ typedef KGenericFactory<ModifySelection> ModifySelectionFactory; K_EXPORT_COMPONENT_FACTORY( chalkmodifyselection, ModifySelectionFactory( "chalk" ) ) -ModifySelection::ModifySelection(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ModifySelection::ModifySelection(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) + if ( parent->inherits("KisView") ) { setInstance(ModifySelectionFactory::instance()); setXMLFile(locate("data","chalkplugins/modify_selection.rc"), true); - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; // Selection manager takes ownership? KAction* a = new KAction(i18n("Grow Selection..."), 0, 0, this, TQT_SLOT(slotGrowSelection()), actionCollection(), "growselection"); diff --git a/chalk/plugins/viewplugins/modify_selection/modify_selection.h b/chalk/plugins/viewplugins/modify_selection/modify_selection.h index db5dd1b73..baffc2d45 100644 --- a/chalk/plugins/viewplugins/modify_selection/modify_selection.h +++ b/chalk/plugins/viewplugins/modify_selection/modify_selection.h @@ -29,7 +29,7 @@ class ModifySelection : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ModifySelection(TQObject *tqparent, const char *name, const TQStringList &); + ModifySelection(TQObject *parent, const char *name, const TQStringList &); virtual ~ModifySelection(); private slots: diff --git a/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc b/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc index 12e3f42cb..dafb66698 100644 --- a/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc +++ b/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc @@ -39,9 +39,9 @@ using namespace std; #include "wdg_perftest.h" -DlgPerfTest::DlgPerfTest( TQWidget * tqparent, +DlgPerfTest::DlgPerfTest( TQWidget * parent, const char * name) - : super (tqparent, name, true, i18n("Performance Test"), Ok | Cancel, Ok) + : super (parent, name, true, i18n("Performance Test"), Ok | Cancel, Ok) { m_lock = false; diff --git a/chalk/plugins/viewplugins/performancetest/dlg_perftest.h b/chalk/plugins/viewplugins/performancetest/dlg_perftest.h index aae398fa7..3652ebf8a 100644 --- a/chalk/plugins/viewplugins/performancetest/dlg_perftest.h +++ b/chalk/plugins/viewplugins/performancetest/dlg_perftest.h @@ -31,7 +31,7 @@ class DlgPerfTest: public KDialogBase { public: - DlgPerfTest(TQWidget * tqparent = 0, + DlgPerfTest(TQWidget * parent = 0, const char* name = 0); ~DlgPerfTest(); diff --git a/chalk/plugins/viewplugins/performancetest/perftest.cc b/chalk/plugins/viewplugins/performancetest/perftest.cc index 88a50e853..8a137374a 100644 --- a/chalk/plugins/viewplugins/performancetest/perftest.cc +++ b/chalk/plugins/viewplugins/performancetest/perftest.cc @@ -78,17 +78,17 @@ typedef KGenericFactory<PerfTest> PerfTestFactory; K_EXPORT_COMPONENT_FACTORY( chalkperftest, PerfTestFactory( "chalk" ) ) -PerfTest::PerfTest(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +PerfTest::PerfTest(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) + if ( parent->inherits("KisView") ) { setInstance(PerfTestFactory::instance()); setXMLFile(locate("data","chalkplugins/perftest.rc"), true); (void) new KAction(i18n("&Performance Test..."), 0, 0, this, TQT_SLOT(slotPerfTest()), actionCollection(), "perf_test"); - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; } } diff --git a/chalk/plugins/viewplugins/performancetest/perftest.h b/chalk/plugins/viewplugins/performancetest/perftest.h index 5bae3c8cd..cbd8799fb 100644 --- a/chalk/plugins/viewplugins/performancetest/perftest.h +++ b/chalk/plugins/viewplugins/performancetest/perftest.h @@ -33,7 +33,7 @@ class PerfTest : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - PerfTest(TQObject *tqparent, const char *name, const TQStringList &); + PerfTest(TQObject *parent, const char *name, const TQStringList &); virtual ~PerfTest(); private slots: diff --git a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc index 6e3cc9f74..03bd6b52c 100644 --- a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc +++ b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc @@ -39,9 +39,9 @@ using namespace std; #include "wdg_rotateimage.h" -DlgRotateImage::DlgRotateImage( TQWidget * tqparent, +DlgRotateImage::DlgRotateImage( TQWidget * parent, const char * name) - : super (tqparent, name, true, i18n("Rotate Image"), Ok | Cancel, Ok) + : super (parent, name, true, i18n("Rotate Image"), Ok | Cancel, Ok) { m_lock = false; diff --git a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.h b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.h index 47ddd344c..7e3a9365d 100644 --- a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.h +++ b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.h @@ -39,7 +39,7 @@ class DlgRotateImage: public KDialogBase { public: - DlgRotateImage(TQWidget * tqparent = 0, + DlgRotateImage(TQWidget * parent = 0, const char* name = 0); ~DlgRotateImage(); diff --git a/chalk/plugins/viewplugins/rotateimage/rotateimage.cc b/chalk/plugins/viewplugins/rotateimage/rotateimage.cc index e8961cec1..60d6f254e 100644 --- a/chalk/plugins/viewplugins/rotateimage/rotateimage.cc +++ b/chalk/plugins/viewplugins/rotateimage/rotateimage.cc @@ -51,14 +51,14 @@ typedef KGenericFactory<RotateImage> RotateImageFactory; K_EXPORT_COMPONENT_FACTORY( chalkrotateimage, RotateImageFactory( "chalk" ) ) // XXX: this plugin could also provide layer scaling/resizing -RotateImage::RotateImage(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +RotateImage::RotateImage(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) { + if ( parent->inherits("KisView") ) { setInstance(RotateImageFactory::instance()); setXMLFile(locate("data","chalkplugins/rotateimage.rc"), true); - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; (void) new KAction(i18n("&Rotate Image..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage()), actionCollection(), "rotateimage"); (void) new KAction(i18n("Rotate Image CW"), "rotate_cw", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage90()), actionCollection(), "rotateImageCW90"); (void) new KAction(i18n("Rotate Image 1&80"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRotateImage180()), actionCollection(), "rotateImage180"); diff --git a/chalk/plugins/viewplugins/rotateimage/rotateimage.h b/chalk/plugins/viewplugins/rotateimage/rotateimage.h index 6b262608c..79c03c085 100644 --- a/chalk/plugins/viewplugins/rotateimage/rotateimage.h +++ b/chalk/plugins/viewplugins/rotateimage/rotateimage.h @@ -29,7 +29,7 @@ class RotateImage : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - RotateImage(TQObject *tqparent, const char *name, const TQStringList &); + RotateImage(TQObject *parent, const char *name, const TQStringList &); virtual ~RotateImage(); private slots: diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp index dad0ee01f..6e942c389 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp @@ -58,8 +58,8 @@ #include <kglobal.h> -KSnapshot::KSnapshot(TQWidget *tqparent, const char *name) - : super(tqparent, name, false, TQString(), Ok|Cancel) +KSnapshot::KSnapshot(TQWidget *parent, const char *name) + : super(parent, name, false, TQString(), Ok|Cancel) { grabber = new TQWidget( 0, 0, WStyle_Customize | WX11BypassWM ); Q_CHECK_PTR(grabber); @@ -319,11 +319,11 @@ Window findRealWindow( Window w, int depth = 0 ) if( type != None ) return w; } - Window root, tqparent; + Window root, parent; Window* tqchildren; unsigned int ntqchildren; Window ret = None; - if( XQueryTree( qt_xdisplay(), w, &root, &tqparent, &tqchildren, &ntqchildren ) != 0 ) { + if( XQueryTree( qt_xdisplay(), w, &root, &parent, &tqchildren, &ntqchildren ) != 0 ) { for( unsigned int i = 0; i < ntqchildren && ret == None; ++i ) @@ -343,11 +343,11 @@ void KSnapshot::performGrab() if ( mainWidget->mode() == WindowUnderCursor ) { Window root; Window child; - uint tqmask; + uint mask; int rootX, rootY, winX, winY; XQueryPointer( qt_xdisplay(), qt_xrootwin(), &root, &child, &rootX, &rootY, &winX, &winY, - &tqmask); + &mask); if( child == None ) child = qt_xrootwin(); if( !mainWidget->includeDecorations()) { @@ -364,16 +364,16 @@ void KSnapshot::performGrab() w += 2 * border; h += 2 * border; - Window tqparent; + Window parent; Window* tqchildren; unsigned int ntqchildren; - if( XQueryTree( qt_xdisplay(), child, &root, &tqparent, + if( XQueryTree( qt_xdisplay(), child, &root, &parent, &tqchildren, &ntqchildren ) != 0 ) { if( tqchildren != NULL ) XFree( tqchildren ); int newx, newy; Window dummy; - if( XTranslateCoordinates( qt_xdisplay(), tqparent, qt_xrootwin(), + if( XTranslateCoordinates( qt_xdisplay(), parent, qt_xrootwin(), x, y, &newx, &newy, &dummy )) { x = newx; y = newy; @@ -385,8 +385,8 @@ void KSnapshot::performGrab() #ifdef HAVE_X11_EXTENSIONS_SHAPE_H //No XShape - no work. if (haveXShape) { - TQBitmap tqmask(w, h); - //As the first step, get the tqmask from XShape. + TQBitmap mask(w, h); + //As the first step, get the mask from XShape. int count, order; XRectangle* rects = XShapeGetRectangles( qt_xdisplay(), child, ShapeBounding, &count, &order); @@ -395,7 +395,7 @@ void KSnapshot::performGrab() //Since the border area is part of the window, we use bounding // to limit our work region if (rects) { - //Create a TQRegion from the rectangles describing the bounding tqmask. + //Create a TQRegion from the rectangles describing the bounding mask. TQRegion contents; for (int pos = 0; pos < count; pos++) contents += TQRegion(rects[pos].x, rects[pos].y, @@ -417,14 +417,14 @@ void KSnapshot::performGrab() TQRegion maskedAway = bbox - contents; TQMemArray<TQRect> maskedAwayRects = maskedAway.rects(); - //Construct a bitmap tqmask from the rectangles - TQPainter p(&tqmask); + //Construct a bitmap mask from the rectangles + TQPainter p(&mask); p.fillRect(0, 0, w, h, TQt::color1); for (uint pos = 0; pos < maskedAwayRects.count(); pos++) p.fillRect(maskedAwayRects[pos], TQt::color0); p.end(); - snapshot.setMask(tqmask); + snapshot.setMask(mask); } } #endif diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.h b/chalk/plugins/viewplugins/screenshot/ksnapshot.h index 030cad127..eb8fa60a1 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.h +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.h @@ -41,8 +41,8 @@ class KSnapshotThumb : public TQLabel TQ_OBJECT public: - KSnapshotThumb(TQWidget *tqparent, const char *name = 0) - : TQLabel(tqparent, name) + KSnapshotThumb(TQWidget *parent, const char *name = 0) + : TQLabel(parent, name) { tqsetAlignment(AlignHCenter | AlignVCenter); } @@ -82,7 +82,7 @@ class KSnapshot : public KDialogBase TQ_OBJECT public: - KSnapshot(TQWidget *tqparent= 0, const char *name= 0); + KSnapshot(TQWidget *parent= 0, const char *name= 0); ~KSnapshot(); enum CaptureMode { FullScreen=0, WindowUnderCursor=1, Region=2 }; diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp index f4511554a..ec5ba7cc0 100644 --- a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp +++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp @@ -28,8 +28,8 @@ #include <kglobalsettings.h> -SizeTip::SizeTip( TQWidget *tqparent, const char *name ) - : TQLabel( tqparent, name, WStyle_Customize | WX11BypassWM | +SizeTip::SizeTip( TQWidget *parent, const char *name ) + : TQLabel( parent, name, WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop | WStyle_NoBorder | WStyle_Tool ) { setMargin( 2 ); diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.h b/chalk/plugins/viewplugins/screenshot/regiongrabber.h index b1da10498..13b35dcf3 100644 --- a/chalk/plugins/viewplugins/screenshot/regiongrabber.h +++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.h @@ -29,7 +29,7 @@ class TQTimer; class SizeTip : public TQLabel { public: - SizeTip( TQWidget *tqparent, const char *name=0 ); + SizeTip( TQWidget *parent, const char *name=0 ); ~SizeTip() {} void setTip( const TQRect &rect ); diff --git a/chalk/plugins/viewplugins/screenshot/screenshot.cpp b/chalk/plugins/viewplugins/screenshot/screenshot.cpp index ff7629253..4af58e3d9 100644 --- a/chalk/plugins/viewplugins/screenshot/screenshot.cpp +++ b/chalk/plugins/viewplugins/screenshot/screenshot.cpp @@ -41,8 +41,8 @@ K_EXPORT_COMPONENT_FACTORY( chalkscreenshot, KGenericFactory<Screenshot>( "chalk" ) ) -Screenshot::Screenshot(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +Screenshot::Screenshot(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { KGlobal::locale()->insertCatalogue("kscreenshot_plugin"); setInstance(KGenericFactory<Screenshot>::instance()); @@ -72,7 +72,7 @@ void Screenshot::slotScreenGrabbed() KTempFile temp(locateLocal("tmp", "screenshot"), ".png"); snapshot->save(temp.name()); - KisView *view = dynamic_cast<KisView *>(tqparent()); + KisView *view = dynamic_cast<KisView *>(parent()); if(view) view->importImage(temp.name()); } diff --git a/chalk/plugins/viewplugins/screenshot/screenshot.h b/chalk/plugins/viewplugins/screenshot/screenshot.h index d1100836a..055bdb3b9 100644 --- a/chalk/plugins/viewplugins/screenshot/screenshot.h +++ b/chalk/plugins/viewplugins/screenshot/screenshot.h @@ -29,7 +29,7 @@ class Screenshot : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - Screenshot(TQObject *tqparent, const char *name, const TQStringList &); + Screenshot(TQObject *parent, const char *name, const TQStringList &); virtual ~Screenshot(); private slots: diff --git a/chalk/plugins/viewplugins/scripting/scripting.cc b/chalk/plugins/viewplugins/scripting/scripting.cc index 34b4d1d83..31e9897aa 100644 --- a/chalk/plugins/viewplugins/scripting/scripting.cc +++ b/chalk/plugins/viewplugins/scripting/scripting.cc @@ -54,16 +54,16 @@ typedef KGenericFactory<Scripting> ChalkScriptingFactory; K_EXPORT_COMPONENT_FACTORY( chalkscripting, ChalkScriptingFactory( "chalk" ) ) -Scripting::Scripting(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +Scripting::Scripting(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { setInstance(ChalkScriptingFactory::instance()); - if ( tqparent->inherits("KisView") ) + if ( parent->inherits("KisView") ) { setInstance(Scripting::instance()); - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; m_scriptguiclient = new Kross::Api::ScriptGUIClient( m_view, m_view ); // m_scriptguiclient ->setXMLFile(locate("data","chalkplugins/scripting.rc"), true); //BEGIN TODO: understand why the ScriptGUIClient doesn't "link" its actions to the menu diff --git a/chalk/plugins/viewplugins/scripting/scripting.h b/chalk/plugins/viewplugins/scripting/scripting.h index a981175de..2cba6abb3 100644 --- a/chalk/plugins/viewplugins/scripting/scripting.h +++ b/chalk/plugins/viewplugins/scripting/scripting.h @@ -39,7 +39,7 @@ class Scripting : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - Scripting(TQObject *tqparent, const char *name, const TQStringList &); + Scripting(TQObject *parent, const char *name, const TQStringList &); virtual ~Scripting(); private slots: void executionFinished(const Kross::Api::ScriptAction*); diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc b/chalk/plugins/viewplugins/selectopaque/selectopaque.cc index a5717a973..b7703846d 100644 --- a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc +++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.cc @@ -53,14 +53,14 @@ typedef KGenericFactory<SelectOpaque> SelectOpaqueFactory; K_EXPORT_COMPONENT_FACTORY( chalkselectopaque, SelectOpaqueFactory( "chalk" ) ) -SelectOpaque::SelectOpaque(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +SelectOpaque::SelectOpaque(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if (tqparent->inherits("KisView")) { + if (parent->inherits("KisView")) { setInstance(SelectOpaqueFactory::instance()); setXMLFile(locate("data","chalkplugins/selectopaque.rc"), true); - m_view = dynamic_cast<KisView*>(tqparent); + m_view = dynamic_cast<KisView*>(parent); m_view->canvasSubject()->selectionManager()->addSelectionAction( new KAction(i18n("&Select All Opaque Pixels..."), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "selectopaque") ); } diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.h b/chalk/plugins/viewplugins/selectopaque/selectopaque.h index 47614e302..b77c352a7 100644 --- a/chalk/plugins/viewplugins/selectopaque/selectopaque.h +++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.h @@ -30,7 +30,7 @@ class SelectOpaque : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - SelectOpaque(TQObject *tqparent, const char *name, const TQStringList &); + SelectOpaque(TQObject *parent, const char *name, const TQStringList &); virtual ~SelectOpaque(); private slots: diff --git a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc index e6124046f..99078d0f2 100644 --- a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc +++ b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc @@ -34,9 +34,9 @@ DlgSeparate::DlgSeparate( const TQString & imageCS, const TQString & layerCS, - TQWidget * tqparent, + TQWidget * parent, const char * name) - : super (tqparent, name, true, i18n("Separate Image"), Ok | Cancel, Ok), + : super (parent, name, true, i18n("Separate Image"), Ok | Cancel, Ok), m_imageCS(imageCS), m_layerCS(layerCS) { diff --git a/chalk/plugins/viewplugins/separate_channels/dlg_separate.h b/chalk/plugins/viewplugins/separate_channels/dlg_separate.h index d3536ddaa..4d97925c6 100644 --- a/chalk/plugins/viewplugins/separate_channels/dlg_separate.h +++ b/chalk/plugins/viewplugins/separate_channels/dlg_separate.h @@ -36,7 +36,7 @@ class DlgSeparate: public KDialogBase { public: - DlgSeparate(const TQString & imageCS, const TQString & layerCS, TQWidget * tqparent = 0, + DlgSeparate(const TQString & imageCS, const TQString & layerCS, TQWidget * parent = 0, const char* name = 0); ~DlgSeparate(); diff --git a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc index 64a83db58..f56b40a2d 100644 --- a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc +++ b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc @@ -39,14 +39,14 @@ K_EXPORT_COMPONENT_FACTORY( chalkseparatechannels, KGenericFactory<KisSeparateChannelsPlugin>( "chalk" ) ) -KisSeparateChannelsPlugin::KisSeparateChannelsPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +KisSeparateChannelsPlugin::KisSeparateChannelsPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) { + if ( parent->inherits("KisView") ) { setInstance(KGenericFactory<KisSeparateChannelsPlugin>::instance()); setXMLFile(locate("data","chalkplugins/imageseparate.rc"), true); - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; (void) new KAction(i18n("Separate Image..."), 0, 0, this, TQT_SLOT(slotSeparate()), actionCollection(), "separate"); } } diff --git a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h index ce3aa7318..6f3c1579b 100644 --- a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h +++ b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h @@ -31,7 +31,7 @@ class KisSeparateChannelsPlugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - KisSeparateChannelsPlugin(TQObject *tqparent, const char *name, const TQStringList &); + KisSeparateChannelsPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~KisSeparateChannelsPlugin(); private slots: diff --git a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc index ff6dadde8..a2c43aa91 100644 --- a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc +++ b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc @@ -39,9 +39,9 @@ using namespace std; #include "wdg_shearimage.h" -DlgShearImage::DlgShearImage( TQWidget * tqparent, +DlgShearImage::DlgShearImage( TQWidget * parent, const char * name) - : super (tqparent, name, true, i18n("Shear Image"), Ok | Cancel, Ok) + : super (parent, name, true, i18n("Shear Image"), Ok | Cancel, Ok) { m_lock = false; diff --git a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.h b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.h index 5c82abc72..f4a5dd8a2 100644 --- a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.h +++ b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.h @@ -31,7 +31,7 @@ class DlgShearImage: public KDialogBase { public: - DlgShearImage(TQWidget * tqparent = 0, + DlgShearImage(TQWidget * parent = 0, const char* name = 0); ~DlgShearImage(); diff --git a/chalk/plugins/viewplugins/shearimage/shearimage.cc b/chalk/plugins/viewplugins/shearimage/shearimage.cc index 4e7e61d6a..7976c266e 100644 --- a/chalk/plugins/viewplugins/shearimage/shearimage.cc +++ b/chalk/plugins/viewplugins/shearimage/shearimage.cc @@ -51,10 +51,10 @@ typedef KGenericFactory<ShearImage> ShearImageFactory; K_EXPORT_COMPONENT_FACTORY( chalkshearimage, ShearImageFactory( "chalk" ) ) // XXX: this plugin could also provide layer scaling/resizing -ShearImage::ShearImage(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +ShearImage::ShearImage(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) + if ( parent->inherits("KisView") ) { setInstance(ShearImageFactory::instance()); setXMLFile(locate("data","chalkplugins/shearimage.rc"), true); @@ -62,7 +62,7 @@ ShearImage::ShearImage(TQObject *tqparent, const char *name, const TQStringList (void) new KAction(i18n("&Shear Image..."), 0, 0, this, TQT_SLOT(slotShearImage()), actionCollection(), "shearimage"); (void) new KAction(i18n("&Shear Layer..."), 0, 0, this, TQT_SLOT(slotShearLayer()), actionCollection(), "shearlayer"); - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; } } diff --git a/chalk/plugins/viewplugins/shearimage/shearimage.h b/chalk/plugins/viewplugins/shearimage/shearimage.h index c824fb51f..9b7e95fa7 100644 --- a/chalk/plugins/viewplugins/shearimage/shearimage.h +++ b/chalk/plugins/viewplugins/shearimage/shearimage.h @@ -29,7 +29,7 @@ class ShearImage : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - ShearImage(TQObject *tqparent, const char *name, const TQStringList &); + ShearImage(TQObject *parent, const char *name, const TQStringList &); virtual ~ShearImage(); private slots: diff --git a/chalk/plugins/viewplugins/substrate/dlg_substrate.cc b/chalk/plugins/viewplugins/substrate/dlg_substrate.cc index dcecce482..b0a898568 100644 --- a/chalk/plugins/viewplugins/substrate/dlg_substrate.cc +++ b/chalk/plugins/viewplugins/substrate/dlg_substrate.cc @@ -24,9 +24,9 @@ #include "wdgsubstrate.h" -DlgSubstrate::DlgSubstrate( TQWidget * tqparent, +DlgSubstrate::DlgSubstrate( TQWidget * parent, const char * name) - : super (tqparent, name, true, i18n("Color Range"), Ok | Cancel, Ok) + : super (parent, name, true, i18n("Color Range"), Ok | Cancel, Ok) { m_previewPix = TQPixmap(); m_page = new WdgSubstrate(this, "substrate"); diff --git a/chalk/plugins/viewplugins/substrate/dlg_substrate.h b/chalk/plugins/viewplugins/substrate/dlg_substrate.h index 82051ad36..ac494ba2b 100644 --- a/chalk/plugins/viewplugins/substrate/dlg_substrate.h +++ b/chalk/plugins/viewplugins/substrate/dlg_substrate.h @@ -40,7 +40,7 @@ class DlgSubstrate: public KDialogBase { public: - DlgSubstrate(TQWidget * tqparent = 0, + DlgSubstrate(TQWidget * parent = 0, const char* name = 0); ~DlgSubstrate(); diff --git a/chalk/plugins/viewplugins/substrate/substrate.cc b/chalk/plugins/viewplugins/substrate/substrate.cc index 8aa4d32ea..2e080df70 100644 --- a/chalk/plugins/viewplugins/substrate/substrate.cc +++ b/chalk/plugins/viewplugins/substrate/substrate.cc @@ -44,18 +44,18 @@ typedef KGenericFactory<SubstratePlugin> SubstrateFactory; K_EXPORT_COMPONENT_FACTORY( chalksubstrate, SubstrateFactory( "chalk" ) ) -SubstratePlugin::SubstratePlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +SubstratePlugin::SubstratePlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) + if ( parent->inherits("KisView") ) { setInstance(SubstrateFactory::instance()); setXMLFile(locate("data","chalkplugins/substrate.rc"), true); (void) new KAction(i18n("&Substrate..."), 0, 0, this, TQT_SLOT(slotSubstrateActivated()), actionCollection(), "substrate"); - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; } } diff --git a/chalk/plugins/viewplugins/substrate/substrate.h b/chalk/plugins/viewplugins/substrate/substrate.h index 409a00f3b..243830452 100644 --- a/chalk/plugins/viewplugins/substrate/substrate.h +++ b/chalk/plugins/viewplugins/substrate/substrate.h @@ -30,7 +30,7 @@ class SubstratePlugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - SubstratePlugin(TQObject *tqparent, const char *name, const TQStringList &); + SubstratePlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~SubstratePlugin(); private slots: diff --git a/chalk/plugins/viewplugins/variations/dlg_variations.cc b/chalk/plugins/viewplugins/variations/dlg_variations.cc index 133246231..4f1890248 100644 --- a/chalk/plugins/viewplugins/variations/dlg_variations.cc +++ b/chalk/plugins/viewplugins/variations/dlg_variations.cc @@ -24,9 +24,9 @@ #include "wdg_variations.h" -DlgVariations::DlgVariations( TQWidget * tqparent, +DlgVariations::DlgVariations( TQWidget * parent, const char * name) - : super (tqparent, name, true, i18n("Color Range"), Ok | Cancel, Ok) + : super (parent, name, true, i18n("Color Range"), Ok | Cancel, Ok) { m_previewPix = TQPixmap(); m_page = new WdgVariations(this, "variations"); diff --git a/chalk/plugins/viewplugins/variations/dlg_variations.h b/chalk/plugins/viewplugins/variations/dlg_variations.h index e160e6aab..31909fca3 100644 --- a/chalk/plugins/viewplugins/variations/dlg_variations.h +++ b/chalk/plugins/viewplugins/variations/dlg_variations.h @@ -40,7 +40,7 @@ class DlgVariations: public KDialogBase { public: - DlgVariations(TQWidget * tqparent = 0, + DlgVariations(TQWidget * parent = 0, const char* name = 0); ~DlgVariations(); diff --git a/chalk/plugins/viewplugins/variations/variations.cc b/chalk/plugins/viewplugins/variations/variations.cc index 40e8fcf8d..2c0aaa9d2 100644 --- a/chalk/plugins/viewplugins/variations/variations.cc +++ b/chalk/plugins/viewplugins/variations/variations.cc @@ -48,18 +48,18 @@ typedef KGenericFactory<Variations> VariationsFactory; K_EXPORT_COMPONENT_FACTORY( chalkvariations, VariationsFactory( "chalk" ) ) -Variations::Variations(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name) +Variations::Variations(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name) { - if ( tqparent->inherits("KisView") ) + if ( parent->inherits("KisView") ) { setInstance(VariationsFactory::instance()); setXMLFile(locate("data","chalkplugins/variations.rc"), true); (void) new KAction(i18n("&Variations..."), 0, 0, this, TQT_SLOT(slotVariationsActivated()), actionCollection(), "variations"); - m_view = (KisView*) tqparent; + m_view = (KisView*) parent; } } diff --git a/chalk/plugins/viewplugins/variations/variations.h b/chalk/plugins/viewplugins/variations/variations.h index d8680ba79..1b448a423 100644 --- a/chalk/plugins/viewplugins/variations/variations.h +++ b/chalk/plugins/viewplugins/variations/variations.h @@ -30,7 +30,7 @@ class Variations : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - Variations(TQObject *tqparent, const char *name, const TQStringList &); + Variations(TQObject *parent, const char *name, const TQStringList &); virtual ~Variations(); private slots: diff --git a/chalk/sdk/kis_progress_subject.h b/chalk/sdk/kis_progress_subject.h index 59a8acb1e..024f77468 100644 --- a/chalk/sdk/kis_progress_subject.h +++ b/chalk/sdk/kis_progress_subject.h @@ -28,7 +28,7 @@ class KRITAUI_EXPORT KisProgressSubject : public TQObject { protected: KisProgressSubject() {}; - KisProgressSubject(TQObject * tqparent, const char * name) : TQObject(tqparent, name) {}; + KisProgressSubject(TQObject * parent, const char * name) : TQObject(parent, name) {}; virtual ~KisProgressSubject(); public: diff --git a/chalk/ui/kcurve.cc b/chalk/ui/kcurve.cc index 846139746..c7f9e0ad8 100644 --- a/chalk/ui/kcurve.cc +++ b/chalk/ui/kcurve.cc @@ -42,8 +42,8 @@ #include "kcurve.h" -KCurve::KCurve(TQWidget *tqparent, const char *name, WFlags f) - : TQWidget(tqparent, name, f) +KCurve::KCurve(TQWidget *parent, const char *name, WFlags f) + : TQWidget(parent, name, f) { m_grab_point = NULL; m_readOnlyMode = false; diff --git a/chalk/ui/kcurve.h b/chalk/ui/kcurve.h index 820b5f5ad..20aa20c3e 100644 --- a/chalk/ui/kcurve.h +++ b/chalk/ui/kcurve.h @@ -32,7 +32,7 @@ Q_OBJECT TQ_OBJECT public: - KCurve(TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0); + KCurve(TQWidget *parent = 0, const char *name = 0, WFlags f = 0); virtual ~KCurve(); diff --git a/chalk/ui/kis_autobrush.cc b/chalk/ui/kis_autobrush.cc index 3d081188f..b2e848a84 100644 --- a/chalk/ui/kis_autobrush.cc +++ b/chalk/ui/kis_autobrush.cc @@ -26,7 +26,7 @@ #include <tqlabel.h> -KisAutobrush::KisAutobrush(TQWidget *tqparent, const char* name, const TQString& caption) : KisWdgAutobrush(tqparent, name) +KisAutobrush::KisAutobrush(TQWidget *parent, const char* name, const TQString& caption) : KisWdgAutobrush(parent, name) { setCaption(caption); diff --git a/chalk/ui/kis_autobrush.h b/chalk/ui/kis_autobrush.h index 92b8509d8..fb06393ed 100644 --- a/chalk/ui/kis_autobrush.h +++ b/chalk/ui/kis_autobrush.h @@ -28,7 +28,7 @@ class KisAutobrush : public KisWdgAutobrush Q_OBJECT TQ_OBJECT public: - KisAutobrush(TQWidget *tqparent, const char* name, const TQString& caption); + KisAutobrush(TQWidget *parent, const char* name, const TQString& caption); void activate(); signals: diff --git a/chalk/ui/kis_autogradient.cc b/chalk/ui/kis_autogradient.cc index 86b755f91..318bf3055 100644 --- a/chalk/ui/kis_autogradient.cc +++ b/chalk/ui/kis_autogradient.cc @@ -32,7 +32,7 @@ /****************************** KisAutogradient ******************************/ -KisAutogradient::KisAutogradient(TQWidget *tqparent, const char* name, const TQString& caption) : KisWdgAutogradient(tqparent, name) +KisAutogradient::KisAutogradient(TQWidget *parent, const char* name, const TQString& caption) : KisWdgAutogradient(parent, name) { setCaption(caption); m_autogradientResource = new KisAutogradientResource(); diff --git a/chalk/ui/kis_autogradient.h b/chalk/ui/kis_autogradient.h index 7399aa67f..19c832a9e 100644 --- a/chalk/ui/kis_autogradient.h +++ b/chalk/ui/kis_autogradient.h @@ -32,7 +32,7 @@ class KisAutogradient : public KisWdgAutogradient TQ_OBJECT public: - KisAutogradient(TQWidget *tqparent, const char* name, const TQString& caption); + KisAutogradient(TQWidget *parent, const char* name, const TQString& caption); void activate(); signals: void activatedResource(KisResource *r); diff --git a/chalk/ui/kis_birdeye_box.cc b/chalk/ui/kis_birdeye_box.cc index 1484563fc..0bc9ae087 100644 --- a/chalk/ui/kis_birdeye_box.cc +++ b/chalk/ui/kis_birdeye_box.cc @@ -177,8 +177,8 @@ namespace { } -KisBirdEyeBox::KisBirdEyeBox(KisView * view, TQWidget* tqparent, const char* name) - : TQWidget(tqparent, name) +KisBirdEyeBox::KisBirdEyeBox(KisView * view, TQWidget* parent, const char* name) + : TQWidget(parent, name) , m_view(view) , m_subject(view->canvasSubject()) { diff --git a/chalk/ui/kis_birdeye_box.h b/chalk/ui/kis_birdeye_box.h index b95504748..e8fb88f71 100644 --- a/chalk/ui/kis_birdeye_box.h +++ b/chalk/ui/kis_birdeye_box.h @@ -38,7 +38,7 @@ class KisBirdEyeBox : public TQWidget public: - KisBirdEyeBox(KisView * view, TQWidget * tqparent = 0, const char* name=0); + KisBirdEyeBox(KisView * view, TQWidget * parent = 0, const char* name=0); ~KisBirdEyeBox(); void setImage(KisImageSP image); diff --git a/chalk/ui/kis_brush_chooser.cc b/chalk/ui/kis_brush_chooser.cc index 69aeafdfa..20de3c5b7 100644 --- a/chalk/ui/kis_brush_chooser.cc +++ b/chalk/ui/kis_brush_chooser.cc @@ -27,8 +27,8 @@ #include "kis_icon_item.h" #include "kis_brush.h" -KisBrushChooser::KisBrushChooser(TQWidget *tqparent, const char *name) - : super(tqparent, name) +KisBrushChooser::KisBrushChooser(TQWidget *parent, const char *name) + : super(parent, name) { m_lbSpacing = new TQLabel(i18n("Spacing:"), this); m_slSpacing = new KisDoubleWidget(0.0, 10, this, "double_widget"); @@ -36,7 +36,7 @@ KisBrushChooser::KisBrushChooser(TQWidget *tqparent, const char *name) m_slSpacing->setTickInterval(1); TQObject::connect(m_slSpacing, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotSetItemSpacing(double))); - m_chkColorMask = new TQCheckBox(i18n("Use color as tqmask"), this); + m_chkColorMask = new TQCheckBox(i18n("Use color as mask"), this); TQObject::connect(m_chkColorMask, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetItemUseColorAsMask(bool))); m_lbName = new TQLabel(this); diff --git a/chalk/ui/kis_brush_chooser.h b/chalk/ui/kis_brush_chooser.h index 99438e70a..cd5509ada 100644 --- a/chalk/ui/kis_brush_chooser.h +++ b/chalk/ui/kis_brush_chooser.h @@ -31,7 +31,7 @@ class KisBrushChooser : public KisItemChooser { TQ_OBJECT public: - KisBrushChooser(TQWidget *tqparent = 0, const char *name = 0); + KisBrushChooser(TQWidget *parent = 0, const char *name = 0); virtual ~KisBrushChooser(); protected: diff --git a/chalk/ui/kis_canvas.cc b/chalk/ui/kis_canvas.cc index 8ad09df3d..168724186 100644 --- a/chalk/ui/kis_canvas.cc +++ b/chalk/ui/kis_canvas.cc @@ -1064,9 +1064,9 @@ KisInputDevice KisCanvasWidget::findActiveInputDevice() #define TQPAINTDEVICE_CANVAS_WIDGET false #define OPENGL_CANVAS_WIDGET true -KisCanvas::KisCanvas(TQWidget *tqparent, const char *name) +KisCanvas::KisCanvas(TQWidget *parent, const char *name) { - m_parent = tqparent; + m_parent = parent; m_name = name; m_enableMoveEventCompressionHint = false; m_canvasWidget = 0; diff --git a/chalk/ui/kis_canvas.h b/chalk/ui/kis_canvas.h index be698ae2d..4d92a4ce9 100644 --- a/chalk/ui/kis_canvas.h +++ b/chalk/ui/kis_canvas.h @@ -286,7 +286,7 @@ class KisCanvas : public TQObject { TQ_OBJECT public: - KisCanvas(TQWidget *tqparent, const char *name); + KisCanvas(TQWidget *parent, const char *name); virtual ~KisCanvas(); // When enabled, the canvas may throw away move events if the application diff --git a/chalk/ui/kis_cmb_composite.cc b/chalk/ui/kis_cmb_composite.cc index 754e69daf..516813510 100644 --- a/chalk/ui/kis_cmb_composite.cc +++ b/chalk/ui/kis_cmb_composite.cc @@ -25,8 +25,8 @@ #include "kis_cmb_composite.h" -KisCmbComposite::KisCmbComposite(TQWidget * tqparent, const char * name) - : super( false, tqparent, name ) +KisCmbComposite::KisCmbComposite(TQWidget * parent, const char * name) + : super( false, parent, name ) { connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotOpActivated(int))); connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotOpHighlighted(int))); diff --git a/chalk/ui/kis_cmb_composite.h b/chalk/ui/kis_cmb_composite.h index ef5df0e61..25ccf3678 100644 --- a/chalk/ui/kis_cmb_composite.h +++ b/chalk/ui/kis_cmb_composite.h @@ -45,7 +45,7 @@ class KRITAUI_EXPORT KisCmbComposite : public TQComboBox public: - KisCmbComposite(TQWidget * tqparent = 0, const char * name = 0 ); + KisCmbComposite(TQWidget * parent = 0, const char * name = 0 ); virtual ~KisCmbComposite(); KisCompositeOp currentItem() const; diff --git a/chalk/ui/kis_cmb_idlist.cc b/chalk/ui/kis_cmb_idlist.cc index 0936350e3..2d7e80d9d 100644 --- a/chalk/ui/kis_cmb_idlist.cc +++ b/chalk/ui/kis_cmb_idlist.cc @@ -26,8 +26,8 @@ #include "kis_id.h" #include "kis_cmb_idlist.h" -KisCmbIDList::KisCmbIDList(TQWidget * tqparent, const char * name) - : super( false, tqparent, name ) +KisCmbIDList::KisCmbIDList(TQWidget * parent, const char * name) + : super( false, parent, name ) { connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotIDActivated(int))); connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotIDHighlighted(int))); diff --git a/chalk/ui/kis_cmb_idlist.h b/chalk/ui/kis_cmb_idlist.h index 2665c8f83..068943098 100644 --- a/chalk/ui/kis_cmb_idlist.h +++ b/chalk/ui/kis_cmb_idlist.h @@ -39,7 +39,7 @@ class KisCmbIDList : public TQComboBox public: - KisCmbIDList(TQWidget * tqparent = 0, const char * name = 0 ); + KisCmbIDList(TQWidget * parent = 0, const char * name = 0 ); virtual ~KisCmbIDList(); diff --git a/chalk/ui/kis_color_cup.cc b/chalk/ui/kis_color_cup.cc index 44a9699b5..4d2103d81 100644 --- a/chalk/ui/kis_color_cup.cc +++ b/chalk/ui/kis_color_cup.cc @@ -43,8 +43,8 @@ #include <kis_color.h> #include <kis_color_cup.h> -KisColorPopup::KisColorPopup(TQColor c, TQWidget * tqparent, const char * name) - : TQFrame(tqparent, name, WType_Popup | WStyle_Customize | WStyle_NoBorder) +KisColorPopup::KisColorPopup(TQColor c, TQWidget * parent, const char * name) + : TQFrame(parent, name, WType_Popup | WStyle_Customize | WStyle_NoBorder) { m_color = c; setMargin(4); @@ -59,8 +59,8 @@ KisColorPopup::KisColorPopup(TQColor c, TQWidget * tqparent, const char * name) } -KisColorCup::KisColorCup(TQWidget * tqparent, const char * name) - : TQPushButton(tqparent, name) +KisColorCup::KisColorCup(TQWidget * parent, const char * name) + : TQPushButton(parent, name) { m_color = TQt::black; m_popup = new KisColorPopup(m_color, this, "colorpopup"); diff --git a/chalk/ui/kis_color_cup.h b/chalk/ui/kis_color_cup.h index 7a59837a2..2cf9ddefe 100644 --- a/chalk/ui/kis_color_cup.h +++ b/chalk/ui/kis_color_cup.h @@ -60,7 +60,7 @@ class KRITAUI_EXPORT KisColorCup : public TQPushButton { public: - KisColorCup(TQWidget * tqparent, const char * name = 0); + KisColorCup(TQWidget * parent, const char * name = 0); virtual ~KisColorCup() {}; diff --git a/chalk/ui/kis_controlframe.cc b/chalk/ui/kis_controlframe.cc index 29b9aa8bd..fab8c4bbb 100644 --- a/chalk/ui/kis_controlframe.cc +++ b/chalk/ui/kis_controlframe.cc @@ -60,8 +60,8 @@ #ifdef HAVE_TEXT_BRUSH #include "kis_text_brush.h" #endif -KisPopupFrame::KisPopupFrame(TQWidget * tqparent, const char* name) - : TQPopupMenu(tqparent, name) +KisPopupFrame::KisPopupFrame(TQWidget * parent, const char* name) + : TQPopupMenu(parent, name) { setFocusPolicy(TQ_StrongFocus); } diff --git a/chalk/ui/kis_controlframe.h b/chalk/ui/kis_controlframe.h index 0c16c77f5..ac20191d7 100644 --- a/chalk/ui/kis_controlframe.h +++ b/chalk/ui/kis_controlframe.h @@ -56,7 +56,7 @@ class KisPopupFrame : public TQPopupMenu { public: - KisPopupFrame(TQWidget * tqparent, const char * name = 0); + KisPopupFrame(TQWidget * parent, const char * name = 0); virtual void keyPressEvent(TQKeyEvent *); public: diff --git a/chalk/ui/kis_cursor.cc b/chalk/ui/kis_cursor.cc index ca899da86..c4281eac9 100644 --- a/chalk/ui/kis_cursor.cc +++ b/chalk/ui/kis_cursor.cc @@ -122,9 +122,9 @@ TQCursor KisCursor::pickerCursor() 0x74, 0x00, 0x00, 0x32, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00}; TQBitmap picker_bitmap(24, 24, picker_bits, true); - TQBitmap picker_tqmask = picker_bitmap.createHeuristicMask( false ); + TQBitmap picker_mask = picker_bitmap.createHeuristicMask( false ); - return TQCursor( picker_bitmap, picker_tqmask, 1, 22 ); + return TQCursor( picker_bitmap, picker_mask, 1, 22 ); } @@ -139,9 +139,9 @@ TQCursor KisCursor::pickerPlusCursor() 0x74, 0x00, 0x0c, 0x32, 0x00, 0x0c, 0x0a, 0x00, 0x0c, 0x00, 0x00, 0x00}; TQBitmap picker_bitmap(24, 24, pickerplus_bits, true); - TQBitmap picker_tqmask = picker_bitmap.createHeuristicMask( false ); + TQBitmap picker_mask = picker_bitmap.createHeuristicMask( false ); - return TQCursor( picker_bitmap, picker_tqmask, 1, 22 ); + return TQCursor( picker_bitmap, picker_mask, 1, 22 ); } @@ -156,9 +156,9 @@ TQCursor KisCursor::pickerMinusCursor() 0x74, 0x00, 0x00, 0x32, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00}; TQBitmap picker_bitmap(24, 24, pickerminus_bits, true); - TQBitmap picker_tqmask = picker_bitmap.createHeuristicMask( false ); + TQBitmap picker_mask = picker_bitmap.createHeuristicMask( false ); - return TQCursor( picker_bitmap, picker_tqmask, 1, 22 ); + return TQCursor( picker_bitmap, picker_mask, 1, 22 ); } @@ -174,9 +174,9 @@ TQCursor KisCursor::penCursor() 0x7c, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00}; TQBitmap pen_bitmap( 24, 24, pen_bits, true ); - TQBitmap pen_tqmask = pen_bitmap.createHeuristicMask( false ); + TQBitmap pen_mask = pen_bitmap.createHeuristicMask( false ); - return TQCursor( pen_bitmap, pen_tqmask, 1, 22 ); + return TQCursor( pen_bitmap, pen_mask, 1, 22 ); } TQCursor KisCursor::brushCursor() @@ -192,9 +192,9 @@ TQCursor KisCursor::brushCursor() 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; TQBitmap brush_bitmap( 25, 23, brush_bits, true ); - TQBitmap brush_tqmask = brush_bitmap.createHeuristicMask( false ); + TQBitmap brush_mask = brush_bitmap.createHeuristicMask( false ); - return TQCursor( brush_bitmap, brush_tqmask, 1, 21 ); + return TQCursor( brush_bitmap, brush_mask, 1, 21 ); } TQCursor KisCursor::airbrushCursor() @@ -208,9 +208,9 @@ TQCursor KisCursor::airbrushCursor() 0xf8, 0x00, 0x06, 0x76, 0x00, 0x03, 0x36, 0x00, 0x03, 0x00, 0x00, 0x00}; TQBitmap airbrush_bitmap( 24, 24, airbrush_bits, true ); - TQBitmap airbrush_tqmask = airbrush_bitmap.createHeuristicMask( false ); + TQBitmap airbrush_mask = airbrush_bitmap.createHeuristicMask( false ); - return TQCursor( airbrush_bitmap, airbrush_tqmask, 1, 22 ); + return TQCursor( airbrush_bitmap, airbrush_mask, 1, 22 ); } TQCursor KisCursor::eraserCursor() @@ -226,9 +226,9 @@ TQCursor KisCursor::eraserCursor() 0x10, 0x01, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; TQBitmap eraser_bitmap( 25, 24, eraser_bits, true ); - TQBitmap eraser_tqmask = eraser_bitmap.createHeuristicMask( false ); + TQBitmap eraser_mask = eraser_bitmap.createHeuristicMask( false ); - return TQCursor( eraser_bitmap, eraser_tqmask, 7, 22 ); + return TQCursor( eraser_bitmap, eraser_mask, 7, 22 ); } TQCursor KisCursor::fillerCursor() @@ -242,9 +242,9 @@ TQCursor KisCursor::fillerCursor() 0x08, 0x60, 0x00, 0x00, 0x00, 0x00}; TQBitmap filler_bitmap( 22, 22, filler_bits, true ); - TQBitmap filler_tqmask = filler_bitmap.createHeuristicMask( false ); + TQBitmap filler_mask = filler_bitmap.createHeuristicMask( false ); - return TQCursor( filler_bitmap, filler_tqmask, 3, 20 ); + return TQCursor( filler_bitmap, filler_mask, 3, 20 ); } TQCursor KisCursor::colorChangerCursor() @@ -258,9 +258,9 @@ TQCursor KisCursor::colorChangerCursor() 0x80, 0x81, 0x01, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00}; TQBitmap colorChanger_bitmap( 24, 23, colorChanger_bits, true ); - TQBitmap colorChanger_tqmask = colorChanger_bitmap.createHeuristicMask( false ); + TQBitmap colorChanger_mask = colorChanger_bitmap.createHeuristicMask( false ); - return TQCursor( colorChanger_bitmap, colorChanger_tqmask, 12, 10 ); + return TQCursor( colorChanger_bitmap, colorChanger_mask, 12, 10 ); } TQCursor KisCursor::zoomCursor() @@ -274,9 +274,9 @@ TQCursor KisCursor::zoomCursor() 0x00, 0x00, 0x7c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00}; TQBitmap zoom_bitmap( 24, 23, zoom_bits, true ); - TQBitmap zoom_tqmask = zoom_bitmap.createHeuristicMask( false ); + TQBitmap zoom_mask = zoom_bitmap.createHeuristicMask( false ); - return TQCursor( zoom_bitmap, zoom_tqmask, 9, 8 ); + return TQCursor( zoom_bitmap, zoom_mask, 9, 8 ); } TQCursor KisCursor::moveCursor() @@ -290,9 +290,9 @@ TQCursor KisCursor::moveCursor() 0x00, 0x7e, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00}; TQBitmap move_bitmap( 24, 24, move_bits, true ); - TQBitmap move_tqmask = move_bitmap.createHeuristicMask( false ); + TQBitmap move_mask = move_bitmap.createHeuristicMask( false ); - return TQCursor( move_bitmap, move_tqmask, 12, 11 ); + return TQCursor( move_bitmap, move_mask, 12, 11 ); } TQCursor KisCursor::handCursor() @@ -311,9 +311,9 @@ TQCursor KisCursor::selectCursor() 0x00, 0x08, 0x00, 0x00, 0x08, 0x00, 0x00, 0x08, 0x00}; TQBitmap select_bitmap(23, 23, select_bits, true); - TQBitmap select_tqmask = select_bitmap.createHeuristicMask( false ); + TQBitmap select_mask = select_bitmap.createHeuristicMask( false ); - return TQCursor( select_bitmap, select_tqmask, 11, 11 ); + return TQCursor( select_bitmap, select_mask, 11, 11 ); } TQCursor KisCursor::openHandCursor() @@ -341,10 +341,10 @@ TQCursor KisCursor::load(const TQString & iconName, int hotspotX, int hotspotY) Q_ASSERT(cursorImage.hasAlphaBuffer()); TQBitmap bitmap(cursorImage.width(), cursorImage.height()); - TQBitmap tqmask(cursorImage.width(), cursorImage.height()); + TQBitmap mask(cursorImage.width(), cursorImage.height()); TQPainter bitmapPainter(&bitmap); - TQPainter maskPainter(&tqmask); + TQPainter maskPainter(&mask); for (TQ_INT32 x = 0; x < cursorImage.width(); ++x) { for (TQ_INT32 y = 0; y < cursorImage.height(); ++y) { @@ -369,6 +369,6 @@ TQCursor KisCursor::load(const TQString & iconName, int hotspotX, int hotspotY) } } - return TQCursor(bitmap, tqmask, hotspotX, hotspotY); + return TQCursor(bitmap, mask, hotspotX, hotspotY); } diff --git a/chalk/ui/kis_custom_brush.cc b/chalk/ui/kis_custom_brush.cc index 49a44cc8c..8091d0fb9 100644 --- a/chalk/ui/kis_custom_brush.cc +++ b/chalk/ui/kis_custom_brush.cc @@ -39,8 +39,8 @@ #include "kis_paint_layer.h" #include "kis_group_layer.h" -KisCustomBrush::KisCustomBrush(TQWidget *tqparent, const char* name, const TQString& caption, KisView* view) - : KisWdgCustomBrush(tqparent, name), m_view(view) +KisCustomBrush::KisCustomBrush(TQWidget *parent, const char* name, const TQString& caption, KisView* view) + : KisWdgCustomBrush(parent, name), m_view(view) { Q_ASSERT(m_view); m_mediator = 0; diff --git a/chalk/ui/kis_custom_brush.h b/chalk/ui/kis_custom_brush.h index 56e90553f..a92ba65c3 100644 --- a/chalk/ui/kis_custom_brush.h +++ b/chalk/ui/kis_custom_brush.h @@ -33,7 +33,7 @@ class KisCustomBrush : public KisWdgCustomBrush Q_OBJECT TQ_OBJECT public: - KisCustomBrush(TQWidget *tqparent, const char* name, const TQString& caption, KisView* view); + KisCustomBrush(TQWidget *parent, const char* name, const TQString& caption, KisView* view); virtual ~KisCustomBrush(); void setResourceServer(KisResourceServerBase* server) { m_server = server; } diff --git a/chalk/ui/kis_custom_image_widget.cc b/chalk/ui/kis_custom_image_widget.cc index 0b77da9f1..93c829778 100644 --- a/chalk/ui/kis_custom_image_widget.cc +++ b/chalk/ui/kis_custom_image_widget.cc @@ -39,8 +39,8 @@ #include <KoUnitWidgets.h> #include <tqlabel.h> -KisCustomImageWidget::KisCustomImageWidget(TQWidget *tqparent, KisDoc *doc, TQ_INT32 defWidth, TQ_INT32 defHeight, double resolution, TQString defColorSpaceName, TQString imageName) - : WdgNewImage(tqparent) { +KisCustomImageWidget::KisCustomImageWidget(TQWidget *parent, KisDoc *doc, TQ_INT32 defWidth, TQ_INT32 defHeight, double resolution, TQString defColorSpaceName, TQString imageName) + : WdgNewImage(parent) { m_doc = doc; txtName->setText(imageName); diff --git a/chalk/ui/kis_custom_image_widget.h b/chalk/ui/kis_custom_image_widget.h index eef443dc2..a36d44bc4 100644 --- a/chalk/ui/kis_custom_image_widget.h +++ b/chalk/ui/kis_custom_image_widget.h @@ -36,10 +36,10 @@ class KisCustomImageWidget : public WdgNewImage { public: /** * Constructor. Please note that this class is being used/created by KisDoc. - * @param tqparent the tqparent widget + * @param parent the parent widget * @param doc the document that wants to be altered */ - KisCustomImageWidget(TQWidget *tqparent, KisDoc *doc, TQ_INT32 defWidth, TQ_INT32 defHeight, double resolution, TQString defColorSpaceName, TQString imageName); + KisCustomImageWidget(TQWidget *parent, KisDoc *doc, TQ_INT32 defWidth, TQ_INT32 defHeight, double resolution, TQString defColorSpaceName, TQString imageName); private slots: void buttonClicked(); diff --git a/chalk/ui/kis_custom_palette.cc b/chalk/ui/kis_custom_palette.cc index 47bd63b40..f84bf24d1 100644 --- a/chalk/ui/kis_custom_palette.cc +++ b/chalk/ui/kis_custom_palette.cc @@ -39,8 +39,8 @@ #include "kis_resource_mediator.h" #include "kis_resourceserver.h" -KisCustomPalette::KisCustomPalette(TQWidget *tqparent, const char* name, const TQString& caption, KisView* view) - : KisWdgCustomPalette(tqparent, name), m_view(view) +KisCustomPalette::KisCustomPalette(TQWidget *parent, const char* name, const TQString& caption, KisView* view) + : KisWdgCustomPalette(parent, name), m_view(view) { Q_ASSERT(m_view); m_mediator = 0; diff --git a/chalk/ui/kis_custom_palette.h b/chalk/ui/kis_custom_palette.h index 7ff9c9d8a..e8994c1e4 100644 --- a/chalk/ui/kis_custom_palette.h +++ b/chalk/ui/kis_custom_palette.h @@ -34,7 +34,7 @@ class KisCustomPalette : public KisWdgCustomPalette Q_OBJECT TQ_OBJECT public: - KisCustomPalette(TQWidget *tqparent, const char* name, const TQString& caption, KisView* view); + KisCustomPalette(TQWidget *parent, const char* name, const TQString& caption, KisView* view); virtual ~KisCustomPalette(); void setResourceServer(KisResourceServerBase* server) { m_server = server; } void setEditMode(bool b); diff --git a/chalk/ui/kis_custom_pattern.cc b/chalk/ui/kis_custom_pattern.cc index 64430f1c3..c5c04f230 100644 --- a/chalk/ui/kis_custom_pattern.cc +++ b/chalk/ui/kis_custom_pattern.cc @@ -36,8 +36,8 @@ #include "kis_resourceserver.h" #include "kis_paint_layer.h" -KisCustomPattern::KisCustomPattern(TQWidget *tqparent, const char* name, const TQString& caption, KisView* view) - : KisWdgCustomPattern(tqparent, name), m_view(view) +KisCustomPattern::KisCustomPattern(TQWidget *parent, const char* name, const TQString& caption, KisView* view) + : KisWdgCustomPattern(parent, name), m_view(view) { Q_ASSERT(m_view); m_mediator = 0; diff --git a/chalk/ui/kis_custom_pattern.h b/chalk/ui/kis_custom_pattern.h index 993c9d107..7850b3704 100644 --- a/chalk/ui/kis_custom_pattern.h +++ b/chalk/ui/kis_custom_pattern.h @@ -33,7 +33,7 @@ class KisCustomPattern : public KisWdgCustomPattern Q_OBJECT TQ_OBJECT public: - KisCustomPattern(TQWidget *tqparent, const char* name, const TQString& caption, KisView* view); + KisCustomPattern(TQWidget *parent, const char* name, const TQString& caption, KisView* view); virtual ~KisCustomPattern(); void setResourceServer(KisResourceServerBase* server) { m_server = server; } diff --git a/chalk/ui/kis_dlg_adj_layer_props.cc b/chalk/ui/kis_dlg_adj_layer_props.cc index c955eba36..1cdd309c4 100644 --- a/chalk/ui/kis_dlg_adj_layer_props.cc +++ b/chalk/ui/kis_dlg_adj_layer_props.cc @@ -44,9 +44,9 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer, const TQString & layerName, const TQString & caption, - TQWidget *tqparent, + TQWidget *parent, const char *name) - : KDialogBase(tqparent, name, true, "", Ok | Cancel) + : KDialogBase(parent, name, true, "", Ok | Cancel) { Q_ASSERT( layer ); m_layer = layer; diff --git a/chalk/ui/kis_dlg_adj_layer_props.h b/chalk/ui/kis_dlg_adj_layer_props.h index de8480020..e40635ee8 100644 --- a/chalk/ui/kis_dlg_adj_layer_props.h +++ b/chalk/ui/kis_dlg_adj_layer_props.h @@ -50,13 +50,13 @@ public: * @param caption the caption for the dialog -- create or properties * @param create if true, set the dialog up for creating a new adj. layer, if false, edit the * propeties of the current adj. layer - * @param tqparent the widget tqparent of this dialog + * @param parent the widget parent of this dialog * @param name the TQObject name, if any */ KisDlgAdjLayerProps(KisAdjustmentLayerSP layer, const TQString & layerName, const TQString & caption, - TQWidget *tqparent = 0, + TQWidget *parent = 0, const char *name = 0); KisFilterConfiguration * filterConfiguration() const; diff --git a/chalk/ui/kis_dlg_adjustment_layer.cc b/chalk/ui/kis_dlg_adjustment_layer.cc index 22cb9c0dc..13caff982 100644 --- a/chalk/ui/kis_dlg_adjustment_layer.cc +++ b/chalk/ui/kis_dlg_adjustment_layer.cc @@ -44,9 +44,9 @@ KisDlgAdjustmentLayer::KisDlgAdjustmentLayer(KisImage * img, const TQString & /*layerName*/, const TQString & caption, - TQWidget *tqparent, + TQWidget *parent, const char *name) - : KDialogBase(tqparent, name, true, "", Ok | Cancel) + : KDialogBase(parent, name, true, "", Ok | Cancel) , m_image(img) , m_currentFilter(0) , m_customName(false) diff --git a/chalk/ui/kis_dlg_adjustment_layer.h b/chalk/ui/kis_dlg_adjustment_layer.h index 4e20b8fd5..dd7992609 100644 --- a/chalk/ui/kis_dlg_adjustment_layer.h +++ b/chalk/ui/kis_dlg_adjustment_layer.h @@ -50,13 +50,13 @@ public: * @param caption the caption for the dialog -- create or properties * @param create if true, set the dialog up for creating a new adj. layer, if false, edit the * propeties of the current adj. layer - * @param tqparent the widget tqparent of this dialog + * @param parent the widget parent of this dialog * @param name the TQObject name, if any */ KisDlgAdjustmentLayer(KisImage * img, const TQString & layerName, const TQString & caption, - TQWidget *tqparent = 0, + TQWidget *parent = 0, const char *name = 0); KisFilterConfiguration * filterConfiguration() const; diff --git a/chalk/ui/kis_dlg_apply_profile.cc b/chalk/ui/kis_dlg_apply_profile.cc index 12134aa0e..5c1367388 100644 --- a/chalk/ui/kis_dlg_apply_profile.cc +++ b/chalk/ui/kis_dlg_apply_profile.cc @@ -34,8 +34,8 @@ #include "wdgapplyprofile.h" // XXX: Hardcode RGBA name. This should be a constant, somewhere. -KisDlgApplyProfile::KisDlgApplyProfile(TQWidget *tqparent, const char *name) - : super(tqparent, name, true, "", Ok | Cancel) +KisDlgApplyProfile::KisDlgApplyProfile(TQWidget *parent, const char *name) + : super(parent, name, true, "", Ok | Cancel) { setCaption(i18n("Apply Image Profile to Clipboard Data")); diff --git a/chalk/ui/kis_dlg_apply_profile.h b/chalk/ui/kis_dlg_apply_profile.h index 18f56d0a8..017c54ecf 100644 --- a/chalk/ui/kis_dlg_apply_profile.h +++ b/chalk/ui/kis_dlg_apply_profile.h @@ -30,7 +30,7 @@ class KisDlgApplyProfile : public KDialogBase { TQ_OBJECT public: - KisDlgApplyProfile(TQWidget *tqparent = 0, + KisDlgApplyProfile(TQWidget *parent = 0, const char *name = 0); virtual ~KisDlgApplyProfile(); diff --git a/chalk/ui/kis_dlg_image_properties.cc b/chalk/ui/kis_dlg_image_properties.cc index 29d221a0b..ca6a1b721 100644 --- a/chalk/ui/kis_dlg_image_properties.cc +++ b/chalk/ui/kis_dlg_image_properties.cc @@ -44,8 +44,8 @@ #include "squeezedcombobox.h" #include "wdgnewimage.h" -KisDlgImageProperties::KisDlgImageProperties(KisImageSP image, TQWidget *tqparent, const char *name) - : super(tqparent, name, true, "", Ok | Cancel) +KisDlgImageProperties::KisDlgImageProperties(KisImageSP image, TQWidget *parent, const char *name) + : super(parent, name, true, "", Ok | Cancel) { setCaption(i18n("Image Properties")); diff --git a/chalk/ui/kis_dlg_image_properties.h b/chalk/ui/kis_dlg_image_properties.h index 934adc05f..b5d0a3aee 100644 --- a/chalk/ui/kis_dlg_image_properties.h +++ b/chalk/ui/kis_dlg_image_properties.h @@ -33,7 +33,7 @@ class KisDlgImageProperties : public KDialogBase { public: KisDlgImageProperties(KisImageSP image, - TQWidget *tqparent = 0, + TQWidget *parent = 0, const char *name = 0); virtual ~KisDlgImageProperties(); diff --git a/chalk/ui/kis_dlg_layer_properties.cc b/chalk/ui/kis_dlg_layer_properties.cc index 68df970ba..7742969b2 100644 --- a/chalk/ui/kis_dlg_layer_properties.cc +++ b/chalk/ui/kis_dlg_layer_properties.cc @@ -39,8 +39,8 @@ KisDlgLayerProperties::KisDlgLayerProperties(const TQString& deviceName, TQ_INT32 opacity, const KisCompositeOp& compositeOp, const KisColorSpace * colorSpace, - TQWidget *tqparent, const char *name, WFlags f) - : super(tqparent, name, f, name, Ok | Cancel) + TQWidget *parent, const char *name, WFlags f) + : super(parent, name, f, name, Ok | Cancel) { m_page = new WdgLayerProperties(this); m_page->tqlayout()->setMargin(0); diff --git a/chalk/ui/kis_dlg_layer_properties.h b/chalk/ui/kis_dlg_layer_properties.h index c2b2a5e0e..d60a6b8f7 100644 --- a/chalk/ui/kis_dlg_layer_properties.h +++ b/chalk/ui/kis_dlg_layer_properties.h @@ -35,7 +35,7 @@ public: TQ_INT32 opacity, const KisCompositeOp& compositeOp, const KisColorSpace * colorSpace, - TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0); + TQWidget *parent = 0, const char *name = 0, WFlags f = 0); virtual ~KisDlgLayerProperties(); diff --git a/chalk/ui/kis_dlg_new_layer.cc b/chalk/ui/kis_dlg_new_layer.cc index a0a97a7ef..154dbf2cc 100644 --- a/chalk/ui/kis_dlg_new_layer.cc +++ b/chalk/ui/kis_dlg_new_layer.cc @@ -43,9 +43,9 @@ NewLayerDialog::NewLayerDialog(const KisID colorSpaceID, const TQString & profilename, const TQString & deviceName, - TQWidget *tqparent, + TQWidget *parent, const char *name) - : super(tqparent, name, true, "", Ok | Cancel) + : super(parent, name, true, "", Ok | Cancel) { m_page = new WdgLayerProperties(this); m_page->tqlayout()->setMargin(0); diff --git a/chalk/ui/kis_dlg_new_layer.h b/chalk/ui/kis_dlg_new_layer.h index b484e1dce..761b2495d 100644 --- a/chalk/ui/kis_dlg_new_layer.h +++ b/chalk/ui/kis_dlg_new_layer.h @@ -38,7 +38,7 @@ public: NewLayerDialog(const KisID colorSpace, const TQString & profilename, const TQString & deviceName, - TQWidget *tqparent = 0, + TQWidget *parent = 0, const char *name = 0); TQString layerName() const; diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cc index 941e033e3..a19edebeb 100644 --- a/chalk/ui/kis_dlg_preferences.cc +++ b/chalk/ui/kis_dlg_preferences.cc @@ -108,8 +108,8 @@ float GeneralTab::dockerFontSize() //--------------------------------------------------------------------------------------------------- -ColorSettingsTab::ColorSettingsTab(TQWidget *tqparent, const char *name ) - : TQWidget(tqparent, name) +ColorSettingsTab::ColorSettingsTab(TQWidget *parent, const char *name ) + : TQWidget(parent, name) { // XXX: Make sure only profiles that fit the specified color model // are shown in the profile combos @@ -195,8 +195,8 @@ void ColorSettingsTab::refillPrintProfiles(const KisID & s) //--------------------------------------------------------------------------------------------------- -PerformanceTab::PerformanceTab(TQWidget *tqparent, const char *name ) - : WdgPerformanceSettings(tqparent, name) +PerformanceTab::PerformanceTab(TQWidget *parent, const char *name ) + : WdgPerformanceSettings(parent, name) { // XXX: Make sure only profiles that fit the specified color model // are shown in the profile combos @@ -216,8 +216,8 @@ void PerformanceTab::setDefault() //--------------------------------------------------------------------------------------------------- -TabletSettingsTab::TabletSettingsTab( TQWidget *tqparent, const char *name) - : WdgTabletSettings( tqparent, name ) +TabletSettingsTab::TabletSettingsTab( TQWidget *parent, const char *name) + : WdgTabletSettings( parent, name ) { #ifdef EXTENDED_X11_TABLET_SUPPORT initTabletDevices(); @@ -380,8 +380,8 @@ TQ_INT32 TabletSettingsTab::DeviceSettings::serialNumberAxis() const } TabletSettingsTab::TabletDeviceSettingsDialog::TabletDeviceSettingsDialog(const TQString& deviceName, DeviceSettings settings, - TQWidget *tqparent, const char *name) - : super(tqparent, name, true, "", Ok | Cancel) + TQWidget *parent, const char *name) + : super(parent, name, true, "", Ok | Cancel) { setCaption(i18n("Configure %1").tqarg(deviceName)); @@ -611,8 +611,8 @@ void TabletSettingsTab::applyTabletDeviceSettings() //--------------------------------------------------------------------------------------------------- -DisplaySettingsTab::DisplaySettingsTab( TQWidget *tqparent, const char *name) - : WdgDisplaySettings( tqparent, name ) +DisplaySettingsTab::DisplaySettingsTab( TQWidget *parent, const char *name) + : WdgDisplaySettings( parent, name ) { #ifdef HAVE_GL KisConfig cfg; @@ -646,7 +646,7 @@ void DisplaySettingsTab::slotUseOpenGLToggled(bool /*isChecked*/) } //--------------------------------------------------------------------------------------------------- -GridSettingsTab::GridSettingsTab(TQWidget* tqparent) : WdgGridSettingsBase(tqparent) +GridSettingsTab::GridSettingsTab(TQWidget* parent) : WdgGridSettingsBase(parent) { KisConfig cfg; selectMainStyle->setCurrentItem(cfg.getGridMainStyle()); @@ -723,8 +723,8 @@ void GridSettingsTab::linkSpacingToggled(bool b) //--------------------------------------------------------------------------------------------------- -PreferencesDialog::PreferencesDialog( TQWidget* tqparent, const char* name ) - : KDialogBase( IconList, i18n("Preferences"), Ok | Cancel | Help | Default /*| Apply*/, Ok, tqparent, name, true, true ) +PreferencesDialog::PreferencesDialog( TQWidget* parent, const char* name ) + : KDialogBase( IconList, i18n("Preferences"), Ok | Cancel | Help | Default /*| Apply*/, Ok, parent, name, true, true ) { TQVBox *vbox; diff --git a/chalk/ui/kis_dlg_preferences.h b/chalk/ui/kis_dlg_preferences.h index 61f4a5867..908caf8e1 100644 --- a/chalk/ui/kis_dlg_preferences.h +++ b/chalk/ui/kis_dlg_preferences.h @@ -53,7 +53,7 @@ class GeneralTab : public WdgGeneralSettings public: - GeneralTab( TQWidget *tqparent = 0, const char *name = 0 ); + GeneralTab( TQWidget *parent = 0, const char *name = 0 ); enumCursorStyle cursorStyle(); enumKoDockability dockability(); @@ -72,7 +72,7 @@ class ColorSettingsTab : public TQWidget public: - ColorSettingsTab( TQWidget *tqparent = 0, const char * name = 0 ); + ColorSettingsTab( TQWidget *parent = 0, const char * name = 0 ); private slots: @@ -94,7 +94,7 @@ Q_OBJECT TQ_OBJECT public: - PerformanceTab( TQWidget *tqparent = 0, const char *name = 0 ); + PerformanceTab( TQWidget *parent = 0, const char *name = 0 ); public: void setDefault(); @@ -112,7 +112,7 @@ Q_OBJECT TQ_OBJECT public: - TabletSettingsTab( TQWidget *tqparent = 0, const char *name = 0 ); + TabletSettingsTab( TQWidget *parent = 0, const char *name = 0 ); public: void setDefault(); @@ -180,7 +180,7 @@ private: public: TabletDeviceSettingsDialog(const TQString& deviceName, DeviceSettings settings, - TQWidget *tqparent = 0, + TQWidget *parent = 0, const char *name = 0); virtual ~TabletDeviceSettingsDialog(); @@ -209,7 +209,7 @@ Q_OBJECT TQ_OBJECT public: - DisplaySettingsTab( TQWidget *tqparent = 0, const char *name = 0 ); + DisplaySettingsTab( TQWidget *parent = 0, const char *name = 0 ); public: void setDefault(); @@ -227,7 +227,7 @@ class GridSettingsTab : public WdgGridSettingsBase { Q_OBJECT TQ_OBJECT public: - GridSettingsTab(TQWidget* tqparent); + GridSettingsTab(TQWidget* parent); public: void setDefault(); private slots: @@ -256,7 +256,7 @@ public: protected: - PreferencesDialog( TQWidget *tqparent = 0, const char *name = 0 ); + PreferencesDialog( TQWidget *parent = 0, const char *name = 0 ); ~PreferencesDialog(); protected: diff --git a/chalk/ui/kis_doc.cc b/chalk/ui/kis_doc.cc index 1fc1c9c91..6bae7e781 100644 --- a/chalk/ui/kis_doc.cc +++ b/chalk/ui/kis_doc.cc @@ -137,8 +137,8 @@ namespace { } -KisDoc::KisDoc(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, bool singleViewMode) : - super(parentWidget, widgetName, tqparent, name, singleViewMode) +KisDoc::KisDoc(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, bool singleViewMode) : + super(parentWidget, widgetName, parent, name, singleViewMode) { m_undo = false; @@ -460,7 +460,7 @@ KisImageSP KisDoc::loadImage(const TQDomElement& element) return img; } -void KisDoc::loadLayers(const TQDomElement& element, KisImageSP img, KisGroupLayerSP tqparent) +void KisDoc::loadLayers(const TQDomElement& element, KisImageSP img, KisGroupLayerSP parent) { TQDomNode node = element.firstChild(); TQDomNode child; @@ -477,7 +477,7 @@ void KisDoc::loadLayers(const TQDomElement& element, KisImageSP img, KisGroupLay } else { img->nextLayerName(); // Make sure the nameserver is current with the number of layers. - img->addLayer(layer, tqparent, 0); + img->addLayer(layer, parent, 0); } } } @@ -593,11 +593,11 @@ KisLayerSP KisDoc::loadPaintLayer(const TQDomElement& element, KisImageSP img, else m_layerFilenames[layer.data()] = TQString(element.attribute("filename")); - if ((attr = element.attribute("hastqmask")).isNull()) + if ((attr = element.attribute("hasmask")).isNull()) attr = "0"; if (attr == "1") { - // We add a tqmask, but we'll fill in the actual tqmask later in completeLoading with the visitor + // We add a mask, but we'll fill in the actual mask later in completeLoading with the visitor layer->createMask(); } @@ -805,7 +805,7 @@ bool KisDoc::completeLoading(KoStore *store) return true; } -TQWidget* KisDoc::createCustomDocumentWidget(TQWidget *tqparent) +TQWidget* KisDoc::createCustomDocumentWidget(TQWidget *parent) { KisConfig cfg; @@ -818,7 +818,7 @@ TQWidget* KisDoc::createCustomDocumentWidget(TQWidget *tqparent) w = sz.width(); h = sz.height(); } - return new KisCustomImageWidget(tqparent, this, w, h, cfg.defImgResolution(), cfg.workingColorSpace(),"unnamed"); + return new KisCustomImageWidget(parent, this, w, h, cfg.defImgResolution(), cfg.workingColorSpace(),"unnamed"); } @@ -931,9 +931,9 @@ bool KisDoc::newImage(const TQString& name, TQ_INT32 width, TQ_INT32 height, Kis return true; } -KoView* KisDoc::createViewInstance(TQWidget* tqparent, const char *name) +KoView* KisDoc::createViewInstance(TQWidget* parent, const char *name) { - KisView * v = new KisView(this, this, tqparent, name); + KisView * v = new KisView(this, this, parent, name); Q_CHECK_PTR(v); return v; diff --git a/chalk/ui/kis_doc.h b/chalk/ui/kis_doc.h index 222e9da65..f09cf39da 100644 --- a/chalk/ui/kis_doc.h +++ b/chalk/ui/kis_doc.h @@ -53,7 +53,7 @@ class KRITACORE_EXPORT KisDoc : public KoDocument, private KisUndoAdapter { TQ_OBJECT public: - KisDoc(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false); + KisDoc(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false); virtual ~KisDoc(); public: @@ -68,7 +68,7 @@ public: virtual bool loadChildren( KoStore* store); virtual bool loadXML(TQIODevice *, const TQDomDocument& doc); virtual TQCString mimeType() const; - virtual TQWidget* createCustomDocumentWidget(TQWidget *tqparent); + virtual TQWidget* createCustomDocumentWidget(TQWidget *parent); virtual KoDocument* hitTest(const TQPoint &pos, const TQWMatrix& matrix = TQWMatrix()); /** @@ -114,13 +114,13 @@ public: void setRedoLimit(TQ_INT32 limit); /** - * Create a new image that has this document as a tqparent and + * Create a new image that has this document as a parent and * replace the current image with this image. */ bool newImage(const TQString& name, TQ_INT32 width, TQ_INT32 height, KisColorSpace * cs, const KisColor &bgColor, const TQString &imgDescription, const double imgResolution); /** - * Create a new image that has this document as a tqparent and + * Create a new image that has this document as a parent and * replace the current image with this image. */ KisImageSP newImage(const TQString& name, TQ_INT32 width, TQ_INT32 height, KisColorSpace * colorstrategy); @@ -168,7 +168,7 @@ signals: protected: // Overide KoDocument - virtual KoView* createViewInstance(TQWidget *tqparent, const char *name); + virtual KoView* createViewInstance(TQWidget *parent, const char *name); protected slots: // Overide KoDocument @@ -183,7 +183,7 @@ private: TQDomElement saveImage(TQDomDocument& doc, KisImageSP img); KisImageSP loadImage(const TQDomElement& elem); - void loadLayers(const TQDomElement& element, KisImageSP img, KisGroupLayerSP tqparent); + void loadLayers(const TQDomElement& element, KisImageSP img, KisGroupLayerSP parent); KisLayerSP loadLayer(const TQDomElement& elem, KisImageSP img); KisLayerSP loadPaintLayer(const TQDomElement& elem, KisImageSP img, TQString name, TQ_INT32 x, TQ_INT32 y, TQ_INT32 opacity, bool visible, bool locked, diff --git a/chalk/ui/kis_double_widget.cc b/chalk/ui/kis_double_widget.cc index 3c13a47ed..6c03b3e95 100644 --- a/chalk/ui/kis_double_widget.cc +++ b/chalk/ui/kis_double_widget.cc @@ -27,14 +27,14 @@ #include "kis_double_widget.h" -KisDoubleWidget::KisDoubleWidget(TQWidget* tqparent, const char* name) - : super(tqparent, name) +KisDoubleWidget::KisDoubleWidget(TQWidget* parent, const char* name) + : super(parent, name) { init(0, 1); } -KisDoubleWidget::KisDoubleWidget(double min, double max, TQWidget* tqparent, const char* name) - : super(tqparent, name) +KisDoubleWidget::KisDoubleWidget(double min, double max, TQWidget* parent, const char* name) + : super(parent, name) { init(min, max); } diff --git a/chalk/ui/kis_double_widget.h b/chalk/ui/kis_double_widget.h index 89a425b7e..beb1cdd03 100644 --- a/chalk/ui/kis_double_widget.h +++ b/chalk/ui/kis_double_widget.h @@ -35,8 +35,8 @@ class KisDoubleWidget : public TQWidget typedef TQWidget super; public: - KisDoubleWidget(TQWidget* tqparent = 0, const char* name = 0); - KisDoubleWidget(double min, double max, TQWidget* tqparent = 0, const char* name = 0); + KisDoubleWidget(TQWidget* parent = 0, const char* name = 0); + KisDoubleWidget(double min, double max, TQWidget* parent = 0, const char* name = 0); ~KisDoubleWidget(); double value() const; diff --git a/chalk/ui/kis_factory.cc b/chalk/ui/kis_factory.cc index aa84aa617..519ca8782 100644 --- a/chalk/ui/kis_factory.cc +++ b/chalk/ui/kis_factory.cc @@ -50,8 +50,8 @@ KInstance* KisFactory::s_instance = 0; -KisFactory::KisFactory( TQObject* tqparent, const char* name ) - : KoFactory( tqparent, name ) +KisFactory::KisFactory( TQObject* parent, const char* name ) + : KoFactory( parent, name ) { s_aboutData = newChalkAboutData(); @@ -79,13 +79,13 @@ KisFactory::~KisFactory() * Create the document */ KParts::Part* KisFactory::createPartObject( TQWidget *parentWidget, - const char *widgetName, TQObject* tqparent, + const char *widgetName, TQObject* parent, const char* name, const char* classname, const TQStringList & ) { bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 ); KisDoc *doc = new KisDoc( parentWidget, - widgetName, tqparent, name, !bWantKoDocument ); + widgetName, parent, name, !bWantKoDocument ); Q_CHECK_PTR(doc); if ( !bWantKoDocument ) diff --git a/chalk/ui/kis_factory.h b/chalk/ui/kis_factory.h index da9d3e409..660e77dd5 100644 --- a/chalk/ui/kis_factory.h +++ b/chalk/ui/kis_factory.h @@ -38,12 +38,12 @@ class KRITACORE_EXPORT KisFactory : public KoFactory TQ_OBJECT public: - KisFactory( TQObject* tqparent = 0, const char* name = 0 ); + KisFactory( TQObject* parent = 0, const char* name = 0 ); ~KisFactory(); virtual KParts::Part *createPartObject(TQWidget *parentWidget = 0, const char *widgetName = 0, - TQObject *tqparent = 0, + TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); diff --git a/chalk/ui/kis_filter_manager.h b/chalk/ui/kis_filter_manager.h index beaf66a2e..a155e74af 100644 --- a/chalk/ui/kis_filter_manager.h +++ b/chalk/ui/kis_filter_manager.h @@ -48,7 +48,7 @@ class KRITACORE_EXPORT KisFilterManager : public TQObject { public: - KisFilterManager(KisView * tqparent, KisDoc * doc); + KisFilterManager(KisView * parent, KisDoc * doc); ~KisFilterManager(); void setup(KActionCollection * ac); diff --git a/chalk/ui/kis_filters_listview.cc b/chalk/ui/kis_filters_listview.cc index 163c88a4b..f2d63cc39 100644 --- a/chalk/ui/kis_filters_listview.cc +++ b/chalk/ui/kis_filters_listview.cc @@ -40,8 +40,8 @@ // ------------------------------------------------ -KisFiltersThumbnailThread::KisFiltersThumbnailThread(TQIconView * tqparent, KisFiltersIconViewItem * iconItem, KisFilterConfiguration * config, KisFilter * filter, KisPaintDeviceSP dev, const TQRect & bounds, KisProfile * profile) - : m_parent(tqparent) +KisFiltersThumbnailThread::KisFiltersThumbnailThread(TQIconView * parent, KisFiltersIconViewItem * iconItem, KisFilterConfiguration * config, KisFilter * filter, KisPaintDeviceSP dev, const TQRect & bounds, KisProfile * profile) + : m_parent(parent) , m_iconItem(iconItem) , m_config(config) , m_filter(filter) @@ -87,15 +87,15 @@ void KisFiltersThumbnailThread::cancel() // ------------------------------------------------ -KisFiltersIconViewItem::KisFiltersIconViewItem(TQIconView * tqparent, const TQString & text, const TQPixmap & icon, +KisFiltersIconViewItem::KisFiltersIconViewItem(TQIconView * parent, const TQString & text, const TQPixmap & icon, KisID id, KisFilter* filter, KisFilterConfiguration* filterConfig, KisPaintDeviceSP thumb, const TQRect & bounds, KisProfile * profile) - : TQIconViewItem(tqparent, text, icon) + : TQIconViewItem(parent, text, icon) , m_id(id) , m_filter(filter) , m_filterconfig(filterConfig) { - m_thread = new KisFiltersThumbnailThread(tqparent, this, filterConfig, filter, thumb, bounds, profile); + m_thread = new KisFiltersThumbnailThread(parent, this, filterConfig, filter, thumb, bounds, profile); } KisFiltersIconViewItem::~KisFiltersIconViewItem() @@ -106,8 +106,8 @@ KisFiltersIconViewItem::~KisFiltersIconViewItem() // ------------------------------------------------ -KisFiltersListView::KisFiltersListView(TQWidget* tqparent, bool filterForAdjustmentLayers, const char* name) - : KIconView(tqparent, name) +KisFiltersListView::KisFiltersListView(TQWidget* parent, bool filterForAdjustmentLayers, const char* name) + : KIconView(parent, name) , m_original(0) , m_profile(0) , m_filterForAdjustmentLayers(filterForAdjustmentLayers) @@ -115,8 +115,8 @@ KisFiltersListView::KisFiltersListView(TQWidget* tqparent, bool filterForAdjustm init(); } -KisFiltersListView::KisFiltersListView(TQWidget * tqparent, const char * name, WFlags f, bool filterForAdjustmentLayers) - : KIconView(tqparent, name, f) +KisFiltersListView::KisFiltersListView(TQWidget * parent, const char * name, WFlags f, bool filterForAdjustmentLayers) + : KIconView(parent, name, f) , m_original(0) , m_profile(0) , m_filterForAdjustmentLayers(filterForAdjustmentLayers) @@ -124,8 +124,8 @@ KisFiltersListView::KisFiltersListView(TQWidget * tqparent, const char * name, W init(); } -KisFiltersListView::KisFiltersListView(KisLayerSP layer, TQWidget* tqparent, bool filterForAdjustmentLayers, const char * name) - : KIconView(tqparent, name) +KisFiltersListView::KisFiltersListView(KisLayerSP layer, TQWidget* parent, bool filterForAdjustmentLayers, const char * name) + : KIconView(parent, name) , m_original(0) , m_profile(0) , m_filterForAdjustmentLayers(filterForAdjustmentLayers) @@ -139,8 +139,8 @@ KisFiltersListView::KisFiltersListView(KisLayerSP layer, TQWidget* tqparent, boo init(); } -KisFiltersListView::KisFiltersListView(KisPaintDeviceSP device, TQWidget* tqparent, bool filterForAdjustmentLayers, const char * name) - : KIconView(tqparent, name) +KisFiltersListView::KisFiltersListView(KisPaintDeviceSP device, TQWidget* parent, bool filterForAdjustmentLayers, const char * name) + : KIconView(parent, name) , m_original(device) , m_profile(0) , m_filterForAdjustmentLayers(filterForAdjustmentLayers) diff --git a/chalk/ui/kis_filters_listview.h b/chalk/ui/kis_filters_listview.h index c4979e250..3b7fa77bc 100644 --- a/chalk/ui/kis_filters_listview.h +++ b/chalk/ui/kis_filters_listview.h @@ -58,7 +58,7 @@ class KisFiltersThumbnailThread : public KisThread { public: - KisFiltersThumbnailThread(TQIconView * tqparent, + KisFiltersThumbnailThread(TQIconView * parent, KisFiltersIconViewItem * iconItem, KisFilterConfiguration * config, KisFilter * filter, KisPaintDeviceSP dev, const TQRect & bounds, @@ -83,7 +83,7 @@ private: class KisFiltersIconViewItem : public TQIconViewItem { public: - KisFiltersIconViewItem( TQIconView * tqparent, const TQString & text, const TQPixmap & icon, + KisFiltersIconViewItem( TQIconView * parent, const TQString & text, const TQPixmap & icon, KisID id, KisFilter* filter, KisFilterConfiguration* filterConfig, KisPaintDeviceSP thumb, const TQRect & bounds, KisProfile * profile); @@ -105,10 +105,10 @@ private: class KisFiltersListView : public KIconView { public: - explicit KisFiltersListView(TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0, bool filterForAdjustmentLayers = false); - KisFiltersListView(TQWidget* tqparent, bool filterForAdjustmentLayers = false, const char* name = 0); - KisFiltersListView(KisLayerSP layer, TQWidget* tqparent, bool filterForAdjustmentLayers = false, const char * name = 0) KDE_DEPRECATED; - KisFiltersListView(KisPaintDeviceSP layer, TQWidget* tqparent, bool filterForAdjustmentLayers = false, const char * name = 0); + explicit KisFiltersListView(TQWidget * parent = 0, const char * name = 0, WFlags f = 0, bool filterForAdjustmentLayers = false); + KisFiltersListView(TQWidget* parent, bool filterForAdjustmentLayers = false, const char* name = 0); + KisFiltersListView(KisLayerSP layer, TQWidget* parent, bool filterForAdjustmentLayers = false, const char * name = 0) KDE_DEPRECATED; + KisFiltersListView(KisPaintDeviceSP layer, TQWidget* parent, bool filterForAdjustmentLayers = false, const char * name = 0); virtual void customEvent(TQCustomEvent *); diff --git a/chalk/ui/kis_gradient_chooser.cc b/chalk/ui/kis_gradient_chooser.cc index 7e416ea1b..203f0718a 100644 --- a/chalk/ui/kis_gradient_chooser.cc +++ b/chalk/ui/kis_gradient_chooser.cc @@ -32,15 +32,15 @@ #include "kis_gradient_chooser.h" -KisCustomGradientDialog::KisCustomGradientDialog(KisView * view, TQWidget * tqparent, const char *name) - : KDialogBase(tqparent, name, false, i18n("Custom Gradient"), Close) +KisCustomGradientDialog::KisCustomGradientDialog(KisView * view, TQWidget * parent, const char *name) + : KDialogBase(parent, name, false, i18n("Custom Gradient"), Close) { m_page = new KisAutogradient(this, "autogradient", i18n("Custom Gradient")); setMainWidget(m_page); connect(m_page, TQT_SIGNAL(activatedResource(KisResource *)), view, TQT_SLOT(gradientActivated(KisResource*))); } -KisGradientChooser::KisGradientChooser(KisView * view, TQWidget *tqparent, const char *name) : super(tqparent, name) +KisGradientChooser::KisGradientChooser(KisView * view, TQWidget *parent, const char *name) : super(parent, name) { m_lbName = new TQLabel(this); diff --git a/chalk/ui/kis_gradient_chooser.h b/chalk/ui/kis_gradient_chooser.h index fc154f3c5..3553213fc 100644 --- a/chalk/ui/kis_gradient_chooser.h +++ b/chalk/ui/kis_gradient_chooser.h @@ -33,7 +33,7 @@ class KisCustomGradientDialog : public KDialogBase { public: - KisCustomGradientDialog(KisView * view, TQWidget * tqparent, const char *name); + KisCustomGradientDialog(KisView * view, TQWidget * parent, const char *name); private: @@ -48,7 +48,7 @@ class KisGradientChooser : public KisItemChooser { public: // XXX: On library redesign, remove m_view parameter here, it's just a temporary hack for the autogradient dialog! - KisGradientChooser(KisView * view, TQWidget *tqparent = 0, const char *name = 0); + KisGradientChooser(KisView * view, TQWidget *parent = 0, const char *name = 0); virtual ~KisGradientChooser(); protected: diff --git a/chalk/ui/kis_gradient_slider_widget.cc b/chalk/ui/kis_gradient_slider_widget.cc index 0547bdb50..cda77d689 100644 --- a/chalk/ui/kis_gradient_slider_widget.cc +++ b/chalk/ui/kis_gradient_slider_widget.cc @@ -30,8 +30,8 @@ #define MARGIN 5 #define HANDLE_SIZE 10 -KisGradientSliderWidget::KisGradientSliderWidget(TQWidget *tqparent, const char* name, WFlags f ) - : TQWidget( tqparent, name, f), +KisGradientSliderWidget::KisGradientSliderWidget(TQWidget *parent, const char* name, WFlags f ) + : TQWidget( parent, name, f), m_currentSegment(0), m_selectedSegment(0), m_drag(0) diff --git a/chalk/ui/kis_gradient_slider_widget.h b/chalk/ui/kis_gradient_slider_widget.h index d15ac1c49..995b3a59e 100644 --- a/chalk/ui/kis_gradient_slider_widget.h +++ b/chalk/ui/kis_gradient_slider_widget.h @@ -33,7 +33,7 @@ class KisGradientSliderWidget : public TQWidget TQ_OBJECT public: - KisGradientSliderWidget(TQWidget *tqparent = 0, const char* name = 0, WFlags f = 0); + KisGradientSliderWidget(TQWidget *parent = 0, const char* name = 0, WFlags f = 0); public: virtual void paintEvent ( TQPaintEvent * ); diff --git a/chalk/ui/kis_grid_manager.cpp b/chalk/ui/kis_grid_manager.cpp index 53ee931c8..5eda1cf9a 100644 --- a/chalk/ui/kis_grid_manager.cpp +++ b/chalk/ui/kis_grid_manager.cpp @@ -40,8 +40,8 @@ #include "kis_image.h" #include "kis_view.h" -KisGridManager::KisGridManager(KisView * tqparent) - : TQObject(tqparent), m_view(tqparent) +KisGridManager::KisGridManager(KisView * parent) + : TQObject(parent), m_view(parent) { } diff --git a/chalk/ui/kis_grid_manager.h b/chalk/ui/kis_grid_manager.h index f4708ef04..16ae03f50 100644 --- a/chalk/ui/kis_grid_manager.h +++ b/chalk/ui/kis_grid_manager.h @@ -35,7 +35,7 @@ class KisGridManager : public TQObject Q_OBJECT TQ_OBJECT public: - KisGridManager(KisView * tqparent); + KisGridManager(KisView * parent); ~KisGridManager(); public: void setup(KActionCollection * collection); diff --git a/chalk/ui/kis_histogram_view.cc b/chalk/ui/kis_histogram_view.cc index cc4fe59c5..3b94db619 100644 --- a/chalk/ui/kis_histogram_view.cc +++ b/chalk/ui/kis_histogram_view.cc @@ -38,8 +38,8 @@ #include "kis_basic_histogram_producers.h" #include "kis_paint_device.h" -KisHistogramView::KisHistogramView(TQWidget *tqparent, const char *name, WFlags f) - : TQLabel(tqparent, name, f) +KisHistogramView::KisHistogramView(TQWidget *parent, const char *name, WFlags f) + : TQLabel(parent, name, f) { // This is needed until we can computationally scale it well. Until then, this is needed // And when we have it, it won't hurt to have it around diff --git a/chalk/ui/kis_histogram_view.h b/chalk/ui/kis_histogram_view.h index 6b4524a8f..92ab8f209 100644 --- a/chalk/ui/kis_histogram_view.h +++ b/chalk/ui/kis_histogram_view.h @@ -49,7 +49,7 @@ class KisHistogramView : public TQLabel { Q_OBJECT TQ_OBJECT public: - KisHistogramView(TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0); + KisHistogramView(TQWidget *parent = 0, const char *name = 0, WFlags f = 0); virtual ~KisHistogramView(); void setPaintDevice(KisPaintDeviceSP dev); diff --git a/chalk/ui/kis_iconwidget.cc b/chalk/ui/kis_iconwidget.cc index 3e9ce4f1d..0109f7ebd 100644 --- a/chalk/ui/kis_iconwidget.cc +++ b/chalk/ui/kis_iconwidget.cc @@ -21,7 +21,7 @@ #include <koIconChooser.h> #include "kis_iconwidget.h" -KisIconWidget::KisIconWidget(TQWidget *tqparent, const char *name) : super(tqparent, name) +KisIconWidget::KisIconWidget(TQWidget *parent, const char *name) : super(parent, name) { m_item = 0; } diff --git a/chalk/ui/kis_iconwidget.h b/chalk/ui/kis_iconwidget.h index d65cbcbdf..45733d135 100644 --- a/chalk/ui/kis_iconwidget.h +++ b/chalk/ui/kis_iconwidget.h @@ -34,7 +34,7 @@ class KisIconWidget : public TQToolButton { * are shown. */ public: - KisIconWidget(TQWidget *tqparent = 0, const char *name = 0); + KisIconWidget(TQWidget *parent = 0, const char *name = 0); public slots: void slotSetItem(KoIconItem& item); diff --git a/chalk/ui/kis_import_catcher.cc b/chalk/ui/kis_import_catcher.cc index b2d04cab2..26040309b 100644 --- a/chalk/ui/kis_import_catcher.cc +++ b/chalk/ui/kis_import_catcher.cc @@ -54,23 +54,23 @@ void KisImportCatcher::slotLoadingFinished() // Don't import the root if this is not a layered image (1 group layer // plus 1 other). importedImageLayer = importedImageLayer->firstChild(); - importedImageLayer->tqparent()->removeLayer(importedImageLayer); + importedImageLayer->parent()->removeLayer(importedImageLayer); } importedImageLayer->setName(m_url.prettyURL()); - KisGroupLayerSP tqparent = 0; + KisGroupLayerSP parent = 0; KisLayerSP currentActiveLayer = m_image->activeLayer(); if (currentActiveLayer) { - tqparent = currentActiveLayer->tqparent(); + parent = currentActiveLayer->parent(); } - if (tqparent == 0) { - tqparent = m_image->rootLayer(); + if (parent == 0) { + parent = m_image->rootLayer(); } - m_image->addLayer(importedImageLayer.data(), tqparent, currentActiveLayer); + m_image->addLayer(importedImageLayer.data(), parent, currentActiveLayer); } } m_doc->deleteLater(); diff --git a/chalk/ui/kis_int_spinbox.cc b/chalk/ui/kis_int_spinbox.cc index 8dc0e68db..1375caccb 100644 --- a/chalk/ui/kis_int_spinbox.cc +++ b/chalk/ui/kis_int_spinbox.cc @@ -61,14 +61,14 @@ public: }; -KisIntSpinbox::KisIntSpinbox(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +KisIntSpinbox::KisIntSpinbox(TQWidget *parent, const char *name) + : TQWidget(parent, name) { init(0); } -KisIntSpinbox::KisIntSpinbox(const TQString & /*label*/, int val, TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +KisIntSpinbox::KisIntSpinbox(const TQString & /*label*/, int val, TQWidget *parent, const char *name) + : TQWidget(parent, name) { init(val); } diff --git a/chalk/ui/kis_int_spinbox.h b/chalk/ui/kis_int_spinbox.h index a5c4602e0..469de0997 100644 --- a/chalk/ui/kis_int_spinbox.h +++ b/chalk/ui/kis_int_spinbox.h @@ -38,8 +38,8 @@ class KisPopupSlider : public TQPopupMenu { public: - KisPopupSlider(int minValue, int maxValue, int pageStep, int value, Qt::Orientation orientation, TQWidget * tqparent, const char * name = 0) - : TQPopupMenu(tqparent, name) + KisPopupSlider(int minValue, int maxValue, int pageStep, int value, Qt::Orientation orientation, TQWidget * parent, const char * name = 0) + : TQPopupMenu(parent, name) { m_slider = new TQSlider(minValue, maxValue, pageStep, value, orientation, this, name); //m_slider->setTracking(false); @@ -86,10 +86,10 @@ public: * Constructs an input control for integer values * with base 10 and initial value 0. * - * @param tqparent tqparent TQWidget + * @param parent parent TQWidget * @param name internal name for this widget */ - KisIntSpinbox(TQWidget *tqparent=0, const char *name=0); + KisIntSpinbox(TQWidget *parent=0, const char *name=0); /** * Constructor * It constructs a TQSpinBox that allows the input of integer numbers @@ -98,10 +98,10 @@ public: * * @param label the tabel (may contain &, and my be empty) * @param value initial value for the control - * @param tqparent tqparent TQWidget + * @param parent parent TQWidget * @param name internal name for this widget */ - KisIntSpinbox(const TQString & label, int value, TQWidget* tqparent=0, const char *name=0); + KisIntSpinbox(const TQString & label, int value, TQWidget* parent=0, const char *name=0); /** * Destructor diff --git a/chalk/ui/kis_itemchooser.cc b/chalk/ui/kis_itemchooser.cc index d418bd2fc..36513c32a 100644 --- a/chalk/ui/kis_itemchooser.cc +++ b/chalk/ui/kis_itemchooser.cc @@ -25,7 +25,7 @@ #include "kis_global.h" #include "kis_icon_item.h" -KisItemChooser::KisItemChooser(TQWidget *tqparent, const char *name) : super(tqparent, name) +KisItemChooser::KisItemChooser(TQWidget *parent, const char *name) : super(parent, name) { /* m_frame = new TQVBox(this); m_frame->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);*/ diff --git a/chalk/ui/kis_itemchooser.h b/chalk/ui/kis_itemchooser.h index d29aa28d6..bb84ddcc8 100644 --- a/chalk/ui/kis_itemchooser.h +++ b/chalk/ui/kis_itemchooser.h @@ -34,7 +34,7 @@ class KisItemChooser : public TQWidget { TQ_OBJECT public: - KisItemChooser(TQWidget *tqparent = 0, + KisItemChooser(TQWidget *parent = 0, const char *name = 0); virtual ~KisItemChooser(); diff --git a/chalk/ui/kis_label_cursor_pos.cc b/chalk/ui/kis_label_cursor_pos.cc index 984df6dd2..d28f1a83b 100644 --- a/chalk/ui/kis_label_cursor_pos.cc +++ b/chalk/ui/kis_label_cursor_pos.cc @@ -18,12 +18,12 @@ #include "kis_label_cursor_pos.h" #include "kis_label_cursor_pos.moc" -KisLabelCursorPos::KisLabelCursorPos(TQWidget *tqparent, const char *name, WFlags f) : super(tqparent, name, f) +KisLabelCursorPos::KisLabelCursorPos(TQWidget *parent, const char *name, WFlags f) : super(parent, name, f) { setText("0:0"); m_doUpdates = true; - //setMinimumSize( 200, tqparent->height() - 4); + //setMinimumSize( 200, parent->height() - 4); } KisLabelCursorPos::~KisLabelCursorPos() diff --git a/chalk/ui/kis_label_cursor_pos.h b/chalk/ui/kis_label_cursor_pos.h index 392a0b689..ff7301f16 100644 --- a/chalk/ui/kis_label_cursor_pos.h +++ b/chalk/ui/kis_label_cursor_pos.h @@ -26,7 +26,7 @@ class KisLabelCursorPos : public TQLabel { typedef TQLabel super; public: - KisLabelCursorPos(TQWidget *tqparent, const char *name = 0, WFlags f = 0); + KisLabelCursorPos(TQWidget *parent, const char *name = 0, WFlags f = 0); virtual ~KisLabelCursorPos(); public slots: diff --git a/chalk/ui/kis_label_progress.cc b/chalk/ui/kis_label_progress.cc index c04452f4d..c081111f0 100644 --- a/chalk/ui/kis_label_progress.cc +++ b/chalk/ui/kis_label_progress.cc @@ -36,7 +36,7 @@ class EscapeButton : public TQToolButton { public: - EscapeButton(TQWidget * tqparent, const char * name) : TQToolButton(tqparent, name) {}; + EscapeButton(TQWidget * parent, const char * name) : TQToolButton(parent, name) {}; void keyReleaseEvent(TQKeyEvent *e) { @@ -45,7 +45,7 @@ public: } }; -KisLabelProgress::KisLabelProgress(TQWidget *tqparent, const char *name, WFlags f) : super(tqparent, name, f) +KisLabelProgress::KisLabelProgress(TQWidget *parent, const char *name, WFlags f) : super(parent, name, f) { m_subject = 0; m_modal = false; diff --git a/chalk/ui/kis_label_progress.h b/chalk/ui/kis_label_progress.h index a2c42fd9f..0539a1436 100644 --- a/chalk/ui/kis_label_progress.h +++ b/chalk/ui/kis_label_progress.h @@ -33,7 +33,7 @@ class KisLabelProgress : public TQLabel, public KisProgressDisplayInterface { typedef TQLabel super; public: - KisLabelProgress(TQWidget *tqparent, const char *name = 0, WFlags f = 0); + KisLabelProgress(TQWidget *parent, const char *name = 0, WFlags f = 0); virtual ~KisLabelProgress(); public: diff --git a/chalk/ui/kis_label_zoom.h b/chalk/ui/kis_label_zoom.h index e7fad08a1..a2cff7eac 100644 --- a/chalk/ui/kis_label_zoom.h +++ b/chalk/ui/kis_label_zoom.h @@ -24,8 +24,8 @@ class KisLabelZoom : public TQLabel { Q_OBJECT TQ_OBJECT - KisLabelZoom( TQWidget *tqparent, const char *name = 0, WFlags f = 0 ) : - TQLabel( tqparent, name, f ) {} + KisLabelZoom( TQWidget *parent, const char *name = 0, WFlags f = 0 ) : + TQLabel( parent, name, f ) {} virtual ~KisLabelZoom() {} }; diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc index cfdc6acdb..424c405db 100644 --- a/chalk/ui/kis_layerbox.cc +++ b/chalk/ui/kis_layerbox.cc @@ -61,8 +61,8 @@ #include "kis_layerbox.h" -KisLayerBox::KisLayerBox(KisCanvasSubject *subject, TQWidget *tqparent, const char *name) - : super(tqparent, name), m_image(0) +KisLayerBox::KisLayerBox(KisCanvasSubject *subject, TQWidget *parent, const char *name) + : super(parent, name), m_image(0) { TQVBoxLayout *vbox = new TQVBoxLayout(this); vbox->setAutoAdd(true); @@ -200,7 +200,7 @@ void KisLayerBox::slotLayerAdded(KisLayerSP layer) vKisLayerSP layersAdded; - if (layer->tqparent() == m_image->rootLayer()) + if (layer->parent() == m_image->rootLayer()) { KisPopulateVisitor visitor(list()); layer->accept(visitor); @@ -208,7 +208,7 @@ void KisLayerBox::slotLayerAdded(KisLayerSP layer) } else { - KisPopulateVisitor visitor(static_cast<KisLayerItem*>(list()->layer(layer->tqparent()->id()))); + KisPopulateVisitor visitor(static_cast<KisLayerItem*>(list()->layer(layer->parent()->id()))); layer->accept(visitor); layersAdded = visitor.layersAdded(); } @@ -229,8 +229,8 @@ void KisLayerBox::slotLayerRemoved(KisLayerSP layer, KisGroupLayerSP wasParent, void KisLayerBox::slotLayerMoved(KisLayerSP layer, KisGroupLayerSP wasParent, KisLayerSP) { - int parentID = layer->tqparent()->id(); - if (layer->tqparent() == m_image->rootLayer()) + int parentID = layer->parent()->id(); + if (layer->parent() == m_image->rootLayer()) parentID = -1; int siblingID = -1; @@ -239,7 +239,7 @@ void KisLayerBox::slotLayerMoved(KisLayerSP layer, KisGroupLayerSP wasParent, Ki list()->moveLayer(layer->id(), parentID, siblingID); - markModified(layer->tqparent()); + markModified(layer->parent()); markModified(wasParent); updateUI(); } @@ -302,16 +302,16 @@ void KisLayerBox::slotLayerPropertyChanged(LayerItem* item, const TQString& name void KisLayerBox::slotLayerMoved(LayerItem* item, LayerItem*, LayerItem*) { KisLayerSP layer = m_image->findLayer(item->id()); - KisGroupLayerSP tqparent; - if( item->tqparent() ) - tqparent = dynamic_cast<KisGroupLayer*>(m_image->findLayer(item->tqparent()->id()).data()); - if( !tqparent ) - tqparent = m_image->rootLayer(); + KisGroupLayerSP parent; + if( item->parent() ) + parent = dynamic_cast<KisGroupLayer*>(m_image->findLayer(item->parent()->id()).data()); + if( !parent ) + parent = m_image->rootLayer(); KisLayerSP above = 0; if (item->nextSibling()) above = m_image->findLayer(item->nextSibling()->id()); if (layer) - m_image->moveLayer(layer, tqparent.data(), above); + m_image->moveLayer(layer, parent.data(), above); updateUI(); } @@ -320,7 +320,7 @@ void KisLayerBox::slotRequestNewLayer(LayerItem* p, LayerItem* after) KisLayer* l = m_image->rootLayer().data(); if (p) l = m_image->findLayer(p->id()).data(); - KisGroupLayerSP tqparent = dynamic_cast<KisGroupLayer*>(l); + KisGroupLayerSP parent = dynamic_cast<KisGroupLayer*>(l); KisLayerSP above = 0; if (after && after->nextSibling()) @@ -328,10 +328,10 @@ void KisLayerBox::slotRequestNewLayer(LayerItem* p, LayerItem* after) else if (after) above = 0; else if (p && p->firstChild()) - above = tqparent->firstChild(); + above = parent->firstChild(); else if (!p && m_image->rootLayer()->childCount()) above = m_image->rootLayer()->firstChild(); - emit sigRequestLayer(tqparent, above); + emit sigRequestLayer(parent, above); } void KisLayerBox::slotRequestNewFolder(LayerItem* p, LayerItem* after) @@ -339,7 +339,7 @@ void KisLayerBox::slotRequestNewFolder(LayerItem* p, LayerItem* after) KisLayer* l = m_image->rootLayer().data(); //FIXME I hate copy-pasting like this. if (p) l = m_image->findLayer(p->id()).data(); - KisGroupLayerSP tqparent = dynamic_cast<KisGroupLayer*>(l); + KisGroupLayerSP parent = dynamic_cast<KisGroupLayer*>(l); KisLayerSP above = 0; if (after && after->nextSibling()) @@ -347,10 +347,10 @@ void KisLayerBox::slotRequestNewFolder(LayerItem* p, LayerItem* after) else if (after) above = 0; else if (p && p->firstChild()) - above = tqparent->firstChild(); + above = parent->firstChild(); else if (!p && m_image->rootLayer()->childCount()) above = m_image->rootLayer()->firstChild(); - emit sigRequestGroupLayer(tqparent, above); + emit sigRequestGroupLayer(parent, above); } void KisLayerBox::slotRequestNewAdjustmentLayer(LayerItem* p, LayerItem* after) @@ -358,7 +358,7 @@ void KisLayerBox::slotRequestNewAdjustmentLayer(LayerItem* p, LayerItem* after) KisLayer* l = m_image->rootLayer().data(); //FIXME here too. if (p) l = m_image->findLayer(p->id()).data(); - KisGroupLayerSP tqparent = dynamic_cast<KisGroupLayer*>(l); + KisGroupLayerSP parent = dynamic_cast<KisGroupLayer*>(l); KisLayerSP above = 0; if (after && after->nextSibling()) @@ -366,10 +366,10 @@ void KisLayerBox::slotRequestNewAdjustmentLayer(LayerItem* p, LayerItem* after) else if (after) above = 0; else if (p && p->firstChild()) - above = tqparent->firstChild(); + above = parent->firstChild(); else if (!p && m_image->rootLayer()->childCount()) above = m_image->rootLayer()->firstChild(); - emit sigRequestAdjustmentLayer(tqparent, above); + emit sigRequestAdjustmentLayer(parent, above); } void KisLayerBox::slotRequestNewObjectLayer(LayerItem* p, LayerItem* after, const KoDocumentEntry& entry) @@ -377,7 +377,7 @@ void KisLayerBox::slotRequestNewObjectLayer(LayerItem* p, LayerItem* after, cons KisLayer* l = m_image->rootLayer().data(); //FIXME and here. if (p) l = m_image->findLayer(p->id()).data(); - KisGroupLayerSP tqparent = dynamic_cast<KisGroupLayer*>(l); + KisGroupLayerSP parent = dynamic_cast<KisGroupLayer*>(l); KisLayerSP above = 0; if (after && after->nextSibling()) @@ -385,10 +385,10 @@ void KisLayerBox::slotRequestNewObjectLayer(LayerItem* p, LayerItem* after, cons else if (after) above = 0; else if (p && p->firstChild()) - above = tqparent->firstChild(); + above = parent->firstChild(); else if (!p && m_image->rootLayer()->childCount()) above = m_image->rootLayer()->firstChild(); - emit sigRequestPartLayer(tqparent, above, entry); + emit sigRequestPartLayer(parent, above, entry); } void KisLayerBox::slotRequestRemoveLayer(LayerItem* item) @@ -410,7 +410,7 @@ void KisLayerBox::slotRequestLayerProperties(LayerItem* item) void KisLayerBox::updateUI() { m_lst->bnDelete->setEnabled(list()->activeLayer()); - m_lst->bnRaise->setEnabled(list()->activeLayer() && (list()->activeLayer()->prevSibling() || list()->activeLayer()->tqparent())); + m_lst->bnRaise->setEnabled(list()->activeLayer() && (list()->activeLayer()->prevSibling() || list()->activeLayer()->parent())); m_lst->bnLower->setEnabled(list()->activeLayer() && list()->activeLayer()->nextSibling()); m_lst->intOpacity->setEnabled(list()->activeLayer()); m_lst->cmbComposite->setEnabled(list()->activeLayer()); @@ -464,35 +464,35 @@ void KisLayerBox::slotAddMenuActivated(int type) return; KisGroupLayerSP root = m_image->rootLayer(); - KisGroupLayerSP tqparent; + KisGroupLayerSP parent; KisLayerSP above; if (KisLayerSP active = m_image->activeLayer()) { - tqparent = root; + parent = root; above = active; - if (active->tqparent()) - tqparent = active->tqparent(); + if (active->parent()) + parent = active->parent(); } else { - tqparent = root; + parent = root; above = m_image->rootLayer()->firstChild(); } switch (type) { case PAINT_LAYER: - emit sigRequestLayer(tqparent, above); + emit sigRequestLayer(parent, above); break; case GROUP_LAYER: - emit sigRequestGroupLayer(tqparent, above); + emit sigRequestGroupLayer(parent, above); break; case ADJUSTMENT_LAYER: - emit sigRequestAdjustmentLayer(tqparent, above); + emit sigRequestAdjustmentLayer(parent, above); break; case OBJECT_LAYER: default: //goddamned TQt doesn't emit activated for default-assigned IDs, so this does nothing - emit sigRequestPartLayer(tqparent, above, m_partLayerAction->documentEntry()); + emit sigRequestPartLayer(parent, above, m_partLayerAction->documentEntry()); } } @@ -522,17 +522,17 @@ void KisLayerBox::slotRaiseClicked() } KisLayerSP layer = m_image->findLayer(l.first()); - if( l.count() == 1 && layer == layer->tqparent()->firstChild() && layer->tqparent() != m_image->rootLayer()) + if( l.count() == 1 && layer == layer->parent()->firstChild() && layer->parent() != m_image->rootLayer()) { - if (KisGroupLayerSP grandtqparent = layer->tqparent()->tqparent()) - m_image->moveLayer(layer, grandtqparent, layer->tqparent().data()); + if (KisGroupLayerSP grandparent = layer->parent()->parent()) + m_image->moveLayer(layer, grandparent, layer->parent().data()); } else { for (int i = 0, n = l.count(); i < n; ++i) if (KisLayerSP li = m_image->findLayer(l[i])) if (li->prevSibling()) - m_image->moveLayer(li, li->tqparent(), li->prevSibling()); + m_image->moveLayer(li, li->parent(), li->prevSibling()); } if( !l.isEmpty() ) @@ -551,7 +551,7 @@ void KisLayerBox::slotLowerClicked() for (int i = l.count() - 1; i >= 0; --i) if (LayerItem *layer = l[i]) if (layer->nextSibling()) - list()->moveLayer(layer, layer->tqparent(), layer->nextSibling()); + list()->moveLayer(layer, layer->parent(), layer->nextSibling()); if( !l.isEmpty() ) list()->ensureItemVisible( l.last() ); @@ -609,7 +609,7 @@ void KisLayerBox::markModified(KisLayer* layer) while (layer && layer != m_image->rootLayer().data()) { v.append(layer->id()); - layer = layer->tqparent(); + layer = layer->parent(); } for (int i = v.count() - 1; i >= 0; --i) if (!m_modified.contains(v[i])) @@ -636,7 +636,7 @@ void KisLayerBox::printChalkLayers() const root = layer; printChalkLayers(); indent -= 2; - root = layer->tqparent(); + root = layer->parent(); } } @@ -652,7 +652,7 @@ void KisLayerBox::printLayerboxLayers() const root = layer; printLayerboxLayers(); indent -= 2; - root = layer->tqparent(); + root = layer->parent(); } return; } @@ -668,7 +668,7 @@ void KisLayerBox::printLayerboxLayers() const root = layer; printLayerboxLayers(); indent -= 2; - root = layer->tqparent(); + root = layer->parent(); } } diff --git a/chalk/ui/kis_layerbox.h b/chalk/ui/kis_layerbox.h index c9d14a881..776f7fe27 100644 --- a/chalk/ui/kis_layerbox.h +++ b/chalk/ui/kis_layerbox.h @@ -47,7 +47,7 @@ class KisLayerBox : public TQFrame { TQ_OBJECT public: - KisLayerBox(KisCanvasSubject *subject, TQWidget *tqparent = 0, const char *name = 0); + KisLayerBox(KisCanvasSubject *subject, TQWidget *parent = 0, const char *name = 0); virtual ~KisLayerBox(); void clear(); @@ -69,10 +69,10 @@ public slots: void slotSetColorSpace(const KisColorSpace * colorSpace); signals: - void sigRequestLayer(KisGroupLayerSP tqparent, KisLayerSP above); - void sigRequestGroupLayer(KisGroupLayerSP tqparent, KisLayerSP above); - void sigRequestAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above); - void sigRequestPartLayer(KisGroupLayerSP tqparent, KisLayerSP above, const KoDocumentEntry& entry); + void sigRequestLayer(KisGroupLayerSP parent, KisLayerSP above); + void sigRequestGroupLayer(KisGroupLayerSP parent, KisLayerSP above); + void sigRequestAdjustmentLayer(KisGroupLayerSP parent, KisLayerSP above); + void sigRequestPartLayer(KisGroupLayerSP parent, KisLayerSP above, const KoDocumentEntry& entry); void sigRequestLayerProperties(KisLayerSP layer); void sigOpacityChanged(int opacity, bool withSlider); @@ -87,11 +87,11 @@ private slots: void slotLayerActivated(LayerItem* layer); void slotLayerDisplayNameChanged(LayerItem* layer, const TQString& displayName); void slotLayerPropertyChanged(LayerItem* layer, const TQString& name, bool on); - void slotLayerMoved(LayerItem* layer, LayerItem* tqparent, LayerItem* after); - void slotRequestNewLayer(LayerItem* tqparent, LayerItem* after); - void slotRequestNewFolder(LayerItem* tqparent, LayerItem* after); - void slotRequestNewAdjustmentLayer(LayerItem* tqparent, LayerItem* after); - void slotRequestNewObjectLayer(LayerItem* tqparent, LayerItem* item, const KoDocumentEntry& entry); + void slotLayerMoved(LayerItem* layer, LayerItem* parent, LayerItem* after); + void slotRequestNewLayer(LayerItem* parent, LayerItem* after); + void slotRequestNewFolder(LayerItem* parent, LayerItem* after); + void slotRequestNewAdjustmentLayer(LayerItem* parent, LayerItem* after); + void slotRequestNewObjectLayer(LayerItem* parent, LayerItem* item, const KoDocumentEntry& entry); void slotRequestRemoveLayer(LayerItem* layer); void slotRequestLayerProperties(LayerItem* layer); diff --git a/chalk/ui/kis_layerlist.cc b/chalk/ui/kis_layerlist.cc index 64127d20d..985bd0c69 100644 --- a/chalk/ui/kis_layerlist.cc +++ b/chalk/ui/kis_layerlist.cc @@ -35,8 +35,8 @@ #include "kis_layerlist.h" -KisLayerList::KisLayerList( TQWidget *tqparent, const char *name ) - : super( tqparent, name ) +KisLayerList::KisLayerList( TQWidget *parent, const char *name ) + : super( parent, name ) { m_partLayerAction = new KoPartSelectAction( i18n( "New &Object Layer" ), "gear", TQT_TQOBJECT(this) ); } @@ -76,26 +76,26 @@ void KisLayerList::constructMenu( LayerItem *layer ) void KisLayerList::menuActivated( int id, LayerItem *layer ) { const TQValueList<LayerItem*> selected = selectedLayers(); - LayerItem *tqparent = ( layer && layer->isFolder() ) ? layer : 0; + LayerItem *parent = ( layer && layer->isFolder() ) ? layer : 0; LayerItem *after = 0; - if( layer && !tqparent ) + if( layer && !parent ) { - tqparent = layer->tqparent(); + parent = layer->parent(); after = layer->prevSibling(); } switch( id ) { case MenuItems::NewLayer: - emit requestNewLayer( tqparent, after ); - emit requestNewLayer( tqparent ? tqparent->id() : -1, after ? after->id() : -1 ); + emit requestNewLayer( parent, after ); + emit requestNewLayer( parent ? parent->id() : -1, after ? after->id() : -1 ); break; case MenuItems::NewFolder: - emit requestNewFolder( tqparent, after ); - emit requestNewFolder( tqparent ? tqparent->id() : -1, after ? after->id() : -1 ); + emit requestNewFolder( parent, after ); + emit requestNewFolder( parent ? parent->id() : -1, after ? after->id() : -1 ); break; case ADJUSTMENT_LAYER: - emit requestNewAdjustmentLayer( tqparent, after ); - emit requestNewAdjustmentLayer( tqparent ? tqparent->id() : -1, after ? after->id() : -1 ); + emit requestNewAdjustmentLayer( parent, after ); + emit requestNewAdjustmentLayer( parent ? parent->id() : -1, after ? after->id() : -1 ); break; case MenuItems::RemoveLayer: { @@ -123,26 +123,26 @@ void KisLayerList::menuActivated( int id, LayerItem *layer ) super::menuActivated( id, layer ); else if( id != -1 ) //object layer was selected { - emit requestNewObjectLayer( tqparent, after, m_partLayerAction->documentEntry() ); - emit requestNewObjectLayer( tqparent ? tqparent->id() : -1, after ? after->id() : -1, m_partLayerAction->documentEntry() ); + emit requestNewObjectLayer( parent, after, m_partLayerAction->documentEntry() ); + emit requestNewObjectLayer( parent ? parent->id() : -1, after ? after->id() : -1, m_partLayerAction->documentEntry() ); } } } -KisLayerItem::KisLayerItem( LayerList* tqparent, KisLayer* layer ) +KisLayerItem::KisLayerItem( LayerList* parent, KisLayer* layer ) : super( layer->name(), - tqparent, - layer->prevSibling() ? tqparent->layer( layer->prevSibling()->id() ) : 0, + parent, + layer->prevSibling() ? parent->layer( layer->prevSibling()->id() ) : 0, layer->id() ) , m_layer( layer ) { init(); } -KisLayerItem::KisLayerItem( LayerItem* tqparent, KisLayer* layer ) +KisLayerItem::KisLayerItem( LayerItem* parent, KisLayer* layer ) : super( layer->name(), - tqparent, - layer->prevSibling() ? tqparent->listView()->layer( layer->prevSibling()->id() ) : 0, + parent, + layer->prevSibling() ? parent->listView()->layer( layer->prevSibling()->id() ) : 0, layer->id() ) , m_layer( layer ) { diff --git a/chalk/ui/kis_layerlist.h b/chalk/ui/kis_layerlist.h index 5b74acea4..c8a2c18ca 100644 --- a/chalk/ui/kis_layerlist.h +++ b/chalk/ui/kis_layerlist.h @@ -34,13 +34,13 @@ class KisLayerList: public LayerList typedef LayerList super; signals: - void requestNewObjectLayer( LayerItem *tqparent, LayerItem *after, const KoDocumentEntry &entry ); + void requestNewObjectLayer( LayerItem *parent, LayerItem *after, const KoDocumentEntry &entry ); void requestNewObjectLayer( int parentID, int afterID, const KoDocumentEntry &entry ); - void requestNewAdjustmentLayer( LayerItem *tqparent, LayerItem *after ); + void requestNewAdjustmentLayer( LayerItem *parent, LayerItem *after ); void requestNewAdjustmentLayer( int parentID, int afterID ); public: - KisLayerList( TQWidget *tqparent = 0, const char *name = 0 ); + KisLayerList( TQWidget *parent = 0, const char *name = 0 ); virtual void constructMenu( LayerItem *layer ); virtual void menuActivated( int id, LayerItem *layer ); @@ -56,8 +56,8 @@ class KisLayerItem: public LayerItem typedef LayerItem super; public: - KisLayerItem( LayerList* tqparent, KisLayer* layer ); - KisLayerItem( LayerItem* tqparent, KisLayer* layer ); + KisLayerItem( LayerList* parent, KisLayer* layer ); + KisLayerItem( LayerItem* parent, KisLayer* layer ); KisLayer* layer() const; diff --git a/chalk/ui/kis_load_visitor.h b/chalk/ui/kis_load_visitor.h index 1997d3bc3..bdac5e82b 100644 --- a/chalk/ui/kis_load_visitor.h +++ b/chalk/ui/kis_load_visitor.h @@ -88,16 +88,16 @@ public: kdDebug(DBG_AREA_FILE) << "Opened icc information, size is " << data.size() << endl; } - // tqmask + // mask if (layer->hasMask()) { // We set this in KisDoc::loadPaintLayer - KisPaintDeviceSP tqmask = layer->getMask(); + KisPaintDeviceSP mask = layer->getMask(); location = m_external ? TQString() : m_uri; - location += m_img->name() + "/layers/" + m_layerFilenames[layer] + ".tqmask"; + location += m_img->name() + "/layers/" + m_layerFilenames[layer] + ".mask"; // Layer data if (m_store->open(location)) { - if (!tqmask->read(m_store)) { - tqmask->disconnect(); + if (!mask->read(m_store)) { + mask->disconnect(); m_store->close(); //IODone(); return false; diff --git a/chalk/ui/kis_multi_bool_filter_widget.cc b/chalk/ui/kis_multi_bool_filter_widget.cc index 2507f1fb2..806998bf7 100644 --- a/chalk/ui/kis_multi_bool_filter_widget.cc +++ b/chalk/ui/kis_multi_bool_filter_widget.cc @@ -32,8 +32,8 @@ KisBoolWidgetParam::KisBoolWidgetParam( bool ninitvalue, TQString nlabel, TQStr } -KisMultiBoolFilterWidget::KisMultiBoolFilterWidget(TQWidget * tqparent, const char * name, const char * caption, vKisBoolWidgetParam iwparam) : - KisFilterConfigWidget( tqparent, name ) +KisMultiBoolFilterWidget::KisMultiBoolFilterWidget(TQWidget * parent, const char * name, const char * caption, vKisBoolWidgetParam iwparam) : + KisFilterConfigWidget( parent, name ) { TQ_INT32 m_nbboolWidgets = iwparam.size(); diff --git a/chalk/ui/kis_multi_bool_filter_widget.h b/chalk/ui/kis_multi_bool_filter_widget.h index 0e719beef..81d626fa0 100644 --- a/chalk/ui/kis_multi_bool_filter_widget.h +++ b/chalk/ui/kis_multi_bool_filter_widget.h @@ -43,7 +43,7 @@ class KRITA_EXPORT KisMultiBoolFilterWidget : public KisFilterConfigWidget Q_OBJECT TQ_OBJECT public: - KisMultiBoolFilterWidget(TQWidget * tqparent, const char * name, const char *caption, vKisBoolWidgetParam iwparam); + KisMultiBoolFilterWidget(TQWidget * parent, const char * name, const char *caption, vKisBoolWidgetParam iwparam); virtual void setConfiguration(KisFilterConfiguration * cfg); public: inline TQ_INT32 nbValues() { return m_nbboolWidgets; }; diff --git a/chalk/ui/kis_multi_double_filter_widget.cc b/chalk/ui/kis_multi_double_filter_widget.cc index 9b5d453ba..486bc7701 100644 --- a/chalk/ui/kis_multi_double_filter_widget.cc +++ b/chalk/ui/kis_multi_double_filter_widget.cc @@ -26,8 +26,8 @@ #include <kis_filter_config_widget.h> #include <klocale.h> -KisDelayedActionDoubleInput::KisDelayedActionDoubleInput(TQWidget * tqparent, const char * name) - : KDoubleNumInput(tqparent, name) +KisDelayedActionDoubleInput::KisDelayedActionDoubleInput(TQWidget * parent, const char * name) + : KDoubleNumInput(parent, name) { m_timer = new TQTimer(this, name); connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotValueChanged())); @@ -59,8 +59,8 @@ KisDoubleWidgetParam::KisDoubleWidgetParam(double nmin, double nmax, double nini } -KisMultiDoubleFilterWidget::KisMultiDoubleFilterWidget(TQWidget * tqparent, const char * name, const char * caption, vKisDoubleWidgetParam dwparam) - : KisFilterConfigWidget( tqparent, name ) +KisMultiDoubleFilterWidget::KisMultiDoubleFilterWidget(TQWidget * parent, const char * name, const char * caption, vKisDoubleWidgetParam dwparam) + : KisFilterConfigWidget( parent, name ) { TQ_INT32 m_nbdoubleWidgets = dwparam.size(); diff --git a/chalk/ui/kis_multi_double_filter_widget.h b/chalk/ui/kis_multi_double_filter_widget.h index 5351745e5..ee3a3dcf3 100644 --- a/chalk/ui/kis_multi_double_filter_widget.h +++ b/chalk/ui/kis_multi_double_filter_widget.h @@ -32,7 +32,7 @@ class KisDelayedActionDoubleInput : public KDoubleNumInput public: - KisDelayedActionDoubleInput(TQWidget * tqparent, const char * name); + KisDelayedActionDoubleInput(TQWidget * parent, const char * name); void cancelDelayedSignal(); @@ -66,7 +66,7 @@ class KRITA_EXPORT KisMultiDoubleFilterWidget : public KisFilterConfigWidget Q_OBJECT TQ_OBJECT public: - KisMultiDoubleFilterWidget(TQWidget * tqparent, const char * name, const char * caption, vKisDoubleWidgetParam dwparam); + KisMultiDoubleFilterWidget(TQWidget * parent, const char * name, const char * caption, vKisDoubleWidgetParam dwparam); virtual void setConfiguration(KisFilterConfiguration * cfg); public: inline TQ_INT32 nbValues() { return m_nbdoubleWidgets; }; diff --git a/chalk/ui/kis_multi_integer_filter_widget.cc b/chalk/ui/kis_multi_integer_filter_widget.cc index 07bfbe2aa..130a03d10 100644 --- a/chalk/ui/kis_multi_integer_filter_widget.cc +++ b/chalk/ui/kis_multi_integer_filter_widget.cc @@ -25,8 +25,8 @@ #include <knuminput.h> #include <klocale.h> -KisDelayedActionIntegerInput::KisDelayedActionIntegerInput(TQWidget * tqparent, const char * name) - : KIntNumInput(tqparent, name) +KisDelayedActionIntegerInput::KisDelayedActionIntegerInput(TQWidget * parent, const char * name) + : KIntNumInput(parent, name) { m_timer = new TQTimer(this, name); connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotValueChanged())); @@ -57,11 +57,11 @@ KisIntegerWidgetParam::KisIntegerWidgetParam( TQ_INT32 nmin, TQ_INT32 nmax, TQ_ { } -KisMultiIntegerFilterWidget::KisMultiIntegerFilterWidget(TQWidget * tqparent, +KisMultiIntegerFilterWidget::KisMultiIntegerFilterWidget(TQWidget * parent, const char * name, const char * caption, vKisIntegerWidgetParam iwparam) - : KisFilterConfigWidget( tqparent, name ) + : KisFilterConfigWidget( parent, name ) { m_nbintegerWidgets = iwparam.size(); this->setCaption(caption); diff --git a/chalk/ui/kis_multi_integer_filter_widget.h b/chalk/ui/kis_multi_integer_filter_widget.h index a08f4cadc..c40b74a15 100644 --- a/chalk/ui/kis_multi_integer_filter_widget.h +++ b/chalk/ui/kis_multi_integer_filter_widget.h @@ -33,7 +33,7 @@ class KisDelayedActionIntegerInput : public KIntNumInput public: - KisDelayedActionIntegerInput(TQWidget * tqparent, const char * name); + KisDelayedActionIntegerInput(TQWidget * parent, const char * name); void cancelDelayedSignal(); @@ -67,7 +67,7 @@ class KRITA_EXPORT KisMultiIntegerFilterWidget : public KisFilterConfigWidget Q_OBJECT TQ_OBJECT public: - KisMultiIntegerFilterWidget(TQWidget * tqparent, const char * name, const char *caption, vKisIntegerWidgetParam iwparam); + KisMultiIntegerFilterWidget(TQWidget * parent, const char * name, const char *caption, vKisIntegerWidgetParam iwparam); virtual void setConfiguration(KisFilterConfiguration * config); diff --git a/chalk/ui/kis_opengl_canvas.cc b/chalk/ui/kis_opengl_canvas.cc index ef8f743e8..82363a0b8 100644 --- a/chalk/ui/kis_opengl_canvas.cc +++ b/chalk/ui/kis_opengl_canvas.cc @@ -21,8 +21,8 @@ #include "kis_opengl_canvas_painter.h" #ifdef HAVE_GL -KisOpenGLCanvasWidget::KisOpenGLCanvasWidget(TQWidget *tqparent, const char *name, TQGLWidget *sharedContextWidget) - : TQGLWidget(KisOpenGLCanvasFormat, tqparent, name, sharedContextWidget) +KisOpenGLCanvasWidget::KisOpenGLCanvasWidget(TQWidget *parent, const char *name, TQGLWidget *sharedContextWidget) + : TQGLWidget(KisOpenGLCanvasFormat, parent, name, sharedContextWidget) { if (isSharing()) { kdDebug(41001) << "Created TQGLWidget with sharing\n"; diff --git a/chalk/ui/kis_opengl_canvas.h b/chalk/ui/kis_opengl_canvas.h index 8ca2b1e36..99a67b09e 100644 --- a/chalk/ui/kis_opengl_canvas.h +++ b/chalk/ui/kis_opengl_canvas.h @@ -43,7 +43,7 @@ class KisOpenGLCanvasWidget : public virtual TQGLWidget, public virtual KisCanvasWidget { public: - KisOpenGLCanvasWidget(TQWidget *tqparent, const char *name, TQGLWidget *sharedContextWidget); + KisOpenGLCanvasWidget(TQWidget *parent, const char *name, TQGLWidget *sharedContextWidget); ~KisOpenGLCanvasWidget(); virtual KisCanvasWidgetPainter *createPainter(); diff --git a/chalk/ui/kis_paintop_box.cc b/chalk/ui/kis_paintop_box.cc index ad4dbabb3..e0fc1dc88 100644 --- a/chalk/ui/kis_paintop_box.cc +++ b/chalk/ui/kis_paintop_box.cc @@ -43,8 +43,8 @@ #include "kis_paintop_box.h" -KisPaintopBox::KisPaintopBox (KisView * view, TQWidget *tqparent, const char * name) - : super (tqparent, name), +KisPaintopBox::KisPaintopBox (KisView * view, TQWidget *parent, const char * name) + : super (parent, name), m_canvasController(view->getCanvasController()) { #if KDE_VERSION >= KDE_MAKE_VERSION(3,3,90) diff --git a/chalk/ui/kis_paintop_box.h b/chalk/ui/kis_paintop_box.h index 90238c78f..400c087c3 100644 --- a/chalk/ui/kis_paintop_box.h +++ b/chalk/ui/kis_paintop_box.h @@ -55,7 +55,7 @@ class KisPaintopBox : public TQWidget { typedef TQWidget super; public: - KisPaintopBox (KisView * view, TQWidget * tqparent, const char * name = 0); + KisPaintopBox (KisView * view, TQWidget * parent, const char * name = 0); ~KisPaintopBox(); diff --git a/chalk/ui/kis_palette_view.cc b/chalk/ui/kis_palette_view.cc index dfc75eb4b..a424d9acc 100644 --- a/chalk/ui/kis_palette_view.cc +++ b/chalk/ui/kis_palette_view.cc @@ -62,8 +62,8 @@ #include "kis_resource.h" #include "kis_palette.h" -KisPaletteView::KisPaletteView(TQWidget *tqparent, const char* name, int minWidth, int cols) - : TQScrollView( tqparent, name ), mMinWidth(minWidth), mCols(cols) +KisPaletteView::KisPaletteView(TQWidget *parent, const char* name, int minWidth, int cols) + : TQScrollView( parent, name ), mMinWidth(minWidth), mCols(cols) { m_cells = 0; m_currentPalette = 0; diff --git a/chalk/ui/kis_palette_view.h b/chalk/ui/kis_palette_view.h index 79b3e0b0e..e82b66c06 100644 --- a/chalk/ui/kis_palette_view.h +++ b/chalk/ui/kis_palette_view.h @@ -37,7 +37,7 @@ class KisPaletteView : public TQScrollView Q_OBJECT TQ_OBJECT public: - KisPaletteView(TQWidget *tqparent, const char* name = 0, int minWidth=210, int cols = 16); + KisPaletteView(TQWidget *parent, const char* name = 0, int minWidth=210, int cols = 16); virtual ~KisPaletteView(); KisPalette* palette() const; diff --git a/chalk/ui/kis_palette_widget.cc b/chalk/ui/kis_palette_widget.cc index a83053378..2feb74c81 100644 --- a/chalk/ui/kis_palette_widget.cc +++ b/chalk/ui/kis_palette_widget.cc @@ -60,8 +60,8 @@ #include "kis_palette.h" #include "kis_palette_view.h" -KisPaletteWidget::KisPaletteWidget( TQWidget *tqparent, int minWidth, int cols) - : TQWidget( tqparent ), mMinWidth(minWidth), mCols(cols) +KisPaletteWidget::KisPaletteWidget( TQWidget *parent, int minWidth, int cols) + : TQWidget( parent ), mMinWidth(minWidth), mCols(cols) { init = false; diff --git a/chalk/ui/kis_palette_widget.h b/chalk/ui/kis_palette_widget.h index 6323b0a7d..6ea62019c 100644 --- a/chalk/ui/kis_palette_widget.h +++ b/chalk/ui/kis_palette_widget.h @@ -41,7 +41,7 @@ class KisPaletteWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - KisPaletteWidget( TQWidget *tqparent, int minWidth=210, int cols = 16); + KisPaletteWidget( TQWidget *parent, int minWidth=210, int cols = 16); virtual ~KisPaletteWidget(); TQString palette() const; diff --git a/chalk/ui/kis_part_layer.h b/chalk/ui/kis_part_layer.h index 650261391..d2ff10eb2 100644 --- a/chalk/ui/kis_part_layer.h +++ b/chalk/ui/kis_part_layer.h @@ -46,7 +46,7 @@ public: virtual ~KisChildDoc(); - KisDoc * tqparent() const { return m_doc; } + KisDoc * parent() const { return m_doc; } void setPartLayer (KisPartLayerSP layer) { m_partLayer = layer; } diff --git a/chalk/ui/kis_part_layer_handler.cc b/chalk/ui/kis_part_layer_handler.cc index f062e4a1a..d44f928a8 100644 --- a/chalk/ui/kis_part_layer_handler.cc +++ b/chalk/ui/kis_part_layer_handler.cc @@ -31,8 +31,8 @@ #include "kis_part_layer_handler.h" KisPartLayerHandler::KisPartLayerHandler(KisView* view, const KoDocumentEntry& entry, - KisGroupLayerSP tqparent, KisLayerSP above) - : m_parent(tqparent), m_above(above), m_view(view), m_entry(entry) { + KisGroupLayerSP parent, KisLayerSP above) + : m_parent(parent), m_above(above), m_view(view), m_entry(entry) { m_started = false; view->getCanvasController()->setCanvasCursor( KisCursor::selectCursor() ); } diff --git a/chalk/ui/kis_part_layer_handler.h b/chalk/ui/kis_part_layer_handler.h index 746b23d97..ad21f8680 100644 --- a/chalk/ui/kis_part_layer_handler.h +++ b/chalk/ui/kis_part_layer_handler.h @@ -32,7 +32,7 @@ Q_OBJECT TQ_OBJECT public: KisPartLayerHandler(KisView* view, const KoDocumentEntry& entry, - KisGroupLayerSP tqparent, KisLayerSP above); + KisGroupLayerSP parent, KisLayerSP above); signals: void sigGotMoveEvent(KisMoveEvent* event); void sigGotKeyPressEvent(TQKeyEvent* event); diff --git a/chalk/ui/kis_pattern_chooser.cc b/chalk/ui/kis_pattern_chooser.cc index f19200bfe..70484b0a3 100644 --- a/chalk/ui/kis_pattern_chooser.cc +++ b/chalk/ui/kis_pattern_chooser.cc @@ -26,7 +26,7 @@ #include "kis_icon_item.h" #include "kis_pattern.h" -KisPatternChooser::KisPatternChooser(TQWidget *tqparent, const char *name) : super(tqparent, name) +KisPatternChooser::KisPatternChooser(TQWidget *parent, const char *name) : super(parent, name) { m_lbName = new TQLabel(this); diff --git a/chalk/ui/kis_pattern_chooser.h b/chalk/ui/kis_pattern_chooser.h index b7a61080a..284bd8e15 100644 --- a/chalk/ui/kis_pattern_chooser.h +++ b/chalk/ui/kis_pattern_chooser.h @@ -28,7 +28,7 @@ class KisPatternChooser : public KisItemChooser { TQ_OBJECT public: - KisPatternChooser(TQWidget *tqparent = 0, const char *name = 0); + KisPatternChooser(TQWidget *parent = 0, const char *name = 0); virtual ~KisPatternChooser(); protected: diff --git a/chalk/ui/kis_perspective_grid_manager.cpp b/chalk/ui/kis_perspective_grid_manager.cpp index c454af801..6c326a3c6 100644 --- a/chalk/ui/kis_perspective_grid_manager.cpp +++ b/chalk/ui/kis_perspective_grid_manager.cpp @@ -29,10 +29,10 @@ #include "kis_perspective_grid.h" #include "kis_view.h" -KisPerspectiveGridManager::KisPerspectiveGridManager(KisView * tqparent) +KisPerspectiveGridManager::KisPerspectiveGridManager(KisView * parent) : TQObject() , m_toggleEdition(false) - , m_view(tqparent) + , m_view(parent) { } diff --git a/chalk/ui/kis_perspective_grid_manager.h b/chalk/ui/kis_perspective_grid_manager.h index 85954ba49..11875587d 100644 --- a/chalk/ui/kis_perspective_grid_manager.h +++ b/chalk/ui/kis_perspective_grid_manager.h @@ -33,7 +33,7 @@ class KisPerspectiveGridManager : public TQObject Q_OBJECT TQ_OBJECT public: - KisPerspectiveGridManager(KisView * tqparent); + KisPerspectiveGridManager(KisView * parent); ~KisPerspectiveGridManager(); void setup(KActionCollection * collection); void drawGrid(TQRect wr, TQPainter *p, bool openGL = false); diff --git a/chalk/ui/kis_populate_visitor.h b/chalk/ui/kis_populate_visitor.h index d228137ac..ee43e825b 100644 --- a/chalk/ui/kis_populate_visitor.h +++ b/chalk/ui/kis_populate_visitor.h @@ -41,9 +41,9 @@ class KisPopulateVisitor: public KisLayerVisitor , m_parent(0) { } - KisPopulateVisitor(KisLayerItem* tqparent) - : m_widget(tqparent->listView()) - , m_parent(tqparent) + KisPopulateVisitor(KisLayerItem* parent) + : m_widget(parent->listView()) + , m_parent(parent) { } virtual bool visit(KisPaintLayer* layer) diff --git a/chalk/ui/kis_previewdialog.cc b/chalk/ui/kis_previewdialog.cc index fdeb872a8..e2857c192 100644 --- a/chalk/ui/kis_previewdialog.cc +++ b/chalk/ui/kis_previewdialog.cc @@ -25,8 +25,8 @@ #include "kis_previewwidget.h" #include "kis_previewdialog.h" -KisPreviewDialog::KisPreviewDialog( TQWidget * tqparent, const char * name, bool modal, const TQString &caption) - : super (tqparent, name, modal, caption, Ok | Cancel, Ok) +KisPreviewDialog::KisPreviewDialog( TQWidget * parent, const char * name, bool modal, const TQString &caption) + : super (parent, name, modal, caption, Ok | Cancel, Ok) { TQHBox* tqlayout = new TQHBox(this); tqlayout->setSpacing( 6 ); diff --git a/chalk/ui/kis_previewdialog.h b/chalk/ui/kis_previewdialog.h index 9f268d449..68f8153d9 100644 --- a/chalk/ui/kis_previewdialog.h +++ b/chalk/ui/kis_previewdialog.h @@ -32,7 +32,7 @@ class KisPreviewDialog: public KDialogBase { TQ_OBJECT public: - KisPreviewDialog( TQWidget* tqparent = 0, const char* name = 0, bool modal = false, const TQString &caption=TQString()); + KisPreviewDialog( TQWidget* parent = 0, const char* name = 0, bool modal = false, const TQString &caption=TQString()); ~KisPreviewDialog(); KisPreviewWidget* previewWidget() { return m_preview; } diff --git a/chalk/ui/kis_previewwidget.cc b/chalk/ui/kis_previewwidget.cc index c534384a8..2598e79d3 100644 --- a/chalk/ui/kis_previewwidget.cc +++ b/chalk/ui/kis_previewwidget.cc @@ -65,8 +65,8 @@ static const int ZOOM_PAUSE = 100; static const int FILTER_PAUSE = 500; static const double ZOOM_FACTOR = 1.1; -KisPreviewWidget::KisPreviewWidget( TQWidget* tqparent, const char* name ) - : PreviewWidgetBase( tqparent, name ) +KisPreviewWidget::KisPreviewWidget( TQWidget* parent, const char* name ) + : PreviewWidgetBase( parent, name ) , m_autoupdate(true) , m_previewIsDisplayed(true) , m_scaledOriginal() diff --git a/chalk/ui/kis_previewwidget.h b/chalk/ui/kis_previewwidget.h index bcdf437eb..51592624c 100644 --- a/chalk/ui/kis_previewwidget.h +++ b/chalk/ui/kis_previewwidget.h @@ -52,7 +52,7 @@ class KisPreviewWidget : public PreviewWidgetBase public: /** Constructs the widget */ - KisPreviewWidget( TQWidget* tqparent = 0, const char* name = 0 ); + KisPreviewWidget( TQWidget* parent = 0, const char* name = 0 ); virtual ~KisPreviewWidget(); /** returns if the preview is automatically updated */ diff --git a/chalk/ui/kis_qpaintdevice_canvas.cc b/chalk/ui/kis_qpaintdevice_canvas.cc index 1f7def2d8..e3824f555 100644 --- a/chalk/ui/kis_qpaintdevice_canvas.cc +++ b/chalk/ui/kis_qpaintdevice_canvas.cc @@ -23,8 +23,8 @@ #include "kis_qpaintdevice_canvas_painter.h" #include <kdebug.h> -KisTQPaintDeviceCanvasWidget::KisTQPaintDeviceCanvasWidget(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +KisTQPaintDeviceCanvasWidget::KisTQPaintDeviceCanvasWidget(TQWidget *parent, const char *name) + : TQWidget(parent, name) { } diff --git a/chalk/ui/kis_qpaintdevice_canvas.h b/chalk/ui/kis_qpaintdevice_canvas.h index ae6882483..706cb195e 100644 --- a/chalk/ui/kis_qpaintdevice_canvas.h +++ b/chalk/ui/kis_qpaintdevice_canvas.h @@ -39,7 +39,7 @@ class KisTQPaintDeviceCanvasWidget : public virtual TQWidget, public virtual KisCanvasWidget { public: - KisTQPaintDeviceCanvasWidget(TQWidget *tqparent = 0, const char *name = 0); + KisTQPaintDeviceCanvasWidget(TQWidget *parent = 0, const char *name = 0); ~KisTQPaintDeviceCanvasWidget(); virtual KisCanvasWidgetPainter *createPainter(); diff --git a/chalk/ui/kis_resource_mediator.cc b/chalk/ui/kis_resource_mediator.cc index d49938076..c06584c33 100644 --- a/chalk/ui/kis_resource_mediator.cc +++ b/chalk/ui/kis_resource_mediator.cc @@ -26,8 +26,8 @@ #include "kis_resource_mediator.h" KisResourceMediator::KisResourceMediator(KisItemChooser *chooser, - TQObject *tqparent, - const char *name) : super(tqparent, name), m_chooser(chooser) + TQObject *parent, + const char *name) : super(parent, name), m_chooser(chooser) { Q_ASSERT(chooser); m_activeItem = 0; diff --git a/chalk/ui/kis_resource_mediator.h b/chalk/ui/kis_resource_mediator.h index b224d25c2..8c67151d7 100644 --- a/chalk/ui/kis_resource_mediator.h +++ b/chalk/ui/kis_resource_mediator.h @@ -41,7 +41,7 @@ class KisResourceMediator : public TQObject { public: KisResourceMediator(KisItemChooser *chooser, - TQObject *tqparent = 0, + TQObject *parent = 0, const char *name = 0); virtual ~KisResourceMediator(); diff --git a/chalk/ui/kis_ruler.cc b/chalk/ui/kis_ruler.cc index 6b0eea807..44e86caed 100644 --- a/chalk/ui/kis_ruler.cc +++ b/chalk/ui/kis_ruler.cc @@ -40,7 +40,7 @@ const char *KisRuler::m_nums[] = { "XX XXXXXX XXX XXX XXXXXX XXX XXXX XXXXX XXXXX XXXX XXX" }; -KisRuler::KisRuler(Qt::Orientation o, TQWidget *tqparent, const char *name) : super(tqparent, name, WRepaintNoErase | WResizeNoErase), m_pixmapNums(m_nums) +KisRuler::KisRuler(Qt::Orientation o, TQWidget *parent, const char *name) : super(parent, name, WRepaintNoErase | WResizeNoErase), m_pixmapNums(m_nums) { setBackgroundMode(NoBackground); setFrameStyle(Box | Sunken); diff --git a/chalk/ui/kis_ruler.h b/chalk/ui/kis_ruler.h index 6c8dd46db..28ab4d826 100644 --- a/chalk/ui/kis_ruler.h +++ b/chalk/ui/kis_ruler.h @@ -38,7 +38,7 @@ class KisRuler : public TQFrame { typedef TQFrame super; public: - KisRuler(Qt::Orientation, TQWidget *tqparent = 0, const char *name = 0); + KisRuler(Qt::Orientation, TQWidget *parent = 0, const char *name = 0); virtual ~KisRuler(); public: diff --git a/chalk/ui/kis_save_visitor.h b/chalk/ui/kis_save_visitor.h index ce668a531..1205632b0 100644 --- a/chalk/ui/kis_save_visitor.h +++ b/chalk/ui/kis_save_visitor.h @@ -80,16 +80,16 @@ public: } if (layer->hasMask()) { - KisPaintDeviceSP tqmask = layer->getMask(); + KisPaintDeviceSP mask = layer->getMask(); - if (tqmask) { + if (mask) { // save layer profile location = m_external ? TQString() : m_uri; - location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".tqmask"; + location += m_img->name() + TQString("/layers/layer%1").tqarg(m_count) + ".mask"; if (m_store->open(location)) { - if (!tqmask->write(m_store)) { - tqmask->disconnect(); + if (!mask->write(m_store)) { + mask->disconnect(); m_store->close(); return false; } diff --git a/chalk/ui/kis_savexml_visitor.h b/chalk/ui/kis_savexml_visitor.h index 52c0dc808..155807523 100644 --- a/chalk/ui/kis_savexml_visitor.h +++ b/chalk/ui/kis_savexml_visitor.h @@ -56,7 +56,7 @@ public: layerElement.setAttribute("layertype", "paintlayer"); layerElement.setAttribute("filename", TQString("layer%1").tqarg(m_count)); layerElement.setAttribute("colorspacename", layer->paintDevice()->colorSpace()->id().id()); - layerElement.setAttribute("hastqmask", layer->hasMask()); + layerElement.setAttribute("hasmask", layer->hasMask()); m_elem.appendChild(layerElement); if(layer->paintDevice()->hasExifInfo()) diff --git a/chalk/ui/kis_selection_manager.cc b/chalk/ui/kis_selection_manager.cc index 3caba5e74..0655b8342 100644 --- a/chalk/ui/kis_selection_manager.cc +++ b/chalk/ui/kis_selection_manager.cc @@ -60,8 +60,8 @@ #include "kis_fill_painter.h" #include "kis_canvas.h" -KisSelectionManager::KisSelectionManager(KisView * tqparent, KisDoc * doc) - : m_parent(tqparent), +KisSelectionManager::KisSelectionManager(KisView * parent, KisDoc * doc) + : m_parent(parent), m_doc(doc), m_copy(0), m_cut(0), @@ -258,7 +258,7 @@ void KisSelectionManager::updateGUI() Q_ASSERT(m_clipboard); if (m_parent == 0) { - // "Eek, no tqparent! + // "Eek, no parent! return; } @@ -393,7 +393,7 @@ void KisSelectionManager::copy() gc.bitBlt(0, 0, COMPOSITE_COPY, dev, r.x(), r.y(), r.width(), r.height()); gc.end(); - // Apply selection tqmask. + // Apply selection mask. for (TQ_INT32 y = 0; y < r.height(); y++) { KisHLineIteratorPixel layerIt = clip->createHLineIterator(0, y, r.width(), true); @@ -451,7 +451,7 @@ KisLayerSP KisSelectionManager::paste() layer->convertTo(img->colorSpace()); */ TQApplication::restoreOverrideCursor(); - if(img->addLayer(layer, img->activeLayer()->tqparent(), img->activeLayer())) + if(img->addLayer(layer, img->activeLayer()->parent(), img->activeLayer())) { return layer; } else { @@ -833,7 +833,7 @@ void KisSelectionManager::grow (TQ_INT32 xradius, TQ_INT32 yradius) TQ_UINT8* out = new TQ_UINT8[ layerSize.width() ]; // holds the new scan line we are computing - TQ_INT32* circ = new TQ_INT32[ 2 * xradius + 1 ]; // holds the y coords of the filter's tqmask + TQ_INT32* circ = new TQ_INT32[ 2 * xradius + 1 ]; // holds the y coords of the filter's mask computeBorder (circ, xradius, yradius); /* offset the circ pointer by xradius so the range of the array @@ -994,7 +994,7 @@ void KisSelectionManager::shrink (TQ_INT32 xradius, TQ_INT32 yradius, bool edge_ TQ_UINT8* out = new TQ_UINT8[layerSize.width()]; // holds the new scan line we are computing - TQ_INT32* circ = new TQ_INT32[2 * xradius + 1]; // holds the y coords of the filter's tqmask + TQ_INT32* circ = new TQ_INT32[2 * xradius + 1]; // holds the y coords of the filter's mask computeBorder (circ, xradius, yradius); @@ -1090,7 +1090,7 @@ void KisSelectionManager::shrink (TQ_INT32 xradius, TQ_INT32 yradius, bool edge_ dev->emitSelectionChanged(); } -//Simple convolution filter to smooth a tqmask (1bpp) +//Simple convolution filter to smooth a mask (1bpp) void KisSelectionManager::smooth() { @@ -1159,7 +1159,7 @@ void KisSelectionManager::smooth() dev->emitSelectionChanged(); } -// Erode (radius 1 pixel) a tqmask (1bpp) +// Erode (radius 1 pixel) a mask (1bpp) void KisSelectionManager::erode() { @@ -1234,7 +1234,7 @@ void KisSelectionManager::erode() dev->emitSelectionChanged(); } -// dilate (radius 1 pixel) a tqmask (1bpp) +// dilate (radius 1 pixel) a mask (1bpp) void KisSelectionManager::dilate() { diff --git a/chalk/ui/kis_selection_manager.h b/chalk/ui/kis_selection_manager.h index fb33218e2..d71353b27 100644 --- a/chalk/ui/kis_selection_manager.h +++ b/chalk/ui/kis_selection_manager.h @@ -40,7 +40,7 @@ class KRITACORE_EXPORT KisSelectionManager : public TQObject { public: - KisSelectionManager(KisView * tqparent, KisDoc * doc); + KisSelectionManager(KisView * parent, KisDoc * doc); virtual ~KisSelectionManager(); void setup(KActionCollection * collection); diff --git a/chalk/ui/kis_selection_options.cc b/chalk/ui/kis_selection_options.cc index f94ff17fe..32933b5ac 100644 --- a/chalk/ui/kis_selection_options.cc +++ b/chalk/ui/kis_selection_options.cc @@ -32,8 +32,8 @@ #include "kis_selection.h" #include "kis_paint_device.h" -KisSelectionOptions::KisSelectionOptions(TQWidget *tqparent, KisCanvasSubject * subject) - : super(tqparent), +KisSelectionOptions::KisSelectionOptions(TQWidget *parent, KisCanvasSubject * subject) + : super(parent), m_subject(subject) { m_page = new WdgSelectionOptions(this); diff --git a/chalk/ui/kis_selection_options.h b/chalk/ui/kis_selection_options.h index e8168d04b..115678cd6 100644 --- a/chalk/ui/kis_selection_options.h +++ b/chalk/ui/kis_selection_options.h @@ -37,7 +37,7 @@ class KRITAUI_EXPORT KisSelectionOptions : public TQWidget typedef TQWidget super; public: - KisSelectionOptions( TQWidget *tqparent, KisCanvasSubject * subject); + KisSelectionOptions( TQWidget *parent, KisCanvasSubject * subject); virtual ~KisSelectionOptions(); int action(); diff --git a/chalk/ui/kis_text_brush.cc b/chalk/ui/kis_text_brush.cc index ef376373a..ad681c75d 100644 --- a/chalk/ui/kis_text_brush.cc +++ b/chalk/ui/kis_text_brush.cc @@ -43,8 +43,8 @@ void KisTextBrushResource::updateBrush() setImage(px.convertToImage ()); } -KisTextBrush::KisTextBrush(TQWidget *tqparent, const char* name, const TQString& caption) - : KisWdgTextBrush(tqparent, name), +KisTextBrush::KisTextBrush(TQWidget *parent, const char* name, const TQString& caption) + : KisWdgTextBrush(parent, name), m_textBrushResource(new KisTextBrushResource()) { setCaption(caption); @@ -57,7 +57,7 @@ KisTextBrush::KisTextBrush(TQWidget *tqparent, const char* name, const TQString& void KisTextBrush::getFont() { - KFontDialog::getFont( m_font, false/*, TQWidget* tqparent! */ ); + KFontDialog::getFont( m_font, false/*, TQWidget* parent! */ ); rebuildTextBrush(); } diff --git a/chalk/ui/kis_text_brush.h b/chalk/ui/kis_text_brush.h index 3c8835dee..623ff4320 100644 --- a/chalk/ui/kis_text_brush.h +++ b/chalk/ui/kis_text_brush.h @@ -51,7 +51,7 @@ class KisTextBrush : public KisWdgTextBrush Q_OBJECT TQ_OBJECT public: - KisTextBrush(TQWidget *tqparent, const char* name, const TQString& caption); + KisTextBrush(TQWidget *parent, const char* name, const TQString& caption); signals: void activatedResource(KisResource *r); diff --git a/chalk/ui/kis_tool.cc b/chalk/ui/kis_tool.cc index 5aee554bb..d6e600af5 100644 --- a/chalk/ui/kis_tool.cc +++ b/chalk/ui/kis_tool.cc @@ -53,10 +53,10 @@ KisTool::~KisTool() delete d; } -TQWidget* KisTool::createOptionWidget(TQWidget* tqparent) +TQWidget* KisTool::createOptionWidget(TQWidget* parent) { - d->optionWidget = new TQLabel(i18n("No options for %1.").tqarg(d->uiname), tqparent); + d->optionWidget = new TQLabel(i18n("No options for %1.").tqarg(d->uiname), parent); d->optionWidget->setCaption(d->uiname); d->optionWidget->tqsetAlignment(TQt::AlignCenter); return d->optionWidget; diff --git a/chalk/ui/kis_tool.h b/chalk/ui/kis_tool.h index c8f2d349a..b9abdc75d 100644 --- a/chalk/ui/kis_tool.h +++ b/chalk/ui/kis_tool.h @@ -93,9 +93,9 @@ public: virtual void setCursor(const TQCursor& cursor) = 0; /** * This function is called to create the configuration widget of the tool. - * @param tqparent the tqparent of the widget + * @param parent the parent of the widget */ - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); /** * @return the current configuration widget. */ diff --git a/chalk/ui/kis_tool_dummy.cc b/chalk/ui/kis_tool_dummy.cc index d8ac04e58..51eb1407b 100644 --- a/chalk/ui/kis_tool_dummy.cc +++ b/chalk/ui/kis_tool_dummy.cc @@ -94,9 +94,9 @@ void KisToolDummy::setup(KActionCollection *collection) } -TQWidget* KisToolDummy::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolDummy::createOptionWidget(TQWidget* parent) { - m_optionWidget = new TQLabel(i18n("Layer is locked or invisible."), tqparent); + m_optionWidget = new TQLabel(i18n("Layer is locked or invisible."), parent); m_optionWidget->setCaption(i18n("No Active Tool")); m_optionWidget->tqsetAlignment(TQt::AlignCenter); return m_optionWidget; diff --git a/chalk/ui/kis_tool_dummy.h b/chalk/ui/kis_tool_dummy.h index d10850e8e..de74ce84b 100644 --- a/chalk/ui/kis_tool_dummy.h +++ b/chalk/ui/kis_tool_dummy.h @@ -53,7 +53,7 @@ public: virtual void move(KisMoveEvent *e); virtual void buttonRelease(KisButtonReleaseEvent *e); - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); private: diff --git a/chalk/ui/kis_tool_freehand.cc b/chalk/ui/kis_tool_freehand.cc index bbe575d1c..adbf9b8ab 100644 --- a/chalk/ui/kis_tool_freehand.cc +++ b/chalk/ui/kis_tool_freehand.cc @@ -182,12 +182,12 @@ void KisToolFreehand::initPaint(KisEvent *) // projection). KisLayer* l = layer->layer(); KisPaintLayer* pl = dynamic_cast<KisPaintLayer*>(l); - if (l->tqparent() && (l->tqparent()->tqparent() == 0) - && (l->tqparent()->childCount() == 1) - && l->tqparent()->paintLayerInducesProjectionOptimization(pl)) { - // If there's a tqmask, device could've been the tqmask. The induce function + if (l->parent() && (l->parent()->parent() == 0) + && (l->parent()->childCount() == 1) + && l->parent()->paintLayerInducesProjectionOptimization(pl)) { + // If there's a mask, device could've been the mask. The induce function // should catch this, but better safe than sorry - l->tqparent()->resetProjection(pl->paintDevice()); + l->parent()->resetProjection(pl->paintDevice()); } m_target = new KisPaintDevice(m_currentImage->activeLayer(), diff --git a/chalk/ui/kis_tool_manager.cc b/chalk/ui/kis_tool_manager.cc index 456c60a77..458b54e23 100644 --- a/chalk/ui/kis_tool_manager.cc +++ b/chalk/ui/kis_tool_manager.cc @@ -32,8 +32,8 @@ #include "kis_input_device.h" -KisToolManager::KisToolManager(KisCanvasSubject * tqparent, KisCanvasController * controller) - : m_subject(tqparent), +KisToolManager::KisToolManager(KisCanvasSubject * parent, KisCanvasController * controller) + : m_subject(parent), m_controller(controller) { m_toolBox = 0; @@ -126,7 +126,7 @@ void KisToolManager::updateGUI() { Q_ASSERT(m_subject); if (m_subject == 0) { - // "Eek, no tqparent! + // "Eek, no parent! return; } diff --git a/chalk/ui/kis_tool_manager.h b/chalk/ui/kis_tool_manager.h index 8f04f6809..f33683832 100644 --- a/chalk/ui/kis_tool_manager.h +++ b/chalk/ui/kis_tool_manager.h @@ -47,7 +47,7 @@ class KisToolManager : public TQObject, public KisToolControllerInterface { public: - KisToolManager(KisCanvasSubject * tqparent, KisCanvasController * controller); + KisToolManager(KisCanvasSubject * parent, KisCanvasController * controller); ~KisToolManager(); public: diff --git a/chalk/ui/kis_tool_paint.cc b/chalk/ui/kis_tool_paint.cc index aa1bf7a77..9d37dae64 100644 --- a/chalk/ui/kis_tool_paint.cc +++ b/chalk/ui/kis_tool_paint.cc @@ -115,9 +115,9 @@ void KisToolPaint::keyRelease(TQKeyEvent *) { } -TQWidget* KisToolPaint::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolPaint::createOptionWidget(TQWidget* parent) { - m_optionWidget = new TQWidget(tqparent); + m_optionWidget = new TQWidget(parent); m_optionWidget->setCaption(m_UIName); m_lbOpacity = new TQLabel(i18n("Opacity:"), m_optionWidget); diff --git a/chalk/ui/kis_tool_paint.h b/chalk/ui/kis_tool_paint.h index 6e1406b51..7fb4b8193 100644 --- a/chalk/ui/kis_tool_paint.h +++ b/chalk/ui/kis_tool_paint.h @@ -73,7 +73,7 @@ public: virtual TQCursor cursor(); virtual void setCursor(const TQCursor& cursor); - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); virtual TQWidget* optionWidget(); virtual void addOptionWidgetOption(TQWidget *control, TQWidget *label = 0); diff --git a/chalk/ui/kis_tool_shape.cc b/chalk/ui/kis_tool_shape.cc index b919a578c..9e76f1596 100644 --- a/chalk/ui/kis_tool_shape.cc +++ b/chalk/ui/kis_tool_shape.cc @@ -37,9 +37,9 @@ KisToolShape::~KisToolShape() { } -TQWidget* KisToolShape::createOptionWidget(TQWidget* tqparent) +TQWidget* KisToolShape::createOptionWidget(TQWidget* parent) { - TQWidget *widget = super::createOptionWidget(tqparent); + TQWidget *widget = super::createOptionWidget(parent); m_tqshapeOptionsWidget = new WdgGeometryOptions(0); Q_CHECK_PTR(m_tqshapeOptionsWidget); diff --git a/chalk/ui/kis_tool_shape.h b/chalk/ui/kis_tool_shape.h index 2c0a95008..e8974c791 100644 --- a/chalk/ui/kis_tool_shape.h +++ b/chalk/ui/kis_tool_shape.h @@ -40,7 +40,7 @@ public: virtual enumToolType toolType() { return TOOL_SHAPE; } protected: - virtual TQWidget* createOptionWidget(TQWidget* tqparent); + virtual TQWidget* createOptionWidget(TQWidget* parent); KisPainter::FillStyle fillStyle(); diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc index 0b288da5e..4455f17db 100644 --- a/chalk/ui/kis_view.cc +++ b/chalk/ui/kis_view.cc @@ -168,8 +168,8 @@ // sent to a receiver if it does not accept the tablet event. #define MOUSE_CHANGE_EVENT_DELAY 100 -KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *tqparent, const char *name) - : super(doc, tqparent, name) +KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent, const char *name) + : super(doc, parent, name) , KXMLGUIBuilder( shell() ) , m_panning( false ) , m_oldTool( 0 ) @@ -239,7 +239,7 @@ KisView::KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *tqparent, const Q_ASSERT(doc); Q_ASSERT(adapter); - Q_ASSERT(tqparent); + Q_ASSERT(parent); KisConfig cfg; @@ -380,7 +380,7 @@ static TQt::Dock stringToDock( const TQString& attrPosition ) return dock; } -TQWidget * KisView::createContainer( TQWidget *tqparent, int index, const TQDomElement &element, int &id ) +TQWidget * KisView::createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id ) { if( element.attribute( "name" ) == "ToolBox" ) { @@ -394,11 +394,11 @@ TQWidget * KisView::createContainer( TQWidget *tqparent, int index, const TQDomE mainWindow()->moveDockWindow( m_toolBox, dock, false, 0, 0 ); } - return KXMLGUIBuilder::createContainer( tqparent, index, element, id ); + return KXMLGUIBuilder::createContainer( parent, index, element, id ); } -void KisView::removeContainer( TQWidget *container, TQWidget *tqparent, TQDomElement &element, int id ) +void KisView::removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id ) { Q_ASSERT(container); @@ -408,7 +408,7 @@ void KisView::removeContainer( TQWidget *container, TQWidget *tqparent, TQDomEle m_toolManager->youAintGotNoToolBox(); } else { - KXMLGUIBuilder::removeContainer( container, tqparent, element, id ); + KXMLGUIBuilder::removeContainer( container, parent, element, id ); } } @@ -645,20 +645,20 @@ void KisView::setupActions() (void)new KAction(i18n("Flip on &Y Axis"), "view_top_bottom", 0, TQT_TQOBJECT(this), TQT_SLOT(mirrorLayerY()), actionCollection(), "mirrorLayerY"); m_createMask = new KAction(i18n("Create Mask"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotCreateMask()), actionCollection(), "create_tqmask"); + TQT_SLOT(slotCreateMask()), actionCollection(), "create_mask"); m_maskFromSelection = new KAction(i18n("Mask From Selection"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMaskFromSelection()), actionCollection(), "mask_fromsel"); m_maskToSelection = new KAction(i18n("Mask to Selection"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMaskToSelection()), actionCollection(), "mask_tosel"); m_applyMask = new KAction(i18n("Apply Mask"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotApplyMask()), - actionCollection(), "apply_tqmask"); + actionCollection(), "apply_mask"); m_removeMask = new KAction(i18n("Remove Mask"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotRemoveMask()), actionCollection(), "remove_tqmask"); + TQT_SLOT(slotRemoveMask()), actionCollection(), "remove_mask"); m_showMask = new KToggleAction(i18n( "Show Mask" ), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotShowMask()), actionCollection(), "show_tqmask"); + TQT_SLOT(slotShowMask()), actionCollection(), "show_mask"); m_editMask = new KToggleAction(i18n( "Edit Mask" ), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotEditMask()), actionCollection(), "edit_tqmask"); + TQT_SLOT(slotEditMask()), actionCollection(), "edit_mask"); // image actions m_imgFlatten = new KAction(i18n("&Flatten Image"), "Ctrl+Shift+E", TQT_TQOBJECT(this), TQT_SLOT(flattenImage()), actionCollection(), "flatten_image"); @@ -2717,13 +2717,13 @@ void KisView::layerAdd() { KisImageSP img = currentImg(); if (img && img->activeLayer()) { - addLayer(img->activeLayer()->tqparent(), img->activeLayer()); + addLayer(img->activeLayer()->parent(), img->activeLayer()); } else if (img) addLayer(static_cast<KisGroupLayer*>(img->rootLayer().data()), 0); } -void KisView::addLayer(KisGroupLayerSP tqparent, KisLayerSP above) +void KisView::addLayer(KisGroupLayerSP parent, KisLayerSP above) { KisImageSP img = currentImg(); if (img) { @@ -2739,7 +2739,7 @@ void KisView::addLayer(KisGroupLayerSP tqparent, KisLayerSP above) KisLayerSP layer = new KisPaintLayer(img, dlg.layerName(), dlg.opacity(), cs); if (layer) { layer->setCompositeOp(dlg.compositeOp()); - img->addLayer(layer, tqparent.data(), above); + img->addLayer(layer, parent.data(), above); updateCanvas(); } else { KMessageBox::error(this, i18n("Could not add layer to image."), i18n("Layer Error")); @@ -2751,7 +2751,7 @@ void KisView::addLayer(KisGroupLayerSP tqparent, KisLayerSP above) } } -void KisView::addGroupLayer(KisGroupLayerSP tqparent, KisLayerSP above) +void KisView::addGroupLayer(KisGroupLayerSP parent, KisLayerSP above) { KisImageSP img = currentImg(); if (img) { @@ -2766,7 +2766,7 @@ void KisView::addGroupLayer(KisGroupLayerSP tqparent, KisLayerSP above) KisLayerSP layer = new KisGroupLayer(img, dlg.layerName(), dlg.opacity()); if (layer) { layer->setCompositeOp(dlg.compositeOp()); - img->addLayer(layer, tqparent.data(), above); + img->addLayer(layer, parent.data(), above); updateCanvas(); } else { KMessageBox::error(this, i18n("Could not add layer to image."), i18n("Layer Error")); @@ -2783,10 +2783,10 @@ void KisView::addPartLayer() addPartLayer(img->rootLayer(), img->rootLayer()->firstChild(), m_actionPartLayer->documentEntry()); } -void KisView::addPartLayer(KisGroupLayerSP tqparent, KisLayerSP above, const KoDocumentEntry& entry) +void KisView::addPartLayer(KisGroupLayerSP parent, KisLayerSP above, const KoDocumentEntry& entry) { delete m_partHandler; // Only one at a time - m_partHandler = new KisPartLayerHandler(this, entry, tqparent, above); + m_partHandler = new KisPartLayerHandler(this, entry, parent, above); disconnect(m_canvas, TQT_SIGNAL(sigGotButtonPressEvent(KisButtonPressEvent*)), this, 0); disconnect(m_canvas, TQT_SIGNAL(sigGotButtonReleaseEvent(KisButtonReleaseEvent*)), this, 0); @@ -2811,7 +2811,7 @@ void KisView::addPartLayer(KisGroupLayerSP tqparent, KisLayerSP above, const KoD } void KisView::insertPart(const TQRect& viewRect, const KoDocumentEntry& entry, - KisGroupLayerSP tqparent, KisLayerSP above) { + KisGroupLayerSP parent, KisLayerSP above) { KisImageSP img = currentImg(); if (!img) return; @@ -2828,7 +2828,7 @@ void KisView::insertPart(const TQRect& viewRect, const KoDocumentEntry& entry, KisPartLayerImpl* partLayer = new KisPartLayerImpl(img, childDoc); partLayer->setDocType(entry.service()->genericName()); - img->addLayer(partLayer, tqparent, above); + img->addLayer(partLayer, parent, above); m_doc->setModified(true); reconnectAfterPartInsert(); @@ -2853,12 +2853,12 @@ void KisView::addAdjustmentLayer() KisImageSP img = currentImg(); if (!img) return; - addAdjustmentLayer( img->activeLayer()->tqparent(), img->activeLayer() ); + addAdjustmentLayer( img->activeLayer()->parent(), img->activeLayer() ); } -void KisView::addAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above) +void KisView::addAdjustmentLayer(KisGroupLayerSP parent, KisLayerSP above) { - Q_ASSERT(tqparent); + Q_ASSERT(parent); Q_ASSERT(above); KisImageSP img = currentImg(); @@ -2898,15 +2898,15 @@ void KisView::addAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above) KisFilterConfiguration * filter = dlg.filterConfiguration(); TQString name = dlg.layerName(); - addAdjustmentLayer( tqparent, above, name, filter, selection); + addAdjustmentLayer( parent, above, name, filter, selection); } } -void KisView::addAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above, const TQString & name, +void KisView::addAdjustmentLayer(KisGroupLayerSP parent, KisLayerSP above, const TQString & name, KisFilterConfiguration * filter, KisSelectionSP selection) { - Q_ASSERT(tqparent); + Q_ASSERT(parent); Q_ASSERT(above); Q_ASSERT(filter); @@ -2914,7 +2914,7 @@ void KisView::addAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above, con if (!img) return; KisAdjustmentLayer * l = new KisAdjustmentLayer(img, name, filter, selection); - img->addLayer(l, tqparent, above); + img->addLayer(l, parent, above); } void KisView::slotChildActivated(bool a) { @@ -2943,8 +2943,8 @@ void KisView::layerRemove() img->removeLayer(layer); - if (layer->tqparent()) - layer->tqparent()->setDirty(layer->extent()); + if (layer->parent()) + layer->parent()->setDirty(layer->extent()); updateCanvas(); layerUpdateGUI(img->activeLayer() != 0); @@ -2966,7 +2966,7 @@ void KisView::layerDuplicate() KisLayerSP dup = active->clone(); dup->setName(i18n("Duplicate of '%1'").tqarg(active->name())); - img->addLayer(dup, active->tqparent().data(), active); + img->addLayer(dup, active->parent().data(), active); if (dup) { img->activate( dup ); updateCanvas(); diff --git a/chalk/ui/kis_view.h b/chalk/ui/kis_view.h index 71bb9065d..3e4b69876 100644 --- a/chalk/ui/kis_view.h +++ b/chalk/ui/kis_view.h @@ -127,13 +127,13 @@ class KRITA_EXPORT KisView typedef vKisCanvasObserver::const_iterator vKisCanvasObserver_cit; public: - KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *tqparent = 0, const char *name = 0); + KisView(KisDoc *doc, KisUndoAdapter *adapter, TQWidget *parent = 0, const char *name = 0); virtual ~KisView(); public: // KXMLGUIBuilder implementation - virtual TQWidget *createContainer( TQWidget *tqparent, int index, const TQDomElement &element, int &id ); - virtual void removeContainer( TQWidget *container, TQWidget *tqparent, TQDomElement &element, int id ); + virtual TQWidget *createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id ); + virtual void removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id ); public: // KoView implementation virtual bool eventFilter(TQObject *o, TQEvent *e); @@ -220,7 +220,7 @@ public: void shearCurrentImage(double angleX, double angleY); void insertPart(const TQRect& viewRect, const KoDocumentEntry& entry, - KisGroupLayerSP tqparent, KisLayerSP above); + KisGroupLayerSP parent, KisLayerSP above); /** * Import an image as a layer. If there is more than @@ -428,7 +428,7 @@ private: private slots: void layersUpdated(); // Used in the channel separation to notify the view that we have added a few layers. - void maskUpdated(); // To update the enabled or disabled status of the tqmask entries + void maskUpdated(); // To update the enabled or disabled status of the mask entries void slotSetFGQColor(const TQColor & c); void slotSetBGQColor(const TQColor & c); @@ -466,13 +466,13 @@ private slots: void layerProperties(); void showLayerProperties(KisLayerSP layer); void layerAdd(); - void addLayer(KisGroupLayerSP tqparent, KisLayerSP above); - void addGroupLayer(KisGroupLayerSP tqparent, KisLayerSP above); + void addLayer(KisGroupLayerSP parent, KisLayerSP above); + void addGroupLayer(KisGroupLayerSP parent, KisLayerSP above); void addPartLayer(); - void addPartLayer(KisGroupLayerSP tqparent, KisLayerSP above, const KoDocumentEntry& entry); + void addPartLayer(KisGroupLayerSP parent, KisLayerSP above, const KoDocumentEntry& entry); void addAdjustmentLayer(); - void addAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above); - void addAdjustmentLayer(KisGroupLayerSP tqparent, KisLayerSP above, const TQString & name, KisFilterConfiguration * filter, KisSelectionSP selection = 0); + void addAdjustmentLayer(KisGroupLayerSP parent, KisLayerSP above); + void addAdjustmentLayer(KisGroupLayerSP parent, KisLayerSP above, const TQString & name, KisFilterConfiguration * filter, KisSelectionSP selection = 0); void layerRemove(); void layerDuplicate(); void layerRaise(); diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp index 34dd043f4..542e257df 100644 --- a/chalk/ui/kobirdeyepanel.cpp +++ b/chalk/ui/kobirdeyepanel.cpp @@ -52,10 +52,10 @@ KoThumbnailAdapter::~KoThumbnailAdapter() {} KoBirdEyePanel::KoBirdEyePanel( KoZoomAdapter * zoomListener, KoThumbnailAdapter * thumbnailProvider, KoCanvasAdapter * canvas, - TQWidget * tqparent, + TQWidget * parent, const char * name, WFlags f) - : TQWidget(tqparent, name, f) + : TQWidget(parent, name, f) , m_zoomListener(zoomListener) , m_thumbnailProvider(thumbnailProvider) , m_canvas(canvas) diff --git a/chalk/ui/kobirdeyepanel.h b/chalk/ui/kobirdeyepanel.h index 24770b18d..de280d9a0 100644 --- a/chalk/ui/kobirdeyepanel.h +++ b/chalk/ui/kobirdeyepanel.h @@ -149,14 +149,14 @@ public: * @param thumbnailProvider the class that creates the small image at the right * zoomlevel * @param canvas the place the document is painted. - * @param tqparent the tqparent widget + * @param parent the parent widget * @param name the TQObject name of this bird eye widget * @param f the widget flags (@see TQWidget) */ KoBirdEyePanel( KoZoomAdapter * zoomListener, KoThumbnailAdapter * thumbnailProvider, KoCanvasAdapter * canvas, - TQWidget * tqparent, + TQWidget * parent, const char * name = 0, WFlags f = 0 ); diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp index 6f7cb4e2a..96e1e032a 100644 --- a/chalk/ui/layerlist.cpp +++ b/chalk/ui/layerlist.cpp @@ -83,7 +83,7 @@ public: KPopupMenu contextMenu; LayerToolTip *tooltip; - Private( TQWidget *tqparent, LayerList *list ); + Private( TQWidget *parent, LayerList *list ); ~Private(); }; @@ -113,8 +113,8 @@ class LayerToolTip: public TQToolTip, public TQFrame TQImage m_img; public: - LayerToolTip( TQWidget *tqparent, LayerList *list ) - : TQToolTip( tqparent ), + LayerToolTip( TQWidget *parent, LayerList *list ) + : TQToolTip( parent ), TQFrame( 0, 0, WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop | WX11BypassWM | WNoAutoErase ), m_list( list ) { @@ -257,9 +257,9 @@ public: } }; -LayerList::Private::Private( TQWidget *tqparent, LayerList *list ) +LayerList::Private::Private( TQWidget *parent, LayerList *list ) : activeLayer( 0 ), foldersCanBeActive( false ), previewsShown( false ), itemHeight( 32 ), - tooltip( new LayerToolTip( tqparent, list ) ) { } + tooltip( new LayerToolTip( parent, list ) ) { } LayerList::Private::~Private() { @@ -280,8 +280,8 @@ static TQSize iconSize() { return TQIconSet::iconSize( TQIconSet::Small ); } // LayerList // /////////////// -LayerList::LayerList( TQWidget *tqparent, const char *name ) - : super( tqparent, name ), d( new Private( viewport(), this ) ) +LayerList::LayerList( TQWidget *parent, const char *name ) + : super( parent, name ), d( new Private( viewport(), this ) ) { setSelectionMode( TQListView::Extended ); setRootIsDecorated( true ); @@ -609,10 +609,10 @@ LayerItem *LayerList::addLayer( const TQString &displayName, int afterID, int id } //SLOT -LayerItem *LayerList::addLayerToParent( const TQString &displayName, LayerItem *tqparent, LayerItem *after, int id ) +LayerItem *LayerList::addLayerToParent( const TQString &displayName, LayerItem *parent, LayerItem *after, int id ) { - if( tqparent && tqparent->isFolder() ) - return tqparent->addLayer( displayName, after, id ); + if( parent && parent->isFolder() ) + return parent->addLayer( displayName, after, id ); else return 0; } @@ -622,23 +622,23 @@ LayerItem *LayerList::addLayerToParent( const TQString &displayName, int parentI return addLayerToParent( displayName, folder( parentID ), layer( afterID ), id ); } -void LayerList::moveLayer( LayerItem *layer, LayerItem *tqparent, LayerItem *after ) //SLOT +void LayerList::moveLayer( LayerItem *layer, LayerItem *parent, LayerItem *after ) //SLOT { if( !layer ) return; - if( tqparent && !tqparent->isFolder() ) - tqparent = 0; + if( parent && !parent->isFolder() ) + parent = 0; - if( layer->tqparent() == tqparent && layer->prevSibling() == after ) + if( layer->parent() == parent && layer->prevSibling() == after ) return; TQListViewItem *current = currentItem(); - moveItem( layer, tqparent, after ); + moveItem( layer, parent, after ); - emit layerMoved( layer, tqparent, after ); - emit layerMoved( layer->id(), tqparent ? tqparent->id() : -1, after ? after->id() : -1 ); + emit layerMoved( layer, parent, after ); + emit layerMoved( layer->id(), parent ? parent->id() : -1, after ? after->id() : -1 ); setCurrentItem( current ); //HACK, sometimes TQt changes this under us } @@ -694,16 +694,16 @@ void LayerList::contentsMouseDoubleClickEvent( TQMouseEvent *e ) } } -void LayerList::findDrop( const TQPoint &pos, TQListViewItem *&tqparent, TQListViewItem *&after ) +void LayerList::findDrop( const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after ) { LayerItem *item = static_cast<LayerItem*>( itemAt( contentsToViewport( pos ) ) ); if( item && item->isFolder() ) { - tqparent = item; + parent = item; after = 0; } else - super::findDrop( pos, tqparent, after ); + super::findDrop( pos, parent, after ); } void LayerList::showContextMenu() @@ -748,22 +748,22 @@ void LayerList::menuActivated( int id, LayerItem *layer ) { const TQValueList<LayerItem*> selected = selectedLayers(); - LayerItem *tqparent = ( layer && layer->isFolder() ) ? layer : 0; + LayerItem *parent = ( layer && layer->isFolder() ) ? layer : 0; LayerItem *after = 0; - if( layer && !tqparent ) + if( layer && !parent ) { - tqparent = layer->tqparent(); + parent = layer->parent(); after = layer->prevSibling(); } switch( id ) { case MenuItems::NewLayer: - emit requestNewLayer( tqparent, after ); - emit requestNewLayer( tqparent ? tqparent->id() : -1, after ? after->id() : -1 ); + emit requestNewLayer( parent, after ); + emit requestNewLayer( parent ? parent->id() : -1, after ? after->id() : -1 ); break; case MenuItems::NewFolder: - emit requestNewFolder( tqparent, after ); - emit requestNewFolder( tqparent ? tqparent->id() : -1, after ? after->id() : -1 ); + emit requestNewFolder( parent, after ); + emit requestNewFolder( parent ? parent->id() : -1, after ? after->id() : -1 ); break; case MenuItems::RemoveLayer: { @@ -810,11 +810,11 @@ void LayerList::slotItemMoved( TQPtrList<TQListViewItem> &items, TQPtrList<TQLis if( !l ) continue; - if( l->tqparent() ) - l->tqparent()->setOpen( true ); + if( l->parent() ) + l->parent()->setOpen( true ); - emit layerMoved( l, l->tqparent(), a ); - emit layerMoved( l->id(), l->tqparent() ? l->tqparent()->id() : -1, a ? a->id() : -1 ); + emit layerMoved( l, l->parent(), a ); + emit layerMoved( l->id(), l->parent() ? l->parent()->id() : -1, a ? a->id() : -1 ); } } @@ -861,8 +861,8 @@ void LayerItem::init() for( int i = 0, n = listView()->d->properties.count(); i < n; ++i ) d->properties.append( listView()->d->properties[i].defaultValue ); - if( tqparent()) - tqparent()->setOpen( true ); + if( parent()) + parent()->setOpen( true ); } LayerItem::~LayerItem() @@ -996,7 +996,7 @@ LayerItem *LayerItem::addLayer( const TQString &displayName, LayerItem *after, i LayerItem *LayerItem::prevSibling() const { - LayerItem *item = tqparent() ? tqparent()->firstChild() : listView()->firstChild(); + LayerItem *item = parent() ? parent()->firstChild() : listView()->firstChild(); if( !item || this == item ) return 0; for(; item && this != item->nextSibling(); item = item->nextSibling() ); @@ -1319,7 +1319,7 @@ LayerList *LayerItem::listView() const { return static_cast<LayerList*>( super:: void LayerItem::update() const { listView()->repaintItem( this ); } LayerItem *LayerItem::firstChild() const { return static_cast<LayerItem*>( super::firstChild() ); } LayerItem *LayerItem::nextSibling() const { return static_cast<LayerItem*>( super::nextSibling() ); } -LayerItem *LayerItem::tqparent() const { return static_cast<LayerItem*>( super::tqparent() ); } +LayerItem *LayerItem::parent() const { return static_cast<LayerItem*>( super::parent() ); } #include "layerlist.moc" diff --git a/chalk/ui/layerlist.h b/chalk/ui/layerlist.h index 5c75b6b75..ea6926b71 100644 --- a/chalk/ui/layerlist.h +++ b/chalk/ui/layerlist.h @@ -37,7 +37,7 @@ class LayerList: public KListView TQ_OBJECT public: - LayerList( TQWidget *tqparent = 0, const char *name = 0 ); + LayerList( TQWidget *parent = 0, const char *name = 0 ); virtual ~LayerList(); void addProperty( const TQString &name, const TQString &displayName, const TQIconSet &icon = TQIconSet(), @@ -97,10 +97,10 @@ public slots: LayerItem *addLayer( const TQString &displayName, LayerItem *after = 0, int id = -1 ); LayerItem *addLayer( const TQString &displayName, int afterID, int id = -1 ); - LayerItem *addLayerToParent( const TQString &displayName, LayerItem *tqparent, LayerItem *after = 0, int id = -1 ); + LayerItem *addLayerToParent( const TQString &displayName, LayerItem *parent, LayerItem *after = 0, int id = -1 ); LayerItem *addLayerToParent( const TQString &displayName, int parentID, int afterID = -1, int id = -1 ); - void moveLayer( LayerItem *layer, LayerItem *tqparent, LayerItem *after ); + void moveLayer( LayerItem *layer, LayerItem *parent, LayerItem *after ); void moveLayer( int id, int parentID, int afterID ); void removeLayer( LayerItem *layer ); @@ -116,13 +116,13 @@ signals: void propertyChanged( LayerItem *layer, const TQString &name, bool on ); void propertyChanged( int id, const TQString &name, bool on ); - void layerMoved( LayerItem *layer, LayerItem *tqparent, LayerItem *after ); + void layerMoved( LayerItem *layer, LayerItem *parent, LayerItem *after ); void layerMoved( int id, int parentID, int afterID ); - void requestNewLayer( LayerItem *tqparent, LayerItem *after ); + void requestNewLayer( LayerItem *parent, LayerItem *after ); void requestNewLayer( int parentID, int afterID ); - void requestNewFolder( LayerItem *tqparent, LayerItem *after ); + void requestNewFolder( LayerItem *parent, LayerItem *after ); void requestNewFolder( int parentID, int afterID ); void requestRemoveLayer( LayerItem *layer ); @@ -163,14 +163,14 @@ public: //reimplemented for internal reasons protected: virtual void contentsMousePressEvent( TQMouseEvent *e ); virtual void contentsMouseDoubleClickEvent ( TQMouseEvent *e ); - virtual void findDrop( const TQPoint &pos, TQListViewItem *&tqparent, TQListViewItem *&after ); + virtual void findDrop( const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after ); }; class LayerItem: public KListViewItem { public: - LayerItem( const TQString &displayName, LayerList *tqparent, LayerItem *after = 0, int id = -1 ); - LayerItem( const TQString &displayName, LayerItem *tqparent, LayerItem *after = 0, int id = -1 ); + LayerItem( const TQString &displayName, LayerList *parent, LayerItem *after = 0, int id = -1 ); + LayerItem( const TQString &displayName, LayerItem *parent, LayerItem *after = 0, int id = -1 ); virtual ~LayerItem(); void makeFolder(); @@ -203,7 +203,7 @@ public: //convenience LayerItem *nextSibling() const; LayerList *listView() const; LayerItem *firstChild() const; - LayerItem *tqparent() const; + LayerItem *parent() const; void update() const; //like TQWidget::update() protected: @@ -259,10 +259,10 @@ public: //reimplemented for internal reasons class LayerFolder: public LayerItem { public: - LayerFolder( const TQString &displayName, LayerList *tqparent, LayerItem *after = 0, int id = -1 ) - : LayerItem( displayName, tqparent, after, id ) { makeFolder(); } - LayerFolder( const TQString &displayName, LayerItem *tqparent, LayerItem *after = 0, int id = -1 ) - : LayerItem( displayName, tqparent, after, id ) { makeFolder(); } + LayerFolder( const TQString &displayName, LayerList *parent, LayerItem *after = 0, int id = -1 ) + : LayerItem( displayName, parent, after, id ) { makeFolder(); } + LayerFolder( const TQString &displayName, LayerItem *parent, LayerItem *after = 0, int id = -1 ) + : LayerItem( displayName, parent, after, id ) { makeFolder(); } }; diff --git a/chalk/ui/squeezedcombobox.cpp b/chalk/ui/squeezedcombobox.cpp index 1c58f1dd1..6b957a26d 100644 --- a/chalk/ui/squeezedcombobox.cpp +++ b/chalk/ui/squeezedcombobox.cpp @@ -35,8 +35,8 @@ #include "squeezedcombobox.h" -SqueezedComboBoxTip::SqueezedComboBoxTip( TQWidget * tqparent, SqueezedComboBox* name ) - : TQToolTip( tqparent ) +SqueezedComboBoxTip::SqueezedComboBoxTip( TQWidget * parent, SqueezedComboBox* name ) + : TQToolTip( parent ) { m_originalWidget = name; } @@ -57,8 +57,8 @@ void SqueezedComboBoxTip::maybeTip( const TQPoint &pos ) } } -SqueezedComboBox::SqueezedComboBox( TQWidget *tqparent, const char *name ) - : TQComboBox( tqparent, name ) +SqueezedComboBox::SqueezedComboBox( TQWidget *parent, const char *name ) + : TQComboBox( parent, name ) { setMinimumWidth(100); m_timer = new TQTimer(this); diff --git a/chalk/ui/squeezedcombobox.h b/chalk/ui/squeezedcombobox.h index 0ca7bb412..03a1cdb93 100644 --- a/chalk/ui/squeezedcombobox.h +++ b/chalk/ui/squeezedcombobox.h @@ -51,10 +51,10 @@ public: * t = new SqueezedComboBoxTip( this->listBox()->viewport(), this ); * @endcode * - * @param tqparent tqparent widget (viewport) - * @param name tqparent widget + * @param parent parent widget (viewport) + * @param name parent widget */ - SqueezedComboBoxTip( TQWidget *tqparent, SqueezedComboBox *name ); + SqueezedComboBoxTip( TQWidget *parent, SqueezedComboBox *name ); protected: /** @@ -87,10 +87,10 @@ class SqueezedComboBox : public TQComboBox public: /** * Constructor - * @param tqparent tqparent widget + * @param parent parent widget * @param name name to give to the widget */ - SqueezedComboBox(TQWidget *tqparent = 0, const char *name = 0 ); + SqueezedComboBox(TQWidget *parent = 0, const char *name = 0 ); /** * destructor diff --git a/chalk/ui/wdgcustombrush.ui b/chalk/ui/wdgcustombrush.ui index 6dca87684..dba17daca 100644 --- a/chalk/ui/wdgcustombrush.ui +++ b/chalk/ui/wdgcustombrush.ui @@ -98,7 +98,7 @@ <cstring>colorAsMask</cstring> </property> <property name="text"> - <string>Use color as tqmask</string> + <string>Use color as mask</string> </property> </widget> <widget class="TQLayoutWidget"> |