From 04766b207afba7961d4d802313e426f5a2fbef63 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- chalk/core/kis_alpha_mask.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'chalk/core/kis_alpha_mask.cc') diff --git a/chalk/core/kis_alpha_mask.cc b/chalk/core/kis_alpha_mask.cc index 1b40e806..3f382c30 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((1 - t) * tqmask1->alphaAt(x, y) + t * tqmask2->alphaAt(x, y)); + TQ_UINT8 d = static_cast((1 - t) * mask1->alphaAt(x, y) + t * mask2->alphaAt(x, y)); outputMask->setAlphaAt(x, y, d); } } -- cgit v1.2.1