1 files changed, 25 insertions, 25 deletions

diff --git a/kreversi/qreversigameview.cpp b/kreversi/qreversigameview.cpp
index df9bc680..f661d62c 100644
--- a/kreversi/qreversigameview.cpp
+++ b/kreversi/qreversigameview.cpp
@@ -37,7 +37,7 @@
  */
 
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwidget.h>
 #include <tqlabel.h>
 
@@ -156,30 +156,30 @@ QReversiGameView::~QReversiGameView()
 
 void QReversiGameView::createView()
 {
-  TQGridLayout  *layout = new TQGridLayout(this, 4, 2);
+  TQGridLayout  *tqlayout = new TQGridLayout(this, 4, 2);
 
   // The board
   m_boardView = new QReversiBoardView(this, m_game);
   m_boardView->loadSettings();	// Load the pixmaps used in the status widgets.
-  layout->addMultiCellWidget(m_boardView, 0, 3, 0, 0);
+  tqlayout->addMultiCellWidget(m_boardView, 0, 3, 0, 0);
 
   // The status widgets
-  m_blackStatus = new StatusWidget(TQString(), this);
-  m_blackStatus->setPixmap(m_boardView->chipPixmap(Black, 20));
-  layout->addWidget(m_blackStatus, 0, 1);
-  m_whiteStatus = new StatusWidget(TQString(), this);
-  m_whiteStatus->setPixmap(m_boardView->chipPixmap(White, 20));
-  layout->addWidget(m_whiteStatus, 1, 1);
+  m_blacktqStatus = new StatusWidget(TQString(), this);
+  m_blacktqStatus->setPixmap(m_boardView->chipPixmap(Black, 20));
+  tqlayout->addWidget(m_blacktqStatus, 0, 1);
+  m_whitetqStatus = new StatusWidget(TQString(), this);
+  m_whitetqStatus->setPixmap(m_boardView->chipPixmap(White, 20));
+  tqlayout->addWidget(m_whitetqStatus, 1, 1);
 
   // The "Moves" label
   TQLabel  *movesLabel = new TQLabel( i18n("Moves"), this);
-  movesLabel->setAlignment(AlignCenter);
-  layout->addWidget(movesLabel, 2, 1);
+  movesLabel->tqsetAlignment(AlignCenter);
+  tqlayout->addWidget(movesLabel, 2, 1);
 
   // The list of moves.
   m_movesView = new TQListBox(this, "moves");
   m_movesView->setMinimumWidth(150);
-  layout->addWidget(m_movesView, 3, 1);
+  tqlayout->addWidget(m_movesView, 3, 1);
 }
 
 
@@ -193,7 +193,7 @@ void QReversiGameView::newGame()
 {
   m_boardView->updateBoard(true);
   m_movesView->clear();
-  updateStatus();
+  updatetqStatus();
 }
 
 
@@ -213,10 +213,10 @@ void QReversiGameView::moveMade(uint moveNum, Move &move)
 
   // Insert the new move in the listbox and mark it as the current one.
   m_movesView->insertItem(TQString("%1. %2 %3")
-			  .arg(moveNum)
-			  .arg(Prefs::grayscale() ? colorsWB[move.color()]
+			  .tqarg(moveNum)
+			  .tqarg(Prefs::grayscale() ? colorsWB[move.color()]
 			       : colorsRB[move.color()])
-			  .arg(move.asString()));
+			  .tqarg(move.asString()));
   m_movesView->setCurrentItem(moveNum - 1);
   m_movesView->ensureCurrentVisible();
 
@@ -225,7 +225,7 @@ void QReversiGameView::moveMade(uint moveNum, Move &move)
   m_boardView->updateBoard();
 
   // Update the score.
-  updateStatus();
+  updatetqStatus();
 }
 
 
@@ -236,16 +236,16 @@ void QReversiGameView::updateView()
 {
   m_boardView->updateBoard(true);
   updateMovelist();
-  updateStatus();
+  updatetqStatus();
 }
 
 
 // Only updates the status widgets (score).
 
-void QReversiGameView::updateStatus()
+void QReversiGameView::updatetqStatus()
 {
-  m_blackStatus->setScore(m_game->score(Black));
-  m_whiteStatus->setScore(m_game->score(White));
+  m_blacktqStatus->setScore(m_game->score(Black));
+  m_whitetqStatus->setScore(m_game->score(White));
 }
 
 
@@ -285,12 +285,12 @@ void QReversiGameView::setHumanColor(Color color)
   m_humanColor = color;
 
   if (color == Black) {
-    m_blackStatus->setText(i18n("You"));
-    m_whiteStatus->setText("");
+    m_blacktqStatus->setText(i18n("You"));
+    m_whitetqStatus->setText("");
   }
   else {
-    m_blackStatus->setText("");
-    m_whiteStatus->setText(i18n("You"));
+    m_blacktqStatus->setText("");
+    m_whitetqStatus->setText(i18n("You"));
   }
 }