summaryrefslogtreecommitdiffstats
path: root/ktuberling/playground.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 /ktuberling/playground.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 'ktuberling/playground.cpp')
-rw-r--r--ktuberling/playground.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/ktuberling/playground.cpp b/ktuberling/playground.cpp
index cdd03d89..c2da26bf 100644
--- a/ktuberling/playground.cpp
+++ b/ktuberling/playground.cpp
@@ -38,10 +38,10 @@ PlayGround::PlayGround(TopLevel *tqparent, const char *name, uint selectedGamebo
setBackgroundColor(white);
- TQDomDocument tqlayoutsDocument;
- bool ok = topLevel->loadLayout(tqlayoutsDocument);
- if (ok) ok = registerPlayGrounds(tqlayoutsDocument);
- if (ok) ok = loadPlayGround(tqlayoutsDocument, selectedGameboard);
+ TQDomDocument layoutsDocument;
+ bool ok = topLevel->loadLayout(layoutsDocument);
+ if (ok) ok = registerPlayGrounds(layoutsDocument);
+ if (ok) ok = loadPlayGround(layoutsDocument, selectedGameboard);
if (!ok) loadFailure();
currentAction = 0;
@@ -71,9 +71,9 @@ void PlayGround::reset()
// Change the gameboard
void PlayGround::change(uint selectedGameboard)
{
- TQDomDocument tqlayoutsDocument;
- bool ok = topLevel->loadLayout(tqlayoutsDocument);
- if (ok) ok = loadPlayGround(tqlayoutsDocument, selectedGameboard);
+ TQDomDocument layoutsDocument;
+ bool ok = topLevel->loadLayout(layoutsDocument);
+ if (ok) ok = loadPlayGround(layoutsDocument, selectedGameboard);
if (!ok) loadFailure();
toDraw.clear();
@@ -221,7 +221,7 @@ void PlayGround::drawGameboard( TQPainter &artist, const TQRect &area ) const
for (TQPtrListIterator<ToDraw> currentObject(toDraw);
currentObject.current();
++currentObject)
- currentObject.current()->draw(artist, area, objectsLayout, &gameboard, &tqmasks);
+ currentObject.current()->draw(artist, area, objectsLayout, &gameboard, &masks);
}
// Painting event
@@ -257,7 +257,7 @@ void PlayGround::mousePressEvent( TQMouseEvent *event )
TQPixmap object(objectsLayout[draggedNumber].size());
TQBitmap tqshape(objectsLayout[draggedNumber].size());
bitBlt(&object, TQPoint(0, 0), &gameboard, objectsLayout[draggedNumber], TQt::CopyROP);
- bitBlt(&tqshape, TQPoint(0, 0), &tqmasks, objectsLayout[draggedNumber], TQt::CopyROP);
+ bitBlt(&tqshape, TQPoint(0, 0), &masks, objectsLayout[draggedNumber], TQt::CopyROP);
object.setMask(tqshape);
draggedCursor = new TQCursor(object, position.x(), position.y());
@@ -325,13 +325,13 @@ void PlayGround::mouseReleaseEvent( TQMouseEvent *event )
}
// Register the various playgrounds
-bool PlayGround::registerPlayGrounds(TQDomDocument &tqlayoutDocument)
+bool PlayGround::registerPlayGrounds(TQDomDocument &layoutDocument)
{
TQDomNodeList playGroundsList, menuItemsList, labelsList;
TQDomElement playGroundElement, menuItemElement, labelElement;
TQDomAttr actionAttribute;
- playGroundsList = tqlayoutDocument.elementsByTagName("playground");
+ playGroundsList = layoutDocument.elementsByTagName("playground");
if (playGroundsList.count() < 1)
return false;
@@ -357,20 +357,20 @@ bool PlayGround::registerPlayGrounds(TQDomDocument &tqlayoutDocument)
return true;
}
-// Load background and draggable objects tqmasks
-bool PlayGround::loadPlayGround(TQDomDocument &tqlayoutDocument, uint toLoad)
+// Load background and draggable objects masks
+bool PlayGround::loadPlayGround(TQDomDocument &layoutDocument, uint toLoad)
{
TQDomNodeList playGroundsList,
editableAreasList, categoriesList, objectsList,
- gameAreasList, tqmaskAreasList, soundNamesList, labelsList;
+ gameAreasList, maskAreasList, soundNamesList, labelsList;
TQDomElement playGroundElement,
editableAreaElement, categoryElement, objectElement,
- gameAreaElement, tqmaskAreaElement, soundNameElement, labelElement;
- TQDomAttr gameboardAttribute, tqmasksAttribute,
+ gameAreaElement, maskAreaElement, soundNameElement, labelElement;
+ TQDomAttr gameboardAttribute, masksAttribute,
leftAttribute, topAttribute, rightAttribute, bottomAttribute,
refAttribute;
- playGroundsList = tqlayoutDocument.elementsByTagName("playground");
+ playGroundsList = layoutDocument.elementsByTagName("playground");
if (toLoad >= playGroundsList.count())
return false;
@@ -380,8 +380,8 @@ bool PlayGround::loadPlayGround(TQDomDocument &tqlayoutDocument, uint toLoad)
if (!gameboard.load(locate("data", "ktuberling/pics/" + gameboardAttribute.value())))
return false;
- tqmasksAttribute = playGroundElement.attributeNode("tqmasks");
- if (!tqmasks.load(locate("data", "ktuberling/pics/" + tqmasksAttribute.value())))
+ masksAttribute = playGroundElement.attributeNode("masks");
+ if (!masks.load(locate("data", "ktuberling/pics/" + masksAttribute.value())))
return false;
editableAreasList = playGroundElement.elementsByTagName("editablearea");
@@ -550,7 +550,7 @@ bool PlayGround::zone(TQPoint &position)
TQBitmap tqshape(objectsLayout[draggedNumber].size());
TQPoint relative(position.x() - toUpdate.x(),
position.y() - toUpdate.y());
- bitBlt(&tqshape, TQPoint(0, 0), &tqmasks, objectsLayout[draggedNumber], TQt::CopyROP);
+ bitBlt(&tqshape, TQPoint(0, 0), &masks, objectsLayout[draggedNumber], TQt::CopyROP);
if (!tqshape.convertToImage().pixelIndex(relative.x(), relative.y())) continue;
toDraw.remove(draggedZOrder);