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

8 files changed, 47 insertions, 47 deletions

diff --git a/kreversi/Move.cpp b/kreversi/Move.cpp
index f1f50872..3916925e 100644
--- a/kreversi/Move.cpp
+++ b/kreversi/Move.cpp
@@ -66,7 +66,7 @@ TQString SimpleMove::asString() const
   if (m_x == -1)
     return TQString("pass");
   else
-    return TQString("%1%2").tqarg(" ABCDEFGH"[m_x]).tqarg(" 12345678"[m_y]);
+    return TQString("%1%2").arg(" ABCDEFGH"[m_x]).arg(" 12345678"[m_y]);
 }
 
 
diff --git a/kreversi/board.cpp b/kreversi/board.cpp
index d24dccd1..8950fc8f 100644
--- a/kreversi/board.cpp
+++ b/kreversi/board.cpp
@@ -308,7 +308,7 @@ void QReversiBoardView::updateBoard (bool force)
 
   // If we are showing legal moves, we have to erase the old ones
   // before we can show the new ones.  The easiest way to do that is
-  // to tqrepaint everything.
+  // to repaint everything.
   //
   // FIXME: A better way, perhaps, is to do the repainting in
   //        drawPiece (which should be renamed drawSquare).
@@ -498,7 +498,7 @@ void QReversiBoardView::drawOnePiece(uint row, uint col, int i)
 }
 
 
-// We got a tqrepaint event.  We make it easy for us and redraw the
+// We got a repaint event.  We make it easy for us and redraw the
 // entire board.
 //
 
diff --git a/kreversi/kreversi.cpp b/kreversi/kreversi.cpp
index 4c72251b..60d555f3 100644
--- a/kreversi/kreversi.cpp
+++ b/kreversi/kreversi.cpp
@@ -39,7 +39,7 @@
 
 #include <unistd.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqlistbox.h>
 
@@ -329,9 +329,9 @@ void KReversi::slotUndo()
   }
 
   if (m_game->toMove() == computerColor()) {
-    // Must tqrepaint so that the new move is not shown before the old
+    // Must repaint so that the new move is not shown before the old
     // one is removed on the screen.
-    m_gameView->tqrepaint();
+    m_gameView->repaint();
     computerMakeMove();
   }
   else
@@ -609,21 +609,21 @@ void KReversi::showGameOver(Color color)
   if ( color == Nobody ) {
     KNotifyClient::event(winId(), "draw", i18n("Draw!"));
     TQString s = i18n("Game is drawn!\n\nYou     : %1\nComputer: %2")
-                .tqarg(human).tqarg(computer);
+                .arg(human).arg(computer);
     KMessageBox::information(this, s, i18n("Game Ended"));
     score.setType(KExtHighscore::Draw);
   }
   else if ( humanColor() == color ) {
     KNotifyClient::event(winId(), "won", i18n("Game won!"));
     TQString s = i18n("Congratulations, you have won!\n\nYou     : %1\nComputer: %2")
-                .tqarg(human).tqarg(computer);
+                .arg(human).arg(computer);
     KMessageBox::information(this, s, i18n("Game Ended"));
     score.setType(KExtHighscore::Won);
   } 
   else {
     KNotifyClient::event(winId(), "lost", i18n("Game lost!"));
     TQString s = i18n("You have lost the game!\n\nYou     : %1\nComputer: %2")
-                .tqarg(human).tqarg(computer);
+                .arg(human).arg(computer);
     KMessageBox::information(this, s, i18n("Game Ended"));
     score.setType(KExtHighscore::Lost);
   }
diff --git a/kreversi/kzoommainwindow.cpp b/kreversi/kzoommainwindow.cpp
index dc2820fe..cb7ca04e 100644
--- a/kreversi/kzoommainwindow.cpp
+++ b/kreversi/kzoommainwindow.cpp
@@ -65,7 +65,7 @@ void KZoomMainWindow::addWidget(TQWidget *widget)
 {
   widget->adjustSize();
 
-  TQWidget          *tlw = widget->tqtopLevelWidget();
+  TQWidget          *tlw = widget->topLevelWidget();
   KZoomMainWindow  *zm = 
     static_cast<KZoomMainWindow *>(tlw->qt_cast("KZoomMainWindow"));
 
@@ -84,7 +84,7 @@ void KZoomMainWindow::widgetDestroyed()
 bool KZoomMainWindow::eventFilter(TQObject *o, TQEvent *e)
 {
   if ( e->type()==TQEvent::LayoutHint )
-    setFixedSize(tqminimumSize()); // because K/TQMainWindow
+    setFixedSize(minimumSize()); // because K/TQMainWindow
                                  // does not manage fixed central widget
                                  // with hidden menubar...
   return KMainWindow::eventFilter(o, e);
diff --git a/kreversi/kzoommainwindow.h b/kreversi/kzoommainwindow.h
index a27b61a4..9885a2e5 100644
--- a/kreversi/kzoommainwindow.h
+++ b/kreversi/kzoommainwindow.h
@@ -55,7 +55,7 @@ public:
 
   /** Add a widget to be managed i.e. the adjustSize() method of the
    * widget is called whenever the zoom is changed.
-   * This function assumes that the tqtopLevelWidget() is the KZoomMainWindow.
+   * This function assumes that the topLevelWidget() is the KZoomMainWindow.
    */
   static void  addWidget(TQWidget *widget);
                   
diff --git a/kreversi/qreversigameview.cpp b/kreversi/qreversigameview.cpp
index f661d62c..df9bc680 100644
--- a/kreversi/qreversigameview.cpp
+++ b/kreversi/qreversigameview.cpp
@@ -37,7 +37,7 @@
  */
 
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidget.h>
 #include <tqlabel.h>
 
@@ -156,30 +156,30 @@ QReversiGameView::~QReversiGameView()
 
 void QReversiGameView::createView()
 {
-  TQGridLayout  *tqlayout = new TQGridLayout(this, 4, 2);
+  TQGridLayout  *layout = 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.
-  tqlayout->addMultiCellWidget(m_boardView, 0, 3, 0, 0);
+  layout->addMultiCellWidget(m_boardView, 0, 3, 0, 0);
 
   // The status widgets
-  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);
+  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);
 
   // The "Moves" label
   TQLabel  *movesLabel = new TQLabel( i18n("Moves"), this);
-  movesLabel->tqsetAlignment(AlignCenter);
-  tqlayout->addWidget(movesLabel, 2, 1);
+  movesLabel->setAlignment(AlignCenter);
+  layout->addWidget(movesLabel, 2, 1);
 
   // The list of moves.
   m_movesView = new TQListBox(this, "moves");
   m_movesView->setMinimumWidth(150);
-  tqlayout->addWidget(m_movesView, 3, 1);
+  layout->addWidget(m_movesView, 3, 1);
 }
 
 
@@ -193,7 +193,7 @@ void QReversiGameView::newGame()
 {
   m_boardView->updateBoard(true);
   m_movesView->clear();
-  updatetqStatus();
+  updateStatus();
 }
 
 
@@ -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")
-			  .tqarg(moveNum)
-			  .tqarg(Prefs::grayscale() ? colorsWB[move.color()]
+			  .arg(moveNum)
+			  .arg(Prefs::grayscale() ? colorsWB[move.color()]
 			       : colorsRB[move.color()])
-			  .tqarg(move.asString()));
+			  .arg(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.
-  updatetqStatus();
+  updateStatus();
 }
 
 
@@ -236,16 +236,16 @@ void QReversiGameView::updateView()
 {
   m_boardView->updateBoard(true);
   updateMovelist();
-  updatetqStatus();
+  updateStatus();
 }
 
 
 // Only updates the status widgets (score).
 
-void QReversiGameView::updatetqStatus()
+void QReversiGameView::updateStatus()
 {
-  m_blacktqStatus->setScore(m_game->score(Black));
-  m_whitetqStatus->setScore(m_game->score(White));
+  m_blackStatus->setScore(m_game->score(Black));
+  m_whiteStatus->setScore(m_game->score(White));
 }
 
 
@@ -285,12 +285,12 @@ void QReversiGameView::setHumanColor(Color color)
   m_humanColor = color;
 
   if (color == Black) {
-    m_blacktqStatus->setText(i18n("You"));
-    m_whitetqStatus->setText("");
+    m_blackStatus->setText(i18n("You"));
+    m_whiteStatus->setText("");
   }
   else {
-    m_blacktqStatus->setText("");
-    m_whitetqStatus->setText(i18n("You"));
+    m_blackStatus->setText("");
+    m_whiteStatus->setText(i18n("You"));
   }
 }
 
diff --git a/kreversi/qreversigameview.h b/kreversi/qreversigameview.h
index 53d258d7..5f5e4e1f 100644
--- a/kreversi/qreversigameview.h
+++ b/kreversi/qreversigameview.h
@@ -104,7 +104,7 @@ public:
   void insertMove(TQString moveString) { m_movesView->insertItem(moveString); }
   void removeMove(int moveNum) { 
     m_movesView->removeItem(moveNum); 
-    updatetqStatus();
+    updateStatus();
   }
   void setCurrentMove(int moveNum) { 
     m_movesView->setCurrentItem(moveNum); 
@@ -129,7 +129,7 @@ public slots:
   void  moveMade(uint moveNum, Move &move);
 
   void  updateView();		// Update the entire view.
-  void  updatetqStatus();		// Update the status widgets (score)
+  void  updateStatus();		// Update the status widgets (score)
   void  updateBoard(bool force = FALSE); // Update the board.
   void  updateMovelist();	// Update the move list.
 
@@ -153,8 +153,8 @@ private:
   // Widgets in the view.
   QReversiBoardView  *m_boardView;
   TQListBox           *m_movesView;
-  StatusWidget       *m_blacktqStatus;
-  StatusWidget       *m_whitetqStatus;
+  StatusWidget       *m_blackStatus;
+  StatusWidget       *m_whiteStatus;
 };
 
 
diff --git a/kreversi/settings.ui b/kreversi/settings.ui
index 4d66c5df..ead4757a 100644
--- a/kreversi/settings.ui
+++ b/kreversi/settings.ui
@@ -52,7 +52,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -143,7 +143,7 @@
                             <property name="text">
                                 <string>Beginner</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignLeft</set>
                             </property>
                         </widget>
@@ -154,7 +154,7 @@
                             <property name="text">
                                 <string>Expert</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -165,7 +165,7 @@
                             <property name="text">
                                 <string>Average</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignCenter</set>
                             </property>
                         </widget>
@@ -189,7 +189,7 @@
                             <property name="text">
                                 <string>Slow</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignLeft</set>
                             </property>
                         </widget>
@@ -200,7 +200,7 @@
                             <property name="text">
                                 <string>Fast</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>