From 0e2b76239f354a9eead0b4e37d86d390ec57ffa9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:31:10 -0600 Subject: Rename old tq methods that no longer need a unique name --- atlantik/libatlantikclient/atlantik_network.cpp | 10 +++++----- atlantik/libatlantikclient/atlantik_network.h | 2 +- atlantik/libatlantikclient/monopdprotocol.cpp | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'atlantik/libatlantikclient') diff --git a/atlantik/libatlantikclient/atlantik_network.cpp b/atlantik/libatlantikclient/atlantik_network.cpp index 7b980ef8..4a5e42c2 100644 --- a/atlantik/libatlantikclient/atlantik_network.cpp +++ b/atlantik/libatlantikclient/atlantik_network.cpp @@ -872,7 +872,7 @@ void AtlantikNetwork::processNode(TQDomNode n) if (auction && !a.isNull()) { int status = a.value().toInt(); - auction->settqStatus(status); + auction->setStatus(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 msgtqStatus(i18n("Connecting to %1:%2...").tqarg(host).tqarg(TQString::number(port)), "connect_creating"); + emit msgStatus(i18n("Connecting to %1:%2...").tqarg(host).tqarg(TQString::number(port)), "connect_creating"); startAsyncConnect(); } void AtlantikNetwork::slotLookupFinished(int count) { - emit msgtqStatus(i18n("Server host name lookup finished...")); + emit msgStatus(i18n("Server host name lookup finished...")); } void AtlantikNetwork::slotConnectionSuccess() { - emit msgtqStatus(i18n("Connected to %1:%2.").tqarg(host()).tqarg(port()), "connect_established"); + emit msgStatus(i18n("Connected to %1:%2.").tqarg(host()).tqarg(port()), "connect_established"); } void AtlantikNetwork::slotConnectionFailed(int error) { - emit msgtqStatus(i18n("Connection failed! Error code: %1").tqarg(error), "connect_no"); + emit msgStatus(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 3164bf18..ee366f69 100644 --- a/atlantik/libatlantikclient/atlantik_network.h +++ b/atlantik/libatlantikclient/atlantik_network.h @@ -102,7 +102,7 @@ signals: void msgInfo(TQString); void msgError(TQString); void msgChat(TQString, TQString); - void msgtqStatus(const TQString &data, const TQString &icon = TQString()); + void msgStatus(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 39f8fb81..f024f163 100644 --- a/atlantik/libatlantikclient/monopdprotocol.cpp +++ b/atlantik/libatlantikclient/monopdprotocol.cpp @@ -36,12 +36,12 @@ MonopdProtocol::MonopdProtocol() : TQObject() void MonopdProtocol::auctionEstate() { - sendData(TQString::tqfromLatin1(".ea")); + sendData(TQString::fromLatin1(".ea")); } void MonopdProtocol::buyEstate() { - sendData(TQString::tqfromLatin1(".eb")); + sendData(TQString::fromLatin1(".eb")); } void MonopdProtocol::confirmTokenLocation(Estate *estate) @@ -53,12 +53,12 @@ void MonopdProtocol::confirmTokenLocation(Estate *estate) void MonopdProtocol::endTurn() { - sendData(TQString::tqfromLatin1(".E")); + sendData(TQString::fromLatin1(".E")); } void MonopdProtocol::rollDice() { - sendData(TQString::tqfromLatin1(".r")); + sendData(TQString::fromLatin1(".r")); } void MonopdProtocol::setName(TQString name) @@ -70,7 +70,7 @@ void MonopdProtocol::setName(TQString name) void MonopdProtocol::startGame() { - sendData(TQString::tqfromLatin1(".gs")); + sendData(TQString::fromLatin1(".gs")); } void MonopdProtocol::sendData(TQString) -- cgit v1.2.1