summaryrefslogtreecommitdiffstats
path: root/kmahjongg/Tileset.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
commitc406d61deefc0c3e3173ebe77bfb38a1bc453ce7 (patch)
tree12ccf93b39a8eedba87ebbd7447d33e5ab59108a /kmahjongg/Tileset.cpp
parent373fe6f2b90bcd2e452f16115a4950a4b46c1f34 (diff)
downloadtdegames-c406d61deefc0c3e3173ebe77bfb38a1bc453ce7.tar.gz
tdegames-c406d61deefc0c3e3173ebe77bfb38a1bc453ce7.zip
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegames@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmahjongg/Tileset.cpp')
-rw-r--r--kmahjongg/Tileset.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/kmahjongg/Tileset.cpp b/kmahjongg/Tileset.cpp
index fb4b1d05..b8c6ec2f 100644
--- a/kmahjongg/Tileset.cpp
+++ b/kmahjongg/Tileset.cpp
@@ -16,9 +16,9 @@ static unsigned char mini_bits[] = {
0xff, 0xff, 0x0f, 0xff, 0xff, 0x0f, 0xff, 0xff, 0x07, 0xff, 0xff, 0x03,
};
-#define tqmask_width 40
-#define tqmask_height 56
-static unsigned char tqmask_bits[] = {
+#define mask_width 40
+#define mask_height 56
+static unsigned char mask_bits[] = {
0xf0, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xff,
0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
@@ -48,8 +48,8 @@ static unsigned char tqmask_bits[] = {
// ---------------------------------------------------------
Tileset::Tileset(bool scale):
- tqmaskBits(tqmask_width, tqmask_height, tqmask_bits, true),
- tqmaskBitsMini(mini_width, mini_height, mini_bits, true)
+ maskBits(mask_width, mask_height, mask_bits, true),
+ maskBitsMini(mini_width, mini_height, mini_bits, true)
{
isScaled = scale;
divisor = (isScaled) ? 2 : 1;
@@ -198,10 +198,10 @@ void Tileset::createPixmap(TQRgb *src, TQPixmap &dest, bool scale, bool shadow)
// create the pixmap and initialise the drawing tqmask
if (!scale) {
dest.convertFromImage(buff);
- dest.setMask(tqmaskBits);
+ dest.setMask(maskBits);
} else {
dest.convertFromImage(buff.smoothScale(w/2, h/2));
- dest.setMask(tqmaskBitsMini);
+ dest.setMask(maskBitsMini);
}
}