TDE
/
tdegames
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdegames
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename a number of old tq methods that are no longer tq specific

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 9c27a1a03e
commit 97d1732e25
337 changed files with 2053 additions and 2053 deletions
Show Stats Download Patch File Download Diff File

2
atlantik/atlanticd/atlanticclient.cpp
Unescape View File

@ -14,7 +14,7 @@
// the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
// Boston, MA 02110-1301, USA.
#include <tqtextstream.h>
#include <textstream.h>
#include <tqtimer.h>
#include "atlanticclient.h"

16
atlantik/client/atlantik.cpp
Unescape View File

@ -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(msgtqStatus(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgtqStatus(const TQString &)));
connect(m_selectServer, TQT_SIGNAL(msgStatus(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgStatus(const TQString &)));
m_selectServer->slotRefresh( m_config.connectOnStart );
}
@ -357,7 +357,7 @@ 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()), TQT_TQOBJECT(this), TQT_SLOT(showSelectServer()));
connect(m_selectGame, TQT_SIGNAL(msgtqStatus(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgtqStatus(const TQString &)));
connect(m_selectGame, TQT_SIGNAL(msgStatus(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgStatus(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 &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgtqStatus(const TQString &)));
connect(m_selectConfiguration, TQT_SIGNAL(statusMessage(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgStatus(const TQString &)));
}
void Atlantik::initBoard()
@ -475,12 +475,12 @@ void Atlantik::networkClosed(int status)
switch( status )
{
case KBufferedIO::involuntary:
slotMsgtqStatus( i18n("Connection with server %1:%2 lost.").tqarg(m_atlantikNetwork->host()).tqarg(m_atlantikNetwork->port()), TQString("connect_no") );
slotMsgStatus( i18n("Connection with server %1:%2 lost.").arg(m_atlantikNetwork->host()).arg(m_atlantikNetwork->port()), TQString("connect_no") );
showSelectServer();
break;
default:
if ( !m_atlantikNetwork->host().isEmpty() )
slotMsgtqStatus( i18n("Disconnected from %1:%2.").tqarg(m_atlantikNetwork->host()).tqarg(m_atlantikNetwork->port()), TQString("connect_no") );
slotMsgStatus( i18n("Disconnected from %1:%2.").arg(m_atlantikNetwork->host()).arg(m_atlantikNetwork->port()), TQString("connect_no") );
break;
}
}
@ -625,7 +625,7 @@ void Atlantik::slotMsgError(TQString msg)
serverMsgsAppend("Error: " + msg);
}
void Atlantik::slotMsgtqStatus(const TQString &message, const TQString &icon)
void Atlantik::slotMsgStatus(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").tqarg(time.toString("hh:mm")).tqarg(player).tqarg(msg));
serverMsgsAppend(TQString("[%1] %2: %3").arg(time.toString("hh:mm")).arg(player).arg(msg));
}
else
serverMsgsAppend(player + ": " + msg);
@ -730,7 +730,7 @@ void Atlantik::initNetworkObject()
m_atlantikNetwork = new AtlantikNetwork(m_atlanticCore);
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(msgStatus(const TQString &, const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgStatus(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()), TQT_TQOBJECT(this), TQT_SLOT(slotNetworkConnected()));

6
atlantik/client/atlantik.h
Unescape View File

@ -18,8 +18,8 @@
#define ATLANTIK_ATLANTIK_H
#include <tqwidget.h>
#include <tqlayout.h>
#include <tqtextedit.h>
#include <layout.h>
#include <textedit.h>
#include <tqlabel.h>
#include <tqptrlist.h>
@ -188,7 +188,7 @@ public slots:
*/
void slotMsgInfo(TQString msg);
void slotMsgtqStatus(const TQString &message, const TQString &icon = TQString());
void slotMsgStatus(const TQString &message, const TQString &icon = TQString());
/**
* Informs serverMsgs() to append an incoming message from the

38
atlantik/client/configdlg.cpp
Unescape View File

@ -14,7 +14,7 @@
// the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
// Boston, MA 02110-1301, USA.
#include <tqlayout.h>
#include <layout.h>
#include <tqgroupbox.h>
#include <tqwhatsthis.h>
#include <tqlabel.h>
@ -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(tqsizeHint());
setMinimumSize(sizeHint());
}
bool ConfigDialog::chatTimestamps()
@ -114,23 +114,23 @@ AtlantikConfig ConfigDialog::config()
ConfigPlayer::ConfigPlayer(ConfigDialog* configDialog, TQWidget *parent, const char *name) : TQWidget(parent, name)
{
m_configDialog = configDialog;
TQVBoxLayout *tqlayout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint());
TQVBoxLayout *layout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint());
TQLabel *label = new TQLabel(i18n("Player name:"), parent);
tqlayout->addWidget(label);
layout->addWidget(label);
m_playerName = new TQLineEdit(parent);
tqlayout->addWidget(m_playerName);
layout->addWidget(m_playerName);
TQLabel *label2 = new TQLabel(i18n("Player image:"), parent);
tqlayout->addWidget(label2);
layout->addWidget(label2);
m_playerIcon = new KPushButton(parent, "playerIcon");
tqlayout->addWidget(m_playerIcon);
layout->addWidget(m_playerIcon);
connect( m_playerIcon, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseImage()) );
tqlayout->addStretch(1);
layout->addStretch(1);
reset();
}
@ -185,10 +185,10 @@ void ConfigPlayer::reset()
ConfigMonopigator::ConfigMonopigator(ConfigDialog *configDialog, TQWidget *parent, const char *name) : TQWidget(parent, name)
{
m_configDialog = configDialog;
TQVBoxLayout *tqlayout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint());
TQVBoxLayout *layout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint());
m_connectOnStart = new TQCheckBox(i18n("Request list of Internet servers on start-up"), parent);
tqlayout->addWidget(m_connectOnStart);
layout->addWidget(m_connectOnStart);
TQString message=i18n(
"If checked, Atlantik connects to a meta server on start-up to\n"
@ -196,7 +196,7 @@ ConfigMonopigator::ConfigMonopigator(ConfigDialog *configDialog, TQWidget *paren
TQWhatsThis::add(m_connectOnStart, message);
m_hideDevelopmentServers = new TQCheckBox(i18n("Hide development servers"), parent);
tqlayout->addWidget(m_hideDevelopmentServers);
layout->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);
tqlayout->addStretch(1);
layout->addStretch(1);
reset();
}
@ -228,17 +228,17 @@ void ConfigMonopigator::reset()
ConfigGeneral::ConfigGeneral(ConfigDialog *configDialog, TQWidget *parent, const char *name) : TQWidget(parent, name)
{
m_configDialog = configDialog;
TQVBoxLayout *tqlayout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint());
TQVBoxLayout *layout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint());
m_chatTimestamps = new TQCheckBox(i18n("Show timestamps in chat messages"), parent);
tqlayout->addWidget(m_chatTimestamps);
layout->addWidget(m_chatTimestamps);
TQString message=i18n(
"If checked, Atlantik will add timestamps in front of chat\n"
"messages.\n");
TQWhatsThis::add(m_chatTimestamps, message);
tqlayout->addStretch(1);
layout->addStretch(1);
reset();
}
@ -256,10 +256,10 @@ void ConfigGeneral::reset()
ConfigBoard::ConfigBoard(ConfigDialog *configDialog, TQWidget *parent, const char *name) : TQWidget(parent, name)
{
m_configDialog = configDialog;
TQVBoxLayout *tqlayout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint());
TQVBoxLayout *layout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint());
TQGroupBox *box = new TQGroupBox(1, Qt::Horizontal, i18n("Game Status Feedback"), parent);
tqlayout->addWidget(box);
layout->addWidget(box);
m_indicateUnowned = new TQCheckBox(i18n("Display title deed card on unowned properties"), box);
TQString message=i18n(
@ -292,9 +292,9 @@ ConfigBoard::ConfigBoard(ConfigDialog *configDialog, TQWidget *parent, const cha
TQWhatsThis::add(m_quartzEffects, message);
// box = new TQGroupBox(1, Qt::Horizontal, i18n("Size"), parent);
// tqlayout->addWidget(box);
// layout->addWidget(box);
tqlayout->addStretch(1);
layout->addStretch(1);
reset();
}

6
atlantik/client/eventlogwidget.cpp
Unescape View File

@ -17,7 +17,7 @@
#include <iostream>
#include <tqheader.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqdatetime.h>
#include <klocale.h>
@ -37,7 +37,7 @@ EventLog::EventLog()
void EventLog::addEvent(const TQString &description, const TQString &icon)
{
Event *event = new Event(TQDateTime::tqcurrentDateTime(), description, icon);
Event *event = new Event(TQDateTime::currentDateTime(), description, icon);
m_events.append(event);
emit newEvent(event);
}
@ -113,7 +113,7 @@ void EventLogWidget::save()
{
TQTextStream stream(&file);
stream << i18n( "Atlantik log file, saved at %1." ).tqarg( TQDateTime::tqcurrentDateTime().toString("yyyy-MM-dd hh:mm:ss") ) << endl;
stream << i18n( "Atlantik log file, saved at %1." ).arg( TQDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss") ) << endl;
TQPtrList<Event> events = m_eventLog->events();
for (TQPtrListIterator<Event> it( events ); (*it) ; ++it)

2
atlantik/client/monopigator.cpp
Unescape View File

@ -46,7 +46,7 @@ void Monopigator::loadData(const KURL &url)
m_downloadData->reset();
m_job = KIO::get(url, true, false);
m_job->addMetaData(TQString::tqfromLatin1("UserAgent"), TQString::tqfromLatin1("Atlantik/" ATLANTIK_VERSION_STRING));
m_job->addMetaData(TQString::fromLatin1("UserAgent"), TQString::fromLatin1("Atlantik/" ATLANTIK_VERSION_STRING));
if (!m_timer)
{

2
atlantik/client/selectconfiguration_widget.h
Unescape View File

@ -18,7 +18,7 @@
#define ATLANTIK_SELECTCONFIGURATION_WIDGET_H
#include <tqwidget.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqvgroupbox.h>
#include <klistview.h>

10
atlantik/client/selectgame_widget.cpp
Unescape View File

@ -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").tqarg(game->name()), game->description(), TQString(), TQString(), game->type() );
TQListViewItem *item = new TQListViewItem( m_gameList, i18n("Create a new %1 Game").arg(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").tqarg( (master ? master->name() : TQString()), 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").arg( (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").tqarg(game->name()));
item->setText(0, i18n("Create a new %1 Game").arg(game->name()));
else
{
Player *master = game->master();
item->setText( 0, i18n("Join %1's %2 Game").tqarg( (master ? master->name() : TQString()), game->name() ) );
item->setText( 0, i18n("Join %1's %2 Game").arg( (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").tqarg( player->name(), game->name() ) );
item->setText( 0, i18n("Join %1's %2 Game").arg( player->name(), game->name() ) );
return;
}
item = item->nextSibling();

4
atlantik/client/selectgame_widget.h
Unescape View File

@ -18,7 +18,7 @@
#define ATLANTIK_SELECTGAME_WIDGET_H
#include <tqwidget.h>
#include <tqlayout.h>
#include <layout.h>
#include <klistview.h>
#include <kpushbutton.h>
@ -52,7 +52,7 @@ signals:
void joinGame(int gameId);
void newGame(const TQString &gameType);
void leaveServer();
void msgtqStatus(const TQString &status);
void msgStatus(const TQString &status);
private:
TQListViewItem *findItem(Game *game);

12
atlantik/client/selectserver_widget.cpp
Unescape View File

@ -15,7 +15,7 @@
// Boston, MA 02110-1301, USA.
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqradiobutton.h>
#include <tqsizepolicy.h>
#include <tqvbuttongroup.h>
@ -42,12 +42,12 @@ SelectServer::SelectServer(bool useMonopigatorOnStart, bool hideDevelopmentServe
TQLabel *hostLabel = new TQLabel(i18n("Hostname:"), customGroup);
m_hostEdit = new KLineEdit(customGroup);
m_hostEdit->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum));
m_hostEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum));
TQLabel *portLabel = new TQLabel(i18n("Port:"), customGroup);
m_portEdit = new KLineEdit(TQString::number(1234), customGroup);
m_portEdit->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum));
m_portEdit->setSizePolicy(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 msgtqStatus(i18n("Retrieving server list..."));
emit msgStatus(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 msgtqStatus(i18n("Retrieved server list."));
emit msgStatus(i18n("Retrieved server list."));
m_refreshButton->setEnabled(true);
}
void SelectServer::monopigatorTimeout()
{
emit msgtqStatus(i18n("Error while retrieving the server list."));
emit msgStatus(i18n("Error while retrieving the server list."));
m_refreshButton->setEnabled(true);
}

4
atlantik/client/selectserver_widget.h
Unescape View File

@ -18,7 +18,7 @@
#define ATLANTIK_SELECTSERVER_WIDGET_H
#include <tqwidget.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqradiobutton.h>
#include <klineedit.h>
@ -57,7 +57,7 @@ private slots:
signals:
void serverConnect(const TQString host, int port);
void msgtqStatus(const TQString &message);
void msgStatus(const TQString &message);
void showDevelopmentServers(bool show);
private:

2
atlantik/kio_atlantik/kio_atlantik.cpp
Unescape View File

@ -16,7 +16,7 @@
#include <stdlib.h>
#include <tqtextstream.h>
#include <textstream.h>
#include <tdeversion.h>
#undef KDE_3_1_FEATURES

2
atlantik/libatlantic/auction.cpp
Unescape View File

@ -32,7 +32,7 @@ Auction::~Auction()
emit completed();
}
void Auction::settqStatus(int status)
void Auction::setStatus(int status)
{
if (m_status != status)
{

2
atlantik/libatlantic/auction.h
Unescape View File

@ -36,7 +36,7 @@ public:
int auctionId() { return m_auctionId; }
Estate *estate() { return m_estate; }
void settqStatus(int status);
void setStatus(int status);
int status() { return m_status; }
void newBid(Player *player, int bid);

2
atlantik/libatlantic/trade.cpp
Unescape View File

@ -196,5 +196,5 @@ void TradeMoney::setMoney(unsigned int money)
TQString TradeMoney::text() const
{
return TQString("$%1").tqarg(m_money);
return TQString("$%1").arg(m_money);
}

48
atlantik/libatlantikclient/atlantik_network.cpp
Unescape View File

@ -17,8 +17,8 @@
#include <iostream>
#include <tqdom.h>
#include <tqtextcodec.h>
#include <tqtextstream.h>
#include <textcodec.h>
#include <textstream.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").tqarg(name));
writeData(TQString(".n%1").arg(name));
}
void AtlantikNetwork::tokenConfirmation(Estate *estate)
{
writeData(TQString(".t%1").tqarg(estate ? estate->id() : -1));
writeData(TQString(".t%1").arg(estate ? estate->id() : -1));
}
void AtlantikNetwork::estateToggleMortgage(Estate *estate)
{
writeData(TQString(".em%1").tqarg(estate ? estate->id() : -1));
writeData(TQString(".em%1").arg(estate ? estate->id() : -1));
}
void AtlantikNetwork::estateHouseBuy(Estate *estate)
{
writeData(TQString(".hb%1").tqarg(estate ? estate->id() : -1));
writeData(TQString(".hb%1").arg(estate ? estate->id() : -1));
}
void AtlantikNetwork::estateHouseSell(Estate *estate)
{
writeData(TQString(".hs%1").tqarg(estate ? estate->id() : -1));
writeData(TQString(".hs%1").arg(estate ? estate->id() : -1));
}
void AtlantikNetwork::newGame(const TQString &gameType)
{
writeData(TQString(".gn%1").tqarg(gameType));
writeData(TQString(".gn%1").arg(gameType));
}
void AtlantikNetwork::joinGame(int gameId)
{
writeData(TQString(".gj%1").tqarg(gameId));
writeData(TQString(".gj%1").arg(gameId));
}
void AtlantikNetwork::cmdChat(TQString msg)
@ -135,42 +135,42 @@ void AtlantikNetwork::cmdChat(TQString msg)
void AtlantikNetwork::newTrade(Player *player)
{
writeData(TQString(".Tn%1").tqarg(player ? player->id() : -1));
writeData(TQString(".Tn%1").arg(player ? player->id() : -1));
}
void AtlantikNetwork::kickPlayer(Player *player)
{
writeData(TQString(".gk%1").tqarg(player ? player->id() : -1));
writeData(TQString(".gk%1").arg(player ? player->id() : -1));
}
void AtlantikNetwork::tradeUpdateEstate(Trade *trade, Estate *estate, Player *player)
{
writeData(TQString(".Te%1:%2:%3").tqarg(trade ? trade->tradeId() : -1).tqarg(estate ? estate->id() : -1).tqarg(player ? player->id() : -1));
writeData(TQString(".Te%1:%2:%3").arg(trade ? trade->tradeId() : -1).arg(estate ? estate->id() : -1).arg(player ? player->id() : -1));
}
void AtlantikNetwork::tradeUpdateMoney(Trade *trade, unsigned int money, Player *pFrom, Player *pTo)
{
writeData(TQString(".Tm%1:%2:%3:%4").tqarg(trade ? trade->tradeId() : -1).tqarg(pFrom ? pFrom->id() : -1).tqarg(pTo ? pTo->id() : -1).tqarg(money));
writeData(TQString(".Tm%1:%2:%3:%4").arg(trade ? trade->tradeId() : -1).arg(pFrom ? pFrom->id() : -1).arg(pTo ? pTo->id() : -1).arg(money));
}
void AtlantikNetwork::tradeReject(Trade *trade)
{
writeData(TQString(".Tr%1").tqarg(trade ? trade->tradeId() : -1));
writeData(TQString(".Tr%1").arg(trade ? trade->tradeId() : -1));
}
void AtlantikNetwork::tradeAccept(Trade *trade)
{
writeData(TQString(".Ta%1:%2").tqarg(trade ? trade->tradeId() : -1).tqarg(trade ? trade->revision() : -1));
writeData(TQString(".Ta%1:%2").arg(trade ? trade->tradeId() : -1).arg(trade ? trade->revision() : -1));
}
void AtlantikNetwork::auctionBid(Auction *auction, int amount)
{
writeData(TQString(".ab%1:%2").tqarg(auction ? auction->auctionId() : -1).tqarg(amount));
writeData(TQString(".ab%1:%2").arg(auction ? auction->auctionId() : -1).arg(amount));
}
void AtlantikNetwork::setImage(const TQString &name)
{
writeData(TQString(".pi%1").tqarg(name));
writeData(TQString(".pi%1").arg(name));
}
void AtlantikNetwork::jailPay()
@ -190,7 +190,7 @@ void AtlantikNetwork::jailCard()
void AtlantikNetwork::changeOption(int configId, const TQString &value)
{
writeData( TQString(".gc%1:%2").tqarg(configId).tqarg(value) );
writeData( TQString(".gc%1:%2").arg(configId).arg(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 tqgeometry
// FIXME: allow any estateId, GUI should not use it to determin its geometry
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->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...").arg(host).arg(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.").arg(host()).arg(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").arg(error), "connect_no");
}
#include "atlantik_network.moc"

2
atlantik/libatlantikclient/atlantik_network.h
Unescape View File

@ -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);

10
atlantik/libatlantikclient/monopdprotocol.cpp
Unescape View File

@ -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)

4
atlantik/libatlantikui/auction_widget.cpp
Unescape View File

@ -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").tqarg(estate->name()) : i18n("Auction"), this, "groupBox");
m_playerGroupBox = new TQVGroupBox(estate ? i18n("Auction: %1").arg(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()));
// tqStatus label
// Status label
m_statusLabel = new TQLabel(this, "statusLabel");
m_mainLayout->addWidget(m_statusLabel);
}

2
atlantik/libatlantikui/auction_widget.h
Unescape View File

@ -18,7 +18,7 @@
#define ATLANTIK_AUCTION_WIDGET_H
#include <tqwidget.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqmap.h>
#include <klistview.h>

12
atlantik/libatlantikui/board.cpp
Unescape View File

@ -351,13 +351,13 @@ TQPoint AtlantikBoard::calculateTokenDestination(Token *token, Estate *eDest)
int x = 0, y = 0;
if (token->player()->inJail())
{
x = evDest->tqgeometry().right() - token->width() - 2;
y = evDest->tqgeometry().top();
x = evDest->geometry().right() - token->width() - 2;
y = evDest->geometry().top();
}
else
{
x = evDest->tqgeometry().center().x() - (token->width()/2);
y = evDest->tqgeometry().center().y() - (token->height()/2);
x = evDest->geometry().center().x() - (token->width()/2);
y = evDest->geometry().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->tqgeometry().x();
int yCurrent = m_movingToken->tqgeometry().y();
int xCurrent = m_movingToken->geometry().x();
int yCurrent = m_movingToken->geometry().y();
// Where do we want to go today?
Estate *eDest = m_atlanticCore->estateAfter(m_movingToken->location());

2
atlantik/libatlantikui/board.h
Unescape View File

@ -19,7 +19,7 @@
#include <tqwidget.h>
#include <tqtimer.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqptrlist.h>
#include "libatlantikui_export.h"
class TQPoint;

14
atlantik/libatlantikui/estatedetails.cpp
Unescape View File

@ -16,7 +16,7 @@
#include <tqpainter.h>
#include <tqpixmap.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqptrlist.h>
#include <tqregexp.h>
#include <tqvgroupbox.h>
@ -114,7 +114,7 @@ void EstateDetails::paintEvent(TQPaintEvent *)
TQColor greenHouse(0, 255, 0);
TQColor redHotel(255, 51, 51);
TQPainter painter;
painter.tqbegin(TQT_TQPAINTDEVICE(m_pixmap), this);
painter.begin(TQT_TQPAINTDEVICE(m_pixmap), this);
painter.setPen(TQt::black);
@ -136,7 +136,7 @@ void EstateDetails::paintEvent(TQPaintEvent *)
quartzBuffer->resize(25, (height()/4)-2);
TQPainter quartzPainter;
quartzPainter.tqbegin(TQT_TQPAINTDEVICE(quartzBuffer), this);
quartzPainter.begin(TQT_TQPAINTDEVICE(quartzBuffer), this);
painter.setBrush(titleColor);
painter.drawRect(0, 0, width(), titleHeight);
@ -217,22 +217,22 @@ void EstateDetails::addDetails()
// Price
if (m_estate->price())
{
infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Price: %1").tqarg(m_estate->price()));
infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Price: %1").arg(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").tqarg(m_estate->owner() ? m_estate->owner()->name() : i18n("unowned")));
infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Owner: %1").arg(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").tqarg(m_estate->houses()));
infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Houses: %1").arg(m_estate->houses()));
infoText->setPixmap(0, TQPixmap(SmallIcon("info")));
infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Mortgaged: %1").tqarg(m_estate->isMortgaged() ? i18n("Yes") : i18n("No")));
infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Mortgaged: %1").arg(m_estate->isMortgaged() ? i18n("Yes") : i18n("No")));
infoText->setPixmap(0, TQPixmap(SmallIcon("info")));
}
}

20
atlantik/libatlantikui/estateview.cpp
Unescape View File

@ -72,20 +72,20 @@ void EstateView::updateToolTip()
TQString toolTip = m_estate->name();
if ( m_estate->isOwned() )
{
toolTip.append( "\n" + i18n("Owner: %1").tqarg( m_estate->owner()->name() ) );
toolTip.append( "\n" + i18n("Owner: %1").arg( m_estate->owner()->name() ) );
if ( m_estate->isMortgaged() )
toolTip.append( "\n" + i18n("Unmortgage Price: %1").tqarg( m_estate->unmortgagePrice() ) );
toolTip.append( "\n" + i18n("Unmortgage Price: %1").arg( m_estate->unmortgagePrice() ) );
else
toolTip.append( "\n" + i18n("Mortgage Value: %1").tqarg( m_estate->mortgagePrice() ) );
toolTip.append( "\n" + i18n("Mortgage Value: %1").arg( m_estate->mortgagePrice() ) );
if ( m_estate->canSellHouses() )
toolTip.append( "\n" + i18n("House Value: %1").tqarg( m_estate->houseSellPrice() ) );
toolTip.append( "\n" + i18n("House Value: %1").arg( m_estate->houseSellPrice() ) );
if ( m_estate->canBuyHouses() )
toolTip.append( "\n" + i18n("House Price: %1").tqarg( m_estate->housePrice() ) );
toolTip.append( "\n" + i18n("House Price: %1").arg( m_estate->housePrice() ) );
}
else if ( m_estate->canBeOwned() )
toolTip.append( "\n" + i18n("Price: %1").tqarg( m_estate->price() ) );
toolTip.append( "\n" + i18n("Price: %1").arg( m_estate->price() ) );
else if ( m_estate->money() )
toolTip.append( "\n" + i18n("Money: %1").tqarg( m_estate->money() ) );
toolTip.append( "\n" + i18n("Money: %1").arg( m_estate->money() ) );
TQToolTip::add( this, toolTip );
}
@ -255,7 +255,7 @@ void EstateView::paintEvent(TQPaintEvent *)
TQColor greenHouse(0, 255, 0);
TQColor redHotel(255, 51, 51);
TQPainter painter;
painter.tqbegin(TQT_TQPAINTDEVICE(qpixmap), this);
painter.begin(TQT_TQPAINTDEVICE(qpixmap), this);
painter.setPen(TQt::black);
@ -281,7 +281,7 @@ void EstateView::paintEvent(TQPaintEvent *)
quartzBuffer->resize(m_titleWidth-2, 25);
TQPainter quartzPainter;
quartzPainter.tqbegin(TQT_TQPAINTDEVICE(quartzBuffer), this);
quartzPainter.begin(TQT_TQPAINTDEVICE(quartzBuffer), this);
painter.setBrush(m_estate->color());
switch(m_orientation)
@ -477,7 +477,7 @@ void EstateView::mousePressEvent(TQMouseEvent *e)
{
// Request trade
if (Player *player = m_estate->owner())
rmbMenu->insertItem(i18n("Request Trade with %1").tqarg(player->name()), 3);
rmbMenu->insertItem(i18n("Request Trade with %1").arg(player->name()), 3);
}
KPopupMenu *pm = dynamic_cast<KPopupMenu *>(rmbMenu);

6
atlantik/libatlantikui/portfolioview.cpp
Unescape View File

@ -196,7 +196,7 @@ void PortfolioView::paintEvent(TQPaintEvent *)
qpixmap = new TQPixmap(width(), height());
TQPainter painter;
painter.tqbegin(TQT_TQPAINTDEVICE(qpixmap), this);
painter.begin(TQT_TQPAINTDEVICE(qpixmap), this);
painter.setPen(TQt::white);
painter.setBrush(TQt::white);
@ -260,12 +260,12 @@ void PortfolioView::mousePressEvent(TQMouseEvent *e)
if ( m_portfolioEstates.count() )
{
// Start trade
rmbMenu->insertItem(i18n("Request Trade with %1").tqarg(m_player->name()), 0);
rmbMenu->insertItem(i18n("Request Trade with %1").arg(m_player->name()), 0);
}
else
{
// Kick player
rmbMenu->insertItem(i18n("Boot Player %1 to Lounge").tqarg(m_player->name()), 0);
rmbMenu->insertItem(i18n("Boot Player %1 to Lounge").arg(m_player->name()), 0);
rmbMenu->setItemEnabled( 0, m_atlanticCore->selfIsMaster() );
}

2
atlantik/libatlantikui/token.cpp
Unescape View File

@ -127,7 +127,7 @@ void Token::paintEvent(TQPaintEvent *)
qpixmap = new TQPixmap(width(), height());
TQPainter painter;
painter.tqbegin(TQT_TQPAINTDEVICE(qpixmap), this);
painter.begin(TQT_TQPAINTDEVICE(qpixmap), this);
if (m_image)
{

10
atlantik/libatlantikui/trade_widget.cpp
Unescape View File

@ -16,7 +16,7 @@
#include <iostream>
#include <tqlayout.h>
#include <layout.h>
#include <tqhgroupbox.h>
#include <tqheader.h>
#include <tqpopupmenu.h>
@ -52,7 +52,7 @@ TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *p
m_trade = trade;
m_atlanticCore = atlanticCore;
setCaption(i18n("Trade %1").tqarg(trade->tradeId()));
setCaption(i18n("Trade %1").arg(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." ).tqarg( m_trade->count( true ) ).tqarg( m_trade->count( false ) ) );
m_status->setText( i18n( "%1 out of %2 players accept current trade proposal." ).arg( m_trade->count( true ) ).arg( 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." ).tqarg( m_trade->count( true ) ).tqarg( m_trade->count( false ) ) );
m_status->setText( i18n( "%1 out of %2 players accept current trade proposal." ).arg( m_trade->count( true ) ).arg( 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.").tqarg(player->name()));
m_status->setText(i18n("Trade proposal was rejected by %1.").arg(player->name()));
else
m_status->setText(i18n("Trade proposal was rejected."));

2
kasteroids/ledmeter.cpp
Unescape View File

@ -76,7 +76,7 @@ void KALedMeter::drawContents( TQPainter *p )
unsigned cidx = 0;
int ncol = mCount;
TQColor col = tqcolorGroup().foreground();
TQColor col = colorGroup().foreground();
if ( !mCRanges.isEmpty() )
{

2
kasteroids/sprites/rock1/rock1.pov
Unescape View File

@ -1,5 +1,5 @@
#include "colors.inc"
#include "tqshapes.inc"
#include "shapes.inc"
#include "textures.inc"
// #include "stones.inc"

2
kasteroids/sprites/rock2/rock2.pov
Unescape View File

@ -1,5 +1,5 @@
#include "colors.inc"
#include "tqshapes.inc"
#include "shapes.inc"
#include "textures.inc"
// #include "stones.inc"

2
kasteroids/sprites/rock3/rock3.pov
Unescape View File

@ -1,5 +1,5 @@
#include "colors.inc"
#include "tqshapes.inc"
#include "shapes.inc"
#include "textures.inc"
// #include "stones.inc"

32
kasteroids/toplevel.cpp
Unescape View File

@ -5,7 +5,7 @@
*/
#include <tqlabel.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqlcdnumber.h>
#include <tqspinbox.h>
#include <tqcheckbox.h>
@ -102,7 +102,7 @@ KAstTopLevel::KAstTopLevel()
label = new TQLabel( i18n("Score"), mainWin );
label->setFont( labelFont );
label->setPalette( pal );
label->setFixedWidth( label->tqsizeHint().width() );
label->setFixedWidth( label->sizeHint().width() );
hb->addWidget( label );
scoreLCD = new TQLCDNumber( 6, mainWin );
@ -116,7 +116,7 @@ KAstTopLevel::KAstTopLevel()
label = new TQLabel( i18n("Level"), mainWin );
label->setFont( labelFont );
label->setPalette( pal );
label->setFixedWidth( label->tqsizeHint().width() );
label->setFixedWidth( label->sizeHint().width() );
hb->addWidget( label );
levelLCD = new TQLCDNumber( 2, mainWin );
@ -129,7 +129,7 @@ KAstTopLevel::KAstTopLevel()
label = new TQLabel( i18n("Ships"), mainWin );
label->setFont( labelFont );
label->setFixedWidth( label->tqsizeHint().width() );
label->setFixedWidth( label->sizeHint().width() );
label->setPalette( pal );
hb->addWidget( label );
@ -151,7 +151,7 @@ KAstTopLevel::KAstTopLevel()
vb->addWidget( view, 10 );
// -- bottom tqlayout:
// -- bottom layout:
TQFrame *sep2 = new TQFrame( mainWin );
sep2->setMaximumHeight( 1 );
sep2->setFrameStyle( TQFrame::HLine | TQFrame::Raised );
@ -168,7 +168,7 @@ KAstTopLevel::KAstTopLevel()
/*
label = new TQLabel( i18n( "T" ), mainWin );
label->setFont( smallFont );
label->setFixedWidth( label->tqsizeHint().width() );
label->setFixedWidth( label->sizeHint().width() );
label->setPalette( pal );
hbd->addWidget( label );
@ -184,7 +184,7 @@ KAstTopLevel::KAstTopLevel()
TQPixmap pm( sprites_prefix + "powerups/brake.png" );