TQt4 port kdegames

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegames@1236074 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 5 insertions, 5 deletions

diff --git a/ktuberling/todraw.cpp b/ktuberling/todraw.cpp
index c88328a7..c148b3a0 100644
--- a/ktuberling/todraw.cpp
+++ b/ktuberling/todraw.cpp
@@ -44,16 +44,16 @@ ToDraw &ToDraw::operator=(const ToDraw &model)
 // Draw an object previously laid down on the game board
 void ToDraw::draw(TQPainter &artist, const TQRect &area,
                   const TQRect *objectsLayout,
-                  const TQPixmap *gameboard, const TQBitmap *masks) const
+                  const TQPixmap *gameboard, const TQBitmap *tqmasks) const
 {
   if (!position.intersects(area)) return;
 
   TQPixmap objectPixmap(objectsLayout[number].size());
-  TQBitmap shapeBitmap(objectsLayout[number].size());
+  TQBitmap tqshapeBitmap(objectsLayout[number].size());
 
-  bitBlt(&objectPixmap, TQPoint(0, 0), gameboard, objectsLayout[number], Qt::CopyROP);
-  bitBlt(&shapeBitmap, TQPoint(0, 0), masks, objectsLayout[number], Qt::CopyROP);
-  objectPixmap.setMask(shapeBitmap);
+  bitBlt(&objectPixmap, TQPoint(0, 0), gameboard, objectsLayout[number], TQt::CopyROP);
+  bitBlt(&tqshapeBitmap, TQPoint(0, 0), tqmasks, objectsLayout[number], TQt::CopyROP);
+  objectPixmap.setMask(tqshapeBitmap);
   artist.drawPixmap(position.topLeft(), objectPixmap);
 }