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

This reverts commit 97d1732e257f8700488d7ca1660ae7eba8fc6065.

8 files changed, 22 insertions, 22 deletions

diff --git a/klines/field.cpp b/klines/field.cpp
index ef509a33..088febc2 100644
--- a/klines/field.cpp
+++ b/klines/field.cpp
@@ -73,7 +73,7 @@ void Field::putBall(int x, int y, char color)
     if( checkBounds(x,y) ){
       field[y][x].setColor(color);
       erase5Balls();
-      repaint(FALSE);
+      tqrepaint(FALSE);
     }
 }*/
 void Field::moveBall(int xa, int ya, int xb, int yb)
diff --git a/klines/klines.cpp b/klines/klines.cpp
index b0bbe51f..bebc14fe 100644
--- a/klines/klines.cpp
+++ b/klines/klines.cpp
@@ -164,7 +164,7 @@ void KLines::startGame()
 
 void KLines::setLevel(int level) {
     levelStr = i18n(LEVEL[level+2]);
-    statusBar()->changeItem(i18n(" Level: %1").arg(levelStr), 0);
+    statusBar()->changeItem(i18n(" Level: %1").tqarg(levelStr), 0);
 }
 
 void KLines::startDemo()
@@ -183,7 +183,7 @@ void KLines::startDemo()
     bFirst = true;
 
     levelStr = i18n("Tutorial");
-    statusBar()->changeItem(i18n(" Level: %1").arg(levelStr), 0);
+    statusBar()->changeItem(i18n(" Level: %1").tqarg(levelStr), 0);
 
     lsb->startDemoMode();
     lsb->setGameOver(false);
@@ -202,7 +202,7 @@ void KLines::stopDemo()
     bDemo = false;
     lsb->hideDemoText();
     demoTimer.stop();
-    statusBar()->changeItem(i18n(" Level: %1").arg(i18n("Tutorial - Stopped")), 0);
+    statusBar()->changeItem(i18n(" Level: %1").tqarg(i18n("Tutorial - Stopped")), 0);
     act_demo->setText(i18n("Start &Tutorial"));
 }
 
@@ -419,7 +419,7 @@ void KLines::focusOutEvent(TQFocusEvent *ev)
    {
       lsb->hideDemoText();
       demoTimer.stop();
-      statusBar()->changeItem(i18n(" Level: %1").arg(i18n("Tutorial - Paused")), 0);
+      statusBar()->changeItem(i18n(" Level: %1").tqarg(i18n("Tutorial - Paused")), 0);
    }
    KMainWindow::focusOutEvent(ev);
 }
@@ -428,7 +428,7 @@ void KLines::focusInEvent(TQFocusEvent *ev)
 {
    if (bDemo)
    {
-      statusBar()->changeItem(i18n(" Level: %1").arg(levelStr), 0);
+      statusBar()->changeItem(i18n(" Level: %1").tqarg(levelStr), 0);
       slotDemo();
    }
    KMainWindow::focusInEvent(ev);
@@ -528,7 +528,7 @@ void KLines::addScore(int ballsErased)
 
 void KLines::updateStat()
 {
-    statusBar()->changeItem(i18n(" Score: %1").arg(score), 1);
+    statusBar()->changeItem(i18n(" Score: %1").tqarg(score), 1);
 }
 
 void KLines::viewHighScore()
@@ -540,7 +540,7 @@ void KLines::viewHighScore()
 void KLines::endGame()
 {
     lsb->setGameOver(true);
-    lsb->repaint(false);
+    lsb->tqrepaint(false);
 
     if (bDemo)
        return;
diff --git a/klines/linesboard.cpp b/klines/linesboard.cpp
index bd5610cb..4de4f474 100644
--- a/klines/linesboard.cpp
+++ b/klines/linesboard.cpp
@@ -163,7 +163,7 @@ void LinesBoard::placeBall(  )
 
 /*id LinesBoard::doAfterBalls() {
   erase5Balls();
-  repaint(FALSE);
+  tqrepaint(FALSE);
 }
 */
 /*
@@ -306,7 +306,7 @@ void LinesBoard::moveFocus(int dx, int dy)
     focusX = (focusX + dx + NUMCELLSW) % NUMCELLSW;
     focusY = (focusY + dy + NUMCELLSH) % NUMCELLSH;
   }
-  repaint(FALSE);
+  tqrepaint(FALSE);
 } 
 
 void LinesBoard::moveLeft()
@@ -401,7 +401,7 @@ int LinesBoard::AnimEnd( )
   else if ( oldanim == ANIM_BURN )
   {
     emit eraseLine( deleteAnimatedBalls() );
-    repaint(FALSE);
+    tqrepaint(FALSE);
     if ( nextBallToPlace < BALLSDROP )
     {
       placeBall();
@@ -455,7 +455,7 @@ void LinesBoard::AnimNext() {
       if ( (direction > 0 && animstep == animmax) || ( direction < 0 && animstep == 0))
         direction = -direction;
       animstep += direction;
-      repaint(FALSE);
+      tqrepaint(FALSE);
     } else {
       if ( animstep >= animmax )
         AnimEnd();
@@ -466,7 +466,7 @@ void LinesBoard::AnimNext() {
             moveBall(way[animstep].x,way[animstep].y,way[animstep+1].x,way[animstep+1].y);
           animstep++;
           animdelaycount = animdelaystart;
-          repaint( FALSE );
+          tqrepaint( FALSE );
         }
       }
     }
@@ -698,7 +698,7 @@ void LinesBoard::undo()
   AnimEnd();
   restoreUndo();
   restoreRandomState();
-  repaint( FALSE );
+  tqrepaint( FALSE );
 }
 
 void LinesBoard::showDemoText(const TQString &text)
@@ -711,13 +711,13 @@ void LinesBoard::showDemoText(const TQString &text)
      demoLabel->setAutoMask( FALSE );
      demoLabel->setFrameStyle( TQFrame::Plain | TQFrame::Box );
      demoLabel->setLineWidth( 1 );
-     demoLabel->setAlignment( AlignHCenter | AlignTop );
+     demoLabel->tqsetAlignment( AlignHCenter | AlignTop );
      demoLabel->setPalette(TQToolTip::palette());
      demoLabel->polish();
   }
   demoLabel->setText(text);
   demoLabel->adjustSize();
-  TQSize s = demoLabel->sizeHint();
+  TQSize s = demoLabel->tqsizeHint();
   TQPoint p = TQPoint(x() + (width()-s.width())/2, y() + (height()-s.height())/2);
   demoLabel->move(mapToGlobal(p));
   demoLabel->show();
diff --git a/klines/mwidget.cpp b/klines/mwidget.cpp
index 21a55a17..1492d390 100644
--- a/klines/mwidget.cpp
+++ b/klines/mwidget.cpp
@@ -20,7 +20,7 @@
 #include <klocale.h>
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include "ballpainter.h"
 
@@ -46,7 +46,7 @@ MainWidget::MainWidget( TQWidget* parent, const char* name )
 
 //    warning("width: %i height: %i", width(), height() );
 
-//    warning("wh: %i hh: %i", sizeHint().width(), sizeHint().height() );
+//    warning("wh: %i hh: %i", tqsizeHint().width(), tqsizeHint().height() );
 
 }
 
diff --git a/klines/povray/balls.sh b/klines/povray/balls.sh
index 1897afaa..66b6ddc2 100755
--- a/klines/povray/balls.sh
+++ b/klines/povray/balls.sh
@@ -7,7 +7,7 @@ povray -w30 -h30 -V1 -P +A +KI5 +KF6 +KFF6 +SF2 +EF5 -Iball.pov +Ob$1.tga
 #### burning balls balls
 povray -w30 -h30 -V1 -P +A +KI0 +KF1 +KFF11 +SF1 +EF5 -Iball.pov +Oe$1.tga
 
-montage -geometry 30x30 -tile 100x1 -page 570x30 a$1??.tga b$1?.tga e$1??.tga bl_$1.tga
+montage -tqgeometry 30x30 -tile 100x1 -page 570x30 a$1??.tga b$1?.tga e$1??.tga bl_$1.tga
 mogrify  -crop 570x30+0+0 bl_$1.tga
 
 
diff --git a/klines/povray/fire.sh b/klines/povray/fire.sh
index 2b6b5f9a..c3eaa319 100755
--- a/klines/povray/fire.sh
+++ b/klines/povray/fire.sh
@@ -3,7 +3,7 @@ echo "#declare BallColor = White" >clr.inc
 if (povray -w30 -h30 -V1 -P +A +KI0 +KF1 +KFF11 +SF6 +EF10 -Iball.pov \
 +Ofire.tga)  
 then   # mogrify -raise 1x1 e$1??.tga
- montage -geometry 30x30 -tile 100x1 -page 150x30 fire*.tga fire.tga
+ montage -tqgeometry 30x30 -tile 100x1 -page 150x30 fire*.tga fire.tga
  mogrify  -crop 150x30+0+0 fire.tga
 # animate -delay 7 $1??.tga
 fi
diff --git a/klines/povray/makeballs.sh b/klines/povray/makeballs.sh
index 62769605..0d937415 100755
--- a/klines/povray/makeballs.sh
+++ b/klines/povray/makeballs.sh
@@ -17,7 +17,7 @@ balls.sh Brown "rgb<1/2,1/3,0>"
 
 #### montage balls ( 20x7  cells each 30x30)
 
-montage -geometry 570x30 -tile 1x10 bl_*.tga balls.tga
+montage -tqgeometry 570x30 -tile 1x10 bl_*.tga balls.tga
 mogrify -crop 570x210+0+0 balls.tga
 
 #### convert to jpeg
diff --git a/klines/povray/povray.ini b/klines/povray/povray.ini
index 22ddf8ec..6c01d50a 100644
--- a/klines/povray/povray.ini
+++ b/klines/povray/povray.ini
@@ -10,7 +10,7 @@
 ;
 ;  The general form of the options is "Variable=value".  Everything 
 ;  between the equals sign and the end of the line is considered part 
-;  of the value.  The spacing and layout is free-form but only one option 
+;  of the value.  The spacing and tqlayout is free-form but only one option 
 ;  per line is allowed.  Variables and values are not case-sensitive.  
 ;
 ;  Note: characters after a semi-colon are treated as a comment