From 576eb4299a00bc053db35414406f46372a0f70f2 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:42:31 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegames@1157643 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- atlantik/libatlantic/atlantic_core.cpp | 68 +++++++++++++++++----------------- atlantik/libatlantic/atlantic_core.h | 36 +++++++++--------- atlantik/libatlantic/auction.cpp | 2 +- atlantik/libatlantic/auction.h | 2 +- atlantik/libatlantic/configoption.cpp | 14 +++---- atlantik/libatlantic/configoption.h | 18 ++++----- atlantik/libatlantic/estate.cpp | 16 ++++---- atlantik/libatlantic/estate.h | 20 +++++----- atlantik/libatlantic/estategroup.cpp | 4 +- atlantik/libatlantic/estategroup.h | 8 ++-- atlantik/libatlantic/game.cpp | 20 +++++----- atlantik/libatlantic/game.h | 16 ++++---- atlantik/libatlantic/player.cpp | 8 ++-- atlantik/libatlantic/player.h | 18 ++++----- atlantik/libatlantic/trade.cpp | 16 ++++---- atlantik/libatlantic/trade.h | 18 ++++----- 16 files changed, 142 insertions(+), 142 deletions(-) (limited to 'atlantik/libatlantic') diff --git a/atlantik/libatlantic/atlantic_core.cpp b/atlantik/libatlantic/atlantic_core.cpp index 39e1200e..9139e6ed 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(QObject *parent, const char *name) : QObject(parent, name) +AtlanticCore::AtlanticCore(TQObject *parent, const char *name) : TQObject(parent, name) { m_playerSelf = 0; } @@ -47,7 +47,7 @@ void AtlanticCore::reset(bool deletePermanents) m_configOptions.setAutoDelete(false); Trade *trade = 0; - for (QPtrListIterator it(m_trades); (trade = *it) ; ++it) + for (TQPtrListIterator it(m_trades); (trade = *it) ; ++it) { emit removeGUI(trade); trade->deleteLater(); @@ -55,7 +55,7 @@ void AtlanticCore::reset(bool deletePermanents) m_trades.clear(); Player *player = 0; - for (QPtrListIterator it(m_players); (player = *it) ; ++it) + for (TQPtrListIterator it(m_players); (player = *it) ; ++it) { if (deletePermanents) { @@ -74,7 +74,7 @@ void AtlanticCore::reset(bool deletePermanents) m_playerSelf = 0; Game *game = 0; - for (QPtrListIterator it(m_games); (game = *it) ; ++it) + for (TQPtrListIterator it(m_games); (game = *it) ; ++it) { emit removeGUI(game); game->deleteLater(); @@ -98,7 +98,7 @@ Player *AtlanticCore::playerSelf() return m_playerSelf; } -QPtrList AtlanticCore::players() +TQPtrList AtlanticCore::players() { return m_players; } @@ -122,7 +122,7 @@ Player *AtlanticCore::newPlayer(int playerId, const bool &playerSelf) Player *AtlanticCore::findPlayer(int playerId) { Player *player = 0; - for (QPtrListIterator it(m_players); (player = *it) ; ++it) + for (TQPtrListIterator it(m_players); (player = *it) ; ++it) if (player->id() == playerId) return player; @@ -136,12 +136,12 @@ void AtlanticCore::removePlayer(Player *player) player->deleteLater(); } -QPtrList AtlanticCore::games() +TQPtrList AtlanticCore::games() { return m_games; } -Game *AtlanticCore::newGame(int gameId, const QString &type) +Game *AtlanticCore::newGame(int gameId, const TQString &type) { Game *game = new Game(gameId); m_games.append(game); @@ -154,10 +154,10 @@ Game *AtlanticCore::newGame(int gameId, const QString &type) return game; } -Game *AtlanticCore::findGame(const QString &type) +Game *AtlanticCore::findGame(const TQString &type) { Game *game = 0; - for (QPtrListIterator it(m_games); (game = *it) ; ++it) + for (TQPtrListIterator it(m_games); (game = *it) ; ++it) if (game->id() == -1 && game->type() == type) return game; @@ -170,7 +170,7 @@ Game *AtlanticCore::findGame(int gameId) return 0; Game *game = 0; - for (QPtrListIterator it(m_games); (game = *it) ; ++it) + for (TQPtrListIterator it(m_games); (game = *it) ; ++it) if (game->id() == gameId) return game; @@ -191,11 +191,11 @@ void AtlanticCore::removeGame(Game *game) void AtlanticCore::emitGames() { - for (QPtrListIterator it(m_games); (*it) ; ++it) + for (TQPtrListIterator it(m_games); (*it) ; ++it) emit createGUI( (*it) ); } -QPtrList AtlanticCore::estates() +TQPtrList AtlanticCore::estates() { return m_estates; } @@ -210,7 +210,7 @@ Estate *AtlanticCore::newEstate(int estateId) Estate *AtlanticCore::findEstate(int estateId) { Estate *estate = 0; - for (QPtrListIterator it(m_estates); (estate = *it) ; ++it) + for (TQPtrListIterator it(m_estates); (estate = *it) ; ++it) if (estate->id() == estateId) return estate; @@ -221,7 +221,7 @@ Estate *AtlanticCore::estateAfter(Estate *estate) { Estate *eFirst = 0, *eTmp = 0; bool useNext = false; - for (QPtrListIterator it(m_estates); (eTmp = *it) ; ++it) + for (TQPtrListIterator it(m_estates); (eTmp = *it) ; ++it) { if (!eFirst) eFirst = eTmp; @@ -233,7 +233,7 @@ Estate *AtlanticCore::estateAfter(Estate *estate) return eFirst; } -QPtrList AtlanticCore::estateGroups() +TQPtrList AtlanticCore::estateGroups() { return m_estateGroups; } @@ -248,14 +248,14 @@ EstateGroup *AtlanticCore::newEstateGroup(int groupId) EstateGroup *AtlanticCore::findEstateGroup(int groupId) { EstateGroup *estateGroup = 0; - for (QPtrListIterator it(m_estateGroups); (estateGroup = *it) ; ++it) + for (TQPtrListIterator it(m_estateGroups); (estateGroup = *it) ; ++it) if (estateGroup->id() == groupId) return estateGroup; return 0; } -QPtrList AtlanticCore::trades() +TQPtrList AtlanticCore::trades() { return m_trades; } @@ -273,7 +273,7 @@ Trade *AtlanticCore::newTrade(int tradeId) Trade *AtlanticCore::findTrade(int tradeId) { Trade *trade = 0; - for (QPtrListIterator it(m_trades); (trade = *it) ; ++it) + for (TQPtrListIterator it(m_trades); (trade = *it) ; ++it) if (trade->tradeId() == tradeId) return trade; @@ -287,7 +287,7 @@ void AtlanticCore::removeTrade(Trade *trade) trade->deleteLater(); } -QPtrList AtlanticCore::auctions() +TQPtrList AtlanticCore::auctions() { return m_auctions; } @@ -325,7 +325,7 @@ void AtlanticCore::removeConfigOption(ConfigOption *configOption) ConfigOption *AtlanticCore::findConfigOption(int configId) { ConfigOption *configOption = 0; - for (QPtrListIterator it(m_configOptions); (configOption = *it) ; ++it) + for (TQPtrListIterator it(m_configOptions); (configOption = *it) ; ++it) if (configOption->id() == configId) return configOption; @@ -335,35 +335,35 @@ ConfigOption *AtlanticCore::findConfigOption(int configId) void AtlanticCore::printDebug() { Player *player = 0; - for (QPtrListIterator it(m_players); (player = *it) ; ++it) + for (TQPtrListIterator it(m_players); (player = *it) ; ++it) if (player == m_playerSelf) - std::cout << "PS: " << player->name().latin1() << ", game " << QString::number(player->game() ? player->game()->id() : -1).latin1() << std::endl; + std::cout << "PS: " << player->name().latin1() << ", game " << TQString::number(player->game() ? player->game()->id() : -1).latin1() << std::endl; else - std::cout << " P: " << player->name().latin1() << ", game " << QString::number(player->game() ? player->game()->id() : -1).latin1() << std::endl; + std::cout << " P: " << player->name().latin1() << ", game " << TQString::number(player->game() ? player->game()->id() : -1).latin1() << std::endl; Game *game = 0; - for (QPtrListIterator it(m_games); (game = *it) ; ++it) - std::cout << " G: " << QString::number(game->id()).latin1() << ", master: " << QString::number(game->master() ? game->master()->id() : -1 ).latin1() << std::endl; + for (TQPtrListIterator it(m_games); (game = *it) ; ++it) + std::cout << " G: " << TQString::number(game->id()).latin1() << ", master: " << TQString::number(game->master() ? game->master()->id() : -1 ).latin1() << std::endl; Estate *estate = 0; - for (QPtrListIterator it(m_estates); (estate = *it) ; ++it) + for (TQPtrListIterator it(m_estates); (estate = *it) ; ++it) std::cout << " E: " << estate->name().latin1() << std::endl; EstateGroup *estateGroup = 0; - for (QPtrListIterator it(m_estateGroups); (estateGroup = *it) ; ++it) + for (TQPtrListIterator it(m_estateGroups); (estateGroup = *it) ; ++it) std::cout << "EG: " << estateGroup->name().latin1() << std::endl; Auction *auction = 0; - for (QPtrListIterator it(m_auctions); (auction = *it) ; ++it) - std::cout << " A: " << QString::number(auction->auctionId()).latin1() << std::endl; + for (TQPtrListIterator it(m_auctions); (auction = *it) ; ++it) + std::cout << " A: " << TQString::number(auction->auctionId()).latin1() << std::endl; Trade *trade = 0; - for (QPtrListIterator it(m_trades); (trade = *it) ; ++it) - std::cout << " T: " << QString::number(trade->tradeId()).latin1() << std::endl; + for (TQPtrListIterator it(m_trades); (trade = *it) ; ++it) + std::cout << " T: " << TQString::number(trade->tradeId()).latin1() << std::endl; ConfigOption *configOption = 0; - for (QPtrListIterator it(m_configOptions); (configOption = *it) ; ++it) - std::cout << "CO:" << QString::number(configOption->id()).latin1() << " " << configOption->name().latin1() << " " << configOption->value().latin1() << std::endl; + for (TQPtrListIterator it(m_configOptions); (configOption = *it) ; ++it) + std::cout << "CO:" << TQString::number(configOption->id()).latin1() << " " << configOption->name().latin1() << " " << configOption->value().latin1() << std::endl; } #include "atlantic_core.moc" diff --git a/atlantik/libatlantic/atlantic_core.h b/atlantik/libatlantic/atlantic_core.h index bca5b783..197fca91 100644 --- a/atlantik/libatlantic/atlantic_core.h +++ b/atlantik/libatlantic/atlantic_core.h @@ -17,8 +17,8 @@ #ifndef LIBATLANTIC_CORE_H #define LIBATLANTIC_CORE_H -#include -#include +#include +#include #include "libatlantic_export.h" @@ -35,7 +35,7 @@ class LIBATLANTIC_EXPORT AtlanticCore : public QObject Q_OBJECT public: - AtlanticCore(QObject *parent, const char *name); + AtlanticCore(TQObject *parent, const char *name); void reset(bool deletePermanents = false); @@ -44,34 +44,34 @@ public: void setPlayerSelf(Player *player); Player *playerSelf(); - QPtrList players(); + TQPtrList players(); Player *newPlayer(int playerId, const bool &playerSelf = false); Player *findPlayer(int playerId); void removePlayer(Player *player); - QPtrList games(); - Game *newGame(int gameId, const QString &type = QString::null); - Game *findGame(const QString &type); // finds game types + TQPtrList games(); + Game *newGame(int gameId, const TQString &type = TQString::null); + Game *findGame(const TQString &type); // finds game types Game *findGame(int gameId); // finds actual games Game *gameSelf(); void removeGame(Game *game); void emitGames(); - QPtrList estates(); + TQPtrList estates(); Estate *newEstate(int estateId); Estate *findEstate(int estateId); Estate *estateAfter(Estate *estate); - QPtrList estateGroups(); + TQPtrList estateGroups(); EstateGroup *newEstateGroup(int groupId); EstateGroup *findEstateGroup(int groupId); - QPtrList trades(); + TQPtrList trades(); Trade *newTrade(int tradeId); Trade *findTrade(int tradeId); void removeTrade(Trade *trade); - QPtrList auctions(); + TQPtrList auctions(); Auction *newAuction(int auctionId, Estate *estate); void delAuction(Auction *auction); @@ -93,13 +93,13 @@ signals: private: Player *m_playerSelf; - QPtrList m_players; - QPtrList m_games; - QPtrList m_estates; - QPtrList m_estateGroups; - QPtrList m_trades; - QPtrList m_auctions; - QPtrList m_configOptions; + TQPtrList m_players; + TQPtrList m_games; + TQPtrList m_estates; + TQPtrList m_estateGroups; + TQPtrList m_trades; + TQPtrList m_auctions; + TQPtrList m_configOptions; }; #endif diff --git a/atlantik/libatlantic/auction.cpp b/atlantik/libatlantic/auction.cpp index 70734c4e..2e09a685 100644 --- a/atlantik/libatlantic/auction.cpp +++ b/atlantik/libatlantic/auction.cpp @@ -19,7 +19,7 @@ #include "player.h" #include "estate.h" -Auction::Auction(int auctionId, Estate *estate) : QObject() +Auction::Auction(int auctionId, Estate *estate) : TQObject() { m_auctionId = auctionId; m_estate = estate; diff --git a/atlantik/libatlantic/auction.h b/atlantik/libatlantic/auction.h index cc44cce5..80633bc8 100644 --- a/atlantik/libatlantic/auction.h +++ b/atlantik/libatlantic/auction.h @@ -17,7 +17,7 @@ #ifndef LIBATLANTIC_AUCTION_H #define LIBATLANTIC_AUCTION_H -#include +#include #include "libatlantic_export.h" diff --git a/atlantik/libatlantic/configoption.cpp b/atlantik/libatlantic/configoption.cpp index 00a8eb12..1d1dcc62 100644 --- a/atlantik/libatlantic/configoption.cpp +++ b/atlantik/libatlantic/configoption.cpp @@ -16,7 +16,7 @@ #include "configoption.h" -ConfigOption::ConfigOption(int configId) : QObject() +ConfigOption::ConfigOption(int configId) : TQObject() { m_id = configId; m_name = ""; @@ -31,7 +31,7 @@ int ConfigOption::id() return m_id; } -void ConfigOption::setName(const QString &name) +void ConfigOption::setName(const TQString &name) { if (m_name != name) { @@ -40,12 +40,12 @@ void ConfigOption::setName(const QString &name) } } -QString ConfigOption::name() const +TQString ConfigOption::name() const { return m_name; } -void ConfigOption::setDescription(const QString &description) +void ConfigOption::setDescription(const TQString &description) { if (m_description != description) { @@ -54,7 +54,7 @@ void ConfigOption::setDescription(const QString &description) } } -QString ConfigOption::description() const +TQString ConfigOption::description() const { return m_description; } @@ -73,7 +73,7 @@ bool ConfigOption::edit() return m_edit; } -void ConfigOption::setValue(const QString &value) +void ConfigOption::setValue(const TQString &value) { if (m_value != value) { @@ -82,7 +82,7 @@ void ConfigOption::setValue(const QString &value) } } -QString ConfigOption::value() const +TQString ConfigOption::value() const { return m_value; } diff --git a/atlantik/libatlantic/configoption.h b/atlantik/libatlantic/configoption.h index a29d6b45..823938c8 100644 --- a/atlantik/libatlantic/configoption.h +++ b/atlantik/libatlantic/configoption.h @@ -17,8 +17,8 @@ #ifndef LIBATLANTIC_CONFIGOPTION_H #define LIBATLANTIC_CONFIGOPTION_H -#include -#include +#include +#include #include "libatlantic_export.h" @@ -29,14 +29,14 @@ Q_OBJECT public: ConfigOption(int configId); int id(); - void setName(const QString &name); - QString name() const; - void setDescription(const QString &description); - QString description() const; + void setName(const TQString &name); + TQString name() const; + void setDescription(const TQString &description); + TQString description() const; void setEdit(bool edit); bool edit(); - void setValue(const QString &value); - QString value() const; + void setValue(const TQString &value); + TQString value() const; void update(bool force = false); signals: @@ -45,7 +45,7 @@ signals: private: int m_id; bool m_changed, m_edit; - QString m_name, m_description, m_value; + TQString m_name, m_description, m_value; }; #endif diff --git a/atlantik/libatlantic/estate.cpp b/atlantik/libatlantic/estate.cpp index eef69280..c9b40e73 100644 --- a/atlantik/libatlantic/estate.cpp +++ b/atlantik/libatlantic/estate.cpp @@ -20,18 +20,18 @@ #include "estate.moc" #include "player.h" -Estate::Estate(int estateId) : QObject() +Estate::Estate(int estateId) : TQObject() { m_id = estateId; - m_name = QString::null; + m_name = TQString::null; m_owner = 0; m_houses = 0; m_price = 0; m_money = 0; m_estateGroup = 0; m_changed = m_canBeOwned = m_canBuyHouses = m_canSellHouses = m_isMortgaged = m_canToggleMortgage = false; - m_bgColor = QColor(); - m_color = QColor(); + m_bgColor = TQColor(); + m_color = TQColor(); } void Estate::setEstateGroup(EstateGroup *estateGroup) @@ -71,7 +71,7 @@ void Estate::setHouses(unsigned int houses) m_changed = true; } -void Estate::setName(QString name) +void Estate::setName(TQString name) { if (m_name != name) { @@ -80,12 +80,12 @@ void Estate::setName(QString name) } } -QString Estate::name() const +TQString Estate::name() const { return m_name; } -void Estate::setColor(QColor color) +void Estate::setColor(TQColor color) { if (m_color != color) { @@ -94,7 +94,7 @@ void Estate::setColor(QColor color) } } -void Estate::setBgColor(QColor color) +void Estate::setBgColor(TQColor color) { if (m_bgColor != color) { diff --git a/atlantik/libatlantic/estate.h b/atlantik/libatlantic/estate.h index b6b768a5..cbbd51e1 100644 --- a/atlantik/libatlantic/estate.h +++ b/atlantik/libatlantic/estate.h @@ -17,8 +17,8 @@ #ifndef LIBATLANTIC_ESTATE_H #define LIBATLANTIC_ESTATE_H -#include -#include +#include +#include #include "libatlantic_export.h" @@ -32,8 +32,8 @@ Q_OBJECT public: Estate(int estateId); int id() { return m_id; } - void setName(QString name); - QString name() const; + void setName(TQString name); + TQString name() const; void setEstateGroup(EstateGroup *estateGroup); EstateGroup *estateGroup() { return m_estateGroup; } void setOwner(Player *player); @@ -60,10 +60,10 @@ public: unsigned int mortgagePrice() const { return m_mortgagePrice; } void setUnmortgagePrice(const unsigned int unmortgagePrice) { m_unmortgagePrice = unmortgagePrice; } unsigned int unmortgagePrice() const { return m_unmortgagePrice; } - void setColor(QColor color); - QColor color() const { return m_color; } - void setBgColor(QColor color); - QColor bgColor() const { return m_bgColor; } + void setColor(TQColor color); + TQColor color() const { return m_color; } + void setBgColor(TQColor color); + TQColor bgColor() const { return m_bgColor; } void setPrice(const unsigned int price) { m_price = price; } unsigned int price() const { return m_price; } void setMoney(int money); @@ -83,13 +83,13 @@ protected: int m_id; private: - QString m_name; + TQString m_name; Player *m_owner; EstateGroup *m_estateGroup; unsigned int m_houses, m_price, m_housePrice, m_houseSellPrice, m_mortgagePrice, m_unmortgagePrice; int m_money; bool m_canBeOwned, m_canBuyHouses, m_canSellHouses, m_isMortgaged, m_canToggleMortgage; - QColor m_bgColor, m_color; + TQColor m_bgColor, m_color; }; #endif diff --git a/atlantik/libatlantic/estategroup.cpp b/atlantik/libatlantic/estategroup.cpp index e0148afc..ef96b988 100644 --- a/atlantik/libatlantic/estategroup.cpp +++ b/atlantik/libatlantic/estategroup.cpp @@ -17,12 +17,12 @@ #include "estategroup.h" #include "estategroup.moc" -EstateGroup::EstateGroup(const int id) : QObject() +EstateGroup::EstateGroup(const int id) : TQObject() { m_id = id; } -void EstateGroup::setName(const QString name) +void EstateGroup::setName(const TQString name) { if (m_name != name) { diff --git a/atlantik/libatlantic/estategroup.h b/atlantik/libatlantic/estategroup.h index 3e08a9ce..9e0399bc 100644 --- a/atlantik/libatlantic/estategroup.h +++ b/atlantik/libatlantic/estategroup.h @@ -17,7 +17,7 @@ #ifndef LIBATLANTIC_ESTATEGROUP_H #define LIBATLANTIC_ESTATEGROUP_H -#include +#include #include "libatlantic_export.h" @@ -28,8 +28,8 @@ Q_OBJECT public: EstateGroup(const int id); int id() { return m_id; } - void setName(const QString name); - QString name() const { return m_name; } + void setName(const TQString name); + TQString name() const { return m_name; } void update(bool force = false); signals: @@ -38,7 +38,7 @@ signals: private: int m_id; bool m_changed; - QString m_name; + TQString m_name; }; #endif diff --git a/atlantik/libatlantic/game.cpp b/atlantik/libatlantic/game.cpp index 1f4eb244..308a827d 100644 --- a/atlantik/libatlantic/game.cpp +++ b/atlantik/libatlantic/game.cpp @@ -14,15 +14,15 @@ // the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, // Boston, MA 02110-1301, USA. -#include +#include #include "game.h" -Game::Game(int gameId) : QObject() +Game::Game(int gameId) : TQObject() { m_id = gameId; - m_description = QString::null; - m_type = QString::null; + m_description = TQString::null; + m_type = TQString::null; m_players = 0; m_master = 0; @@ -48,7 +48,7 @@ bool Game::canBeJoined() const return m_canBeJoined; } -void Game::setDescription(const QString &description) +void Game::setDescription(const TQString &description) { if (m_description != description) { @@ -57,12 +57,12 @@ void Game::setDescription(const QString &description) } } -QString Game::description() const +TQString Game::description() const { return m_description; } -void Game::setName(const QString &name) +void Game::setName(const TQString &name) { if (m_name != name) { @@ -71,12 +71,12 @@ void Game::setName(const QString &name) } } -QString Game::name() const +TQString Game::name() const { return m_name; } -void Game::setType(const QString &type) +void Game::setType(const TQString &type) { if (m_type != type) { @@ -85,7 +85,7 @@ void Game::setType(const QString &type) } } -QString Game::type() const +TQString Game::type() const { return m_type; } diff --git a/atlantik/libatlantic/game.h b/atlantik/libatlantic/game.h index 8eaa85f6..7194dfd3 100644 --- a/atlantik/libatlantic/game.h +++ b/atlantik/libatlantic/game.h @@ -17,7 +17,7 @@ #ifndef LIBATLANTIC_GAME_H #define LIBATLANTIC_GAME_H -#include +#include #include "libatlantic_export.h" @@ -35,12 +35,12 @@ public: int id() const; void setCanBeJoined(const bool &canBeJoined); bool canBeJoined() const; - void setDescription(const QString &description); - QString description() const; - void setName(const QString &name); - QString name() const; - void setType(const QString &type); - QString type() const; + void setDescription(const TQString &description); + TQString description() const; + void setName(const TQString &name); + TQString name() const; + void setType(const TQString &type); + TQString type() const; int players(); void setPlayers(int players); Player *master(); @@ -54,7 +54,7 @@ signals: private: bool m_changed; bool m_canBeJoined; - QString m_description, m_name, m_type; + TQString m_description, m_name, m_type; int m_id, m_players; Player *m_master; }; diff --git a/atlantik/libatlantic/player.cpp b/atlantik/libatlantic/player.cpp index ab5e9268..e944e970 100644 --- a/atlantik/libatlantic/player.cpp +++ b/atlantik/libatlantic/player.cpp @@ -18,7 +18,7 @@ #include "player.moc" #include "estate.h" -Player::Player(int playerId) : QObject() +Player::Player(int playerId) : TQObject() { m_id = playerId; m_game = 0; @@ -137,7 +137,7 @@ void Player::setInJail(const bool inJail) } } -void Player::setName(const QString _n) +void Player::setName(const TQString _n) { if (m_name != _n) { @@ -146,7 +146,7 @@ void Player::setName(const QString _n) } } -void Player::setHost(const QString &host) +void Player::setHost(const TQString &host) { if (m_host != host) { @@ -155,7 +155,7 @@ void Player::setHost(const QString &host) } } -void Player::setImage(const QString &image) +void Player::setImage(const TQString &image) { if (m_image != image) { diff --git a/atlantik/libatlantic/player.h b/atlantik/libatlantic/player.h index 571276ef..f36b1e8a 100644 --- a/atlantik/libatlantic/player.h +++ b/atlantik/libatlantic/player.h @@ -17,8 +17,8 @@ #ifndef LIBATLANTIC_PLAYER_H #define LIBATLANTIC_PLAYER_H -#include -#include +#include +#include #include "libatlantic_export.h" @@ -57,12 +57,12 @@ public: bool canUseCard() const { return m_canUseCard; } void setInJail(const bool inJail); bool inJail() const { return m_inJail; } - void setName(const QString _n); - QString name() const { return m_name; } - void setHost(const QString &host); - QString host() const { return m_host; } - void setImage(const QString &image); - const QString image() const { return m_image; } + void setName(const TQString _n); + TQString name() const { return m_name; } + void setHost(const TQString &host); + TQString host() const { return m_host; } + void setImage(const TQString &image); + const TQString image() const { return m_image; } void setMoney(unsigned int _m); unsigned int money() const { return m_money; } void update(bool force = false); @@ -76,7 +76,7 @@ private: bool m_changed, m_isSelf; bool m_bankrupt, m_hasDebt, m_hasTurn, m_canRoll, m_canBuy, m_canAuction, m_canUseCard, m_inJail; unsigned int m_money; - QString m_name, m_host, m_image; + TQString m_name, m_host, m_image; Game *m_game; Estate *m_location, *m_destination; }; diff --git a/atlantik/libatlantic/trade.cpp b/atlantik/libatlantic/trade.cpp index b516dc70..7bd638c9 100644 --- a/atlantik/libatlantic/trade.cpp +++ b/atlantik/libatlantic/trade.cpp @@ -49,7 +49,7 @@ void Trade::removePlayer(Player *player) unsigned int Trade::count( bool acceptOnly ) { unsigned int count = 0; - for (QMapIterator it = m_playerAcceptMap.begin() ; it != m_playerAcceptMap.end() ; ++it) + for (TQMapIterator it = m_playerAcceptMap.begin() ; it != m_playerAcceptMap.end() ; ++it) if ( !acceptOnly || it.data() ) count++; return count; @@ -59,7 +59,7 @@ void Trade::updateEstate(Estate *estate, Player *to) { TradeEstate *t=0; - for (QPtrListIterator i(mTradeItems); *i; ++i) + for (TQPtrListIterator i(mTradeItems); *i; ++i) { t=dynamic_cast(*i); @@ -100,7 +100,7 @@ void Trade::updateMoney(unsigned int money, Player *from, Player *to) { TradeMoney *t=0; - for (QPtrListIterator i(mTradeItems); *i; ++i) + for (TQPtrListIterator i(mTradeItems); *i; ++i) { t=dynamic_cast(*i); @@ -163,8 +163,8 @@ void Trade::update(bool force) TradeItem::TradeItem(Trade *trade, Player *from, Player *to) : mFrom(from), mTo(to), mTrade(trade) { - connect(from, SIGNAL(changed(Player *)), this, SLOT(playerChanged())); - connect(to, SIGNAL(changed(Player *)), this, SLOT(playerChanged())); + connect(from, TQT_SIGNAL(changed(Player *)), this, TQT_SLOT(playerChanged())); + connect(to, TQT_SIGNAL(changed(Player *)), this, TQT_SLOT(playerChanged())); } void TradeItem::playerChanged() @@ -176,7 +176,7 @@ TradeEstate::TradeEstate(Estate *estate, Trade *trade, Player *to) : TradeItem(t { } -QString TradeEstate::text() const +TQString TradeEstate::text() const { return mEstate->name(); } @@ -194,7 +194,7 @@ void TradeMoney::setMoney(unsigned int money) } } -QString TradeMoney::text() const +TQString TradeMoney::text() const { - return QString("$%1").arg(m_money); + return TQString("$%1").arg(m_money); } diff --git a/atlantik/libatlantic/trade.h b/atlantik/libatlantic/trade.h index 5d8f3c01..0d168f0a 100644 --- a/atlantik/libatlantic/trade.h +++ b/atlantik/libatlantic/trade.h @@ -17,9 +17,9 @@ #ifndef LIBATLANTIC_TRADE_H #define LIBATLANTIC_TRADE_H -#include -#include -#include +#include +#include +#include #include "libatlantic_export.h" #include "player.h" @@ -44,7 +44,7 @@ public: /** * how to visualize this **/ - virtual QString text() const=0; + virtual TQString text() const=0; signals: void changed(TradeItem *); @@ -66,7 +66,7 @@ public: Estate *estate() { return mEstate; } - virtual QString text() const; + virtual TQString text() const; signals: void updateEstate(Trade *trade, Estate *estate, Player *player); @@ -86,7 +86,7 @@ public: unsigned int money() const { return m_money; } void setMoney(unsigned int money); - virtual QString text() const; + virtual TQString text() const; signals: void changed(TradeItem *tradeItem); @@ -143,10 +143,10 @@ private: bool m_changed, m_rejected; int m_tradeId, m_revision; - QPtrList mPlayers; - QMap m_playerAcceptMap; + TQPtrList mPlayers; + TQMap m_playerAcceptMap; - QPtrList mTradeItems; + TQPtrList mTradeItems; }; #endif -- cgit v1.2.1