Remove additional unneeded tq method conversions

6 files changed, 68 insertions, 68 deletions

diff --git a/kenolaba/AbTop.cpp b/kenolaba/AbTop.cpp
index 1cc39c8a..1a921b34 100644
--- a/kenolaba/AbTop.cpp
+++ b/kenolaba/AbTop.cpp
@@ -381,7 +381,7 @@ void AbTop::setupStatusBar()
 {
   TQString tmp;
 
-  TQString t = i18n("Press %1 for a new game").tqarg( newAction->shortcut().toString());
+  TQString t = i18n("Press %1 for a new game").arg( newAction->shortcut().toString());
   statusLabel = new TQLabel( t, statusBar(), "statusLabel" );
   statusBar()->addWidget(statusLabel,1,false);
 
@@ -405,7 +405,7 @@ void AbTop::setupStatusBar()
   ballLabel->setAlignment( AlignCenter );
   statusBar()->addWidget(ballLabel, 0, true);
 
-  moveLabel = new TQLabel( i18n("Move %1").tqarg("--"), statusBar(), "moveLabel" );
+  moveLabel = new TQLabel( i18n("Move %1").arg("--"), statusBar(), "moveLabel" );
   statusBar()->addWidget(moveLabel, 0, true);
 
 #ifdef MYTRACE
@@ -464,11 +464,11 @@ void AbTop::updateStatus()
   bool showValid = false;
 
   if (!editMode && timerState == noGame) {
-    tmp = i18n("Move %1").tqarg("--");
+    tmp = i18n("Move %1").arg("--");
     ballLabel->setPixmap(noBall);
   }
   else {
-    tmp = i18n("Move %1").tqarg(moveNo/2 + 1);
+    tmp = i18n("Move %1").arg(moveNo/2 + 1);
     ballLabel->setPixmap( (board->actColor() == Board::color1)
 			  ? redBall : yellowBall);
   }
@@ -476,15 +476,15 @@ void AbTop::updateStatus()
 
   if (editMode) {
     tmp = TQString("%1: %2 %3 - %4 %5")
-      .tqarg( i18n("Edit") )
-      .tqarg( i18n("Red") ).tqarg(boardWidget->getColor1Count())
-      .tqarg( i18n("Yellow") ).tqarg(boardWidget->getColor2Count());
+      .arg( i18n("Edit") )
+      .arg( i18n("Red") ).arg(boardWidget->getColor1Count())
+      .arg( i18n("Yellow") ).arg(boardWidget->getColor2Count());
     validLabel->setPixmap( (board->validState() == Board::invalid)
 			   ? warningPix:okPix );
     showValid = true;
   }
   else if (timerState == noGame) {
-    tmp = i18n("Press %1 for a new game").tqarg( newAction->shortcut().toString());
+    tmp = i18n("Press %1 for a new game").arg( newAction->shortcut().toString());
   }
   else {
     if (timerState == gameOver) {
@@ -495,9 +495,9 @@ void AbTop::updateStatus()
     }
     else {
       tmp = TQString("%1 - %2")
-	.tqarg( (board->actColor() == Board::color1) ?
+	.arg( (board->actColor() == Board::color1) ?
 	      i18n("Red"):i18n("Yellow") )
-	.tqarg( iPlayNow() ?
+	.arg( iPlayNow() ?
 	      i18n("I am thinking...") : i18n("It is your turn!") );
     }
   }
@@ -514,7 +514,7 @@ void AbTop::updateStatus()
     validShown = showValid;
   }
   statusBar()->clear();
-  statusBar()->tqrepaint();
+  statusBar()->repaint();
 }
 
 void AbTop::edited(int vState)
diff --git a/kenolaba/Ball.cpp b/kenolaba/Ball.cpp
index 39448305..392a61c5 100644
--- a/kenolaba/Ball.cpp
+++ b/kenolaba/Ball.cpp
@@ -21,14 +21,14 @@ void Ball::setSize(int x, int y)
   sizeX = x;
   sizeY = y;
 
-  tqinvalidate();
+  invalidate();
 }
 
-void Ball::tqinvalidate()
+void Ball::invalidate()
 {
   Ball *b;
 
-  /* tqinvalidate all Balls... */
+  /* invalidate all Balls... */
   for(b=first;b!=0;b=b->next)
     b->pm.resize(0,0);
 }
@@ -43,7 +43,7 @@ void Ball::setLight(int x, int y, int z, const TQColor& c)
 
   lightColor = c;
 
-  tqinvalidate();
+  invalidate();
 }
 
 
@@ -52,7 +52,7 @@ void Ball::setTexture(double c, double d)
   rippleCount = c;
   rippleDepth = d;
 
-  tqinvalidate();
+  invalidate();
 }
 
 
@@ -309,7 +309,7 @@ void BallWidget::resizeEvent(TQResizeEvent *)
   realSize = (w>h) ? h:w;
 
   Ball::setSize( realSize/ballFraction, realSize/ballFraction );
-  tqrepaint();
+  repaint();
 }
 
 void BallWidget::paintEvent(TQPaintEvent *)
@@ -414,7 +414,7 @@ void BallWidget::animate()
     timer->start(1000/freq,true);
   }
 
-  //  tqrepaint( false );
+  //  repaint( false );
 }
 
 
diff --git a/kenolaba/Ball.h b/kenolaba/Ball.h
index 9cdfe344..6558a600 100644
--- a/kenolaba/Ball.h
+++ b/kenolaba/Ball.h
@@ -49,7 +49,7 @@ class Ball {
  private:
 
   void render();
-  static void tqinvalidate();
+  static void invalidate();
 
   //static TQImage back;
   static int sizeX, sizeY;
diff --git a/kenolaba/BoardWidget.cpp b/kenolaba/BoardWidget.cpp
index 06a5f520..744ccb16 100644
--- a/kenolaba/BoardWidget.cpp
+++ b/kenolaba/BoardWidget.cpp
@@ -345,7 +345,7 @@ void BoardWidget::draw()
 
   if (renderMode) {
     updateBalls();
-    tqrepaint(false);
+    repaint(false);
     return;
   }
 
@@ -889,7 +889,7 @@ void BoardWidget::mousePressEvent( TQMouseEvent* pEvent )
 
   TQString tmp;
   actValue = - board.calcEvaluation();
-  tmp = i18n("Board value: %1").tqarg(actValue);
+  tmp = i18n("Board value: %1").arg(actValue);
   emit updateSpy(tmp);
 }
 
@@ -930,7 +930,7 @@ void BoardWidget::mouseMoveEvent( TQMouseEvent* pEvent )
 
     TQString tmp;
     actValue = - board.calcEvaluation();
-    tmp = i18n("Board value: %1").tqarg(actValue);
+    tmp = i18n("Board value: %1").arg(actValue);
     emit updateSpy(tmp);
     return;
   }
@@ -948,7 +948,7 @@ void BoardWidget::mouseMoveEvent( TQMouseEvent* pEvent )
 
     TQString tmp;
     tmp.sprintf("%+d", v-actValue);
-    TQString str = TQString("%1 : %2").tqarg(actMove.name()).tqarg(tmp);
+    TQString str = TQString("%1 : %2").arg(actMove.name()).arg(tmp);
     emit updateSpy(str);
     
     showMove(actMove,3);
@@ -961,7 +961,7 @@ void BoardWidget::mouseMoveEvent( TQMouseEvent* pEvent )
     if (pos == startPos) {
 	showStart(actMove,1);
 	startShown = true;
-	tmp = i18n("Board value: %1").tqarg(actValue);
+	tmp = i18n("Board value: %1").arg(actValue);
     }
     else
       draw();
diff --git a/kenolaba/EvalDlg.ui b/kenolaba/EvalDlg.ui
index 46e5c056..a98354d4 100644
--- a/kenolaba/EvalDlg.ui
+++ b/kenolaba/EvalDlg.ui
@@ -96,7 +96,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -131,7 +131,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -166,7 +166,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -269,7 +269,7 @@
                                 <property name="text">
                                     <string>Push Out</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignTop|AlignLeft</set>
                                 </property>
                                 <property name="vAlign" stdset="0">
@@ -293,7 +293,7 @@
                                 <property name="text">
                                     <string>Push</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignTop|AlignLeft</set>
                                 </property>
                                 <property name="vAlign" stdset="0">
@@ -366,7 +366,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -390,7 +390,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -480,7 +480,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -648,7 +648,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -694,7 +694,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -740,7 +740,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -810,7 +810,7 @@
                                 <property name="text">
                                     <string>Normal</string>
                                 </property>
-                                <property name="tqalignment">
+                                <property name="alignment">
                                     <set>AlignTop|AlignLeft</set>
                                 </property>
                                 <property name="vAlign" stdset="0">
@@ -831,7 +831,7 @@
                         <property name="text">
                             <string>For every move possible the given points are added to the Evaluation.</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>WordBreak|AlignTop|AlignLeft</set>
                         </property>
                         <property name="vAlign" stdset="0">
@@ -926,7 +926,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -942,7 +942,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -958,7 +958,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -982,7 +982,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -998,7 +998,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -1014,7 +1014,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -1038,7 +1038,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -1054,7 +1054,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -1094,7 +1094,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -1146,7 +1146,7 @@
                         <property name="text">
                             <string>For every ball, the given points are added to the evaluation depending on the balls position. The bonus for a given position is changed randomly in the +/- range.</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>WordBreak|AlignTop|AlignLeft</set>
                         </property>
                         <property name="vAlign" stdset="0">
@@ -1233,7 +1233,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -1249,7 +1249,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -1265,7 +1265,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -1281,7 +1281,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -1341,7 +1341,7 @@
                         <property name="text">
                             <string>For a number of balls In-a-Row, the given points are added to the evaluation</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>WordBreak|AlignTop|AlignLeft</set>
                         </property>
                         <property name="vAlign" stdset="0">
@@ -1428,7 +1428,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -1452,7 +1452,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -1468,7 +1468,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -1500,7 +1500,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -1524,7 +1524,7 @@
                                                 <height>32767</height>
                                             </size>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignLeft</set>
                                         </property>
                                         <property name="hAlign" stdset="0">
@@ -1560,7 +1560,7 @@
                         <property name="text">
                             <string>For a difference in the number of balls, the given points are added to the evaluation. A difference of 6 only can be a lost/won game.</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>WordBreak|AlignTop|AlignLeft</set>
                         </property>
                         <property name="vAlign" stdset="0">
@@ -1642,7 +1642,7 @@
                         <property name="text">
                             <string>Your evaluation scheme, defined in all other tabs of this dialog, can be stored here.</string>
                         </property>
-                        <property name="tqalignment">
+                        <property name="alignment">
                             <set>WordBreak|AlignTop|AlignLeft</set>
                         </property>
                         <property name="vAlign" stdset="0">
diff --git a/kenolaba/EvalScheme.cpp b/kenolaba/EvalScheme.cpp
index 0d179a85..d884f398 100644
--- a/kenolaba/EvalScheme.cpp
+++ b/kenolaba/EvalScheme.cpp
@@ -76,7 +76,7 @@ void EvalScheme::setDefaults()
 
 void EvalScheme::read(KConfig *config)
 {
-  TQString confSection = TQString("%1 Evaluation Scheme").tqarg(_name);
+  TQString confSection = TQString("%1 Evaluation Scheme").arg(_name);
   config->setGroup(confSection);
 
   TQStringList list;
@@ -117,7 +117,7 @@ void EvalScheme::read(KConfig *config)
 
 void EvalScheme::save(KConfig* config)
 {
-  TQString confSection = TQString("%1 Evaluation Scheme").tqarg(_name);
+  TQString confSection = TQString("%1 Evaluation Scheme").arg(_name);
   config->setGroup(confSection);
 
   TQString entry;
@@ -128,12 +128,12 @@ void EvalScheme::save(KConfig* config)
 
   entry.sprintf("%d", _moveValue[0]);
   for(int i=1;i<Move::typeCount;i++)
-    entry += TQString(", %1").tqarg( _moveValue[i] );
+    entry += TQString(", %1").arg( _moveValue[i] );
   config->writeEntry("MoveValues", entry);
 
   entry.sprintf("%d", _inARowValue[0]);
   for(int i=1;i<InARowCounter::inARowCount;i++)
-    entry += TQString(", %1").tqarg( _inARowValue[i] );
+    entry += TQString(", %1").arg( _inARowValue[i] );
   config->writeEntry("InARowValues", entry);
 
   entry.sprintf("%d,%d,%d,%d,%d", _ringValue[0], _ringValue[1],
@@ -217,15 +217,15 @@ TQString EvalScheme::ascii()
 
   res.sprintf("%s=%d", _name.ascii(), _stoneValue[1]);
   for(i=1;i<6;i++)                
-    res += TQString(",%1").tqarg( _stoneValue[i] );
+    res += TQString(",%1").arg( _stoneValue[i] );
   for(i=0;i<Move::typeCount;i++)
-    res += TQString(",%1").tqarg( _moveValue[i] );
+    res += TQString(",%1").arg( _moveValue[i] );
   for(i=0;i<InARowCounter::inARowCount;i++)
-    res += TQString(",%1").tqarg( _inARowValue[i] );
+    res += TQString(",%1").arg( _inARowValue[i] );
   for(i=0;i<5;i++)
-    res += TQString(",%1").tqarg( _ringValue[i] );
+    res += TQString(",%1").arg( _ringValue[i] );
   for(i=0;i<5;i++)
-    res += TQString(",%1").tqarg( _ringDiff[i] );
+    res += TQString(",%1").arg( _ringDiff[i] );
 
   return res;
 }