1 files changed, 11 insertions, 11 deletions

diff --git a/twin4/twin4/twin4.cpp b/twin4/twin4/twin4.cpp
index aa8df6c5..8500c2e6 100644
--- a/twin4/twin4/twin4.cpp
+++ b/twin4/twin4/twin4.cpp
@@ -17,7 +17,7 @@
 
 // include files for QT
 #include <tqstring.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqhgroupbox.h>
 #include <tqvbox.h>
 #include <tqradiobutton.h>
@@ -138,7 +138,7 @@ Kwin4App::Kwin4App(TQWidget *parent, const char *name) : KMainWindow(parent,name
 void Kwin4App::checkMenus(CheckFlags menu)
 {
   bool localgame=(!doc->isNetwork());
-  bool isRunning = (doc->gameStatus()==KGame::Run);
+  bool isRunning = (doc->gametqStatus()==KGame::Run);
   if (!menu || (menu&CheckFileMenu))
   {
     changeAction("hint", !(!isRunning && localgame));
@@ -338,11 +338,11 @@ void Kwin4App::slotSaveGame()
 void Kwin4App::newGame()
 {
   // End the intro if it is running
-  doc->setGameStatus(Kwin4Doc::End);
+  doc->setGametqStatus(Kwin4Doc::End);
   // Init the board and Clear the old game out
-  doc->setGameStatus(Kwin4Doc::Init);
+  doc->setGametqStatus(Kwin4Doc::Init);
   // Run it
-  doc->setGameStatus(Kwin4Doc::Run);
+  doc->setGametqStatus(Kwin4Doc::Run);
 }
 
 /**
@@ -360,7 +360,7 @@ void Kwin4App::slotNewGame()
  */
 void Kwin4App::endGame()
 {
-  doc->setGameStatus(Kwin4Doc::Abort);
+  doc->setGametqStatus(Kwin4Doc::Abort);
 }
 
 /** 
@@ -453,7 +453,7 @@ void Kwin4App::EndGame(TABLE mode)
  */
 void Kwin4App::slotStatusNames(){
   TQString msg;
-  if (!(doc->gameStatus()==KGame::Run))
+  if (!(doc->gametqStatus()==KGame::Run))
     msg=i18n("No game  ");
   else if (doc->QueryCurrentPlayer()==Gelb)
     msg=TQString(" ")+doc->QueryName(Gelb)+ i18n(" - Yellow ");
@@ -480,7 +480,7 @@ void Kwin4App::slotNetworkBroken(int /*id*/, int oldstatus ,KGame * /*game */)
   doc->getPlayer(doc->QueryCurrentPlayer())->setTurn(true,true);
 
   KMessageBox::information(this,i18n("The network game ended!\n"));
-  doc->setGameStatus(oldstatus);
+  doc->setGametqStatus(oldstatus);
 }
 
 /**
@@ -509,7 +509,7 @@ void Kwin4App::slotGameOver(int status, KPlayer * p, KGame * /*me*/)
       EndGame(TWin);
     else
       EndGame(TLost);
-    TQString msg=i18n("%1 won the game. Please restart next round.").arg(doc->QueryName(((FARBE)p->userId())));
+    TQString msg=i18n("%1 won the game. Please restart next round.").tqarg(doc->QueryName(((FARBE)p->userId())));
     slotStatusMsg(msg);
   }
   else if (status==2) // Abort
@@ -527,7 +527,7 @@ void Kwin4App::slotGameOver(int status, KPlayer * p, KGame * /*me*/)
 
 void Kwin4App::slotInitNetwork()
 {
-  if (doc->gameStatus()==Kwin4Doc::Intro) doc->setGameStatus(Kwin4Doc::Pause);
+  if (doc->gametqStatus()==Kwin4Doc::Intro) doc->setGametqStatus(Kwin4Doc::Pause);
 
   TQString host = Prefs::host();
   int port=Prefs::port();
@@ -539,7 +539,7 @@ void Kwin4App::slotInitNetwork()
   dlg.networkConfig()->setDiscoveryInfo("_twin4._tcp",Prefs::gamename());
 
   TQVBox *box=dlg.configPage(KGameDialog::NetworkConfig);
-  TQVBoxLayout *l=(TQVBoxLayout *)(box->layout());
+  TQVBoxLayout *l=(TQVBoxLayout *)(box->tqlayout());
 
   mColorGroup=new TQVButtonGroup(box);
   connect(mColorGroup, TQT_SIGNAL(clicked(int)), TQT_TQOBJECT(this), TQT_SLOT(slotRemoteChanged(int)));