summaryrefslogtreecommitdiffstats
path: root/atlantik/client
diff options
context:
space:
mode:
Diffstat (limited to 'atlantik/client')
-rw-r--r--atlantik/client/atlantik.cpp104
-rw-r--r--atlantik/client/atlantik.h8
-rw-r--r--atlantik/client/configdlg.cpp66
-rw-r--r--atlantik/client/configdlg.h23
-rw-r--r--atlantik/client/event.h5
-rw-r--r--atlantik/client/eventlogwidget.cpp8
-rw-r--r--atlantik/client/eventlogwidget.h10
-rw-r--r--atlantik/client/monopigator.cpp8
-rw-r--r--atlantik/client/monopigator.h8
-rw-r--r--atlantik/client/selectconfiguration_widget.cpp12
-rw-r--r--atlantik/client/selectconfiguration_widget.h5
-rw-r--r--atlantik/client/selectgame_widget.cpp12
-rw-r--r--atlantik/client/selectgame_widget.h7
-rw-r--r--atlantik/client/selectserver_widget.cpp12
-rw-r--r--atlantik/client/selectserver_widget.h7
15 files changed, 155 insertions, 140 deletions
diff --git a/atlantik/client/atlantik.cpp b/atlantik/client/atlantik.cpp
index f1e24645..2ad1bf98 100644
--- a/atlantik/client/atlantik.cpp
+++ b/atlantik/client/atlantik.cpp
@@ -64,15 +64,15 @@
#include "selectgame_widget.h"
#include "selectconfiguration_widget.h"
-LogTextEdit::LogTextEdit( TQWidget *parent, const char *name ) : TQTextEdit( parent, name )
+LogTextEdit::LogTextEdit( TQWidget *tqparent, const char *name ) : TQTextEdit( tqparent, name )
{
#ifdef KDE_3_2_FEATURES
- m_clear = KStdAction::clear( this, TQT_SLOT( clear() ), 0 );
+ m_clear = KStdAction::clear( TQT_TQOBJECT(this), TQT_SLOT( clear() ), 0 );
#else
- m_clear = new KAction( i18n("Clear"), "clear", NULL, this, TQT_SLOT( clear() ), static_cast<KActionCollection *>(0), "clear" );
+ m_clear = new KAction( i18n("Clear"), "clear", NULL, TQT_TQOBJECT(this), TQT_SLOT( clear() ), static_cast<KActionCollection *>(0), "clear" );
#endif
- m_selectAll = KStdAction::selectAll( this, TQT_SLOT( selectAll() ), 0 );
- m_copy = KStdAction::copy( this, TQT_SLOT( copy() ), 0 );
+ m_selectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( selectAll() ), 0 );
+ m_copy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( copy() ), 0 );
}
LogTextEdit::~LogTextEdit()
@@ -103,12 +103,12 @@ Atlantik::Atlantik ()
// Toolbar: Game
// KStdGameAction::gameNew(this, TQT_SLOT(slotNewGame()), actionCollection(), "game_new");
- m_showEventLog = new KAction(i18n("Show Event &Log")/*, "atlantik_showeventlog"*/, CTRL+Key_L, this, TQT_SLOT(showEventLog()), actionCollection(), "showeventlog");
- KStdGameAction::quit(kapp, TQT_SLOT(closeAllWindows()), actionCollection(), "game_quit");
+ m_showEventLog = new KAction(i18n("Show Event &Log")/*, "atlantik_showeventlog"*/, CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(showEventLog()), actionCollection(), "showeventlog");
+ KStdGameAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(closeAllWindows()), actionCollection(), "game_quit");
// Toolbar: Settings
- KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actionCollection());
- KStdAction::configureNotifications(this, TQT_SLOT(configureNotifications()), actionCollection());
+ KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection());
+ KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(configureNotifications()), actionCollection());
// Initialize pointers to 0L
m_configDialog = 0;
@@ -120,37 +120,37 @@ Atlantik::Atlantik ()
m_atlantikNetwork = 0;
// Game and network core
- m_atlanticCore = new AtlanticCore(this, "atlanticCore");
- connect(m_atlanticCore, TQT_SIGNAL(createGUI(Player *)), this, TQT_SLOT(newPlayer(Player *)));
- connect(m_atlanticCore, TQT_SIGNAL(removeGUI(Player *)), this, TQT_SLOT(removeGUI(Player *)));
- connect(m_atlanticCore, TQT_SIGNAL(createGUI(Trade *)), this, TQT_SLOT(newTrade(Trade *)));
- connect(m_atlanticCore, TQT_SIGNAL(removeGUI(Trade *)), this, TQT_SLOT(removeGUI(Trade *)));
+ m_atlanticCore = new AtlanticCore(TQT_TQOBJECT(this), "atlanticCore");
+ connect(m_atlanticCore, TQT_SIGNAL(createGUI(Player *)), TQT_TQOBJECT(this), TQT_SLOT(newPlayer(Player *)));
+ connect(m_atlanticCore, TQT_SIGNAL(removeGUI(Player *)), TQT_TQOBJECT(this), TQT_SLOT(removeGUI(Player *)));
+ connect(m_atlanticCore, TQT_SIGNAL(createGUI(Trade *)), TQT_TQOBJECT(this), TQT_SLOT(newTrade(Trade *)));
+ connect(m_atlanticCore, TQT_SIGNAL(removeGUI(Trade *)), TQT_TQOBJECT(this), TQT_SLOT(removeGUI(Trade *)));
initEventLog();
initNetworkObject();
// Menu,toolbar: Move
- m_roll = KStdGameAction::roll(this, TQT_SIGNAL(rollDice()), actionCollection());
+ m_roll = KStdGameAction::roll(TQT_TQOBJECT(this), TQT_SIGNAL(rollDice()), actionCollection());
m_roll->setEnabled(false);
- m_buyEstate = new KAction(i18n("&Buy"), "atlantik_buy_estate", CTRL+Key_B, this, TQT_SIGNAL(buyEstate()), actionCollection(), "buy_estate");
+ m_buyEstate = new KAction(i18n("&Buy"), "atlantik_buy_estate", CTRL+Key_B, TQT_TQOBJECT(this), TQT_SIGNAL(buyEstate()), actionCollection(), "buy_estate");
m_buyEstate->setEnabled(false);
- m_auctionEstate = new KAction(i18n("&Auction"), "auction", CTRL+Key_A, this, TQT_SIGNAL(auctionEstate()), actionCollection(), "auction");
+ m_auctionEstate = new KAction(i18n("&Auction"), "auction", CTRL+Key_A, TQT_TQOBJECT(this), TQT_SIGNAL(auctionEstate()), actionCollection(), "auction");
m_auctionEstate->setEnabled(false);
- m_endTurn = KStdGameAction::endTurn(this, TQT_SIGNAL(endTurn()), actionCollection());
+ m_endTurn = KStdGameAction::endTurn(TQT_TQOBJECT(this), TQT_SIGNAL(endTurn()), actionCollection());
m_endTurn->setEnabled(false);
- m_jailCard = new KAction(i18n("Use Card to Leave Jail")/*, "atlantik_move_jail_card"*/, 0, this, TQT_SIGNAL(jailCard()), actionCollection(), "move_jailcard");
+ m_jailCard = new KAction(i18n("Use Card to Leave Jail")/*, "atlantik_move_jail_card"*/, 0, TQT_TQOBJECT(this), TQT_SIGNAL(jailCard()), actionCollection(), "move_jailcard");
m_jailCard->setEnabled(false);
- m_jailPay = new KAction(i18n("&Pay to Leave Jail"), "jail_pay", CTRL+Key_P, this, TQT_SIGNAL(jailPay()), actionCollection(), "move_jailpay");
+ m_jailPay = new KAction(i18n("&Pay to Leave Jail"), "jail_pay", CTRL+Key_P, TQT_TQOBJECT(this), TQT_SIGNAL(jailPay()), actionCollection(), "move_jailpay");
m_jailPay->setEnabled(false);
- m_jailRoll = new KAction(i18n("Roll to Leave &Jail")/*, "atlantik_move_jail_roll"*/, CTRL+Key_J, this, TQT_SIGNAL(jailRoll()), actionCollection(), "move_jailroll");
+ m_jailRoll = new KAction(i18n("Roll to Leave &Jail")/*, "atlantik_move_jail_roll"*/, CTRL+Key_J, TQT_TQOBJECT(this), TQT_SIGNAL(jailRoll()), actionCollection(), "move_jailroll");
m_jailRoll->setEnabled(false);
// Mix code and XML into GUI
KMainWindow::createGUI();
applyMainWindowSettings( KGlobal::config(), "AtlantikMainWindow" );
KMainWindow::statusBar()->insertItem("Atlantik " ATLANTIK_VERSION_STRING, 0);
- KMainWindow::statusBar()->insertItem(TQString::null, 1);
- connect(statusBar(), TQT_SIGNAL(released(int)), this, TQT_SLOT(statusBarClick(int)));
+ KMainWindow::statusBar()->insertItem(TQString(), 1);
+ connect(statusBar(), TQT_SIGNAL(released(int)), TQT_TQOBJECT(this), TQT_SLOT(statusBarClick(int)));
// Main widget, containing all others
m_mainWidget = new TQWidget(this, "main");
@@ -158,7 +158,7 @@ Atlantik::Atlantik ()
m_mainLayout = new TQGridLayout(m_mainWidget, 3, 2);
setCentralWidget(m_mainWidget);
- // Vertical view area for portfolios.
+ //Qt::Vertical view area for portfolios.
m_portfolioScroll = new TQScrollView(m_mainWidget, "pfScroll");
m_mainLayout->addWidget( m_portfolioScroll, 0, 0 );
m_portfolioScroll->setHScrollBarMode( TQScrollView::AlwaysOff );
@@ -192,7 +192,7 @@ Atlantik::Atlantik ()
m_serverMsgs->setFocusProxy(m_input);
- connect(m_input, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotSendMsg()));
+ connect(m_input, TQT_SIGNAL(returnPressed()), TQT_TQOBJECT(this), TQT_SLOT(slotSendMsg()));
// Set stretching where we want it.
m_mainLayout->setRowStretch(1, 1); // make m_board+m_serverMsgs stretch vertically, not the rest
@@ -253,8 +253,8 @@ void Atlantik::newPlayer(Player *player)
// we'd better force an update.
playerChanged(player);
- connect(player, TQT_SIGNAL(changed(Player *)), this, TQT_SLOT(playerChanged(Player *)));
- connect(player, TQT_SIGNAL(gainedTurn()), this, TQT_SLOT(gainedTurn()));
+ connect(player, TQT_SIGNAL(changed(Player *)), TQT_TQOBJECT(this), TQT_SLOT(playerChanged(Player *)));
+ connect(player, TQT_SIGNAL(gainedTurn()), TQT_TQOBJECT(this), TQT_SLOT(gainedTurn()));
connect(player, TQT_SIGNAL(changed(Player *)), m_board, TQT_SLOT(playerChanged(Player *)));
KNotifyClient::event(winId(), "newplayer");
@@ -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(msgStatus(const TQString &)), this, TQT_SLOT(slotMsgStatus(const TQString &)));
+ connect(m_selectServer, TQT_SIGNAL(msgtqStatus(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgtqStatus(const TQString &)));
m_selectServer->slotRefresh( m_config.connectOnStart );
}
@@ -356,8 +356,8 @@ 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()), this, TQT_SLOT(showSelectServer()));
- connect(m_selectGame, TQT_SIGNAL(msgStatus(const TQString &)), this, TQT_SLOT(slotMsgStatus(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 &)));
}
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 &)), this, TQT_SLOT(slotMsgStatus(const TQString &)));
+ connect(m_selectConfiguration, TQT_SIGNAL(statusMessage(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgtqStatus(const TQString &)));
}
void Atlantik::initBoard()
@@ -475,12 +475,12 @@ void Atlantik::networkClosed(int status)
switch( status )
{
case KBufferedIO::involuntary:
- slotMsgStatus( i18n("Connection with server %1:%2 lost.").arg(m_atlantikNetwork->host()).arg(m_atlantikNetwork->port()), TQString("connect_no") );
+ slotMsgtqStatus( i18n("Connection with server %1:%2 lost.").tqarg(m_atlantikNetwork->host()).tqarg(m_atlantikNetwork->port()), TQString("connect_no") );
showSelectServer();
break;
default:
if ( !m_atlantikNetwork->host().isEmpty() )
- slotMsgStatus( i18n("Disconnected from %1:%2.").arg(m_atlantikNetwork->host()).arg(m_atlantikNetwork->port()), TQString("connect_no") );
+ slotMsgtqStatus( i18n("Disconnected from %1:%2.").tqarg(m_atlantikNetwork->host()).tqarg(m_atlantikNetwork->port()), TQString("connect_no") );
break;
}
}
@@ -491,7 +491,7 @@ void Atlantik::slotConfigure()
m_configDialog = new ConfigDialog(this);
m_configDialog->show();
- connect(m_configDialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotUpdateConfig()));
+ connect(m_configDialog, TQT_SIGNAL(okClicked()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateConfig()));
}
void Atlantik::showEventLog()
@@ -612,7 +612,7 @@ void Atlantik::slotUpdateConfig()
void Atlantik::slotSendMsg()
{
m_atlantikNetwork->cmdChat(m_input->text());
- m_input->setText(TQString::null);
+ m_input->setText(TQString());
}
void Atlantik::slotMsgInfo(TQString msg)
@@ -625,7 +625,7 @@ void Atlantik::slotMsgError(TQString msg)
serverMsgsAppend("Error: " + msg);
}
-void Atlantik::slotMsgStatus(const TQString &message, const TQString &icon)
+void Atlantik::slotMsgtqStatus(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").arg(time.toString("hh:mm")).arg(player).arg(msg));
+ serverMsgsAppend(TQString("[%1] %2: %3").tqarg(time.toString("hh:mm")).tqarg(player).tqarg(msg));
}
else
serverMsgsAppend(player + ": " + msg);
@@ -728,26 +728,26 @@ void Atlantik::initNetworkObject()
}
m_atlantikNetwork = new AtlantikNetwork(m_atlanticCore);
- connect(m_atlantikNetwork, TQT_SIGNAL(msgInfo(TQString)), this, TQT_SLOT(slotMsgInfo(TQString)));
- connect(m_atlantikNetwork, TQT_SIGNAL(msgError(TQString)), this, TQT_SLOT(slotMsgError(TQString)));
- connect(m_atlantikNetwork, TQT_SIGNAL(msgStatus(const TQString &, const TQString &)), this, TQT_SLOT(slotMsgStatus(const TQString &, const TQString &)));
- connect(m_atlantikNetwork, TQT_SIGNAL(msgChat(TQString, TQString)), this, TQT_SLOT(slotMsgChat(TQString, TQString)));
+ 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(msgChat(TQString, TQString)), TQT_TQOBJECT(this), TQT_SLOT(slotMsgChat(TQString, TQString)));
- connect(m_atlantikNetwork, TQT_SIGNAL(connectionSuccess()), this, TQT_SLOT(slotNetworkConnected()));
- connect(m_atlantikNetwork, TQT_SIGNAL(connectionFailed(int)), this, TQT_SLOT(slotNetworkError(int)));
- connect(m_atlantikNetwork, TQT_SIGNAL(closed(int)), this, TQT_SLOT(networkClosed(int)));
+ connect(m_atlantikNetwork, TQT_SIGNAL(connectionSuccess()), TQT_TQOBJECT(this), TQT_SLOT(slotNetworkConnected()));
+ connect(m_atlantikNetwork, TQT_SIGNAL(connectionFailed(int)), TQT_TQOBJECT(this), TQT_SLOT(slotNetworkError(int)));
+ connect(m_atlantikNetwork, TQT_SIGNAL(closed(int)), TQT_TQOBJECT(this), TQT_SLOT(networkClosed(int)));
- connect(m_atlantikNetwork, TQT_SIGNAL(receivedHandshake()), this, TQT_SLOT(sendHandshake()));
+ connect(m_atlantikNetwork, TQT_SIGNAL(receivedHandshake()), TQT_TQOBJECT(this), TQT_SLOT(sendHandshake()));
- connect(m_atlantikNetwork, TQT_SIGNAL(gameConfig()), this, TQT_SLOT(showSelectConfiguration()));
- connect(m_atlantikNetwork, TQT_SIGNAL(gameInit()), this, TQT_SLOT(initBoard()));
- connect(m_atlantikNetwork, TQT_SIGNAL(gameRun()), this, TQT_SLOT(showBoard()));
- connect(m_atlantikNetwork, TQT_SIGNAL(gameEnd()), this, TQT_SLOT(freezeBoard()));
+ connect(m_atlantikNetwork, TQT_SIGNAL(gameConfig()), TQT_TQOBJECT(this), TQT_SLOT(showSelectConfiguration()));
+ connect(m_atlantikNetwork, TQT_SIGNAL(gameInit()), TQT_TQOBJECT(this), TQT_SLOT(initBoard()));
+ connect(m_atlantikNetwork, TQT_SIGNAL(gameRun()), TQT_TQOBJECT(this), TQT_SLOT(showBoard()));
+ connect(m_atlantikNetwork, TQT_SIGNAL(gameEnd()), TQT_TQOBJECT(this), TQT_SLOT(freezeBoard()));
- connect(m_atlantikNetwork, TQT_SIGNAL(newEstate(Estate *)), this, TQT_SLOT(newEstate(Estate *)));
- connect(m_atlantikNetwork, TQT_SIGNAL(newAuction(Auction *)), this, TQT_SLOT(newAuction(Auction *)));
+ connect(m_atlantikNetwork, TQT_SIGNAL(newEstate(Estate *)), TQT_TQOBJECT(this), TQT_SLOT(newEstate(Estate *)));
+ connect(m_atlantikNetwork, TQT_SIGNAL(newAuction(Auction *)), TQT_TQOBJECT(this), TQT_SLOT(newAuction(Auction *)));
- connect(m_atlantikNetwork, TQT_SIGNAL(clientCookie(TQString)), this, TQT_SLOT(clientCookie(TQString)));
+ connect(m_atlantikNetwork, TQT_SIGNAL(clientCookie(TQString)), TQT_TQOBJECT(this), TQT_SLOT(clientCookie(TQString)));
connect(m_atlantikNetwork, TQT_SIGNAL(networkEvent(const TQString &, const TQString &)), m_eventLog, TQT_SLOT(addEvent(const TQString &, const TQString &)));
connect(this, TQT_SIGNAL(rollDice()), m_atlantikNetwork, TQT_SLOT(rollDice()));
diff --git a/atlantik/client/atlantik.h b/atlantik/client/atlantik.h
index d3eac354..24b989d3 100644
--- a/atlantik/client/atlantik.h
+++ b/atlantik/client/atlantik.h
@@ -68,12 +68,13 @@ class Player;
class Estate;
class Trade;
-class LogTextEdit : public QTextEdit
+class LogTextEdit : public TQTextEdit
{
Q_OBJECT
+ TQ_OBJECT
public:
- LogTextEdit( TQWidget *parent = 0, const char *name = 0 );
+ LogTextEdit( TQWidget *tqparent = 0, const char *name = 0 );
virtual ~LogTextEdit();
TQPopupMenu *createPopupMenu( const TQPoint & pos );
@@ -91,6 +92,7 @@ private:
class Atlantik : public KMainWindow
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -186,7 +188,7 @@ public slots:
*/
void slotMsgInfo(TQString msg);
- void slotMsgStatus(const TQString &message, const TQString &icon = TQString::null);
+ void slotMsgtqStatus(const TQString &message, const TQString &icon = TQString());
/**
* Informs serverMsgs() to append an incoming message from the
diff --git a/atlantik/client/configdlg.cpp b/atlantik/client/configdlg.cpp
index 9e936147..b5d1ecae 100644
--- a/atlantik/client/configdlg.cpp
+++ b/atlantik/client/configdlg.cpp
@@ -40,9 +40,9 @@
#include "atlantik.h"
#include "configdlg.moc"
-ConfigDialog::ConfigDialog(Atlantik* parent, const char *name) : KDialogBase(IconList, i18n("Configure Atlantik"), Ok|Cancel, Ok, parent, "config_atlantik", false, name)
+ConfigDialog::ConfigDialog(Atlantik* tqparent, const char *name) : KDialogBase(IconList, i18n("Configure Atlantik"), Ok|Cancel, Ok, tqparent, "config_atlantik", false, name)
{
- m_parent = parent;
+ m_parent = tqparent;
p_general = addPage(i18n("General"), i18n("General"), BarIcon("configure", KIcon::SizeMedium));
p_p13n = addPage(i18n("Personalization"), i18n("Personalization"), BarIcon("personal", KIcon::SizeMedium));
p_board = addPage(i18n("Board"), i18n("Board"), BarIcon("monop_board", KIcon::SizeMedium));
@@ -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(sizeHint());
+ setMinimumSize(tqsizeHint());
}
bool ConfigDialog::chatTimestamps()
@@ -111,26 +111,26 @@ AtlantikConfig ConfigDialog::config()
return m_parent->config();
}
-ConfigPlayer::ConfigPlayer(ConfigDialog* configDialog, TQWidget *parent, const char *name) : TQWidget(parent, name)
+ConfigPlayer::ConfigPlayer(ConfigDialog* configDialog, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
{
m_configDialog = configDialog;
- TQVBoxLayout *layout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint());
+ TQVBoxLayout *tqlayout = new TQVBoxLayout(tqparent, KDialog::marginHint(), KDialog::spacingHint());
- TQLabel *label = new TQLabel(i18n("Player name:"), parent);
- layout->addWidget(label);
+ TQLabel *label = new TQLabel(i18n("Player name:"), tqparent);
+ tqlayout->addWidget(label);
- m_playerName = new TQLineEdit(parent);
- layout->addWidget(m_playerName);
+ m_playerName = new TQLineEdit(tqparent);
+ tqlayout->addWidget(m_playerName);
- TQLabel *label2 = new TQLabel(i18n("Player image:"), parent);
- layout->addWidget(label2);
+ TQLabel *label2 = new TQLabel(i18n("Player image:"), tqparent);
+ tqlayout->addWidget(label2);
- m_playerIcon = new KPushButton(parent, "playerIcon");
- layout->addWidget(m_playerIcon);
+ m_playerIcon = new KPushButton(tqparent, "playerIcon");
+ tqlayout->addWidget(m_playerIcon);
connect( m_playerIcon, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseImage()) );
- layout->addStretch(1);
+ tqlayout->addStretch(1);
reset();
}
@@ -182,21 +182,21 @@ void ConfigPlayer::reset()
setImage();
}
-ConfigMonopigator::ConfigMonopigator(ConfigDialog *configDialog, TQWidget *parent, const char *name) : TQWidget(parent, name)
+ConfigMonopigator::ConfigMonopigator(ConfigDialog *configDialog, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
{
m_configDialog = configDialog;
- TQVBoxLayout *layout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint());
+ TQVBoxLayout *tqlayout = new TQVBoxLayout(tqparent, KDialog::marginHint(), KDialog::spacingHint());
- m_connectOnStart = new TQCheckBox(i18n("Request list of Internet servers on start-up"), parent);
- layout->addWidget(m_connectOnStart);
+ m_connectOnStart = new TQCheckBox(i18n("Request list of Internet servers on start-up"), tqparent);
+ tqlayout->addWidget(m_connectOnStart);
TQString message=i18n(
"If checked, Atlantik connects to a meta server on start-up to\n"
"request a list of Internet servers.\n");
TQWhatsThis::add(m_connectOnStart, message);
- m_hideDevelopmentServers = new TQCheckBox(i18n("Hide development servers"), parent);
- layout->addWidget(m_hideDevelopmentServers);
+ m_hideDevelopmentServers = new TQCheckBox(i18n("Hide development servers"), tqparent);
+ tqlayout->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);
- layout->addStretch(1);
+ tqlayout->addStretch(1);
reset();
}
@@ -225,20 +225,20 @@ void ConfigMonopigator::reset()
m_hideDevelopmentServers->setChecked(m_configDialog->config().hideDevelopmentServers);
}
-ConfigGeneral::ConfigGeneral(ConfigDialog *configDialog, TQWidget *parent, const char *name) : TQWidget(parent, name)
+ConfigGeneral::ConfigGeneral(ConfigDialog *configDialog, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
{
m_configDialog = configDialog;
- TQVBoxLayout *layout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint());
+ TQVBoxLayout *tqlayout = new TQVBoxLayout(tqparent, KDialog::marginHint(), KDialog::spacingHint());
- m_chatTimestamps = new TQCheckBox(i18n("Show timestamps in chat messages"), parent);
- layout->addWidget(m_chatTimestamps);
+ m_chatTimestamps = new TQCheckBox(i18n("Show timestamps in chat messages"), tqparent);
+ tqlayout->addWidget(m_chatTimestamps);
TQString message=i18n(
"If checked, Atlantik will add timestamps in front of chat\n"
"messages.\n");
TQWhatsThis::add(m_chatTimestamps, message);
- layout->addStretch(1);
+ tqlayout->addStretch(1);
reset();
}
@@ -253,13 +253,13 @@ void ConfigGeneral::reset()
m_chatTimestamps->setChecked(m_configDialog->config().chatTimestamps);
}
-ConfigBoard::ConfigBoard(ConfigDialog *configDialog, TQWidget *parent, const char *name) : TQWidget(parent, name)
+ConfigBoard::ConfigBoard(ConfigDialog *configDialog, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
{
m_configDialog = configDialog;
- TQVBoxLayout *layout = new TQVBoxLayout(parent, KDialog::marginHint(), KDialog::spacingHint());
+ TQVBoxLayout *tqlayout = new TQVBoxLayout(tqparent, KDialog::marginHint(), KDialog::spacingHint());
- TQGroupBox *box = new TQGroupBox(1, Qt::Horizontal, i18n("Game Status Feedback"), parent);
- layout->addWidget(box);
+ TQGroupBox *box = new TQGroupBox(1, Qt::Horizontal, i18n("Game tqStatus Feedback"), tqparent);
+ tqlayout->addWidget(box);
m_indicateUnowned = new TQCheckBox(i18n("Display title deed card on unowned properties"), box);
TQString message=i18n(
@@ -291,10 +291,10 @@ ConfigBoard::ConfigBoard(ConfigDialog *configDialog, TQWidget *parent, const cha
"will have a Quartz effect similar to the Quartz KWin style.\n");
TQWhatsThis::add(m_quartzEffects, message);
-// box = new TQGroupBox(1, Qt::Horizontal, i18n("Size"), parent);
-// layout->addWidget(box);
+// box = new TQGroupBox(1, Qt::Horizontal, i18n("Size"), tqparent);
+// tqlayout->addWidget(box);
- layout->addStretch(1);
+ tqlayout->addStretch(1);
reset();
}
diff --git a/atlantik/client/configdlg.h b/atlantik/client/configdlg.h
index 41843ca6..c28e3a98 100644
--- a/atlantik/client/configdlg.h
+++ b/atlantik/client/configdlg.h
@@ -32,12 +32,13 @@ class ConfigDialog;
struct AtlantikConfig;
-class ConfigPlayer : public QWidget
+class ConfigPlayer : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- ConfigPlayer(ConfigDialog *configDialog, TQWidget *parent, const char *name=0);
+ ConfigPlayer(ConfigDialog *configDialog, TQWidget *tqparent, const char *name=0);
TQString playerName();
TQString playerImage();
@@ -55,12 +56,13 @@ private:
KPushButton *m_playerIcon;
};
-class ConfigBoard : public QWidget
+class ConfigBoard : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- ConfigBoard(ConfigDialog *configDialog, TQWidget *parent, const char *name=0);
+ ConfigBoard(ConfigDialog *configDialog, TQWidget *tqparent, const char *name=0);
bool indicateUnowned();
bool highliteUnowned();
@@ -75,12 +77,13 @@ private:
TQCheckBox *m_indicateUnowned, *m_highliteUnowned, *m_darkenMortgaged, *m_animateToken, *m_quartzEffects;
};
-class ConfigMonopigator : public QWidget
+class ConfigMonopigator : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- ConfigMonopigator(ConfigDialog *dialog, TQWidget *parent, const char *name = 0);
+ ConfigMonopigator(ConfigDialog *dialog, TQWidget *tqparent, const char *name = 0);
bool connectOnStart();
bool hideDevelopmentServers();
@@ -92,12 +95,13 @@ private:
TQCheckBox *m_connectOnStart, *m_hideDevelopmentServers;
};
-class ConfigGeneral : public QWidget
+class ConfigGeneral : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- ConfigGeneral(ConfigDialog *dialog, TQWidget *parent, const char *name = 0);
+ ConfigGeneral(ConfigDialog *dialog, TQWidget *tqparent, const char *name = 0);
bool chatTimestamps();
@@ -111,9 +115,10 @@ private:
class ConfigDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- ConfigDialog(Atlantik *parent, const char *name=0);
+ ConfigDialog(Atlantik *tqparent, const char *name=0);
bool chatTimestamps();
bool indicateUnowned();
diff --git a/atlantik/client/event.h b/atlantik/client/event.h
index dc3b6c9b..96d02c41 100644
--- a/atlantik/client/event.h
+++ b/atlantik/client/event.h
@@ -22,12 +22,13 @@
class TQDateTime;
class TQString;
-class Event : public QObject
+class Event : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
- Event(const TQDateTime &dateTime, const TQString &description, const TQString &icon = TQString::null);
+ Event(const TQDateTime &dateTime, const TQString &description, const TQString &icon = TQString());
TQDateTime dateTime() const;
TQString description() const;
TQString icon() const;
diff --git a/atlantik/client/eventlogwidget.cpp b/atlantik/client/eventlogwidget.cpp
index 6bc81b04..2821253a 100644
--- a/atlantik/client/eventlogwidget.cpp
+++ b/atlantik/client/eventlogwidget.cpp
@@ -37,7 +37,7 @@ EventLog::EventLog()
void EventLog::addEvent(const TQString &description, const TQString &icon)
{
- Event *event = new Event(TQDateTime::currentDateTime(), description, icon);
+ Event *event = new Event(TQDateTime::tqcurrentDateTime(), description, icon);
m_events.append(event);
emit newEvent(event);
}
@@ -47,8 +47,8 @@ TQPtrList<Event> EventLog::events()
return m_events;
}
-EventLogWidget::EventLogWidget(EventLog *eventLog, TQWidget *parent, const char *name)
- : TQWidget(parent, name,
+EventLogWidget::EventLogWidget(EventLog *eventLog, TQWidget *tqparent, const char *name)
+ : TQWidget(tqparent, name,
WType_Dialog | WStyle_Customize | WStyle_DialogBorder | WStyle_Title |
WStyle_Minimize | WStyle_ContextHelp )
{
@@ -113,7 +113,7 @@ void EventLogWidget::save()
{
TQTextStream stream(&file);
- stream << i18n( "Atlantik log file, saved at %1." ).arg( TQDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss") ) << endl;
+ stream << i18n( "Atlantik log file, saved at %1." ).tqarg( TQDateTime::tqcurrentDateTime().toString("yyyy-MM-dd hh:mm:ss") ) << endl;
TQPtrList<Event> events = m_eventLog->events();
for (TQPtrListIterator<Event> it( events ); (*it) ; ++it)
diff --git a/atlantik/client/eventlogwidget.h b/atlantik/client/eventlogwidget.h
index c9e1eacd..3b2d1883 100644
--- a/atlantik/client/eventlogwidget.h
+++ b/atlantik/client/eventlogwidget.h
@@ -28,16 +28,17 @@ class KListView;
class KListViewItem;
class KPushButton;
-class EventLog : public QObject
+class EventLog : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
EventLog();
TQPtrList<Event> events();
public slots:
- void addEvent(const TQString &description, const TQString &icon = TQString::null);
+ void addEvent(const TQString &description, const TQString &icon = TQString());
signals:
void newEvent(Event *event);
@@ -46,14 +47,15 @@ private:
TQPtrList<Event> m_events;
};
-class EventLogWidget : public QWidget
+class EventLogWidget : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
enum EventLogType { Default, Net_In, Net_Out };
- EventLogWidget(EventLog *eventLog, TQWidget *parent=0, const char *name = 0);
+ EventLogWidget(EventLog *eventLog, TQWidget *tqparent=0, const char *name = 0);
public slots:
void addEvent(Event *event);
diff --git a/atlantik/client/monopigator.cpp b/atlantik/client/monopigator.cpp
index 7e0a834d..22081de0 100644
--- a/atlantik/client/monopigator.cpp
+++ b/atlantik/client/monopigator.cpp
@@ -46,7 +46,7 @@ void Monopigator::loadData(const KURL &url)
m_downloadData->reset();
m_job = KIO::get(url, true, false);
- m_job->addMetaData(TQString::fromLatin1("UserAgent"), TQString::fromLatin1("Atlantik/" ATLANTIK_VERSION_STRING));
+ m_job->addMetaData(TQString::tqfromLatin1("UserAgent"), TQString::tqfromLatin1("Atlantik/" ATLANTIK_VERSION_STRING));
if (!m_timer)
{
@@ -108,12 +108,12 @@ void Monopigator::processData(const TQByteArray &data, bool okSoFar)
}
}
-MonopigatorEntry::MonopigatorEntry(TQListView *parent, TQString host, TQString latency, TQString version, TQString users, TQString port, TQString ip) : TQObject(), TQListViewItem(parent, host, latency, version, users, port)
+MonopigatorEntry::MonopigatorEntry(TQListView *tqparent, TQString host, TQString latency, TQString version, TQString users, TQString port, TQString ip) : TQObject(), TQListViewItem(tqparent, host, latency, version, users, port)
{
- m_isDev = ( version.find( TQRegExp("(CVS|-dev)") ) != -1 ) ? true : false;
+ m_isDev = ( version.tqfind( TQRegExp("(CVS|-dev)") ) != -1 ) ? true : false;
setEnabled(false);
- parent->sort();
+ tqparent->sort();
if ( !ip.isEmpty() )
host = ip;
diff --git a/atlantik/client/monopigator.h b/atlantik/client/monopigator.h
index dd88b0ae..c785b980 100644
--- a/atlantik/client/monopigator.h
+++ b/atlantik/client/monopigator.h
@@ -28,9 +28,10 @@
class KExtendedSocket;
class TQTime;
-class Monopigator : public QObject
+class Monopigator : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
Monopigator();
@@ -55,12 +56,13 @@ private:
KIO::Job *m_job;
};
-class MonopigatorEntry : public TQObject, public QListViewItem
+class MonopigatorEntry : public TQObject, public TQListViewItem
{
Q_OBJECT
+ TQ_OBJECT
public:
- MonopigatorEntry(TQListView *parent, TQString host, TQString latency, TQString version, TQString users, TQString port, TQString ip);
+ MonopigatorEntry(TQListView *tqparent, TQString host, TQString latency, TQString version, TQString users, TQString port, TQString ip);
int compare(TQListViewItem *i, int col, bool ascending) const;
bool isDev() const;
diff --git a/atlantik/client/selectconfiguration_widget.cpp b/atlantik/client/selectconfiguration_widget.cpp
index b40bdd4f..1cb7a142 100644
--- a/atlantik/client/selectconfiguration_widget.cpp
+++ b/atlantik/client/selectconfiguration_widget.cpp
@@ -33,7 +33,7 @@
#include "selectconfiguration_widget.moc"
-SelectConfiguration::SelectConfiguration(AtlanticCore *atlanticCore, TQWidget *parent, const char *name) : TQWidget(parent, name)
+SelectConfiguration::SelectConfiguration(AtlanticCore *atlanticCore, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
{
m_atlanticCore = atlanticCore;
m_game = 0;
@@ -51,7 +51,7 @@ SelectConfiguration::SelectConfiguration(AtlanticCore *atlanticCore, TQWidget *p
playerButtons->addItem(new TQSpacerItem(20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
- // Vertical spacer.
+ //Qt::Vertical spacer.
m_mainLayout->addItem(new TQSpacerItem(20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
// Server buttons.
@@ -127,11 +127,11 @@ void SelectConfiguration::gameOption(TQString title, TQString type, TQString val
void SelectConfiguration::changeOption()
{
- ConfigOption *configOption = m_configMap[(TQObject *)TQObject::sender()];
+ ConfigOption *configOption = m_configMap[(TQObject *)TQT_BASE_OBJECT_NAME::sender()];
if (configOption)
{
- kdDebug() << "checked " << ((TQCheckBox *)TQObject::sender())->isChecked() << endl;
- emit changeOption( configOption->id(), TQString::number( ((TQCheckBox *)TQObject::sender())->isChecked() ) );
+ kdDebug() << "checked " << ((TQCheckBox *)TQT_BASE_OBJECT_NAME::sender())->isChecked() << endl;
+ emit changeOption( configOption->id(), TQString::number( ((TQCheckBox *)TQT_BASE_OBJECT_NAME::sender())->isChecked() ) );
}
}
@@ -148,7 +148,7 @@ void SelectConfiguration::optionChanged(ConfigOption *configOption)
void SelectConfiguration::optionChanged()
{
- TQString command = m_optionCommandMap[(TQObject *)TQObject::sender()];
+ TQString command = m_optionCommandMap[(TQObject *)TQT_BASE_OBJECT_NAME::sender()];
if (TQCheckBox *checkBox = m_checkBoxMap[command])
{
diff --git a/atlantik/client/selectconfiguration_widget.h b/atlantik/client/selectconfiguration_widget.h
index a0cfcd24..0ad747d0 100644
--- a/atlantik/client/selectconfiguration_widget.h
+++ b/atlantik/client/selectconfiguration_widget.h
@@ -32,12 +32,13 @@ class ConfigOption;
class Game;
class Player;
-class SelectConfiguration : public QWidget
+class SelectConfiguration : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- SelectConfiguration(AtlanticCore *atlanticCore, TQWidget *parent, const char *name=0);
+ SelectConfiguration(AtlanticCore *atlanticCore, TQWidget *tqparent, const char *name=0);
void setCanStart(const bool &canStart);
TQString hostToConnect() const;
diff --git a/atlantik/client/selectgame_widget.cpp b/atlantik/client/selectgame_widget.cpp
index 8f39ff08..e634b3c2 100644
--- a/atlantik/client/selectgame_widget.cpp
+++ b/atlantik/client/selectgame_widget.cpp
@@ -29,7 +29,7 @@
#include "selectgame_widget.h"
-SelectGame::SelectGame(AtlanticCore *atlanticCore, TQWidget *parent, const char *name) : TQWidget(parent, name)
+SelectGame::SelectGame(AtlanticCore *atlanticCore, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
{
m_atlanticCore = atlanticCore;
@@ -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").arg(game->name()), game->description(), TQString::null, TQString::null, game->type() );
+ TQListViewItem *item = new TQListViewItem( m_gameList, i18n("Create a new %1 Game").tqarg(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").arg( (master ? master->name() : TQString::null), 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").tqarg( (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").arg(game->name()));
+ item->setText(0, i18n("Create a new %1 Game").tqarg(game->name()));
else
{
Player *master = game->master();
- item->setText( 0, i18n("Join %1's %2 Game").arg( (master ? master->name() : TQString::null), game->name() ) );
+ item->setText( 0, i18n("Join %1's %2 Game").tqarg( (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").arg( player->name(), game->name() ) );
+ item->setText( 0, i18n("Join %1's %2 Game").tqarg( player->name(), game->name() ) );
return;
}
item = item->nextSibling();
diff --git a/atlantik/client/selectgame_widget.h b/atlantik/client/selectgame_widget.h
index f6d28f43..42ec3350 100644
--- a/atlantik/client/selectgame_widget.h
+++ b/atlantik/client/selectgame_widget.h
@@ -27,12 +27,13 @@ class AtlanticCore;
class Game;
class Player;
-class SelectGame : public QWidget
+class SelectGame : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- SelectGame(AtlanticCore *atlanticCore, TQWidget *parent, const char *name=0);
+ SelectGame(AtlanticCore *atlanticCore, TQWidget *tqparent, const char *name=0);
void initPage();
bool validateNext();
@@ -51,7 +52,7 @@ signals:
void joinGame(int gameId);
void newGame(const TQString &gameType);
void leaveServer();
- void msgStatus(const TQString &status);
+ void msgtqStatus(const TQString &status);
private:
TQListViewItem *findItem(Game *game);
diff --git a/atlantik/client/selectserver_widget.cpp b/atlantik/client/selectserver_widget.cpp
index 97a594c4..2404ebd1 100644
--- a/atlantik/client/selectserver_widget.cpp
+++ b/atlantik/client/selectserver_widget.cpp
@@ -28,7 +28,7 @@
#include "selectserver_widget.moc"
-SelectServer::SelectServer(bool useMonopigatorOnStart, bool hideDevelopmentServers, TQWidget *parent, const char *name) : TQWidget(parent, name)
+SelectServer::SelectServer(bool useMonopigatorOnStart, bool hideDevelopmentServers, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name)
{
m_hideDevelopmentServers = hideDevelopmentServers;
@@ -42,12 +42,12 @@ SelectServer::SelectServer(bool useMonopigatorOnStart, bool hideDevelopmentServe
TQLabel *hostLabel = new TQLabel(i18n("Hostname:"), customGroup);
m_hostEdit = new KLineEdit(customGroup);
- m_hostEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum));
+ m_hostEdit->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum));
TQLabel *portLabel = new TQLabel(i18n("Port:"), customGroup);
m_portEdit = new KLineEdit(TQString::number(1234), customGroup);
- m_portEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum));
+ m_portEdit->tqsetSizePolicy(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 msgStatus(i18n("Retrieving server list..."));
+ emit msgtqStatus(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 msgStatus(i18n("Retrieved server list."));
+ emit msgtqStatus(i18n("Retrieved server list."));
m_refreshButton->setEnabled(true);
}
void SelectServer::monopigatorTimeout()
{
- emit msgStatus(i18n("Error while retrieving the server list."));
+ emit msgtqStatus(i18n("Error while retrieving the server list."));
m_refreshButton->setEnabled(true);
}
diff --git a/atlantik/client/selectserver_widget.h b/atlantik/client/selectserver_widget.h
index 471bc8d2..7e4ba45d 100644
--- a/atlantik/client/selectserver_widget.h
+++ b/atlantik/client/selectserver_widget.h
@@ -29,12 +29,13 @@
class KExtendedSocket;
-class SelectServer : public QWidget
+class SelectServer : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- SelectServer(bool useMonopigatorOnStart, bool hideDevelopmentServers, TQWidget *parent, const char *name=0);
+ SelectServer(bool useMonopigatorOnStart, bool hideDevelopmentServers, TQWidget *tqparent, const char *name=0);
virtual ~SelectServer();
void initPage();
@@ -56,7 +57,7 @@ private slots:
signals:
void serverConnect(const TQString host, int port);
- void msgStatus(const TQString &message);
+ void msgtqStatus(const TQString &message);
void showDevelopmentServers(bool show);
private:
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-06 03:54:36 +0000