13 files changed, 29 insertions, 18 deletions
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);