summaryrefslogtreecommitdiffstats
path: root/src/widgets/qeffects.cpp
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2012-06-18 00:09:52 -0500
committerDarrell Anderson <[email protected]>2012-06-18 00:09:52 -0500
commitd1096751ddb25cdef23919c17389fc268c31edaf (patch)
treeb910be3588cb706defc00c31aefa850bb2312784 /src/widgets/qeffects.cpp
parentaf8fdcf1ca7bdbda6f0c1afecd8c2d8ffa23bebb (diff)
parent6dec101d43dcbd4195c47d54bd388db1a8d7230e (diff)
downloadtqt3-d1096751ddb25cdef23919c17389fc268c31edaf.tar.gz
tqt3-d1096751ddb25cdef23919c17389fc268c31edaf.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/widgets/qeffects.cpp')
-rw-r--r--src/widgets/qeffects.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/widgets/qeffects.cpp b/src/widgets/qeffects.cpp
index d2f207912..d431f21b3 100644
--- a/src/widgets/qeffects.cpp
+++ b/src/widgets/qeffects.cpp
@@ -307,18 +307,18 @@ void TQAlphaWidget::alphaBlend()
switch( front.depth() ) {
case 32:
{
- Q_UINT32** md = (Q_UINT32**)mixed.jumpTable();
- Q_UINT32** bd = (Q_UINT32**)back.jumpTable();
- Q_UINT32** fd = (Q_UINT32**)front.jumpTable();
+ TQ_UINT32** md = (TQ_UINT32**)mixed.jumpTable();
+ TQ_UINT32** bd = (TQ_UINT32**)back.jumpTable();
+ TQ_UINT32** fd = (TQ_UINT32**)front.jumpTable();
for (int sy = 0; sy < sh; sy++ ) {
- Q_UINT32* bl = ((Q_UINT32*)bd[sy]);
- Q_UINT32* fl = ((Q_UINT32*)fd[sy]);
+ TQ_UINT32* bl = ((TQ_UINT32*)bd[sy]);
+ TQ_UINT32* fl = ((TQ_UINT32*)fd[sy]);
for (int sx = 0; sx < sw; sx++ ) {
- Q_UINT32 bp = bl[sx];
- Q_UINT32 fp = fl[sx];
+ TQ_UINT32 bp = bl[sx];
+ TQ_UINT32 fp = fl[sx];
- ((Q_UINT32*)(md[sy]))[sx] = tqRgb(int (tqRed(bp)*ia + tqRed(fp)*alpha),
+ ((TQ_UINT32*)(md[sy]))[sx] = tqRgb(int (tqRed(bp)*ia + tqRed(fp)*alpha),
int (tqGreen(bp)*ia + tqGreen(fp)*alpha),
int (tqBlue(bp)*ia + tqBlue(fp)*alpha) );
}