5 files changed, 25 insertions, 25 deletions

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..0d0ea728 100644
--- a/kreversi/qreversigameview.cpp
+++ b/kreversi/qreversigameview.cpp
@@ -164,16 +164,16 @@ void QReversiGameView::createView()
   tqlayout->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));
+  tqlayout->addWidget(m_blackStatus, 0, 1);
+  m_whiteStatus = new StatusWidget(TQString(), this);
+  m_whiteStatus->setPixmap(m_boardView->chipPixmap(White, 20));
+  tqlayout->addWidget(m_whiteStatus, 1, 1);
 
   // The "Moves" label
   TQLabel  *movesLabel = new TQLabel( i18n("Moves"), this);
-  movesLabel->tqsetAlignment(AlignCenter);
+  movesLabel->setAlignment(AlignCenter);
   tqlayout->addWidget(movesLabel, 2, 1);
 
   // The list of moves.
@@ -193,7 +193,7 @@ void QReversiGameView::newGame()
 {
   m_boardView->updateBoard(true);
   m_movesView->clear();
-  updatetqStatus();
+  updateStatus();
 }
 
 
@@ -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..fe7dc1a5 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>