TQt4 port kdegames

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegames@1236074 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

56 files changed, 342 insertions, 302 deletions

diff --git a/atlantik/COPYING.LIB b/atlantik/COPYING.LIB
index ae23fcfd..fbb61ee9 100644
--- a/atlantik/COPYING.LIB
+++ b/atlantik/COPYING.LIB
@@ -135,7 +135,7 @@ included without limitation in the term "modification".)
 
   "Source code" for a work means the preferred form of the work for
 making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
+all the source code for all modules it tqcontains, plus any associated
 interface definition files, plus the scripts used to control compilation
 and installation of the library.
 
@@ -257,7 +257,7 @@ linked without the Library, or if the work is itself a library.  The
 threshold for this to be true is not precisely defined by law.
 
   If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
+structure tqlayouts and accessors, and small macros and small inline
 functions (ten lines or less in length), then the use of the object
 file is unrestricted, regardless of whether it is legally a derivative
 work.  (Executables containing this object code plus portions of the
diff --git a/atlantik/atlanticd/atlanticclient.cpp b/atlantik/atlanticd/atlanticclient.cpp
index 0e4e3e12..a3baf2e6 100644
--- a/atlantik/atlanticd/atlanticclient.cpp
+++ b/atlantik/atlanticd/atlanticclient.cpp
@@ -20,7 +20,7 @@
 #include "atlanticclient.h"
 #include "atlanticclient.moc"
 
-AtlanticClient::AtlanticClient(TQObject *parent, const char *name) : TQSocket(parent, name)
+AtlanticClient::AtlanticClient(TQObject *tqparent, const char *name) : TQSocket(tqparent, name)
 {
 	connect(this, TQT_SIGNAL(readyRead()), this, TQT_SLOT(readData()));
 }
diff --git a/atlantik/atlanticd/atlanticclient.h b/atlantik/atlanticd/atlanticclient.h
index 8f63b88c..7b4dc19a 100644
--- a/atlantik/atlanticd/atlanticclient.h
+++ b/atlantik/atlanticd/atlanticclient.h
@@ -19,12 +19,13 @@
 
 #include <tqsocket.h>
 
-class AtlanticClient : public QSocket
+class AtlanticClient : public TQSocket
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-	AtlanticClient(TQObject *parent = 0, const char *name = 0);
+	AtlanticClient(TQObject *tqparent = 0, const char *name = 0);
 	void sendData(const TQString &data);
 
 private slots:
diff --git a/atlantik/atlanticd/atlanticdaemon.h b/atlantik/atlanticd/atlanticdaemon.h
index 2e107a0a..8de64c3e 100644
--- a/atlantik/atlanticd/atlanticdaemon.h
+++ b/atlantik/atlanticd/atlanticdaemon.h
@@ -25,9 +25,10 @@ class AtlanticCore;
 class AtlanticClient;
 class ServerSocket;
 
-class AtlanticDaemon : public QObject
+class AtlanticDaemon : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	AtlanticDaemon();
diff --git a/atlantik/atlanticd/serversocket.h b/atlantik/atlanticd/serversocket.h
index cc31c8ab..29550769 100644
--- a/atlantik/atlanticd/serversocket.h
+++ b/atlantik/atlanticd/serversocket.h
@@ -21,9 +21,10 @@
 
 class AtlanticClient;
 
-class ServerSocket : public QServerSocket
+class ServerSocket : public TQServerSocket
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	ServerSocket(int port, int backlog);
diff --git a/atlantik/client/atlantik.cpp b/atlantik/client/atlantik.cpp
index f1e24645..2ad1bf98 100644
--- a/atlantik/client/atlantik.cpp
+++ b/atlantik/client/atlantik.cpp
@@ -64,15 +64,15 @@
 #include "selectgame_widget.h"
 #include "selectconfiguration_widget.h"
 
-LogTextEdit::LogTextEdit( TQWidget *parent, const char *name ) : TQTextEdit( parent, name )
+LogTextEdit::LogTextEdit( TQWidget *tqparent, const char *name ) : TQTextEdit( tqparent, name )
 {
 #ifdef KDE_3_2_FEATURES
-	m_clear = KStdAction::clear( this, TQT_SLOT( clear() ), 0 );
+	m_clear = KStdAction::clear( TQT_TQOBJECT(this), TQT_SLOT( clear() ), 0 );
 #else
-	m_clear = new KAction( i18n("Clear"), "clear", NULL, this, TQT_SLOT( clear() ), static_cast<KActionCollection *>(0), "clear" );
+	m_clear = new KAction( i18n("Clear"), "clear", NULL, TQT_TQOBJECT(this), TQT_SLOT( clear() ), static_cast<KActionCollection *>(0), "clear" );
 #endif
-	m_selectAll = KStdAction::selectAll( this, TQT_SLOT( selectAll() ), 0 );
-	m_copy = KStdAction::copy( this, TQT_SLOT( copy() ), 0 );
+	m_selectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), 0 );
+	m_copy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( copy() ), 0 );
 }
 
 LogTextEdit::~LogTextEdit()
@@ -103,12 +103,12 @@ Atlantik::Atlantik ()
 
 	// Toolbar: Game
 //	KStdGameAction::gameNew(this, TQT_SLOT(slotNewGame()), actionCollection(), "game_new");
-        m_showEventLog = new KAction(i18n("Show Event &Log")/*, "atlantik_showeventlog"*/, CTRL+Key_L, this, TQT_SLOT(showEventLog()), actionCollection(), "showeventlog");
-	KStdGameAction::quit(kapp, TQT_SLOT(closeAllWindows()), actionCollection(), "game_quit");
+        m_showEventLog = new KAction(i18n("Show Event &Log")/*, "atlantik_showeventlog"*/, CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(showEventLog()), actionCollection(), "showeventlog");
+	KStdGameAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(closeAllWindows()), actionCollection(), "game_quit");
 
 	// Toolbar: Settings
-	KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actionCollection());
-	KStdAction::configureNotifications(this, TQT_SLOT(configureNotifications()), actionCollection());
+	KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection());
+	KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(configureNotifications()), actionCollection());
 
 	// Initialize pointers to 0L
 	m_configDialog = 0;
@@ -120,37 +120,37 @@ Atlantik::Atlantik ()
 	m_atlantikNetwork = 0;
 
 	// Game and network core
-	m_atlanticCore = new AtlanticCore(this, "atlanticCore");
-	connect(m_atlanticCore, TQT_SIGNAL(createGUI(Player *)), this, TQT_SLOT(newPlayer(Player *)));
-	connect(m_atlanticCore, TQT_SIGNAL(removeGUI(Player *)), this, TQT_SLOT(removeGUI(Player *)));
-	connect(m_atlanticCore, TQT_SIGNAL(createGUI(Trade *)), this, TQT_SLOT(newTrade(Trade *)));
-	connect(m_atlanticCore, TQT_SIGNAL(removeGUI(Trade *)), this, TQT_SLOT(removeGUI(Trade *)));
+	m_atlanticCore = new AtlanticCore(TQT_TQOBJECT(this), "atlanticCore");
+	connect(m_atlanticCore, TQT_SIGNAL(createGUI(Player *)), TQT_TQOBJECT(this), TQT_SLOT(newPlayer(Player *)));
+	connect(m_atlanticCore, TQT_SIGNAL(removeGUI(Player *)), TQT_TQOBJECT(this), TQT_SLOT(removeGUI(Player *)));
+	connect(m_atlanticCore, TQT_SIGNAL(createGUI(Trade *)), TQT_TQOBJECT(this), TQT_SLOT(newTrade(Trade *)));
+	connect(m_atlanticCore, TQT_SIGNAL(removeGUI(Trade *)), TQT_TQOBJECT(this), TQT_SLOT(removeGUI(Trade *)));
 
 	initEventLog();
 	initNetworkObject();
 
 	// Menu,toolbar: Move
-	m_roll = KStdGameAction::roll(this, TQT_SIGNAL(rollDice()), actionCollection());
+	m_roll = KStdGameAction::roll(TQT_TQOBJECT(this), TQT_SIGNAL(rollDice()), actionCollection());
 	m_roll->setEnabled(false);
-	m_buyEstate = new KAction(i18n("&Buy"), "atlantik_buy_estate", CTRL+Key_B, this, TQT_SIGNAL(buyEstate()), actionCollection(), "buy_estate");
+	m_buyEstate = new KAction(i18n("&Buy"), "atlantik_buy_estate", CTRL+Key_B, TQT_TQOBJECT(this), TQT_SIGNAL(buyEstate()), actionCollection(), "buy_estate");
 	m_buyEstate->setEnabled(false);
-	m_auctionEstate = new KAction(i18n("&Auction"), "auction", CTRL+Key_A, this, TQT_SIGNAL(auctionEstate()), actionCollection(), "auction");
+	m_auctionEstate = new KAction(i18n("&Auction"), "auction", CTRL+Key_A, TQT_TQOBJECT(this), TQT_SIGNAL(auctionEstate()), actionCollection(), "auction");
 	m_auctionEstate->setEnabled(false);
-	m_endTurn = KStdGameAction::endTurn(this, TQT_SIGNAL(endTurn()), actionCollection());
+	m_endTurn = KStdGameAction::endTurn(TQT_TQOBJECT(this), TQT_SIGNAL(endTurn()), actionCollection());
 	m_endTurn->setEnabled(false);
-        m_jailCard = new KAction(i18n("Use Card to Leave Jail")/*, "atlantik_move_jail_card"*/, 0, this, TQT_SIGNAL(jailCard()), actionCollection(), "move_jailcard");
+        m_jailCard = new KAction(i18n("Use Card to Leave Jail")/*, "atlantik_move_jail_card"*/, 0, TQT_TQOBJECT(this), TQT_SIGNAL(jailCard()), actionCollection(), "move_jailcard");
 	m_jailCard->setEnabled(false);
-	m_jailPay = new KAction(i18n("&Pay to Leave Jail"), "jail_pay", CTRL+Key_P, this, TQT_SIGNAL(jailPay()), actionCollection(), "move_jailpay");
+	m_jailPay = new KAction(i18n("&Pay to Leave Jail"), "jail_pay", CTRL+Key_P, TQT_TQOBJECT(this), TQT_SIGNAL(jailPay()), actionCollection(), "move_jailpay");
 	m_jailPay->setEnabled(false);
-        m_jailRoll = new KAction(i18n("Roll to Leave &Jail")/*, "atlantik_move_jail_roll"*/, CTRL+Key_J, this, TQT_SIGNAL(jailRoll()), actionCollection(), "move_jailroll");
+        m_jailRoll = new KAction(i18n("Roll to Leave &Jail")/*, "atlantik_move_jail_roll"*/, CTRL+Key_J, TQT_TQOBJECT(this), TQT_SIGNAL(jailRoll()), actionCollection(), "move_jailroll");
 	m_jailRoll->setEnabled(false);
 
 	// Mix code and XML into GUI
 	KMainWindow::createGUI();
 	applyMainWindowSettings( KGlobal::config(), "AtlantikMainWindow" );
 	KMainWindow::statusBar()->insertItem("Atlantik " ATLANTIK_VERSION_STRING, 0);
-	KMainWindow::statusBar()->insertItem(TQString::null, 1);
-	connect(statusBar(), TQT_SIGNAL(released(int)), this, TQT_SLOT(statusBarClick(int)));
+	KMainWindow::statusBar()->insertItem(TQString(), 1);
+	connect(statusBar(), TQT_SIGNAL(released(int)), TQT_TQOBJECT(this), TQT_SLOT(statusBarClick(int)));
 
 	// Main widget, containing all others
  	m_mainWidget = new TQWidget(this, "main");
@@ -158,7 +158,7 @@ Atlantik::Atlantik ()
 	m_mainLayout = new TQGridLayout(m_mainWidget, 3, 2);
 	setCentralWidget(m_mainWidget);
 
-	// Vertical view area for portfolios.
+	//Qt::Vertical view area for portfolios.
 	m_portfolioScroll = new TQScrollView(m_mainWidget, "pfScroll");
 	m_mainLayout->addWidget( m_portfolioScroll, 0, 0 );
 	m_portfolioScroll->setHScrollBarMode( TQScrollView::AlwaysOff );
@@ -192,7 +192,7 @@ Atlantik::Atlantik ()
 
 	m_serverMsgs->setFocusProxy(m_input);
 
-	connect(m_input, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotSendMsg()));
+	connect(m_input, TQT_SIGNAL(returnPressed()), TQT_TQOBJECT(this), TQT_SLOT(slotSendMsg()));
 
 	// Set stretching where we want it.
 	m_mainLayout->setRowStretch(1, 1); // make m_board+m_serverMsgs stretch vertically, not the rest
@@ -253,8 +253,8 @@ void Atlantik::newPlayer(Player *player)
 	// we'd better force an update.
 	playerChanged(player);
 
-	connect(player, TQT_SIGNAL(changed(Player *)), this, TQT_SLOT(playerChanged(Player *)));
-	connect(player, TQT_SIGNAL(gainedTurn()), this, TQT_SLOT(gainedTurn()));
+	connect(player, TQT_SIGNAL(changed(Player *)), TQT_TQOBJECT(this), TQT_SLOT(playerChanged(Player *)));
+	connect(player, TQT_SIGNAL(gainedTurn()), TQT_TQOBJECT(this), TQT_SLOT(gainedTurn()));
 	connect(player, TQT_SIGNAL(changed(Player *)), m_board, TQT_SLOT(playerChanged(Player *)));
 
 	KNotifyClient::event(winId(), "newplayer");
@@ -315,7 +315,7 @@ void Atlantik::showSelectServer()
 	initNetworkObject();
 
 	connect(m_selectServer, TQT_SIGNAL(serverConnect(const TQString, int)), m_atlantikNetwork, TQT_SLOT(serverConnect(const TQString, int)));
-	connect(m_selectServer, TQT_SIGNAL(msgStatus(const TQString &)), this, TQT_SLOT(slotMsgStatus(const TQString &)));
+	connect(m_selectServer, TQT_SIGNAL(msgtqStatus(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgtqStatus(const TQString &)));
 
 	m_selectServer->slotRefresh( m_config.connectOnStart );
 }
@@ -356,8 +356,8 @@ void Atlantik::showSelectGame()
 
 	connect(m_selectGame, TQT_SIGNAL(joinGame(int)), m_atlantikNetwork, TQT_SLOT(joinGame(int)));
 	connect(m_selectGame, TQT_SIGNAL(newGame(const TQString &)), m_atlantikNetwork, TQT_SLOT(newGame(const TQString &)));
-	connect(m_selectGame, TQT_SIGNAL(leaveServer()), this, TQT_SLOT(showSelectServer()));
-	connect(m_selectGame, TQT_SIGNAL(msgStatus(const TQString &)), this, TQT_SLOT(slotMsgStatus(const TQString &)));
+	connect(m_selectGame, TQT_SIGNAL(leaveServer()), TQT_TQOBJECT(this), TQT_SLOT(showSelectServer()));
+	connect(m_selectGame, TQT_SIGNAL(msgtqStatus(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgtqStatus(const TQString &)));
 }
 
 void Atlantik::showSelectConfiguration()
@@ -383,7 +383,7 @@ void Atlantik::showSelectConfiguration()
 	connect(m_selectConfiguration, TQT_SIGNAL(changeOption(int, const TQString &)), m_atlantikNetwork, TQT_SLOT(changeOption(int, const TQString &)));
 	connect(m_selectConfiguration, TQT_SIGNAL(buttonCommand(TQString)), m_atlantikNetwork, TQT_SLOT(writeData(TQString)));
 	connect(m_selectConfiguration, TQT_SIGNAL(iconSelected(const TQString &)), m_atlantikNetwork, TQT_SLOT(setImage(const TQString &)));
-	connect(m_selectConfiguration, TQT_SIGNAL(statusMessage(const TQString &)), this, TQT_SLOT(slotMsgStatus(const TQString &)));
+	connect(m_selectConfiguration, TQT_SIGNAL(statusMessage(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgtqStatus(const TQString &)));
 }
 
 void Atlantik::initBoard()
@@ -475,12 +475,12 @@ void Atlantik::networkClosed(int status)
 	switch( status )
 	{
 	case KBufferedIO::involuntary:
-		slotMsgStatus( i18n("Connection with server %1:%2 lost.").arg(m_atlantikNetwork->host()).arg(m_atlantikNetwork->port()), TQString("connect_no") );
+		slotMsgtqStatus( i18n("Connection with server %1:%2 lost.").tqarg(m_atlantikNetwork->host()).tqarg(m_atlantikNetwork->port()), TQString("connect_no") );
 		showSelectServer();
 		break;
 	default:
 		if ( !m_atlantikNetwork->host().isEmpty() )
-			slotMsgStatus( i18n("Disconnected from %1:%2.").arg(m_atlantikNetwork->host()).arg(m_atlantikNetwork->port()), TQString("connect_no") );
+			slotMsgtqStatus( i18n("Disconnected from %1:%2.").tqarg(m_atlantikNetwork->host()).tqarg(m_atlantikNetwork->port()), TQString("connect_no") );
 		break;
 	}
 }
@@ -491,7 +491,7 @@ void Atlantik::slotConfigure()
 		m_configDialog = new ConfigDialog(this);
 	m_configDialog->show();
 	
-	connect(m_configDialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotUpdateConfig()));
+	connect(m_configDialog, TQT_SIGNAL(okClicked()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateConfig()));
 }
 
 void Atlantik::showEventLog()
@@ -612,7 +612,7 @@ void Atlantik::slotUpdateConfig()
 void Atlantik::slotSendMsg()
 {
 	m_atlantikNetwork->cmdChat(m_input->text());
-	m_input->setText(TQString::null);
+	m_input->setText(TQString());
 }
 
 void Atlantik::slotMsgInfo(TQString msg)
@@ -625,7 +625,7 @@ void Atlantik::slotMsgError(TQString msg)
 	serverMsgsAppend("Error: " + msg);
 }
 
-void Atlantik::slotMsgStatus(const TQString &message, const TQString &icon)
+void Atlantik::slotMsgtqStatus(const TQString &message, const TQString &icon)
 {
 	KMainWindow::statusBar()->changeItem(message, 1);
 	m_eventLog->addEvent(message, icon);
@@ -636,7 +636,7 @@ void Atlantik::slotMsgChat(TQString player, TQString msg)
 	if (m_config.chatTimestamps)
 	{
 		TQTime time = TQTime::currentTime();
-		serverMsgsAppend(TQString("[%1] %2: %3").arg(time.toString("hh:mm")).arg(player).arg(msg));
+		serverMsgsAppend(TQString("[%1] %2: %3").tqarg(time.toString("hh:mm")).tqarg(player).tqarg(msg));
 	}
 	else
 		serverMsgsAppend(player + ": " + msg);
@@ -728,26 +728,26 @@ void Atlantik::initNetworkObject()
 	}
 
 	m_atlantikNetwork = new AtlantikNetwork(m_atlanticCore);
-	connect(m_atlantikNetwork, TQT_SIGNAL(msgInfo(TQString)), this, TQT_SLOT(slotMsgInfo(TQString)));
-	connect(m_atlantikNetwork, TQT_SIGNAL(msgError(TQString)), this, TQT_SLOT(slotMsgError(TQString)));
-	connect(m_atlantikNetwork, TQT_SIGNAL(msgStatus(const TQString &, const TQString &)), this, TQT_SLOT(slotMsgStatus(const TQString &, const TQString &)));
-	connect(m_atlantikNetwork, TQT_SIGNAL(msgChat(TQString, TQString)), this, TQT_SLOT(slotMsgChat(TQString, TQString)));
+	connect(m_atlantikNetwork, TQT_SIGNAL(msgInfo(TQString)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgInfo(TQString)));
+	connect(m_atlantikNetwork, TQT_SIGNAL(msgError(TQString)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgError(TQString)));
+	connect(m_atlantikNetwork, TQT_SIGNAL(msgtqStatus(const TQString &, const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgtqStatus(const TQString &, const TQString &)));
+	connect(m_atlantikNetwork, TQT_SIGNAL(msgChat(TQString, TQString)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgChat(TQString, TQString)));
 
-	connect(m_atlantikNetwork, TQT_SIGNAL(connectionSuccess()), this, TQT_SLOT(slotNetworkConnected()));
-	connect(m_atlantikNetwork, TQT_SIGNAL(connectionFailed(int)), this, TQT_SLOT(slotNetworkError(int)));
-	connect(m_atlantikNetwork, TQT_SIGNAL(closed(int)), this, TQT_SLOT(networkClosed(int)));
+	connect(m_atlantikNetwork, TQT_SIGNAL(connectionSuccess()), TQT_TQOBJECT(this), TQT_SLOT(slotNetworkConnected()));
+	connect(m_atlantikNetwork, TQT_SIGNAL(connectionFailed(int)), TQT_TQOBJECT(this), TQT_SLOT(slotNetworkError(int)));
+	connect(m_atlantikNetwork, TQT_SIGNAL(closed(int)), TQT_TQOBJECT(this), TQT_SLOT(networkClosed(int)));
 
-	connect(m_atlantikNetwork, TQT_SIGNAL(receivedHandshake()), this, TQT_SLOT(sendHandshake()));
+	connect(m_atlantikNetwork, TQT_SIGNAL(receivedHandshake()), TQT_TQOBJECT(this), TQT_SLOT(sendHandshake()));
 
-	connect(m_atlantikNetwork, TQT_SIGNAL(gameConfig()), this, TQT_SLOT(showSelectConfiguration()));
-	connect(m_atlantikNetwork, TQT_SIGNAL(gameInit()), this, TQT_SLOT(initBoard()));
-	connect(m_atlantikNetwork, TQT_SIGNAL(gameRun()), this, TQT_SLOT(showBoard()));
-	connect(m_atlantikNetwork, TQT_SIGNAL(gameEnd()), this, TQT_SLOT(freezeBoard()));
+	connect(m_atlantikNetwork, TQT_SIGNAL(gameConfig()), TQT_TQOBJECT(this), TQT_SLOT(showSelectConfiguration()));
+	connect(m_atlantikNetwork, TQT_SIGNAL(gameInit()), TQT_TQOBJECT(this), TQT_SLOT(initBoard()));
+	connect(m_atlantikNetwork, TQT_SIGNAL(gameRun()), TQT_TQOBJECT(this), TQT_SLOT(showBoard()));
+	connect(m_atlantikNetwork, TQT_SIGNAL(gameEnd()), TQT_TQOBJECT(this), TQT_SLOT(freezeBoard()));
 
-	connect(m_atlantikNetwork, TQT_SIGNAL(newEstate(Estate *)), this, TQT_SLOT(newEstate(Estate *)));
-	connect(m_atlantikNetwork, TQT_SIGNAL(newAuction(Auction *)), this, TQT_SLOT(newAuction(Auction *)));
+	connect(m_atlantikNetwork, TQT_SIGNAL(newEstate(Estate *)), TQT_TQOBJECT(this), TQT_SLOT(newEstate(Estate *)));
+	connect(m_atlantikNetwork, TQT_SIGNAL(newAuction(Auction *)), TQT_TQOBJECT(this), TQT_SLOT(newAuction(Auction *)));
 
-	connect(m_atlantikNetwork, TQT_SIGNAL(clientCookie(TQString)), this, TQT_SLOT(clientCookie(TQString)));
+	connect(m_atlantikNetwork, TQT_SIGNAL(clientCookie(TQString)), TQT_TQOBJECT(this), TQT_SLOT(clientCookie(TQString)));
 	connect(m_atlantikNetwork, TQT_SIGNAL(networkEvent(const TQString &, const TQString &)), m_eventLog, TQT_SLOT(addEvent(const TQString &, const TQString &)));
 
 	connect(this, TQT_SIGNAL(rollDice()), m_atlantikNetwork, TQT_SLOT(rollDice()));
diff --git a/atlantik/client/atlantik.h b/atlantik/client/atlantik.h
index d3eac354..24b989d3 100644
--- a/atlantik/client/atlantik.h
+++ b/atlantik/client/atlantik.h
@@ -68,12 +68,13 @@ class Player;
 class Estate;
 class Trade;
 
-class LogTextEdit : public QTextEdit
+class LogTextEdit : public TQTextEdit
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-	LogTextEdit( TQWidget *parent = 0, const char *name = 0 );
+	LogTextEdit( TQWidget *tqparent = 0, const char *name = 0 );
 	virtual ~LogTextEdit();
 
 	TQPopupMenu *createPopupMenu( const TQPoint & pos );
@@ -91,6 +92,7 @@ private:
 class Atlantik : public KMainWindow
 {
 Q_OBJECT
+  TQ_OBJECT
 	
 public:
 	/**
@@ -186,7 +188,7 @@ public slots:
 	 */
 	void slotMsgInfo(TQString msg);
 
-	void slotMsgStatus(const TQString &message, const TQString &icon = TQString::null);
+	void slotMsgtqStatus(const TQString &message, const TQString &icon = TQString());
 
 	/**
 	 * Informs serverMsgs() to append an incoming message from the
diff --git a/atlantik/client/configdlg.cpp b/atlantik/client/configdlg.cpp
index 9e936147..b5d1ecae 100644
--- a/atlantik/client/configdlg.cpp
+++ b/atlantik/client/configdlg.cpp
@@ -40,9 +40,9 @@
 #include "atlantik.h"
 #include "configdlg.moc"
 
-ConfigDialog::ConfigDialog(Atlantik* parent, const char *name) : KDialogBase(IconList, i18n("Configure Atlantik"), Ok|Cancel, Ok, parent, "config_atlantik", false, name)
+ConfigDialog::ConfigDialog(Atlantik* tqparent, const char *name) : KDialogBase(IconList, i18n("Configure Atlantik"), Ok|Cancel, Ok, tqparent, "config_atlantik", false, name)
 {
-	m_parent = parent;
+	m_parent = tqparent;
 	p_general = addPage(i18n("General"), i18n("General"), BarIcon("configure", KIcon::SizeMedium));
 	p_p13n = addPage(i18n("Personalization"), i18n("Personalization"), BarIcon("personal", KIcon::SizeMedium));
 	p_board = addPage(i18n("Board"), i18n("Board"), BarIcon("monop_board", KIcon::SizeMedium));
@@ -53,7 +53,7 @@ ConfigDialog::ConfigDialog(Atlantik* parent, const char *name) : KDialogBase(Ico
 	configBoard = new ConfigBoard(this, p_board, "configBoard");
 	configMonopigator = new ConfigMonopigator(this, p_monopigator, "configMonopigator");
 
-	setMinimumSize(sizeHint());
+	setMinimumSize(tqsizeHint());
 }
 
 bool ConfigDialog::chatTimestamps()
@@ -111,26 +111,26 @@ AtlantikConfig ConfigDialog::config()
 	return m_parent->config();
 }
 
-ConfigPlayer::ConfigPlayer(ConfigDialog* configDialog, TQWidget *parent, const char *name) : TQWidget(parent, name)
+ConfigPlayer::ConfigPlayer(ConfigDialog* configDialog, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
 {
 	m_configDialog = configDialog;
-	TQVBoxLayout *layout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint());
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(tqparent, KDialog::marginHint(), KDialog::spacingHint());
 
-	TQLabel *label = new TQLabel(i18n("Player name:"), parent);
-	layout->addWidget(label);
+	TQLabel *label = new TQLabel(i18n("Player name:"), tqparent);
+	tqlayout->addWidget(label);
 
-	m_playerName = new TQLineEdit(parent);
-	layout->addWidget(m_playerName);
+	m_playerName = new TQLineEdit(tqparent);
+	tqlayout->addWidget(m_playerName);
 
-	TQLabel *label2 = new TQLabel(i18n("Player image:"), parent);
-	layout->addWidget(label2);
+	TQLabel *label2 = new TQLabel(i18n("Player image:"), tqparent);
+	tqlayout->addWidget(label2);
                 
-	m_playerIcon = new KPushButton(parent, "playerIcon");
-	layout->addWidget(m_playerIcon);
+	m_playerIcon = new KPushButton(tqparent, "playerIcon");
+	tqlayout->addWidget(m_playerIcon);
 
 	connect( m_playerIcon, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseImage()) );
                                         
-	layout->addStretch(1);
+	tqlayout->addStretch(1);
 
 	reset();
 }
@@ -182,21 +182,21 @@ void ConfigPlayer::reset()
 	setImage();
 }
 
-ConfigMonopigator::ConfigMonopigator(ConfigDialog *configDialog, TQWidget *parent, const char *name) : TQWidget(parent, name)
+ConfigMonopigator::ConfigMonopigator(ConfigDialog *configDialog, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
 {
 	m_configDialog = configDialog;
-	TQVBoxLayout *layout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint());
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(tqparent, KDialog::marginHint(), KDialog::spacingHint());
 
-	m_connectOnStart = new TQCheckBox(i18n("Request list of Internet servers on start-up"), parent);
-	layout->addWidget(m_connectOnStart);
+	m_connectOnStart = new TQCheckBox(i18n("Request list of Internet servers on start-up"), tqparent);
+	tqlayout->addWidget(m_connectOnStart);
 
 	TQString message=i18n(
 		"If checked, Atlantik connects to a meta server on start-up to\n"
 		"request a list of Internet servers.\n");
 	TQWhatsThis::add(m_connectOnStart, message);
 
-	m_hideDevelopmentServers = new TQCheckBox(i18n("Hide development servers"), parent);
-	layout->addWidget(m_hideDevelopmentServers);
+	m_hideDevelopmentServers = new TQCheckBox(i18n("Hide development servers"), tqparent);
+	tqlayout->addWidget(m_hideDevelopmentServers);
 
 	message=i18n(
 		"Some of the Internet servers might be running development\n"
@@ -204,7 +204,7 @@ ConfigMonopigator::ConfigMonopigator(ConfigDialog *configDialog, TQWidget *paren
 		"display these servers.\n");
 	TQWhatsThis::add(m_hideDevelopmentServers, message);
 
-	layout->addStretch(1);
+	tqlayout->addStretch(1);
 
 	reset();
 }
@@ -225,20 +225,20 @@ void ConfigMonopigator::reset()
 	m_hideDevelopmentServers->setChecked(m_configDialog->config().hideDevelopmentServers);
 }
 
-ConfigGeneral::ConfigGeneral(ConfigDialog *configDialog, TQWidget *parent, const char *name) : TQWidget(parent, name)
+ConfigGeneral::ConfigGeneral(ConfigDialog *configDialog, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
 {
 	m_configDialog = configDialog;
-	TQVBoxLayout *layout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint());
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(tqparent, KDialog::marginHint(), KDialog::spacingHint());
 
-	m_chatTimestamps = new TQCheckBox(i18n("Show timestamps in chat messages"), parent);
-	layout->addWidget(m_chatTimestamps);
+	m_chatTimestamps = new TQCheckBox(i18n("Show timestamps in chat messages"), tqparent);
+	tqlayout->addWidget(m_chatTimestamps);
 
 	TQString message=i18n(
 		"If checked, Atlantik will add timestamps in front of chat\n"
 		"messages.\n");
 	TQWhatsThis::add(m_chatTimestamps, message);
 
-	layout->addStretch(1);
+	tqlayout->addStretch(1);
 
 	reset();
 }
@@ -253,13 +253,13 @@ void ConfigGeneral::reset()
 	m_chatTimestamps->setChecked(m_configDialog->config().chatTimestamps);
 }
 
-ConfigBoard::ConfigBoard(ConfigDialog *configDialog, TQWidget *parent, const char *name) : TQWidget(parent, name)
+ConfigBoard::ConfigBoard(ConfigDialog *configDialog, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
 {
 	m_configDialog = configDialog;
-	TQVBoxLayout *layout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint());
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(tqparent, KDialog::marginHint(), KDialog::spacingHint());
 
-	TQGroupBox *box = new TQGroupBox(1, Qt::Horizontal, i18n("Game Status Feedback"), parent);
-	layout->addWidget(box);
+	TQGroupBox *box = new TQGroupBox(1, Qt::Horizontal, i18n("Game tqStatus Feedback"), tqparent);
+	tqlayout->addWidget(box);
 
 	m_indicateUnowned = new TQCheckBox(i18n("Display title deed card on unowned properties"), box);
 	TQString message=i18n(
@@ -291,10 +291,10 @@ ConfigBoard::ConfigBoard(ConfigDialog *configDialog, TQWidget *parent, const cha
 		"will have a Quartz effect similar to the Quartz KWin style.\n");
 	TQWhatsThis::add(m_quartzEffects, message);
 
-//	box = new TQGroupBox(1, Qt::Horizontal, i18n("Size"), parent);
-//	layout->addWidget(box);
+//	box = new TQGroupBox(1, Qt::Horizontal, i18n("Size"), tqparent);
+//	tqlayout->addWidget(box);
 
-	layout->addStretch(1);
+	tqlayout->addStretch(1);
 
 	reset();
 }
diff --git a/atlantik/client/configdlg.h b/atlantik/client/configdlg.h
index 41843ca6..c28e3a98 100644
--- a/atlantik/client/configdlg.h
+++ b/atlantik/client/configdlg.h
@@ -32,12 +32,13 @@ class ConfigDialog;
 
 struct AtlantikConfig;
 
-class ConfigPlayer : public QWidget
+class ConfigPlayer : public TQWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-	ConfigPlayer(ConfigDialog *configDialog, TQWidget *parent, const char *name=0);
+	ConfigPlayer(ConfigDialog *configDialog, TQWidget *tqparent, const char *name=0);
 
 	TQString playerName();
 	TQString playerImage();
@@ -55,12 +56,13 @@ private:
 	KPushButton *m_playerIcon;
 };
 
-class ConfigBoard : public QWidget
+class ConfigBoard : public TQWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-	ConfigBoard(ConfigDialog *configDialog, TQWidget *parent, const char *name=0);
+	ConfigBoard(ConfigDialog *configDialog, TQWidget *tqparent, const char *name=0);
 
 	bool indicateUnowned();
 	bool highliteUnowned();
@@ -75,12 +77,13 @@ private:
 	TQCheckBox *m_indicateUnowned, *m_highliteUnowned, *m_darkenMortgaged, *m_animateToken, *m_quartzEffects;
 };
 
-class ConfigMonopigator : public QWidget
+class ConfigMonopigator : public TQWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-	ConfigMonopigator(ConfigDialog *dialog, TQWidget *parent, const char *name = 0);
+	ConfigMonopigator(ConfigDialog *dialog, TQWidget *tqparent, const char *name = 0);
 
 	bool connectOnStart();
 	bool hideDevelopmentServers();
@@ -92,12 +95,13 @@ private:
 	TQCheckBox *m_connectOnStart, *m_hideDevelopmentServers;
 };
 
-class ConfigGeneral : public QWidget
+class ConfigGeneral : public TQWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-	ConfigGeneral(ConfigDialog *dialog, TQWidget *parent, const char *name = 0);
+	ConfigGeneral(ConfigDialog *dialog, TQWidget *tqparent, const char *name = 0);
 
 	bool chatTimestamps();
 
@@ -111,9 +115,10 @@ private:
 class ConfigDialog : public KDialogBase
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-	ConfigDialog(Atlantik *parent, const char *name=0);
+	ConfigDialog(Atlantik *tqparent, const char *name=0);
 
 	bool chatTimestamps();
 	bool indicateUnowned();
diff --git a/atlantik/client/event.h b/atlantik/client/event.h
index dc3b6c9b..96d02c41 100644
--- a/atlantik/client/event.h
+++ b/atlantik/client/event.h
@@ -22,12 +22,13 @@
 class TQDateTime;
 class TQString;
 
-class Event : public QObject
+class Event : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-	Event(const TQDateTime &dateTime, const TQString &description, const TQString &icon = TQString::null);
+	Event(const TQDateTime &dateTime, const TQString &description, const TQString &icon = TQString());
 	TQDateTime dateTime() const;
 	TQString description() const;
 	TQString icon() const;
diff --git a/atlantik/client/eventlogwidget.cpp b/atlantik/client/eventlogwidget.cpp
index 6bc81b04..2821253a 100644
--- a/atlantik/client/eventlogwidget.cpp
+++ b/atlantik/client/eventlogwidget.cpp
@@ -37,7 +37,7 @@ EventLog::EventLog()
 
 void EventLog::addEvent(const TQString &description, const TQString &icon)
 {
-	Event *event = new Event(TQDateTime::currentDateTime(), description, icon);
+	Event *event = new Event(TQDateTime::tqcurrentDateTime(), description, icon);
 	m_events.append(event);
 	emit newEvent(event);
 }
@@ -47,8 +47,8 @@ TQPtrList<Event> EventLog::events()
 	return m_events;
 }
 
-EventLogWidget::EventLogWidget(EventLog *eventLog, TQWidget *parent, const char *name)
-	: TQWidget(parent, name,
+EventLogWidget::EventLogWidget(EventLog *eventLog, TQWidget *tqparent, const char *name)
+	: TQWidget(tqparent, name,
 	  WType_Dialog | WStyle_Customize | WStyle_DialogBorder | WStyle_Title |
 	  WStyle_Minimize | WStyle_ContextHelp )
 {
@@ -113,7 +113,7 @@ void EventLogWidget::save()
 	{
 		TQTextStream stream(&file);
 
-		stream << i18n( "Atlantik log file, saved at %1." ).arg( TQDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss") ) << endl;
+		stream << i18n( "Atlantik log file, saved at %1." ).tqarg( TQDateTime::tqcurrentDateTime().toString("yyyy-MM-dd hh:mm:ss") ) << endl;
 
 		TQPtrList<Event> events = m_eventLog->events();
 		for (TQPtrListIterator<Event> it( events ); (*it) ; ++it)
diff --git a/atlantik/client/eventlogwidget.h b/atlantik/client/eventlogwidget.h
index c9e1eacd..3b2d1883 100644
--- a/atlantik/client/eventlogwidget.h
+++ b/atlantik/client/eventlogwidget.h
@@ -28,16 +28,17 @@ class KListView;
 class KListViewItem;
 class KPushButton;
 
-class EventLog : public QObject
+class EventLog : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	EventLog();
 	TQPtrList<Event> events();
 
 public slots:
-	void addEvent(const TQString &description, const TQString &icon = TQString::null);
+	void addEvent(const TQString &description, const TQString &icon = TQString());
 
 signals:
 	void newEvent(Event *event);
@@ -46,14 +47,15 @@ private:
 	TQPtrList<Event> m_events;
 };
 
-class EventLogWidget : public QWidget
+class EventLogWidget : public TQWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	enum EventLogType { Default, Net_In, Net_Out };
 
-	EventLogWidget(EventLog *eventLog, TQWidget *parent=0, const char *name = 0);
+	EventLogWidget(EventLog *eventLog, TQWidget *tqparent=0, const char *name = 0);
 
 public slots:
 	void addEvent(Event *event);
diff --git a/atlantik/client/monopigator.cpp b/atlantik/client/monopigator.cpp
index 7e0a834d..22081de0 100644
--- a/atlantik/client/monopigator.cpp
+++ b/atlantik/client/monopigator.cpp
@@ -46,7 +46,7 @@ void Monopigator::loadData(const KURL &url)
 	m_downloadData->reset();
 
 	m_job = KIO::get(url, true, false);
-	m_job->addMetaData(TQString::fromLatin1("UserAgent"), TQString::fromLatin1("Atlantik/" ATLANTIK_VERSION_STRING));
+	m_job->addMetaData(TQString::tqfromLatin1("UserAgent"), TQString::tqfromLatin1("Atlantik/" ATLANTIK_VERSION_STRING));
 
 	if (!m_timer)
 	{
@@ -108,12 +108,12 @@ void Monopigator::processData(const TQByteArray &data, bool okSoFar)
 	}
 }
 
-MonopigatorEntry::MonopigatorEntry(TQListView *parent, TQString host, TQString latency, TQString version, TQString users, TQString port, TQString ip) : TQObject(), TQListViewItem(parent, host, latency, version, users, port)
+MonopigatorEntry::MonopigatorEntry(TQListView *tqparent, TQString host, TQString latency, TQString version, TQString users, TQString port, TQString ip) : TQObject(), TQListViewItem(tqparent, host, latency, version, users, port)
 {
-	m_isDev = ( version.find( TQRegExp("(CVS|-dev)") ) != -1 ) ? true : false;
+	m_isDev = ( version.tqfind( TQRegExp("(CVS|-dev)") ) != -1 ) ? true : false;
 
 	setEnabled(false);
-	parent->sort();
+	tqparent->sort();
 
 	if ( !ip.isEmpty() )
 		host = ip;
diff --git a/atlantik/client/monopigator.h b/atlantik/client/monopigator.h
index dd88b0ae..c785b980 100644
--- a/atlantik/client/monopigator.h
+++ b/atlantik/client/monopigator.h
@@ -28,9 +28,10 @@
 class KExtendedSocket;
 class TQTime;
 
-class Monopigator : public QObject
+class Monopigator : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	Monopigator();
@@ -55,12 +56,13 @@ private:
 	KIO::Job *m_job;
 };
 
-class MonopigatorEntry : public TQObject, public QListViewItem
+class MonopigatorEntry : public TQObject, public TQListViewItem
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-	MonopigatorEntry(TQListView *parent, TQString host, TQString latency, TQString version, TQString users, TQString port, TQString ip);
+	MonopigatorEntry(TQListView *tqparent, TQString host, TQString latency, TQString version, TQString users, TQString port, TQString ip);
 	int compare(TQListViewItem *i, int col, bool ascending) const;
 	bool isDev() const;
 
diff --git a/atlantik/client/selectconfiguration_widget.cpp b/atlantik/client/selectconfiguration_widget.cpp
index b40bdd4f..1cb7a142 100644
--- a/atlantik/client/selectconfiguration_widget.cpp
+++ b/atlantik/client/selectconfiguration_widget.cpp
@@ -33,7 +33,7 @@
 
 #include "selectconfiguration_widget.moc"
 
-SelectConfiguration::SelectConfiguration(AtlanticCore *atlanticCore, TQWidget *parent, const char *name) : TQWidget(parent, name)
+SelectConfiguration::SelectConfiguration(AtlanticCore *atlanticCore, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
 {
 	m_atlanticCore = atlanticCore;
 	m_game = 0;
@@ -51,7 +51,7 @@ SelectConfiguration::SelectConfiguration(AtlanticCore *atlanticCore, TQWidget *p
 
 	playerButtons->addItem(new TQSpacerItem(20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
 
-	// Vertical spacer.
+	//Qt::Vertical spacer.
 	m_mainLayout->addItem(new TQSpacerItem(20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
 
 	// Server buttons.
@@ -127,11 +127,11 @@ void SelectConfiguration::gameOption(TQString title, TQString type, TQString val
 
 void SelectConfiguration::changeOption()
 {
-	ConfigOption *configOption = m_configMap[(TQObject *)TQObject::sender()];
+	ConfigOption *configOption = m_configMap[(TQObject *)TQT_BASE_OBJECT_NAME::sender()];
 	if (configOption)
 	{
-		kdDebug() << "checked " << ((TQCheckBox *)TQObject::sender())->isChecked() << endl;
-		emit changeOption( configOption->id(), TQString::number( ((TQCheckBox *)TQObject::sender())->isChecked() ) );
+		kdDebug() << "checked " << ((TQCheckBox *)TQT_BASE_OBJECT_NAME::sender())->isChecked() << endl;
+		emit changeOption( configOption->id(), TQString::number( ((TQCheckBox *)TQT_BASE_OBJECT_NAME::sender())->isChecked() ) );
 	}
 }
 
@@ -148,7 +148,7 @@ void SelectConfiguration::optionChanged(ConfigOption *configOption)
 
 void SelectConfiguration::optionChanged()
 {
-	TQString command = m_optionCommandMap[(TQObject *)TQObject::sender()];
+	TQString command = m_optionCommandMap[(TQObject *)TQT_BASE_OBJECT_NAME::sender()];
 
 	if (TQCheckBox *checkBox = m_checkBoxMap[command])
 	{
diff --git a/atlantik/client/selectconfiguration_widget.h b/atlantik/client/selectconfiguration_widget.h
index a0cfcd24..0ad747d0 100644
--- a/atlantik/client/selectconfiguration_widget.h
+++ b/atlantik/client/selectconfiguration_widget.h
@@ -32,12 +32,13 @@ class ConfigOption;
 class Game;
 class Player;
 
-class SelectConfiguration : public QWidget
+class SelectConfiguration : public TQWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-	SelectConfiguration(AtlanticCore *atlanticCore, TQWidget *parent, const char *name=0);
+	SelectConfiguration(AtlanticCore *atlanticCore, TQWidget *tqparent, const char *name=0);
 
 	void setCanStart(const bool &canStart);
 	TQString hostToConnect() const;
diff --git a/atlantik/client/selectgame_widget.cpp b/atlantik/client/selectgame_widget.cpp
index 8f39ff08..e634b3c2 100644
--- a/atlantik/client/selectgame_widget.cpp
+++ b/atlantik/client/selectgame_widget.cpp
@@ -29,7 +29,7 @@
 
 #include "selectgame_widget.h"
 
-SelectGame::SelectGame(AtlanticCore *atlanticCore, TQWidget *parent, const char *name) : TQWidget(parent, name)
+SelectGame::SelectGame(AtlanticCore *atlanticCore, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
 {
 	m_atlanticCore = atlanticCore;
 
@@ -80,13 +80,13 @@ void SelectGame::addGame(Game *game)
 
 	if (game->id() == -1)
 	{
-		TQListViewItem *item = new TQListViewItem( m_gameList, i18n("Create a new %1 Game").arg(game->name()), game->description(), TQString::null, TQString::null, game->type() );
+		TQListViewItem *item = new TQListViewItem( m_gameList, i18n("Create a new %1 Game").tqarg(game->name()), game->description(), TQString(), TQString(), game->type() );
 		item->setPixmap(0, TQPixmap(SmallIcon("filenew")));
 	}
 	else
 	{
 		Player *master = game->master();
-		TQListViewItem *item = new TQListViewItem( m_gameList, i18n("Join %1's %2 Game").arg( (master ? master->name() : TQString::null), game->name() ), game->description(), TQString::number(game->id()), TQString::number(game->players()), game->type() );
+		TQListViewItem *item = new TQListViewItem( m_gameList, i18n("Join %1's %2 Game").tqarg( (master ? master->name() : TQString()), game->name() ), game->description(), TQString::number(game->id()), TQString::number(game->players()), game->type() );
 		item->setPixmap( 0, TQPixmap(SmallIcon("atlantik")) );
 		item->setEnabled(game->canBeJoined());
 
@@ -118,11 +118,11 @@ void SelectGame::updateGame(Game *game)
 	item->setText( 1, game->description() );
 
 	if (game->id() == -1)
-		item->setText(0, i18n("Create a new %1 Game").arg(game->name()));
+		item->setText(0, i18n("Create a new %1 Game").tqarg(game->name()));
 	else
 	{
 		Player *master = game->master();
-		item->setText( 0, i18n("Join %1's %2 Game").arg( (master ? master->name() : TQString::null), game->name() ) );
+		item->setText( 0, i18n("Join %1's %2 Game").tqarg( (master ? master->name() : TQString()), game->name() ) );
 		item->setText( 3, TQString::number( game->players() ) );
 		item->setEnabled( game->canBeJoined() );
 
@@ -143,7 +143,7 @@ void SelectGame::playerChanged(Player *player)
 		game = m_atlanticCore->findGame( item->text(2).toInt() );
 		if ( game && game->master() == player )
 		{
-			item->setText( 0, i18n("Join %1's %2 Game").arg( player->name(), game->name() ) );
+			item->setText( 0, i18n("Join %1's %2 Game").tqarg( player->name(), game->name() ) );
 			return;
 		}
 		item = item->nextSibling();
diff --git a/atlantik/client/selectgame_widget.h b/atlantik/client/selectgame_widget.h
index f6d28f43..42ec3350 100644
--- a/atlantik/client/selectgame_widget.h
+++ b/atlantik/client/selectgame_widget.h
@@ -27,12 +27,13 @@ class AtlanticCore;
 class Game;
 class Player;
 
-class SelectGame : public QWidget
+class SelectGame : public TQWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-	SelectGame(AtlanticCore *atlanticCore, TQWidget *parent, const char *name=0);
+	SelectGame(AtlanticCore *atlanticCore, TQWidget *tqparent, const char *name=0);
 
 	void initPage();
 	bool validateNext();
@@ -51,7 +52,7 @@ signals:
 	void joinGame(int gameId);
 	void newGame(const TQString &gameType);
 	void leaveServer();
-	void msgStatus(const TQString &status);
+	void msgtqStatus(const TQString &status);
 
 private:
 	TQListViewItem *findItem(Game *game);
diff --git a/atlantik/client/selectserver_widget.cpp b/atlantik/client/selectserver_widget.cpp
index 97a594c4..2404ebd1 100644
--- a/atlantik/client/selectserver_widget.cpp
+++ b/atlantik/client/selectserver_widget.cpp
@@ -28,7 +28,7 @@
 
 #include "selectserver_widget.moc"
 
-SelectServer::SelectServer(bool useMonopigatorOnStart, bool hideDevelopmentServers, TQWidget *parent, const char *name) : TQWidget(parent, name)
+SelectServer::SelectServer(bool useMonopigatorOnStart, bool hideDevelopmentServers, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
 {
 	m_hideDevelopmentServers = hideDevelopmentServers;
 
@@ -42,12 +42,12 @@ SelectServer::SelectServer(bool useMonopigatorOnStart, bool hideDevelopmentServe
 	TQLabel *hostLabel = new TQLabel(i18n("Hostname:"), customGroup);
 
 	m_hostEdit = new KLineEdit(customGroup);
-	m_hostEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum));
+	m_hostEdit->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum));
 
 	TQLabel *portLabel = new TQLabel(i18n("Port:"), customGroup);
 
 	m_portEdit = new KLineEdit(TQString::number(1234), customGroup);
-	m_portEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum));
+	m_portEdit->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum));
 
 	KPushButton *connectButton = new KPushButton( KGuiItem(i18n("Connect"), "network"), customGroup);
 	connect(connectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(customConnect()));
@@ -113,7 +113,7 @@ void SelectServer::setHideDevelopmentServers(bool hideDevelopmentServers)
 void SelectServer::initMonopigator()
 {
 	// Hardcoded, but there aren't any other Monopigator root servers at the moment
-	emit msgStatus(i18n("Retrieving server list..."));
+	emit msgtqStatus(i18n("Retrieving server list..."));
 
 	m_refreshButton->setGuiItem(KGuiItem(i18n("Reload Server List"), "reload"));
 	m_monopigator->loadData(KURL( "http://monopd-gator.kde.org/"));
@@ -135,13 +135,13 @@ void SelectServer::slotMonopigatorAdd(TQString ip, TQString host, TQString port,
 
 void SelectServer::monopigatorFinished()
 {
-	emit msgStatus(i18n("Retrieved server list."));
+	emit msgtqStatus(i18n("Retrieved server list."));
 	m_refreshButton->setEnabled(true);
 }
 
 void SelectServer::monopigatorTimeout()
 {
-	emit msgStatus(i18n("Error while retrieving the server list."));
+	emit msgtqStatus(i18n("Error while retrieving the server list."));
 	m_refreshButton->setEnabled(true);
 }
 
diff --git a/atlantik/client/selectserver_widget.h b/atlantik/client/selectserver_widget.h
index 471bc8d2..7e4ba45d 100644
--- a/atlantik/client/selectserver_widget.h
+++ b/atlantik/client/selectserver_widget.h
@@ -29,12 +29,13 @@
 
 class KExtendedSocket;
 
-class SelectServer : public QWidget
+class SelectServer : public TQWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-	SelectServer(bool useMonopigatorOnStart, bool hideDevelopmentServers, TQWidget *parent, const char *name=0);
+	SelectServer(bool useMonopigatorOnStart, bool hideDevelopmentServers, TQWidget *tqparent, const char *name=0);
 	virtual ~SelectServer();
 
 	void initPage();
@@ -56,7 +57,7 @@ private slots:
 
 signals:
 	void serverConnect(const TQString host, int port);
-	void msgStatus(const TQString &message);
+	void msgtqStatus(const TQString &message);
 	void showDevelopmentServers(bool show);
 
 private:
diff --git a/atlantik/kio_atlantik/kio_atlantik.cpp b/atlantik/kio_atlantik/kio_atlantik.cpp
index de74a1e0..fcf425e1 100644
--- a/atlantik/kio_atlantik/kio_atlantik.cpp
+++ b/atlantik/kio_atlantik/kio_atlantik.cpp
@@ -55,7 +55,7 @@ void AtlantikProtocol::get( const KURL& url )
 #endif
 	TQString port = TQString::number( url.port() ? url.port() : 1234 );
 	int game = url.queryItem("game").toInt();
-	TQString gameString = game ? TQString::number( game ) : TQString::null;
+	TQString gameString = game ? TQString::number( game ) : TQString();
 
 	if (!host.isNull() && !port.isNull())
 	{
diff --git a/atlantik/libatlantic/atlantic_core.cpp b/atlantik/libatlantic/atlantic_core.cpp
index 9139e6ed..c73b6e0f 100644
--- a/atlantik/libatlantic/atlantic_core.cpp
+++ b/atlantik/libatlantic/atlantic_core.cpp
@@ -26,7 +26,7 @@
 #include "player.h"
 #include "trade.h"
 
-AtlanticCore::AtlanticCore(TQObject *parent, const char *name) : TQObject(parent, name)
+AtlanticCore::AtlanticCore(TQObject *tqparent, const char *name) : TQObject(tqparent, name)
 {
 	m_playerSelf = 0;
 }
diff --git a/atlantik/libatlantic/atlantic_core.h b/atlantik/libatlantic/atlantic_core.h
index 197fca91..2ea9f25c 100644
--- a/atlantik/libatlantic/atlantic_core.h
+++ b/atlantik/libatlantic/atlantic_core.h
@@ -30,12 +30,13 @@ class Game;
 class Trade;
 class Auction;
 
-class LIBATLANTIC_EXPORT AtlanticCore : public QObject
+class LIBATLANTIC_EXPORT AtlanticCore : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-	AtlanticCore(TQObject *parent, const char *name);
+	AtlanticCore(TQObject *tqparent, const char *name);
 
 	void reset(bool deletePermanents = false);
 
@@ -50,7 +51,7 @@ public:
 	void removePlayer(Player *player);
 
 	TQPtrList<Game> games();
-	Game *newGame(int gameId, const TQString &type = TQString::null);
+	Game *newGame(int gameId, const TQString &type = TQString());
 	Game *findGame(const TQString &type); // finds game types
 	Game *findGame(int gameId); // finds actual games
 	Game *gameSelf();
diff --git a/atlantik/libatlantic/auction.cpp b/atlantik/libatlantic/auction.cpp
index 2e09a685..ebc6c40e 100644
--- a/atlantik/libatlantic/auction.cpp
+++ b/atlantik/libatlantic/auction.cpp
@@ -32,7 +32,7 @@ Auction::~Auction()
 	emit completed();
 }
 
-void Auction::setStatus(int status)
+void Auction::settqStatus(int status)
 {
 	if (m_status != status)
 	{
diff --git a/atlantik/libatlantic/auction.h b/atlantik/libatlantic/auction.h
index 80633bc8..c482416e 100644
--- a/atlantik/libatlantic/auction.h
+++ b/atlantik/libatlantic/auction.h
@@ -24,9 +24,10 @@
 class Player;
 class Estate;
 
-class LIBATLANTIC_EXPORT Auction : public QObject
+class LIBATLANTIC_EXPORT Auction : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	Auction(int auctionId, Estate *estate);
@@ -35,7 +36,7 @@ public:
 	int auctionId() { return m_auctionId; }
 	Estate *estate() { return m_estate; }
 
-	void setStatus(int status);
+	void settqStatus(int status);
 	int status() { return m_status; }
 
 	void newBid(Player *player, int bid);
diff --git a/atlantik/libatlantic/configoption.h b/atlantik/libatlantic/configoption.h
index 823938c8..b988e22f 100644
--- a/atlantik/libatlantic/configoption.h
+++ b/atlantik/libatlantic/configoption.h
@@ -22,9 +22,10 @@
 
 #include "libatlantic_export.h"
 
-class LIBATLANTIC_EXPORT ConfigOption : public QObject
+class LIBATLANTIC_EXPORT ConfigOption : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	ConfigOption(int configId);
diff --git a/atlantik/libatlantic/estate.cpp b/atlantik/libatlantic/estate.cpp
index c9b40e73..ec86c6ff 100644
--- a/atlantik/libatlantic/estate.cpp
+++ b/atlantik/libatlantic/estate.cpp
@@ -23,7 +23,7 @@
 Estate::Estate(int estateId) : TQObject()
 {
 	m_id = estateId;
-	m_name = TQString::null;
+	m_name = TQString();
 	m_owner = 0;
 	m_houses = 0;
 	m_price = 0;
diff --git a/atlantik/libatlantic/estate.h b/atlantik/libatlantic/estate.h
index cbbd51e1..dc92fd5f 100644
--- a/atlantik/libatlantic/estate.h
+++ b/atlantik/libatlantic/estate.h
@@ -25,9 +25,10 @@
 class EstateGroup;
 class Player;
 
-class LIBATLANTIC_EXPORT Estate : public QObject
+class LIBATLANTIC_EXPORT Estate : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	Estate(int estateId);
diff --git a/atlantik/libatlantic/estategroup.h b/atlantik/libatlantic/estategroup.h
index 9e0399bc..48c81a8b 100644
--- a/atlantik/libatlantic/estategroup.h
+++ b/atlantik/libatlantic/estategroup.h
@@ -21,9 +21,10 @@
 
 #include "libatlantic_export.h"
 
-class LIBATLANTIC_EXPORT EstateGroup : public QObject
+class LIBATLANTIC_EXPORT EstateGroup : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	EstateGroup(const int id);
diff --git a/atlantik/libatlantic/game.cpp b/atlantik/libatlantic/game.cpp
index 308a827d..8a310e16 100644
--- a/atlantik/libatlantic/game.cpp
+++ b/atlantik/libatlantic/game.cpp
@@ -21,8 +21,8 @@
 Game::Game(int gameId) : TQObject()
 {
 	m_id = gameId;
-	m_description = TQString::null;
-	m_type = TQString::null;
+	m_description = TQString();
+	m_type = TQString();
 	m_players = 0;
 	m_master = 0;
 
diff --git a/atlantik/libatlantic/game.h b/atlantik/libatlantic/game.h
index c2e8138f..34a40b73 100644
--- a/atlantik/libatlantic/game.h
+++ b/atlantik/libatlantic/game.h
@@ -25,9 +25,10 @@ class TQString;
 
 class Player;
 
-class LIBATLANTIC_EXPORT Game : public QObject
+class LIBATLANTIC_EXPORT Game : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	Game(int gameId);
diff --git a/atlantik/libatlantic/player.h b/atlantik/libatlantic/player.h
index f36b1e8a..98f67f89 100644
--- a/atlantik/libatlantic/player.h
+++ b/atlantik/libatlantic/player.h
@@ -25,9 +25,10 @@
 class Estate;
 class Game;
 
-class LIBATLANTIC_EXPORT Player : public QObject
+class LIBATLANTIC_EXPORT Player : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	Player(int playerId);
diff --git a/atlantik/libatlantic/trade.cpp b/atlantik/libatlantic/trade.cpp
index 7bd638c9..7bd3aee1 100644
--- a/atlantik/libatlantic/trade.cpp
+++ b/atlantik/libatlantic/trade.cpp
@@ -196,5 +196,5 @@ void TradeMoney::setMoney(unsigned int money)
 
 TQString TradeMoney::text() const
 {
-	return TQString("$%1").arg(m_money);
+	return TQString("$%1").tqarg(m_money);
 }
diff --git a/atlantik/libatlantic/trade.h b/atlantik/libatlantic/trade.h
index 0d168f0a..5ee399d1 100644
--- a/atlantik/libatlantic/trade.h
+++ b/atlantik/libatlantic/trade.h
@@ -28,9 +28,10 @@ class Player;
 class Trade;
 class Estate;
 
-class LIBATLANTIC_EXPORT TradeItem : public QObject
+class LIBATLANTIC_EXPORT TradeItem : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	TradeItem(Trade *trade, Player *from, Player *to);
@@ -60,6 +61,7 @@ private:
 class LIBATLANTIC_EXPORT TradeEstate : public TradeItem
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	TradeEstate(Estate *estate, Trade *trade, Player *to);
@@ -79,6 +81,7 @@ private:
 class LIBATLANTIC_EXPORT TradeMoney : public TradeItem
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	TradeMoney(unsigned int money, Trade *trade, Player *from, Player *to);
@@ -96,9 +99,10 @@ private:
 };
 
 
-class LIBATLANTIC_EXPORT Trade : public QObject
+class LIBATLANTIC_EXPORT Trade : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	Trade(int tradeId);
diff --git a/atlantik/libatlantikclient/atlantik_network.cpp b/atlantik/libatlantikclient/atlantik_network.cpp
index 51347f84..7b980ef8 100644
--- a/atlantik/libatlantikclient/atlantik_network.cpp
+++ b/atlantik/libatlantikclient/atlantik_network.cpp
@@ -95,37 +95,37 @@ void AtlantikNetwork::endTurn()
 void AtlantikNetwork::setName(TQString name)
 {
 	// Almost deprecated, will be replaced by libmonopdprotocol
-	writeData(TQString(".n%1").arg(name));
+	writeData(TQString(".n%1").tqarg(name));
 }
 
 void AtlantikNetwork::tokenConfirmation(Estate *estate)
 {
-	writeData(TQString(".t%1").arg(estate ? estate->id() : -1));
+	writeData(TQString(".t%1").tqarg(estate ? estate->id() : -1));
 }
 
 void AtlantikNetwork::estateToggleMortgage(Estate *estate)
 {
-	writeData(TQString(".em%1").arg(estate ? estate->id() : -1));
+	writeData(TQString(".em%1").tqarg(estate ? estate->id() : -1));
 }
 
 void AtlantikNetwork::estateHouseBuy(Estate *estate)
 {
-	writeData(TQString(".hb%1").arg(estate ? estate->id() : -1));
+	writeData(TQString(".hb%1").tqarg(estate ? estate->id() : -1));
 }
 
 void AtlantikNetwork::estateHouseSell(Estate *estate)
 {
-	writeData(TQString(".hs%1").arg(estate ? estate->id() : -1));
+	writeData(TQString(".hs%1").tqarg(estate ? estate->id() : -1));
 }
 
 void AtlantikNetwork::newGame(const TQString &gameType)
 {
-	writeData(TQString(".gn%1").arg(gameType));
+	writeData(TQString(".gn%1").tqarg(gameType));
 }
 
 void AtlantikNetwork::joinGame(int gameId)
 {
-	writeData(TQString(".gj%1").arg(gameId));
+	writeData(TQString(".gj%1").tqarg(gameId));
 }
 
 void AtlantikNetwork::cmdChat(TQString msg)
@@ -135,42 +135,42 @@ void AtlantikNetwork::cmdChat(TQString msg)
 
 void AtlantikNetwork::newTrade(Player *player)
 {
-	writeData(TQString(".Tn%1").arg(player ? player->id() : -1));
+	writeData(TQString(".Tn%1").tqarg(player ? player->id() : -1));
 }
 
 void AtlantikNetwork::kickPlayer(Player *player)
 {
-	writeData(TQString(".gk%1").arg(player ? player->id() : -1));
+	writeData(TQString(".gk%1").tqarg(player ? player->id() : -1));
 }
 
 void AtlantikNetwork::tradeUpdateEstate(Trade *trade, Estate *estate, Player *player)
 {
-	writeData(TQString(".Te%1:%2:%3").arg(trade ? trade->tradeId() : -1).arg(estate ? estate->id() : -1).arg(player ? player->id() : -1));
+	writeData(TQString(".Te%1:%2:%3").tqarg(trade ? trade->tradeId() : -1).tqarg(estate ? estate->id() : -1).tqarg(player ? player->id() : -1));
 }
 
 void AtlantikNetwork::tradeUpdateMoney(Trade *trade, unsigned int money, Player *pFrom, Player *pTo)
 {
-	writeData(TQString(".Tm%1:%2:%3:%4").arg(trade ? trade->tradeId() : -1).arg(pFrom ? pFrom->id() : -1).arg(pTo ? pTo->id() : -1).arg(money));
+	writeData(TQString(".Tm%1:%2:%3:%4").tqarg(trade ? trade->tradeId() : -1).tqarg(pFrom ? pFrom->id() : -1).tqarg(pTo ? pTo->id() : -1).tqarg(money));
 }
 
 void AtlantikNetwork::tradeReject(Trade *trade)
 {
-	writeData(TQString(".Tr%1").arg(trade ? trade->tradeId() : -1));
+	writeData(TQString(".Tr%1").tqarg(trade ? trade->tradeId() : -1));
 }
 
 void AtlantikNetwork::tradeAccept(Trade *trade)
 {
-	writeData(TQString(".Ta%1:%2").arg(trade ? trade->tradeId() : -1).arg(trade ? trade->revision() : -1));
+	writeData(TQString(".Ta%1:%2").tqarg(trade ? trade->tradeId() : -1).tqarg(trade ? trade->revision() : -1));
 }
 
 void AtlantikNetwork::auctionBid(Auction *auction, int amount)
 {
-	writeData(TQString(".ab%1:%2").arg(auction ? auction->auctionId() : -1).arg(amount));
+	writeData(TQString(".ab%1:%2").tqarg(auction ? auction->auctionId() : -1).tqarg(amount));
 }
 
 void AtlantikNetwork::setImage(const TQString &name)
 {
-	writeData(TQString(".pi%1").arg(name));
+	writeData(TQString(".pi%1").tqarg(name));
 }
 
 void AtlantikNetwork::jailPay()
@@ -190,7 +190,7 @@ void AtlantikNetwork::jailCard()
 
 void AtlantikNetwork::changeOption(int configId, const TQString &value)
 {
-	writeData( TQString(".gc%1:%2").arg(configId).arg(value) );
+	writeData( TQString(".gc%1:%2").tqarg(configId).tqarg(value) );
 }
 
 void AtlantikNetwork::writeData(TQString msg)
@@ -607,7 +607,7 @@ void AtlantikNetwork::processNode(TQDomNode n)
 					Estate *estate = 0;
 					bool b_newEstate = false;
 
-					// FIXME: allow any estateId, GUI should not use it to determin its geometry
+					// FIXME: allow any estateId, GUI should not use it to determin its tqgeometry
 					if (estateId >= 0 && estateId < 100 && !(estate = m_atlanticCore->findEstate(a.value().toInt())))
 					{
 						// Create estate object
@@ -872,7 +872,7 @@ void AtlantikNetwork::processNode(TQDomNode n)
 					if (auction && !a.isNull())
 					{
 						int status = a.value().toInt();
-						auction->setStatus(status);
+						auction->settqStatus(status);
 
 						// TODO: find a good way to visualise "sold!"
 						if (status == 3)
@@ -906,23 +906,23 @@ void AtlantikNetwork::serverConnect(const TQString host, int port)
 {
 	setAddress(host, port);
 	enableRead(true);
-	emit msgStatus(i18n("Connecting to %1:%2...").arg(host).arg(TQString::number(port)), "connect_creating");
+	emit msgtqStatus(i18n("Connecting to %1:%2...").tqarg(host).tqarg(TQString::number(port)), "connect_creating");
 	startAsyncConnect();
 }
 
 void AtlantikNetwork::slotLookupFinished(int count)
 {
-	emit msgStatus(i18n("Server host name lookup finished..."));
+	emit msgtqStatus(i18n("Server host name lookup finished..."));
 }
 
 void AtlantikNetwork::slotConnectionSuccess()
 {
-	emit msgStatus(i18n("Connected to %1:%2.").arg(host()).arg(port()), "connect_established");
+	emit msgtqStatus(i18n("Connected to %1:%2.").tqarg(host()).tqarg(port()), "connect_established");
 }
 
 void AtlantikNetwork::slotConnectionFailed(int error)
 {
-	emit msgStatus(i18n("Connection failed! Error code: %1").arg(error), "connect_no");
+	emit msgtqStatus(i18n("Connection failed! Error code: %1").tqarg(error), "connect_no");
 }
 
 #include "atlantik_network.moc"
diff --git a/atlantik/libatlantikclient/atlantik_network.h b/atlantik/libatlantikclient/atlantik_network.h
index 44099121..3164bf18 100644
--- a/atlantik/libatlantikclient/atlantik_network.h
+++ b/atlantik/libatlantikclient/atlantik_network.h
@@ -35,6 +35,7 @@ class Auction;
 class LIBATLANTIC_EXPORT AtlantikNetwork : public KExtendedSocket
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	AtlantikNetwork(AtlanticCore *atlanticCore);
@@ -101,7 +102,7 @@ signals:
 	void msgInfo(TQString);
 	void msgError(TQString);
 	void msgChat(TQString, TQString);
-	void msgStatus(const TQString &data, const TQString &icon = TQString::null);
+	void msgtqStatus(const TQString &data, const TQString &icon = TQString());
 	void networkEvent(const TQString &data, const TQString &icon);
 
 	void displayDetails(TQString text, bool clearText, bool clearButtons, Estate *estate = 0);
diff --git a/atlantik/libatlantikclient/monopdprotocol.cpp b/atlantik/libatlantikclient/monopdprotocol.cpp
index f024f163..39f8fb81 100644
--- a/atlantik/libatlantikclient/monopdprotocol.cpp
+++ b/atlantik/libatlantikclient/monopdprotocol.cpp
@@ -36,12 +36,12 @@ MonopdProtocol::MonopdProtocol() : TQObject()
 
 void MonopdProtocol::auctionEstate()
 {
-	sendData(TQString::fromLatin1(".ea"));
+	sendData(TQString::tqfromLatin1(".ea"));
 }
 
 void MonopdProtocol::buyEstate()
 {
-	sendData(TQString::fromLatin1(".eb"));
+	sendData(TQString::tqfromLatin1(".eb"));
 }
 
 void MonopdProtocol::confirmTokenLocation(Estate *estate)
@@ -53,12 +53,12 @@ void MonopdProtocol::confirmTokenLocation(Estate *estate)
 
 void MonopdProtocol::endTurn()
 {
-	sendData(TQString::fromLatin1(".E"));
+	sendData(TQString::tqfromLatin1(".E"));
 }
 
 void MonopdProtocol::rollDice()
 {
-	sendData(TQString::fromLatin1(".r"));
+	sendData(TQString::tqfromLatin1(".r"));
 }
 
 void MonopdProtocol::setName(TQString name)
@@ -70,7 +70,7 @@ void MonopdProtocol::setName(TQString name)
 
 void MonopdProtocol::startGame()
 {
-	sendData(TQString::fromLatin1(".gs"));
+	sendData(TQString::tqfromLatin1(".gs"));
 }
 
 void MonopdProtocol::sendData(TQString)
diff --git a/atlantik/libatlantikclient/monopdprotocol.h b/atlantik/libatlantikclient/monopdprotocol.h
index b2162715..f5569d43 100644
--- a/atlantik/libatlantikclient/monopdprotocol.h
+++ b/atlantik/libatlantikclient/monopdprotocol.h
@@ -35,9 +35,10 @@ class Auction;
 
 class Estate;
 
-class MonopdProtocol : public QObject
+class MonopdProtocol : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	MonopdProtocol();
diff --git a/atlantik/libatlantikui/auction_widget.cpp b/atlantik/libatlantikui/auction_widget.cpp
index 219c8b2b..2bb582fe 100644
--- a/atlantik/libatlantikui/auction_widget.cpp
+++ b/atlantik/libatlantikui/auction_widget.cpp
@@ -33,7 +33,7 @@
 
 #include "auction_widget.moc"
 
-AuctionWidget::AuctionWidget(AtlanticCore *atlanticCore, Auction *auction, TQWidget *parent, const char *name) : TQWidget(parent, name)
+AuctionWidget::AuctionWidget(AtlanticCore *atlanticCore, Auction *auction, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
 {
 	m_atlanticCore = atlanticCore;
 
@@ -47,7 +47,7 @@ AuctionWidget::AuctionWidget(AtlanticCore *atlanticCore, Auction *auction, TQWid
 
 	// Player list
 	Estate *estate = auction->estate();
-	m_playerGroupBox = new TQVGroupBox(estate ? i18n("Auction: %1").arg(estate->name()) : i18n("Auction"), this, "groupBox");
+	m_playerGroupBox = new TQVGroupBox(estate ? i18n("Auction: %1").tqarg(estate->name()) : i18n("Auction"), this, "groupBox");
 	m_mainLayout->addWidget(m_playerGroupBox);
 
 	m_playerList = new KListView(m_playerGroupBox);
@@ -80,7 +80,7 @@ AuctionWidget::AuctionWidget(AtlanticCore *atlanticCore, Auction *auction, TQWid
 	KPushButton *bidButton = new KPushButton(i18n("Make Bid"), bidBox, "bidButton");
 	connect(bidButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBidButtonClicked()));
 
-	// Status label
+	// tqStatus label
 	m_statusLabel = new TQLabel(this, "statusLabel");
 	m_mainLayout->addWidget(m_statusLabel);
 }
@@ -103,7 +103,7 @@ void AuctionWidget::auctionChanged()
 		break;
 
 	default:
-		status = TQString::null;
+		status = TQString();
 	}
 	m_statusLabel->setText(status);
 }
diff --git a/atlantik/libatlantikui/auction_widget.h b/atlantik/libatlantikui/auction_widget.h
index 92e20c5c..5a21c95b 100644
--- a/atlantik/libatlantikui/auction_widget.h
+++ b/atlantik/libatlantikui/auction_widget.h
@@ -33,12 +33,13 @@ class AtlanticCore;
 class Player;
 class Auction;
 
-class AuctionWidget : public QWidget
+class AuctionWidget : public TQWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-	AuctionWidget(AtlanticCore *atlanticCore, Auction *auction, TQWidget *parent, const char *name=0);
+	AuctionWidget(AtlanticCore *atlanticCore, Auction *auction, TQWidget *tqparent, const char *name=0);
 
 private slots:
 	void auctionChanged();
diff --git a/atlantik/libatlantikui/board.cpp b/atlantik/libatlantikui/board.cpp
index 1b9ae0b5..6b48b40d 100644
--- a/atlantik/libatlantikui/board.cpp
+++ b/atlantik/libatlantikui/board.cpp
@@ -35,7 +35,7 @@
 #include "board.h"
 #include "board.moc"
 
-AtlantikBoard::AtlantikBoard(AtlanticCore *atlanticCore, int maxEstates, DisplayMode mode, TQWidget *parent, const char *name) : TQWidget(parent, name)
+AtlantikBoard::AtlantikBoard(AtlanticCore *atlanticCore, int maxEstates, DisplayMode mode, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
 {
 	m_atlanticCore = atlanticCore;
 	m_maxEstates = maxEstates;
@@ -351,13 +351,13 @@ TQPoint AtlantikBoard::calculateTokenDestination(Token *token, Estate *eDest)
 		int x = 0, y = 0;
 		if (token->player()->inJail())
 		{
-			x = evDest->geometry().right() - token->width() - 2;
-			y = evDest->geometry().top();
+			x = evDest->tqgeometry().right() - token->width() - 2;
+			y = evDest->tqgeometry().top();
 		}
 		else
 		{
-			x = evDest->geometry().center().x() - (token->width()/2);
-			y = evDest->geometry().center().y() - (token->height()/2);
+			x = evDest->tqgeometry().center().x() - (token->width()/2);
+			y = evDest->tqgeometry().center().y() - (token->height()/2);
 
 /*
 			// Re-center because of EstateView headers
@@ -394,8 +394,8 @@ void AtlantikBoard::slotMoveToken()
 	}
 
 	// Where are we?
-	int xCurrent = m_movingToken->geometry().x();
-	int yCurrent = m_movingToken->geometry().y();
+	int xCurrent = m_movingToken->tqgeometry().x();
+	int yCurrent = m_movingToken->tqgeometry().y();
 
 	// Where do we want to go today?
 	Estate *eDest = m_atlanticCore->estateAfter(m_movingToken->location());
@@ -560,7 +560,7 @@ void AtlantikBoard::prependEstateDetails(Estate *estate)
 
 	if (m_displayQueue.getFirst() == m_lastServerDisplay)
 	{
-		eDetails = new EstateDetails(estate, TQString::null, this);
+		eDetails = new EstateDetails(estate, TQString(), this);
 		m_displayQueue.prepend(eDetails);
 
 		connect(eDetails, TQT_SIGNAL(buttonCommand(TQString)), this, TQT_SIGNAL(buttonCommand(TQString)));
@@ -572,7 +572,7 @@ void AtlantikBoard::prependEstateDetails(Estate *estate)
 		if (eDetails)
 		{
 			eDetails->setEstate(estate);
-			eDetails->setText( TQString::null );
+			eDetails->setText( TQString() );
 			// eDetails->clearButtons();
 		}
 		else
diff --git a/atlantik/libatlantikui/board.h b/atlantik/libatlantikui/board.h
index 11194336..6240568d 100644
--- a/atlantik/libatlantikui/board.h
+++ b/atlantik/libatlantikui/board.h
@@ -32,14 +32,15 @@ class Token;
 
 class EstateView;
 
-class LIBATLANTIKUI_EXPORT AtlantikBoard : public QWidget
+class LIBATLANTIKUI_EXPORT AtlantikBoard : public TQWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
 	enum DisplayMode { Play, Edit };
 
-	AtlantikBoard(AtlanticCore *atlanticCore, int maxEstates, DisplayMode mode, TQWidget *parent, const char *name=0);
+	AtlantikBoard(AtlanticCore *atlanticCore, int maxEstates, DisplayMode mode, TQWidget *tqparent, const char *name=0);
 	~AtlantikBoard();
 	void reset();
 
diff --git a/atlantik/libatlantikui/estatedetails.cpp b/atlantik/libatlantikui/estatedetails.cpp
index 3a71f25a..d2690a91 100644
--- a/atlantik/libatlantikui/estatedetails.cpp
+++ b/atlantik/libatlantikui/estatedetails.cpp
@@ -39,7 +39,7 @@
 #include "estatedetails.h"
 #include "kwrappedlistviewitem.h"
 
-EstateDetails::EstateDetails(Estate *estate, TQString text, TQWidget *parent, const char *name) : TQWidget(parent, name)
+EstateDetails::EstateDetails(Estate *estate, TQString text, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
 {
 	m_pixmap = 0;
 	m_quartzBlocks = 0;
@@ -114,11 +114,11 @@ void EstateDetails::paintEvent(TQPaintEvent *)
 		TQColor greenHouse(0, 255, 0);
 		TQColor redHotel(255, 51, 51);
 		TQPainter painter;
-		painter.begin(m_pixmap, this);
+		painter.tqbegin(TQT_TQPAINTDEVICE(m_pixmap), this);
 
-		painter.setPen(Qt::black);
+		painter.setPen(TQt::black);
 
-		painter.setBrush(m_estate ? m_estate->bgColor() : Qt::white);
+		painter.setBrush(m_estate ? m_estate->bgColor() : TQt::white);
 		painter.drawRect(rect());
 
 /*
@@ -136,7 +136,7 @@ void EstateDetails::paintEvent(TQPaintEvent *)
 			quartzBuffer->resize(25, (height()/4)-2);
 
 			TQPainter quartzPainter;
-			quartzPainter.begin(quartzBuffer, this);
+			quartzPainter.tqbegin(TQT_TQPAINTDEVICE(quartzBuffer), this);
 
 			painter.setBrush(titleColor);
 			painter.drawRect(0, 0, width(), titleHeight);
@@ -173,15 +173,15 @@ void EstateDetails::paintEvent(TQPaintEvent *)
 			// TODO: steal blur code from kicker/taskbar/taskcontainer.cpp
 
 			// Estate name
-			painter.setPen(Qt::white);
+			painter.setPen(TQt::white);
 			int fontSize = KGlobalSettings::generalFont().pointSize();
 			if (fontSize == -1)
 				fontSize = KGlobalSettings::generalFont().pixelSize();
 
 			painter.setFont(TQFont(KGlobalSettings::generalFont().family(), fontSize * 2, TQFont::Bold));
-			painter.drawText(KDialog::marginHint(), KDialog::marginHint(), width()-KDialog::marginHint(), titleHeight, Qt::AlignJustify, m_estate->name());
+			painter.drawText(KDialog::marginHint(), KDialog::marginHint(), width()-KDialog::marginHint(), titleHeight, TQt::AlignJustify, m_estate->name());
 
-			painter.setPen(Qt::black);
+			painter.setPen(TQt::black);
 
 			int xText = 0;
 
@@ -190,7 +190,7 @@ void EstateDetails::paintEvent(TQPaintEvent *)
 			{
 				xText = titleHeight - fontSize - KDialog::marginHint();
 				painter.setFont(TQFont(KGlobalSettings::generalFont().family(), fontSize, TQFont::Bold));
-				painter.drawText(5, xText, width()-10, titleHeight, Qt::AlignRight, m_estate->estateGroup()->name().upper());
+				painter.drawText(5, xText, width()-10, titleHeight, TQt::AlignRight, m_estate->estateGroup()->name().upper());
 			}
 
 			xText = titleHeight + fontSize + 5;
@@ -217,22 +217,22 @@ void EstateDetails::addDetails()
 		// Price
 		if (m_estate->price())
 		{
-			infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Price: %1").arg(m_estate->price()));
+			infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Price: %1").tqarg(m_estate->price()));
 			infoText->setPixmap(0, TQPixmap(SmallIcon("info")));
 		}
 
 		// Owner, houses, isMortgaged
 		if (m_estate && m_estate->canBeOwned())
 		{
-			infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Owner: %1").arg(m_estate->owner() ? m_estate->owner()->name() : i18n("unowned")));
+			infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Owner: %1").tqarg(m_estate->owner() ? m_estate->owner()->name() : i18n("unowned")));
 			infoText->setPixmap(0, TQPixmap(SmallIcon("info")));
 
 			if (m_estate->isOwned())
 			{
-				infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Houses: %1").arg(m_estate->houses()));
+				infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Houses: %1").tqarg(m_estate->houses()));
 				infoText->setPixmap(0, TQPixmap(SmallIcon("info")));
 
-				infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Mortgaged: %1").arg(m_estate->isMortgaged() ? i18n("Yes") : i18n("No")));
+				infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Mortgaged: %1").tqarg(m_estate->isMortgaged() ? i18n("Yes") : i18n("No")));
 				infoText->setPixmap(0, TQPixmap(SmallIcon("info")));
 			}
 		}
@@ -250,7 +250,7 @@ void EstateDetails::addButton(TQString command, TQString caption, bool enabled)
 	{
 		TQColor bgColor, fgColor;
 		bgColor = m_estate->bgColor().light(110);
-		fgColor = ( bgColor.red() + bgColor.green() + bgColor.blue() < 255 ) ? Qt::white : Qt::black;
+		fgColor = ( bgColor.red() + bgColor.green() + bgColor.blue() < 255 ) ? TQt::white : TQt::black;
 
 		button->setPaletteForegroundColor( fgColor );
 		button->setPaletteBackgroundColor( bgColor );
@@ -298,7 +298,7 @@ void EstateDetails::appendText(TQString text)
 
 	KWrappedListViewItem *infoText = new KWrappedListViewItem(m_infoListView, m_infoListView->lastItem(), text);
 
-	if ( text.find( TQRegExp("rolls") ) != -1 )
+	if ( text.tqfind( TQRegExp("rolls") ) != -1 )
 		infoText->setPixmap(0, TQPixmap(SmallIcon("roll")));
 	else
 		infoText->setPixmap(0, TQPixmap(SmallIcon("atlantik")));
@@ -321,7 +321,7 @@ void EstateDetails::clearButtons()
 
 void EstateDetails::buttonPressed()
 {
-	emit buttonCommand(TQString(m_buttonCommandMap[(TQObject *)TQObject::sender()]));
+	emit buttonCommand(TQString(m_buttonCommandMap[(TQObject *)TQT_BASE_OBJECT_NAME::sender()]));
 }
 
 #include "estatedetails.moc"
diff --git a/atlantik/libatlantikui/estatedetails.h b/atlantik/libatlantikui/estatedetails.h
index 6659055a..315bfa5f 100644
--- a/atlantik/libatlantikui/estatedetails.h
+++ b/atlantik/libatlantikui/estatedetails.h
@@ -32,12 +32,13 @@ class KPushButton;
 class Player;
 class Estate;
 
-class EstateDetails : public QWidget
+class EstateDetails : public TQWidget
 {
-Q_OBJECT
+  Q_OBJECT
+  TQ_OBJECT
 
 public:
-	EstateDetails(Estate *estate, TQString text, TQWidget *parent, const char *name = 0);
+	EstateDetails(Estate *estate, TQString text, TQWidget *tqparent, const char *name = 0);
 	~EstateDetails();
 	Estate *estate() { return m_estate; }
 
diff --git a/atlantik/libatlantikui/estateview.cpp b/atlantik/libatlantikui/estateview.cpp
index 4755ccd3..19eec4d5 100644
--- a/atlantik/libatlantikui/estateview.cpp
+++ b/atlantik/libatlantikui/estateview.cpp
@@ -36,7 +36,7 @@
 #include "estateview.moc"
 #include "config.h"
 
-EstateView::EstateView(Estate *estate, EstateOrientation orientation, const TQString &_icon, bool indicateUnowned, bool highliteUnowned, bool darkenMortgaged, bool quartzEffects, TQWidget *parent, const char *name) : TQWidget(parent, name, WResizeNoErase)
+EstateView::EstateView(Estate *estate, EstateOrientation orientation, const TQString &_icon, bool indicateUnowned, bool highliteUnowned, bool darkenMortgaged, bool quartzEffects, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name, WResizeNoErase)
 {
 	m_estate = estate;
 	m_orientation = orientation;
@@ -72,20 +72,20 @@ void EstateView::updateToolTip()
 		TQString toolTip = m_estate->name();
 		if ( m_estate->isOwned() )
 		{
-			toolTip.append( "\n" + i18n("Owner: %1").arg( m_estate->owner()->name() ) );
+			toolTip.append( "\n" + i18n("Owner: %1").tqarg( m_estate->owner()->name() ) );
 			if ( m_estate->isMortgaged() )
-				toolTip.append( "\n" + i18n("Unmortgage Price: %1").arg( m_estate->unmortgagePrice() ) );
+				toolTip.append( "\n" + i18n("Unmortgage Price: %1").tqarg( m_estate->unmortgagePrice() ) );
 		     	else
-		     		toolTip.append( "\n" + i18n("Mortgage Value: %1").arg( m_estate->mortgagePrice() ) );	
+		     		toolTip.append( "\n" + i18n("Mortgage Value: %1").tqarg( m_estate->mortgagePrice() ) );	
 			if ( m_estate->canSellHouses() )
-				toolTip.append( "\n" + i18n("House Value: %1").arg( m_estate->houseSellPrice() ) );
+				toolTip.append( "\n" + i18n("House Value: %1").tqarg( m_estate->houseSellPrice() ) );
 			if ( m_estate->canBuyHouses() )
-				toolTip.append( "\n" + i18n("House Price: %1").arg( m_estate->housePrice() ) );
+				toolTip.append( "\n" + i18n("House Price: %1").tqarg( m_estate->housePrice() ) );
 		}
 		else if ( m_estate->canBeOwned() )
-			toolTip.append( "\n" + i18n("Price: %1").arg( m_estate->price() ) );
+			toolTip.append( "\n" + i18n("Price: %1").tqarg( m_estate->price() ) );
 		else if ( m_estate->money() )
-			toolTip.append( "\n" + i18n("Money: %1").arg( m_estate->money() ) );
+			toolTip.append( "\n" + i18n("Money: %1").tqarg( m_estate->money() ) );
 
 		TQToolTip::add( this, toolTip );
 	}
@@ -255,9 +255,9 @@ void EstateView::paintEvent(TQPaintEvent *)
 		TQColor greenHouse(0, 255, 0);
 		TQColor redHotel(255, 51, 51);
 		TQPainter painter;
-		painter.begin(qpixmap, this);
+		painter.tqbegin(TQT_TQPAINTDEVICE(qpixmap), this);
 
-		painter.setPen(Qt::black);
+		painter.setPen(TQt::black);
 		
 		if (m_darkenMortgaged==true && m_estate->isMortgaged())
 			painter.setBrush(m_estate->bgColor().light(10));
@@ -281,7 +281,7 @@ void EstateView::paintEvent(TQPaintEvent *)
 				quartzBuffer->resize(m_titleWidth-2, 25);
 
 			TQPainter quartzPainter;
-			quartzPainter.begin(quartzBuffer, this);
+			quartzPainter.tqbegin(TQT_TQPAINTDEVICE(quartzBuffer), this);
 
 			painter.setBrush(m_estate->color());
 			switch(m_orientation)
@@ -432,7 +432,7 @@ void EstateView::resizeEvent(TQResizeEvent *)
 
 void EstateView::mousePressEvent(TQMouseEvent *e) 
 {
-	if (e->button()==RightButton && m_estate->isOwned())
+	if (e->button()==Qt::RightButton && m_estate->isOwned())
 	{
 		KPopupMenu *rmbMenu = new KPopupMenu(this);
 		rmbMenu->insertTitle(m_estate->name());
@@ -477,7 +477,7 @@ void EstateView::mousePressEvent(TQMouseEvent *e)
 		{
 			// Request trade
 			if (Player *player = m_estate->owner())
-				rmbMenu->insertItem(i18n("Request Trade with %1").arg(player->name()), 3);
+				rmbMenu->insertItem(i18n("Request Trade with %1").tqarg(player->name()), 3);
 		}
 
 		KPopupMenu *pm = dynamic_cast<KPopupMenu *>(rmbMenu);
@@ -488,7 +488,7 @@ void EstateView::mousePressEvent(TQMouseEvent *e)
 		rmbMenu->exec(g);
 		delete rmbMenu;
 	}
-	else if (e->button()==LeftButton)
+	else if (e->button()==Qt::LeftButton)
 		emit LMBClicked(m_estate);
 }
 
diff --git a/atlantik/libatlantikui/estateview.h b/atlantik/libatlantikui/estateview.h
index 7e1d8cdc..a24d6888 100644
--- a/atlantik/libatlantikui/estateview.h
+++ b/atlantik/libatlantikui/estateview.h
@@ -29,12 +29,13 @@ enum EstateOrientation { North=0, East=1, South=2, West=3 };
 class Player;
 class Estate;
 
-class EstateView : public QWidget
+class EstateView : public TQWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		EstateView(Estate *estate, EstateOrientation orientation, const TQString &, bool indicateUnowned, bool highliteUnowned, bool darkenMortgaged, bool quartzEffects, TQWidget *parent, const char *name = 0);
+		EstateView(Estate *estate, EstateOrientation orientation, const TQString &, bool indicateUnowned, bool highliteUnowned, bool darkenMortgaged, bool quartzEffects, TQWidget *tqparent, const char *name = 0);
 		void setViewProperties(bool indicateUnowned, bool highliteUnowned, bool darkenMortgaged, bool quartzEffects);
 		Estate *estate() { return m_estate; }
 		void updatePE();
diff --git a/atlantik/libatlantikui/kwrappedlistviewitem.cpp b/atlantik/libatlantikui/kwrappedlistviewitem.cpp
index 38c0d636..81f06dd7 100644
--- a/atlantik/libatlantikui/kwrappedlistviewitem.cpp
+++ b/atlantik/libatlantikui/kwrappedlistviewitem.cpp
@@ -31,16 +31,16 @@
 
 #include "kwrappedlistviewitem.h"
 
-KWrappedListViewItem::KWrappedListViewItem( TQListView *parent, TQString text, TQString t2 )
-: TQObject(), KListViewItem( parent )
+KWrappedListViewItem::KWrappedListViewItem( TQListView *tqparent, TQString text, TQString t2 )
+: TQObject(), KListViewItem( tqparent )
 {
-	init( parent, text, t2 );
+	init( tqparent, text, t2 );
 }
 
-KWrappedListViewItem::KWrappedListViewItem( TQListView *parent, TQListViewItem *after, TQString text, TQString t2 )
-: TQObject(), KListViewItem( parent, after )
+KWrappedListViewItem::KWrappedListViewItem( TQListView *tqparent, TQListViewItem *after, TQString text, TQString t2 )
+: TQObject(), KListViewItem( tqparent, after )
 {
-	init( parent, text, t2 );
+	init( tqparent, text, t2 );
 }
 
 void KWrappedListViewItem::setup()
@@ -83,7 +83,7 @@ void KWrappedListViewItem::wrapColumn( int c )
 	KWordWrap *wrap = KWordWrap::formatText( fm, rect, 0, m_origText );
 	setText( c, wrap->wrappedString() );
 
-	int lc = text(c).contains( TQChar( '\n' ) ) + 1;
+	int lc = text(c).tqcontains( TQChar( '\n' ) ) + 1;
 	setHeight( wrap->boundingRect().height() + lc*lv->itemMargin() );
 
 	widthChanged( c );
@@ -91,11 +91,11 @@ void KWrappedListViewItem::wrapColumn( int c )
 	delete wrap;
 }
 
-void KWrappedListViewItem::init( TQListView *parent, TQString text, TQString t2 )
+void KWrappedListViewItem::init( TQListView *tqparent, TQString text, TQString t2 )
 {
 	m_wrapColumn = 0;
 	setMultiLinesEnabled( true );
-	parent->setResizeMode( TQListView::LastColumn );
+	tqparent->setResizeMode( TQListView::LastColumn );
 
 	m_origText = text;
 
@@ -110,7 +110,7 @@ void KWrappedListViewItem::init( TQListView *parent, TQString text, TQString t2
 
 	wrapColumn( m_wrapColumn );
 		
-	connect( parent->header(), TQT_SIGNAL(sizeChange(int, int, int)), this, TQT_SLOT(wrapColumn(int)));
+	connect( tqparent->header(), TQT_SIGNAL(sizeChange(int, int, int)), this, TQT_SLOT(wrapColumn(int)));
 }
 
 #include "kwrappedlistviewitem.moc"
diff --git a/atlantik/libatlantikui/kwrappedlistviewitem.h b/atlantik/libatlantikui/kwrappedlistviewitem.h
index ceda1afe..0107fef3 100644
--- a/atlantik/libatlantikui/kwrappedlistviewitem.h
+++ b/atlantik/libatlantikui/kwrappedlistviewitem.h
@@ -35,10 +35,11 @@ class KWordWrap;
 class KWrappedListViewItem : public TQObject, public KListViewItem
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-	KWrappedListViewItem( TQListView *parent, TQString text, QString=TQString::null );
-	KWrappedListViewItem( TQListView *parent, TQListViewItem *after, TQString text, QString=TQString::null );
+	KWrappedListViewItem( TQListView *tqparent, TQString text, TQString=TQString() );
+	KWrappedListViewItem( TQListView *tqparent, TQListViewItem *after, TQString text, TQString=TQString() );
 	void setup();
 //	int width(const TQFontMetrics& fm, const TQListView* lv, int c) const;
 
@@ -46,7 +47,7 @@ private slots:
 	void wrapColumn( int c );
 
 private:
-	void init( TQListView *parent, TQString text, QString=TQString::null );
+	void init( TQListView *tqparent, TQString text, TQString=TQString() );
 	TQString m_origText;
 	int m_wrapColumn;
 };
diff --git a/atlantik/libatlantikui/portfolioestate.cpp b/atlantik/libatlantikui/portfolioestate.cpp
index 3bfed677..9b55b565 100644
--- a/atlantik/libatlantikui/portfolioestate.cpp
+++ b/atlantik/libatlantikui/portfolioestate.cpp
@@ -21,7 +21,7 @@
 #include "portfolioestate.moc"
 #include "estate.h"
 
-PortfolioEstate::PortfolioEstate(Estate *estate, Player *player, bool alwaysOwned, TQWidget *parent, const char *name) : TQWidget(parent, name)
+PortfolioEstate::PortfolioEstate(Estate *estate, Player *player, bool alwaysOwned, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
 {
 	m_estate = estate;
 	m_player = player;
@@ -55,7 +55,7 @@ TQPixmap PortfolioEstate::drawPixmap(Estate *estate, Player *player, bool always
 		for (int y=5;y<=13;y+=2)
 			painter.drawLine(2, y, 10, y);
 
-		painter.setPen(Qt::white);
+		painter.setPen(TQt::white);
 		painter.drawPoint(8, 5);
 		painter.drawPoint(8, 7);
 		painter.drawPoint(8, 9);
@@ -89,6 +89,6 @@ void PortfolioEstate::paintEvent(TQPaintEvent *)
 
 void PortfolioEstate::mousePressEvent(TQMouseEvent *e) 
 {
-	if (e->button()==LeftButton)
+	if (e->button()==Qt::LeftButton)
 		emit estateClicked(m_estate);
 }
diff --git a/atlantik/libatlantikui/portfolioestate.h b/atlantik/libatlantikui/portfolioestate.h
index fb1dc8d3..93ddde8d 100644
--- a/atlantik/libatlantikui/portfolioestate.h
+++ b/atlantik/libatlantikui/portfolioestate.h
@@ -26,12 +26,13 @@
 class Estate;
 class Player;
   
-class PortfolioEstate : public QWidget
+class PortfolioEstate : public TQWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-	PortfolioEstate(Estate *estate, Player *player, bool alwaysOwned, TQWidget *parent, const char *name = 0);
+	PortfolioEstate(Estate *estate, Player *player, bool alwaysOwned, TQWidget *tqparent, const char *name = 0);
 	Estate *estate() { return m_estate; }
 	static TQPixmap drawPixmap(Estate *estate, Player *player = 0, bool alwaysOwned = true);
 
diff --git a/atlantik/libatlantikui/portfolioview.cpp b/atlantik/libatlantikui/portfolioview.cpp
index 6725cbca..83d2b0d2 100644
--- a/atlantik/libatlantikui/portfolioview.cpp
+++ b/atlantik/libatlantikui/portfolioview.cpp
@@ -40,7 +40,7 @@
 #define PE_MARGINH	2
 #define ICONSIZE	48
 
-PortfolioView::PortfolioView(AtlanticCore *core, Player *player, TQColor activeColor, TQColor inactiveColor, TQWidget *parent, const char *name) : TQWidget(parent, name)
+PortfolioView::PortfolioView(AtlanticCore *core, Player *player, TQColor activeColor, TQColor inactiveColor, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
 {
 	m_atlanticCore = core;
 	m_player = player;
@@ -52,7 +52,7 @@ PortfolioView::PortfolioView(AtlanticCore *core, Player *player, TQColor activeC
 	b_recreate = true;
 
 	m_portfolioEstates.setAutoDelete(true);
-	setBackgroundColor(Qt::white);
+	setBackgroundColor(TQt::white);
 	setMinimumHeight(ICONSIZE);
 
 	// Init icon
@@ -196,26 +196,26 @@ void PortfolioView::paintEvent(TQPaintEvent *)
 		qpixmap = new TQPixmap(width(), height());
 
 		TQPainter painter;
-		painter.begin(qpixmap, this);
+		painter.tqbegin(TQT_TQPAINTDEVICE(qpixmap), this);
 
-		painter.setPen(Qt::white);
-		painter.setBrush(Qt::white);
+		painter.setPen(TQt::white);
+		painter.setBrush(TQt::white);
 		painter.drawRect(rect());
 
-		painter.setPen(m_player->hasTurn() ? m_activeColor : Qt::black);
-		painter.setBrush(m_player->hasTurn() ? m_activeColor : Qt::black);
+		painter.setPen(m_player->hasTurn() ? m_activeColor : TQt::black);
+		painter.setBrush(m_player->hasTurn() ? m_activeColor : TQt::black);
 		painter.drawRect(0, 0, width(), 20);
 
 		if (m_image)
 		{
-			painter.setPen(Qt::black);
-			painter.setBrush(Qt::white);
+			painter.setPen(TQt::black);
+			painter.setBrush(TQt::white);
 			painter.drawRect(0, 0, ICONSIZE, ICONSIZE);
 
 			painter.drawPixmap(0, 0, *m_image);
 		}
 
-		painter.setPen(Qt::white);
+		painter.setPen(TQt::white);
 		painter.setFont(TQFont(KGlobalSettings::generalFont().family(), KGlobalSettings::generalFont().pointSize(), TQFont::Bold));
 		painter.drawText(ICONSIZE + KDialog::marginHint(), 15, m_player->name());
 
@@ -223,8 +223,8 @@ void PortfolioView::paintEvent(TQPaintEvent *)
 			painter.drawText(width() - 50, 15, TQString::number(m_player->money()));
 		else
 		{
-			painter.setPen(Qt::black);
-			painter.setBrush(Qt::white);
+			painter.setPen(TQt::black);
+			painter.setBrush(TQt::white);
 
 			painter.setFont(TQFont(KGlobalSettings::generalFont().family(), KGlobalSettings::generalFont().pointSize(), TQFont::Normal));
 			painter.drawText(ICONSIZE + KDialog::marginHint(), 30, m_player->host());
@@ -252,7 +252,7 @@ void PortfolioView::mousePressEvent(TQMouseEvent *e)
 {
 	Player *playerSelf = m_atlanticCore->playerSelf();
 
-	if ( e->button()==RightButton && (m_player != playerSelf) )
+	if ( e->button()==Qt::RightButton && (m_player != playerSelf) )
 	{
 		KPopupMenu *rmbMenu = new KPopupMenu(this);
 		rmbMenu->insertTitle(m_player->name());
@@ -260,12 +260,12 @@ void PortfolioView::mousePressEvent(TQMouseEvent *e)
 		if ( m_portfolioEstates.count() )
 		{
 			// Start trade
-			rmbMenu->insertItem(i18n("Request Trade with %1").arg(m_player->name()), 0);
+			rmbMenu->insertItem(i18n("Request Trade with %1").tqarg(m_player->name()), 0);
 		}
 		else
 		{
 			// Kick player
-			rmbMenu->insertItem(i18n("Boot Player %1 to Lounge").arg(m_player->name()), 0);
+			rmbMenu->insertItem(i18n("Boot Player %1 to Lounge").tqarg(m_player->name()), 0);
 			rmbMenu->setItemEnabled( 0, m_atlanticCore->selfIsMaster() );
 		}
 
diff --git a/atlantik/libatlantikui/portfolioview.h b/atlantik/libatlantikui/portfolioview.h
index 524f568f..d07aacda 100644
--- a/atlantik/libatlantikui/portfolioview.h
+++ b/atlantik/libatlantikui/portfolioview.h
@@ -30,12 +30,13 @@ class AtlanticCore;
 class Player;
 class Estate;
 
-class LIBATLANTIKUI_EXPORT PortfolioView : public QWidget
+class LIBATLANTIKUI_EXPORT PortfolioView : public TQWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-	PortfolioView(AtlanticCore *core, Player *_player, TQColor activeColor, TQColor inactiveColor, TQWidget *parent, const char *name = 0);
+	PortfolioView(AtlanticCore *core, Player *_player, TQColor activeColor, TQColor inactiveColor, TQWidget *tqparent, const char *name = 0);
 	~PortfolioView();
 
 	void buildPortfolio();
diff --git a/atlantik/libatlantikui/token.cpp b/atlantik/libatlantikui/token.cpp
index c77aeadb..0a4f5193 100644
--- a/atlantik/libatlantikui/token.cpp
+++ b/atlantik/libatlantikui/token.cpp
@@ -33,11 +33,11 @@
 
 #define TOKEN_ICONSIZE	32
 
-Token::Token(Player *player, AtlantikBoard *parent, const char *name) : TQWidget(parent, name)
+Token::Token(Player *player, AtlantikBoard *tqparent, const char *name) : TQWidget(tqparent, name)
 {
 	setBackgroundMode(NoBackground); // avoid flickering
 
-	m_parentBoard = parent;
+	m_parentBoard = tqparent;
 
 	m_player = player;
 	connect(m_player, TQT_SIGNAL(changed(Player *)), this, TQT_SLOT(playerChanged()));
@@ -127,24 +127,24 @@ void Token::paintEvent(TQPaintEvent *)
 		qpixmap = new TQPixmap(width(), height());
 
 		TQPainter painter;
-		painter.begin(qpixmap, this);
+		painter.tqbegin(TQT_TQPAINTDEVICE(qpixmap), this);
 
         if (m_image)
 		{
-			painter.setPen(Qt::black);
-			painter.setBrush(Qt::white);
+			painter.setPen(TQt::black);
+			painter.setBrush(TQt::white);
 			painter.drawRect(0, 0, TOKEN_ICONSIZE, TOKEN_ICONSIZE);
 
 			painter.drawPixmap(0, 0, *m_image);
 		}
 
-		painter.setPen(Qt::black);
-		painter.setBrush(Qt::black);
+		painter.setPen(TQt::black);
+		painter.setBrush(TQt::black);
 		painter.drawRect(0, TOKEN_ICONSIZE, width(), KGlobalSettings::generalFont().pointSize());
 
-		painter.setPen(Qt::white);
+		painter.setPen(TQt::white);
 		painter.setFont(TQFont(KGlobalSettings::generalFont().family(), KGlobalSettings::generalFont().pointSize(), TQFont::DemiBold));
-		painter.drawText(1, height()-1, (m_player ? m_player->name() : TQString::null));
+		painter.drawText(1, height()-1, (m_player ? m_player->name() : TQString()));
 
 		b_recreate = false;
 	}
diff --git a/atlantik/libatlantikui/token.h b/atlantik/libatlantikui/token.h
index 30d43c61..ea45888d 100644
--- a/atlantik/libatlantikui/token.h
+++ b/atlantik/libatlantikui/token.h
@@ -25,12 +25,13 @@ class Player;
 class Estate;
 class AtlantikBoard;
 
-class Token : public QWidget
+class Token : public TQWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 
 	public:
-		Token (Player *player, AtlantikBoard *parent, const char *name = 0);
+		Token (Player *player, AtlantikBoard *tqparent, const char *name = 0);
 		~Token();
 		Player *player();
 		void setLocation(Estate *estate);
diff --git a/atlantik/libatlantikui/trade_widget.cpp b/atlantik/libatlantikui/trade_widget.cpp
index be8b2749..bf4eeac6 100644
--- a/atlantik/libatlantikui/trade_widget.cpp
+++ b/atlantik/libatlantikui/trade_widget.cpp
@@ -44,15 +44,15 @@
 
 #include "trade_widget.moc"
 
-TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *parent, const char *name)
-	: TQWidget(parent, name,
+TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *tqparent, const char *name)
+	: TQWidget(tqparent, name,
 	  WType_Dialog | WStyle_Customize | WStyle_DialogBorder | WStyle_Title |
 	  WStyle_Minimize | WStyle_ContextHelp )
 {
 	m_trade = trade;
 	m_atlanticCore = atlanticCore;
 
-	setCaption(i18n("Trade %1").arg(trade->tradeId()));
+	setCaption(i18n("Trade %1").tqarg(trade->tradeId()));
 
 	TQVBoxLayout *listCompBox = new TQVBoxLayout(this, KDialog::marginHint());
 
@@ -143,7 +143,7 @@ TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *p
 
 	m_status = new TQLabel(this);
 	listCompBox->addWidget(m_status);
-	m_status->setText( i18n( "%1 out of %2 players accept current trade proposal." ).arg( m_trade->count( true ) ).arg( m_trade->count( false ) ) );
+	m_status->setText( i18n( "%1 out of %2 players accept current trade proposal." ).tqarg( m_trade->count( true ) ).tqarg( m_trade->count( false ) ) );
 
 //	mPlayerList->header()->hide();
 //	mPlayerList->setRootIsDecorated(true);
@@ -216,7 +216,7 @@ void TradeDisplay::tradeChanged()
 {
 	// TODO: add notification whether playerSelf has accepted or not and
 	// enable/disable accept button based on that
-	m_status->setText( i18n( "%1 out of %2 players accept current trade proposal." ).arg( m_trade->count( true ) ).arg( m_trade->count( false ) ) );
+	m_status->setText( i18n( "%1 out of %2 players accept current trade proposal." ).tqarg( m_trade->count( true ) ).tqarg( m_trade->count( false ) ) );
 }
 
 void TradeDisplay::playerChanged(Player *player)
@@ -232,7 +232,7 @@ void TradeDisplay::playerChanged(Player *player)
 void TradeDisplay::tradeRejected(Player *player)
 {
 	if (player)
-		m_status->setText(i18n("Trade proposal was rejected by %1.").arg(player->name()));
+		m_status->setText(i18n("Trade proposal was rejected by %1.").tqarg(player->name()));
 	else
 		m_status->setText(i18n("Trade proposal was rejected."));
 
diff --git a/atlantik/libatlantikui/trade_widget.h b/atlantik/libatlantikui/trade_widget.h
index 73842a91..ebaba426 100644
--- a/atlantik/libatlantikui/trade_widget.h
+++ b/atlantik/libatlantikui/trade_widget.h
@@ -36,12 +36,13 @@ class Player;
 class Trade;
 class TradeItem;
 
-class LIBATLANTIKUI_EXPORT TradeDisplay : public QWidget
+class LIBATLANTIKUI_EXPORT TradeDisplay : public TQWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 
 public:
-	TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *parent=0, const char *name = 0);
+	TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *tqparent=0, const char *name = 0);
 
 	Trade *trade() { return mTrade; }
 
@@ -86,7 +87,7 @@ private:
 	Trade *mTrade, *m_trade;
 	TradeItem *m_contextTradeItem;
 
-	// TODO: Wouldn't QPair make more sense here?
+	// TODO: Wouldn't TQPair make more sense here?
 	TQMap<TradeItem *, KListViewItem *> m_componentMap;
 	TQMap<KListViewItem *, TradeItem *> m_componentRevMap;
 	TQMap<int, Estate *> m_estateMap;