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

8 files changed, 49 insertions, 49 deletions

diff --git a/ktuberling/pics/layout.xml b/ktuberling/pics/layout.xml
index 84b09a2a..9e87dae7 100644
--- a/ktuberling/pics/layout.xml
+++ b/ktuberling/pics/layout.xml
@@ -11,7 +11,7 @@
 
 <ktuberling>
 
-  <playground gameboard="potato-game.png" tqmasks="potato-tqmask.png">
+  <playground gameboard="potato-game.png" masks="potato-tqmask.png">
 
     <menuitem action="playground_potato_guy">
       <label>Potato &amp;Guy</label>
@@ -269,7 +269,7 @@
 
   </playground>
 
-  <playground gameboard="penguin-game.png" tqmasks="penguin-tqmask.png">
+  <playground gameboard="penguin-game.png" masks="penguin-tqmask.png">
 
     <menuitem action="playground_penguin">
       <label>&amp;Penguin</label>
@@ -422,7 +422,7 @@
 
   </playground>
 
-  <playground gameboard="aquarium-game.png" tqmasks="aquarium-tqmask.png">
+  <playground gameboard="aquarium-game.png" masks="aquarium-tqmask.png">
 
     <menuitem action="playground_aquarium">
       <label>&amp;Aquarium</label>
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);
diff --git a/ktuberling/playground.h b/ktuberling/playground.h
index a428f88b..65fbaff0 100644
--- a/ktuberling/playground.h
+++ b/ktuberling/playground.h
@@ -51,8 +51,8 @@ protected:
 
 private:
 
-  bool registerPlayGrounds(TQDomDocument &tqlayoutDocument);
-  bool loadPlayGround(TQDomDocument &tqlayoutDocument, uint toLoad);
+  bool registerPlayGrounds(TQDomDocument &layoutDocument);
+  bool loadPlayGround(TQDomDocument &layoutDocument, uint toLoad);
   void loadFailure();
   void setupGeometry();
   bool zone(TQPoint &position);
@@ -62,7 +62,7 @@ private:
 private:
 
   TQPixmap gameboard;		// Picture of the game board
-  TQBitmap tqmasks;		// Pictures of the objects' tqshapes
+  TQBitmap masks;		// Pictures of the objects' tqshapes
   TQRect editableArea;           // Part of the gameboard where the player can lay down objects
   TQString menuItem,		// Menu item describing describing this gameboard
           editableSound;        // Sound associated with this area
diff --git a/ktuberling/soundfactory.cpp b/ktuberling/soundfactory.cpp
index 5bb309d8..f10d0a8c 100644
--- a/ktuberling/soundfactory.cpp
+++ b/ktuberling/soundfactory.cpp
@@ -25,10 +25,10 @@ SoundFactory::SoundFactory(TopLevel *tqparent, const char *name, uint selectedLa
 
   namesList = filesList = 0;
 
-  TQDomDocument tqlayoutsDocument;
-  bool ok = topLevel->loadLayout(tqlayoutsDocument);
-  if (ok) ok = registerLanguages(tqlayoutsDocument);
-  if (ok) ok = loadLanguage(tqlayoutsDocument, selectedLanguage);
+  TQDomDocument layoutsDocument;
+  bool ok = topLevel->loadLayout(layoutsDocument);
+  if (ok) ok = registerLanguages(layoutsDocument);
+  if (ok) ok = loadLanguage(layoutsDocument, selectedLanguage);
   if (!ok) loadFailure();
 }
 
@@ -42,9 +42,9 @@ SoundFactory::~SoundFactory()
 // Change the language
 void SoundFactory::change(uint selectedLanguage)
 {
-  TQDomDocument tqlayoutsDocument;
-  bool ok = topLevel->loadLayout(tqlayoutsDocument);
-  if (ok) ok = loadLanguage(tqlayoutsDocument, selectedLanguage);
+  TQDomDocument layoutsDocument;
+  bool ok = topLevel->loadLayout(layoutsDocument);
+  if (ok) ok = loadLanguage(layoutsDocument, selectedLanguage);
   if (!ok) loadFailure();
 }
 
@@ -74,14 +74,14 @@ void SoundFactory::loadFailure()
 }
 
 // Register the various languages
-bool SoundFactory::registerLanguages(TQDomDocument &tqlayoutDocument)
+bool SoundFactory::registerLanguages(TQDomDocument &layoutDocument)
 {
   TQDomNodeList languagesList, menuItemsList, labelsList;
   TQDomElement languageElement, menuItemElement, labelElement;
   TQDomAttr codeAttribute, actionAttribute;
   bool enabled;
 
-  languagesList = tqlayoutDocument.elementsByTagName("language");
+  languagesList = layoutDocument.elementsByTagName("language");
   if (languagesList.count() < 1)
     return false;
 
@@ -110,7 +110,7 @@ bool SoundFactory::registerLanguages(TQDomDocument &tqlayoutDocument)
 }
 
 // Load the sounds of one given language
-bool SoundFactory::loadLanguage(TQDomDocument &tqlayoutDocument, uint toLoad)
+bool SoundFactory::loadLanguage(TQDomDocument &layoutDocument, uint toLoad)
 {
   TQDomNodeList languagesList,
                soundNamesList;
@@ -118,7 +118,7 @@ bool SoundFactory::loadLanguage(TQDomDocument &tqlayoutDocument, uint toLoad)
               soundNameElement;
   TQDomAttr nameAttribute, fileAttribute;
 
-  languagesList = tqlayoutDocument.elementsByTagName("language");
+  languagesList = layoutDocument.elementsByTagName("language");
   if (toLoad >= languagesList.count())
     return false;
 
diff --git a/ktuberling/soundfactory.h b/ktuberling/soundfactory.h
index 6fe923bc..76272e0a 100644
--- a/ktuberling/soundfactory.h
+++ b/ktuberling/soundfactory.h
@@ -28,8 +28,8 @@ public:
 
 protected:
 
-  bool registerLanguages(TQDomDocument &tqlayoutDocument);
-  bool loadLanguage(TQDomDocument &tqlayoutDocument, uint toLoad);
+  bool registerLanguages(TQDomDocument &layoutDocument);
+  bool loadLanguage(TQDomDocument &layoutDocument, uint toLoad);
 
 private:
 
diff --git a/ktuberling/todraw.cpp b/ktuberling/todraw.cpp
index c148b3a0..cec7b014 100644
--- a/ktuberling/todraw.cpp
+++ b/ktuberling/todraw.cpp
@@ -44,7 +44,7 @@ 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 *tqmasks) const
+                  const TQPixmap *gameboard, const TQBitmap *masks) const
 {
   if (!position.intersects(area)) return;
 
@@ -52,7 +52,7 @@ void ToDraw::draw(TQPainter &artist, const TQRect &area,
   TQBitmap tqshapeBitmap(objectsLayout[number].size());
 
   bitBlt(&objectPixmap, TQPoint(0, 0), gameboard, objectsLayout[number], TQt::CopyROP);
-  bitBlt(&tqshapeBitmap, TQPoint(0, 0), tqmasks, objectsLayout[number], TQt::CopyROP);
+  bitBlt(&tqshapeBitmap, TQPoint(0, 0), masks, objectsLayout[number], TQt::CopyROP);
   objectPixmap.setMask(tqshapeBitmap);
   artist.drawPixmap(position.topLeft(), objectPixmap);
 }
diff --git a/ktuberling/toplevel.cpp b/ktuberling/toplevel.cpp
index c0131d26..0563d856 100644
--- a/ktuberling/toplevel.cpp
+++ b/ktuberling/toplevel.cpp
@@ -186,19 +186,19 @@ void TopLevel::changeLanguage(uint newLanguage)
   soundFactory->change(newLanguage);
 }
 
-// Load the tqlayouts file
-bool TopLevel::loadLayout(TQDomDocument &tqlayoutDocument)
+// Load the layouts file
+bool TopLevel::loadLayout(TQDomDocument &layoutDocument)
 {
-  TQFile tqlayoutFile(TQFile::encodeName(locate("data", "ktuberling/pics/tqlayout.xml")));
-  if (!tqlayoutFile.open(IO_ReadOnly))
+  TQFile layoutFile(TQFile::encodeName(locate("data", "ktuberling/pics/tqlayout.xml")));
+  if (!layoutFile.open(IO_ReadOnly))
      return false;
 
-  if (!tqlayoutDocument.setContent(&tqlayoutFile))
+  if (!layoutDocument.setContent(&layoutFile))
   {
-     tqlayoutFile.close();
+     layoutFile.close();
      return false;
   }
-  tqlayoutFile.close();
+  layoutFile.close();
 
   return true;
 }
diff --git a/ktuberling/toplevel.h b/ktuberling/toplevel.h
index 04ceaa96..a92d27c4 100644
--- a/ktuberling/toplevel.h
+++ b/ktuberling/toplevel.h
@@ -32,7 +32,7 @@ public:
   void registerLanguage(const TQString &menuItem, const char *actionId, bool enabled);
   void changeGameboard(uint newGameboard);
   void changeLanguage(uint newLanguage);
-  bool loadLayout(TQDomDocument &tqlayoutDocument);
+  bool loadLayout(TQDomDocument &layoutDocument);
   void playSound(const TQString &ref) const;
 
   inline bool isSoundEnabled() const {return soundEnabled;}