summaryrefslogtreecommitdiffstats
path: root/kicker/libkicker/kshadowengine.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
commit8155225c9be993acc0512956416d195edfef4eb9 (patch)
treede4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kicker/libkicker/kshadowengine.cpp
parent364641b8e0279758d236af39abd138d379328a19 (diff)
downloadtdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz
tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker/libkicker/kshadowengine.cpp')
-rw-r--r--kicker/libkicker/kshadowengine.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/kicker/libkicker/kshadowengine.cpp b/kicker/libkicker/kshadowengine.cpp
index 19ccc669d..a933026d5 100644
--- a/kicker/libkicker/kshadowengine.cpp
+++ b/kicker/libkicker/kshadowengine.cpp
@@ -78,7 +78,7 @@ TQImage KShadowEngine::makeShadow(const TQPixmap& textPixmap, const TQColor &bgC
/*
* This is the source pixmap
*/
- TQImage img = textPixmap.convertToImage().convertDepth(32);
+ TQImage img = TQImage(textPixmap.convertToImage()).convertDepth(32);
/*
* Resize the image if necessary
@@ -114,7 +114,7 @@ TQImage KShadowEngine::makeShadow(const TQPixmap& textPixmap, const TQColor &bgC
alphaShadow = (alphaShadow > m_shadowSettings->maxOpacity()) ? m_shadowSettings->maxOpacity() : alphaShadow;
// update the shadow's i,j pixel.
- result.setPixel(i,j, qRgba(bgRed, bgGreen , bgBlue, (int) alphaShadow));
+ result.setPixel(i,j, tqRgba(bgRed, bgGreen , bgBlue, (int) alphaShadow));
}
}
return result;
@@ -131,15 +131,15 @@ double KShadowEngine::defaultDecay(TQImage& source, int i, int j)
return 0;
double alphaShadow;
- alphaShadow =(qGray(source.pixel(i-1,j-1)) * DIAGONAL_FACTOR +
- qGray(source.pixel(i-1,j )) * AXIS_FACTOR +
- qGray(source.pixel(i-1,j+1)) * DIAGONAL_FACTOR +
- qGray(source.pixel(i ,j-1)) * AXIS_FACTOR +
+ alphaShadow =(tqGray(source.pixel(i-1,j-1)) * DIAGONAL_FACTOR +
+ tqGray(source.pixel(i-1,j )) * AXIS_FACTOR +
+ tqGray(source.pixel(i-1,j+1)) * DIAGONAL_FACTOR +
+ tqGray(source.pixel(i ,j-1)) * AXIS_FACTOR +
0 +
- qGray(source.pixel(i ,j+1)) * AXIS_FACTOR +
- qGray(source.pixel(i+1,j-1)) * DIAGONAL_FACTOR +
- qGray(source.pixel(i+1,j )) * AXIS_FACTOR +
- qGray(source.pixel(i+1,j+1)) * DIAGONAL_FACTOR) / m_shadowSettings->multiplicationFactor();
+ tqGray(source.pixel(i ,j+1)) * AXIS_FACTOR +
+ tqGray(source.pixel(i+1,j-1)) * DIAGONAL_FACTOR +
+ tqGray(source.pixel(i+1,j )) * AXIS_FACTOR +
+ tqGray(source.pixel(i+1,j+1)) * DIAGONAL_FACTOR) / m_shadowSettings->multiplicationFactor();
return alphaShadow;
}
@@ -189,7 +189,7 @@ double KShadowEngine::noDecay(TQImage& source, int i, int j)
else
sy = j + m;
- opacity += qGray(source.pixel(sx, sy));
+ opacity += tqGray(source.pixel(sx, sy));
}
}
alphaShadow += opacity / m_shadowSettings->multiplicationFactor();