diff options
Diffstat (limited to 'atlantik/libatlantikclient/atlantik_network.cpp')
| -rw-r--r-- | atlantik/libatlantikclient/atlantik_network.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/atlantik/libatlantikclient/atlantik_network.cpp b/atlantik/libatlantikclient/atlantik_network.cpp index cb53577f..7b980ef8 100644 --- a/atlantik/libatlantikclient/atlantik_network.cpp +++ b/atlantik/libatlantikclient/atlantik_network.cpp @@ -17,8 +17,8 @@ #include <iostream> #include <tqdom.h> -#include <textcodec.h> -#include <textstream.h> +#include <tqtextcodec.h> +#include <tqtextstream.h> #include <tqtimer.h> #include <kdebug.h> @@ -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" |