1 files changed, 25 insertions, 25 deletions

diff --git a/kenolaba/AbTop.cpp b/kenolaba/AbTop.cpp
index f107408d..a7dc9a7e 100644
--- a/kenolaba/AbTop.cpp
+++ b/kenolaba/AbTop.cpp
@@ -2,7 +2,7 @@
 
 #include <tqpopupmenu.h>
 #include <tqtimer.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 
 #include <kaction.h>
 #include <kapplication.h>
@@ -107,7 +107,7 @@ AbTop::AbTop()
   showSpy = false;
   renderBalls = true;
 
-  updatetqStatus();
+  updateStatus();
   updateActions();
   setupGUI();
 }
@@ -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);
 
@@ -391,8 +391,8 @@ void AbTop::setupStatusBar()
   warningPix = BarIcon( "warning" );
   okPix = BarIcon( "ok" );
   validLabel = new TQLabel( "", statusBar(), "validLabel" );
-  validLabel->setFixedSize( 18, statusLabel->tqsizeHint().height() );
-  validLabel->tqsetAlignment( AlignCenter );
+  validLabel->setFixedSize( 18, statusLabel->sizeHint().height() );
+  validLabel->setAlignment( AlignCenter );
   validLabel->hide();
   validShown = false;
 
@@ -401,11 +401,11 @@ void AbTop::setupStatusBar()
   noBall = BarIcon( "noball" );
   ballLabel = new TQLabel( "", statusBar(), "ballLabel" );
   ballLabel->setPixmap(noBall);
-  ballLabel->setFixedSize( 18, statusLabel->tqsizeHint().height() );
-  ballLabel->tqsetAlignment( AlignCenter );
+  ballLabel->setFixedSize( 18, statusLabel->sizeHint().height() );
+  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
@@ -436,7 +436,7 @@ void AbTop::updateSpy(TQString s)
 {
   if (showSpy) {
     if (s.isEmpty()) {
-      updatetqStatus();
+      updateStatus();
       //      statusBar()->clear();
     }
     else
@@ -458,17 +458,17 @@ void AbTop::updateBestMove(Move& m, int value)
 }
 
 
-void AbTop::updatetqStatus()
+void AbTop::updateStatus()
 {
   TQString tmp;
   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::updatetqStatus()
 
   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::updatetqStatus()
     }
     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::updatetqStatus()
     validShown = showValid;
   }
   statusBar()->clear();
-  statusBar()->tqrepaint();
+  statusBar()->repaint();
 }
 
 void AbTop::edited(int vState)
@@ -522,7 +522,7 @@ void AbTop::edited(int vState)
   if (vState == Board::empty)
     timerState = noGame;
 
-  updatetqStatus();
+  updateStatus();
 }
 
 /* only <stop search>, <hint>, <take back> have to be updated */
@@ -662,7 +662,7 @@ void AbTop::playGame()
     timerState = gameOver;
   }
 
-  updatetqStatus();
+  updateStatus();
   updateActions();
   boardWidget->setCursor(crossCursor);
   if (stop) return;
@@ -733,7 +733,7 @@ void AbTop::newGame()
 /* Copy ASCII representation into Clipboard */
 void AbTop::copy()
 {
-  TQClipboard *cb = TQApplication::tqclipboard();
+  TQClipboard *cb = TQApplication::clipboard();
   cb->setText( board->getASCIIState( moveNo ).ascii() );
 }
 
@@ -741,7 +741,7 @@ void AbTop::paste()
 {
   if (!pastePossible) return;
 
-  TQClipboard *cb = TQApplication::tqclipboard();
+  TQClipboard *cb = TQApplication::clipboard();
   pastePosition( cb->text().ascii() );
   /* don't do this in pastePosition: RECURSION !! */
 
@@ -814,7 +814,7 @@ void AbTop::editModify(bool on)
     timerState = noGame;
 
   updateActions();
-  updatetqStatus();
+  updateStatus();
   if (!editMode && vState == Board::valid) {
     actMove.type = Move::none;
     timerState = moveShown;
@@ -864,7 +864,7 @@ void AbTop::setMoveNo(int m, bool updateGUI)
   board->setActColor( ((moveNo%2)==0) ? Board::color1 : Board::color2 );
 
   if (updateGUI) {
-    updatetqStatus();
+    updateStatus();
     updateActions();
   }
 }