Rename a number of old tq methods that are no longer tq specific

6 files changed, 22 insertions, 22 deletions

diff --git a/ktuberling/pics/layout.i18n b/ktuberling/pics/layout.i18n
index 85c63ed9..373203cb 100644
--- a/ktuberling/pics/layout.i18n
+++ b/ktuberling/pics/layout.i18n
@@ -1,6 +1,6 @@
 /* -------------------------------------------------------------
    KDE Tuberling
-   List of strings in tqlayout.xml that are translatable
+   List of strings in layout.xml that are translatable
    mailto:e.bischoff@noos.fr
  ------------------------------------------------------------- */
 
diff --git a/ktuberling/pics/layout.xml b/ktuberling/pics/layout.xml
index e96beb07..c5b02fb8 100644
--- a/ktuberling/pics/layout.xml
+++ b/ktuberling/pics/layout.xml
@@ -5,7 +5,7 @@
 
    Modify this file if you want to add new playgrounds, new sounds,
    or modify existing ones. If you do that, don't forget to update:
-   - tqlayout.i18n (strings that might be translated)
+   - layout.i18n (strings that might be translated)
    - ktuberlingui.rc (actions associated with menu items).
 -->
 
diff --git a/ktuberling/playground.cpp b/ktuberling/playground.cpp
index 586f143f..62d2b107 100644
--- a/ktuberling/playground.cpp
+++ b/ktuberling/playground.cpp
@@ -94,7 +94,7 @@ void PlayGround::repaintAll()
          editableArea.width() + 20,
          editableArea.height() + 20);
 
-  tqrepaint(dirtyArea, false);
+  repaint(dirtyArea, false);
 }
 
 // Undo last action
@@ -255,10 +255,10 @@ void PlayGround::mousePressEvent( TQMouseEvent *event )
 
   int draggedNumber = draggedObject.getNumber();
   TQPixmap object(objectsLayout[draggedNumber].size());
-  TQBitmap tqshape(objectsLayout[draggedNumber].size());
+  TQBitmap shape(objectsLayout[draggedNumber].size());
   bitBlt(&object, TQPoint(0, 0), &gameboard, objectsLayout[draggedNumber], TQt::CopyROP);
-  bitBlt(&tqshape, TQPoint(0, 0), &masks, objectsLayout[draggedNumber], TQt::CopyROP);
-  object.setMask(tqshape);
+  bitBlt(&shape, TQPoint(0, 0), &masks, objectsLayout[draggedNumber], TQt::CopyROP);
+  object.setMask(shape);
 
   draggedCursor = new TQCursor(object, position.x(), position.y());
   setCursor(*draggedCursor);
@@ -320,7 +320,7 @@ void PlayGround::mouseReleaseEvent( TQMouseEvent *event )
 
   // Repaint the editable area
   position.moveBy(XMARGIN, YMARGIN);
-  tqrepaint(position, false);
+  repaint(position, false);
 
 }
 
@@ -506,7 +506,7 @@ void PlayGround::loadFailure()
   exit(-1);
 }
 
-// Set up play ground's tqgeometry
+// Set up play ground's geometry
 void PlayGround::setupGeometry()
 {
   int width = gameboard.width() + 2 * XMARGIN,
@@ -547,15 +547,15 @@ bool PlayGround::zone(TQPoint &position)
     draggedObject = *currentObject;
     draggedNumber = draggedObject.getNumber();
 
-    TQBitmap tqshape(objectsLayout[draggedNumber].size());
+    TQBitmap shape(objectsLayout[draggedNumber].size());
     TQPoint relative(position.x() - toUpdate.x(),
                     position.y() - toUpdate.y());
-    bitBlt(&tqshape, TQPoint(0, 0), &masks, objectsLayout[draggedNumber], TQt::CopyROP);
-    if (!tqshape.convertToImage().pixelIndex(relative.x(), relative.y())) continue;
+    bitBlt(&shape, TQPoint(0, 0), &masks, objectsLayout[draggedNumber], TQt::CopyROP);
+    if (!shape.convertToImage().pixelIndex(relative.x(), relative.y())) continue;
 
     toDraw.remove(draggedZOrder);
     toUpdate.moveBy(XMARGIN, YMARGIN);
-    tqrepaint(toUpdate, false);
+    repaint(toUpdate, false);
 
     position = relative;
 
diff --git a/ktuberling/playground.h b/ktuberling/playground.h
index 4bd8c210..2883ff1f 100644
--- a/ktuberling/playground.h
+++ b/ktuberling/playground.h
@@ -62,7 +62,7 @@ private:
 private:
 
   TQPixmap gameboard;		// Picture of the game board
-  TQBitmap masks;		// Pictures of the objects' tqshapes
+  TQBitmap masks;		// Pictures of the objects' shapes
   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
@@ -73,7 +73,7 @@ private:
   TQString *textsList,           // List of the message numbers associated with categories
           *soundsList;          // List of sounds associated with each object
 
-  TQCursor *draggedCursor;       // Cursor's tqshape for currently dragged object
+  TQCursor *draggedCursor;       // Cursor's shape for currently dragged object
   ToDraw draggedObject;         // Object currently dragged
   int draggedZOrder;            // Z-order (in to-draw buffer) of this object
 
diff --git a/ktuberling/todraw.cpp b/ktuberling/todraw.cpp
index cec7b014..2523a203 100644
--- a/ktuberling/todraw.cpp
+++ b/ktuberling/todraw.cpp
@@ -49,11 +49,11 @@ void ToDraw::draw(TQPainter &artist, const TQRect &area,
   if (!position.intersects(area)) return;
 
   TQPixmap objectPixmap(objectsLayout[number].size());
-  TQBitmap tqshapeBitmap(objectsLayout[number].size());
+  TQBitmap shapeBitmap(objectsLayout[number].size());
 
   bitBlt(&objectPixmap, TQPoint(0, 0), gameboard, objectsLayout[number], TQt::CopyROP);
-  bitBlt(&tqshapeBitmap, TQPoint(0, 0), masks, objectsLayout[number], TQt::CopyROP);
-  objectPixmap.setMask(tqshapeBitmap);
+  bitBlt(&shapeBitmap, TQPoint(0, 0), masks, objectsLayout[number], TQt::CopyROP);
+  objectPixmap.setMask(shapeBitmap);
   artist.drawPixmap(position.topLeft(), objectPixmap);
 }
 
diff --git a/ktuberling/toplevel.cpp b/ktuberling/toplevel.cpp
index fc0939f0..975672bc 100644
--- a/ktuberling/toplevel.cpp
+++ b/ktuberling/toplevel.cpp
@@ -15,7 +15,7 @@
 #include <kstdgameaction.h>
 
 #include <kprinter.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 #include "toplevel.moc"
 #include "playground.h"
@@ -189,7 +189,7 @@ void TopLevel::changeLanguage(uint newLanguage)
 // Load the layouts file
 bool TopLevel::loadLayout(TQDomDocument &layoutDocument)
 {
-  TQFile layoutFile(TQFile::encodeName(locate("data", "ktuberling/pics/tqlayout.xml")));
+  TQFile layoutFile(TQFile::encodeName(locate("data", "ktuberling/pics/layout.xml")));
   if (!layoutFile.open(IO_ReadOnly))
      return false;
 
@@ -408,9 +408,9 @@ void TopLevel::filePrint()
   KPrinter printer;
   bool ok;
 
-  ok = printer.setup(this, i18n("Print %1").tqarg(actionCollection()->action(gameboardActions[selectedGameboard].latin1())->plainText()));
+  ok = printer.setup(this, i18n("Print %1").arg(actionCollection()->action(gameboardActions[selectedGameboard].latin1())->plainText()));
   if (!ok) return;
-  playGround->tqrepaint(true);
+  playGround->repaint(true);
   if (!playGround->printPicture(printer))
     KMessageBox::error(this,
                          i18n("Could not print picture."));
@@ -422,7 +422,7 @@ void TopLevel::filePrint()
 // Copy modified area to clipboard
 void TopLevel::editCopy()
 {
-  TQClipboard *clipboard = TQApplication::tqclipboard();
+  TQClipboard *clipboard = TQApplication::clipboard();
   TQPixmap picture(playGround->getPicture());
 
   clipboard->setPixmap(picture);