Rename old tq methods that no longer need a unique name

pull/1/head
Timothy Pearson 12 years ago
parent 84ace1135c
commit 0e2b76239f

@ -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.").tqarg(m_atlantikNetwork->host()).tqarg(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.").tqarg(m_atlantikNetwork->host()).tqarg(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);
@ -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()));

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

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

@ -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." ).tqarg( TQDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss") ) << endl;
TQPtrList<Event> events = m_eventLog->events();
for (TQPtrListIterator<Event> it( events ); (*it) ; ++it)

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

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

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

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

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

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

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

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

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

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

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

@ -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 );
@ -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" );
label = new TQLabel( mainWin );
label->setPixmap( pm );
label->setFixedWidth( label->tqsizeHint().width() );
label->setFixedWidth( label->sizeHint().width() );
label->setPalette( pal );
hbd->addWidget( label );
@ -200,7 +200,7 @@ KAstTopLevel::KAstTopLevel()
pm.load( sprites_prefix + "powerups/shield.png" );
label = new TQLabel( mainWin );
label->setPixmap( pm );
label->setFixedWidth( label->tqsizeHint().width() );
label->setFixedWidth( label->sizeHint().width() );
label->setPalette( pal );
hbd->addWidget( label );
@ -216,7 +216,7 @@ KAstTopLevel::KAstTopLevel()
pm.load( sprites_prefix + "powerups/shoot.png" );
label = new TQLabel( mainWin );
label->setPixmap( pm );
label->setFixedWidth( label->tqsizeHint().width() );
label->setFixedWidth( label->sizeHint().width() );
label->setPalette( pal );
hbd->addWidget( label );
@ -231,7 +231,7 @@ KAstTopLevel::KAstTopLevel()
label = new TQLabel( i18n( "Fuel" ), mainWin );
label->setFont( smallFont );
label->setFixedWidth( label->tqsizeHint().width() + 10 );
label->setFixedWidth( label->sizeHint().width() + 10 );
label->setPalette( pal );
hbd->addWidget( label );

@ -78,7 +78,7 @@ KAsteroidsView::KAsteroidsView( TQWidget *parent, const char *name )
field.setBackgroundColor(black);
TQPixmap pm( locate("sprite", IMG_BACKGROUND) );
field.tqsetBackgroundPixmap( pm );
field.setBackgroundPixmap( pm );
textSprite = new TQCanvasText( &field );
TQFont font( KGlobalSettings::generalFont().family(), 18 );

@ -124,7 +124,7 @@ void Feld::mousePressEvent (TQMouseEvent *e)
resetValidDirs();
chosen = false;
}
emittqStatus();
emitStatus();
}
const atom& Feld::getAtom(uint index) const
@ -154,7 +154,7 @@ void Feld::nextAtom()
xpos = x; ypos = y;
chosen = true;
resetValidDirs();
emittqStatus();
emitStatus();
return;
}
}
@ -187,7 +187,7 @@ void Feld::previousAtom()
xpos = x; ypos = y;
chosen = true;
resetValidDirs();
emittqStatus();
emitStatus();
return;
}
}
@ -198,7 +198,7 @@ void Feld::previousAtom()
}
void Feld::emittqStatus()
void Feld::emitStatus()
{
if (!chosen || moving) {}
else {
@ -231,7 +231,7 @@ void Feld::done ()
if (moving)
return;
emittqStatus();
emitStatus();
if (checkDone())
emit gameOver(moves);

@ -65,7 +65,7 @@ protected:
void paintMovingAtom();
void mousePressEvent (TQMouseEvent *);
void mouseMoveEvent (TQMouseEvent *);
void emittqStatus();
void emitStatus();
protected:
struct UndoInfo {

@ -214,7 +214,7 @@ GameWidget::GameWidget ( TQWidget *parent, const char* name )
headerFont.setBold(true);
hs = new TQLabel (highest, bg);
hs->tqsetAlignment(TQt::AlignRight);
hs->setAlignment(TQt::AlignRight);
hs->setFont(headerFont);
slay->addWidget(hs);
@ -223,7 +223,7 @@ GameWidget::GameWidget ( TQWidget *parent, const char* name )
slay->addWidget(new TQLabel(i18n("Your score so far:"), bg));
ys = new TQLabel (current, bg);
ys->tqsetAlignment(TQt::AlignRight);
ys->setAlignment(TQt::AlignRight);
ys->setFont(headerFont);
slay->addWidget(ys);

@ -947,7 +947,7 @@ void KBgEngineFIBS::connected()
/*
* Initialize the rx state machine
*/
rxtqStatus = RxConnect;
rxStatus = RxConnect;
rxCollect = "";
/*
@ -992,7 +992,7 @@ void KBgEngineFIBS::newAccount()
if (!queryConnection(true))
return;
rxtqStatus = RxNewLogin;
rxStatus = RxNewLogin;
rxCollect = "";
login = false;
connectFIBS();
@ -1289,7 +1289,7 @@ void KBgEngineFIBS::handleServerData(TQString &line)
*/
line.replace(pat[TabChar], " ");
switch (rxtqStatus) {
switch (rxStatus) {
case RxConnect:
handleMessageConnect(line, rawline);
@ -1345,7 +1345,7 @@ void KBgEngineFIBS::handleMessageWhois(const TQString &line)
{
rxCollect += "<br>&nbsp;&nbsp;&nbsp;&nbsp;" + line;
if (line.contains(pat[WhoisE1]) || line.contains(pat[WhoisE2])) {
rxtqStatus = RxNormal;
rxStatus = RxNormal;
emit infoText("<font color=\"darkgreen\">" + rxCollect + "<br></font>");
}
}
@ -1358,7 +1358,7 @@ void KBgEngineFIBS::handleMessageRating(const TQString &line)
rxCollect += "<br>" + line;
if (line.contains(pat[EndRate]) && ++rxCount == 2) {
emit infoText("<font color=\"blue\">" + rxCollect + "<br></font>");
rxtqStatus = RxNormal;
rxStatus = RxNormal;
}
}
@ -1368,7 +1368,7 @@ void KBgEngineFIBS::handleMessageRating(const TQString &line)
void KBgEngineFIBS::handleMessageMotd(const TQString &line)
{
if (line.contains(pat[MotdEnd])) {
rxtqStatus = RxNormal;
rxStatus = RxNormal;
emit infoText("<font color=\"blue\"><pre>" + rxCollect + "</pre></font>");
/*
* just to be on the safe side, we set the value of boardstyle.
@ -1398,7 +1398,7 @@ void KBgEngineFIBS::handleMessageConnect(const TQString &line, const TQString &r
* This can only happen if the password/login is wrong.
*/
if (rxCollect.isEmpty()) {
rxtqStatus = RxIgnore;
rxStatus = RxIgnore;
int ret = KMessageBox::warningContinueCancel
((TQWidget *)parent(), i18n("There was a problem with "
"your login and password. "
@ -1411,9 +1411,9 @@ void KBgEngineFIBS::handleMessageConnect(const TQString &line, const TQString &r
infoFIBS[FIBSUser] = "";
infoFIBS[FIBSPswd] = "";
login = true;
connectFIBS(); // will reset the rxtqStatus
connectFIBS(); // will reset the rxStatus
} else {
rxtqStatus = RxConnect;
rxStatus = RxConnect;
emit serverString("");
emit serverString("");
}
@ -1473,7 +1473,7 @@ void KBgEngineFIBS::handleMessageConnect(const TQString &line, const TQString &r
*/
if (line.contains(pat[OwnInfo])) {
rxtqStatus = RxNormal;
rxStatus = RxNormal;
int fibsOptions[NumFIBSOpt];
@ -1538,7 +1538,7 @@ void KBgEngineFIBS::handleMessageConnect(const TQString &line, const TQString &r
* The beginning of a new login procedure starts starts here
*/
if (line.contains(pat[OneName])) {
rxtqStatus = RxNewLogin;
rxStatus = RxNewLogin;
emit infoText(TQString("<font color=\"red\">") + rxCollect + "</font>");
rxCollect = "";
TQString tmp = rawline;
@ -1613,7 +1613,7 @@ void KBgEngineFIBS::handleMessageNewLogin(const TQString &line)
"playing backgammon on FIBS.").tqarg(infoFIBS[FIBSUser]);
emit infoText("<br><hr><font color=\"blue\">" + text + "</font><br><hr>");
emit serverString("bye");
rxtqStatus = RxNormal;
rxStatus = RxNormal;
rxCollect = "";
return;
}
@ -1717,7 +1717,7 @@ void KBgEngineFIBS::handleMessageNormal(TQString &line, TQString &rawline)
/*
* Save the board string and create a new game state
*/
KBgtqStatus *st = new KBgtqStatus(currBoard = rawline);
KBgStatus *st = new KBgStatus(currBoard = rawline);
/*
* Save important state data and stop the timeout
@ -1779,13 +1779,13 @@ void KBgEngineFIBS::handleMessageNormal(TQString &line, TQString &rawline)
*/
else if (line.contains(pat[YouAway])) {
emit changePlayertqStatus(infoFIBS[FIBSUser], KFibsPlayerList::Away, true);
emit changePlayerStatus(infoFIBS[FIBSUser], KFibsPlayerList::Away, true);
actBack->setEnabled(true);
line += "<br><pre> </pre>" + i18n("(or use the corresponding menu entry to join the match)");
}
else if (line.contains(pat[YouBack])) {
emit changePlayertqStatus(infoFIBS[FIBSUser], KFibsPlayerList::Away, false);
emit changePlayerStatus(infoFIBS[FIBSUser], KFibsPlayerList::Away, false);
actBack->setEnabled(false);
actAway->setEnabled(true);
}
@ -1863,23 +1863,23 @@ void KBgEngineFIBS::handleMessageNormal(TQString &line, TQString &rawline)
// - rx status changes ------------------------------------------------------------
else if (line.contains(pat[WhoisBG])) {
rxtqStatus = RxWhois;
rxStatus = RxWhois;
rxCollect = TQString("<br><u>") + line + "</u>";
return;
}
else if (line.contains(pat[MotdBeg])) {
rxtqStatus = RxMotd;
rxStatus = RxMotd;
rxCollect = "";
return;
}
else if (line.contains(pat[BegRate])) {
rxtqStatus = RxRating;
rxStatus = RxRating;
rxCount = 0;
rxCollect = "<br>" + line;
return;
}
else if (line.contains(pat[Goodbye])) {
rxtqStatus = RxGoodbye;
rxStatus = RxGoodbye;
rxCollect = "<br><hr><br>";
handleServerData(rawline); // danger: recursion!
return;
@ -1944,13 +1944,13 @@ void KBgEngineFIBS::handleMessageNormal(TQString &line, TQString &rawline)
else if (line.contains(pat[BegBlnd])) {
rawline.replace(pat[BegBlnd], "");
rawline.truncate(rawline.length()-1);
emit changePlayertqStatus(rawline, KFibsPlayerList::Blind, true);
emit changePlayerStatus(rawline, KFibsPlayerList::Blind, true);
line = "<font color=\"red\">" + line + "</font>";
}
else if (line.contains(pat[EndBlnd])) {
rawline.replace(pat[EndBlnd], "");
rawline.truncate(rawline.length()-1);
emit changePlayertqStatus(rawline, KFibsPlayerList::Blind, false);
emit changePlayerStatus(rawline, KFibsPlayerList::Blind, false);
line = "<font color=\"red\">" + line + "</font>";
}
/*
@ -2128,8 +2128,8 @@ KBgEngineFIBS::KBgEngineFIBS(TQWidget *parent, TQString *name, TQPopupMenu *pmen
connect(this, TQT_SIGNAL(fibsLogout (const TQString &)), playerlist, TQT_SLOT(deletePlayer(const TQString &)));
connect(this, TQT_SIGNAL(fibsWhoEnd()), playerlist, TQT_SLOT(stopUpdate()));
connect(this, TQT_SIGNAL(fibsConnectionClosed()), playerlist, TQT_SLOT(stopUpdate()));
connect(this, TQT_SIGNAL(changePlayertqStatus(const TQString &, int, bool)),
playerlist, TQT_SLOT(changePlayertqStatus(const TQString &, int, bool)));
connect(this, TQT_SIGNAL(changePlayerStatus(const TQString &, int, bool)),
playerlist, TQT_SLOT(changePlayerStatus(const TQString &, int, bool)));
connect(playerlist, TQT_SIGNAL(fibsCommand(const TQString &)), this, TQT_SLOT(handleCommand(const TQString &)));
connect(playerlist, TQT_SIGNAL(fibsInvite(const TQString &)), this, TQT_SLOT(fibsRequestInvitation(const TQString &)));

@ -175,7 +175,7 @@ signals:
void fibsConnectionClosed();
void changePlayertqStatus(const TQString &, int, bool);
void changePlayerStatus(const TQString &, int, bool);
void chatMessage(const TQString &msg);
@ -199,7 +199,7 @@ private:
TQString currBoard, caption;
//KBgtqStatus *currBoard
//KBgStatus *currBoard
//KBgFIBSBoard *boardHandler;
TQStringList invitations;
@ -400,10 +400,10 @@ protected slots:
protected:
enum RxtqStatus {RxIgnore, RxConnect, RxWhois, RxMotd, RxRating,
enum RxStatus {RxIgnore, RxConnect, RxWhois, RxMotd, RxRating,
RxNewLogin, RxGoodbye, RxNormal};
int rxtqStatus, rxCount;
int rxStatus, rxCount;
TQString rxCollect;

@ -123,7 +123,7 @@ protected:
*/
virtual void paint(TQPainter *p)
{
t->draw(p, 1, 1, TQRegion(p->viewport()), w->tqcolorGroup());
t->draw(p, 1, 1, TQRegion(p->viewport()), w->colorGroup());
}
private:

@ -103,9 +103,9 @@ KBgInvite::KBgInvite(const char *name)
* Adjust widget sizes and resize the dialog
*/
KDialog::resizeLayout(this, marginHint(), spacingHint());
setMinimumSize(tqchildrenRect().size());
setMinimumSize(childrenRect().size());
vbox->activate();
resize(tqminimumSize());
resize(minimumSize());
/*
* Set focus and default buttons

@ -101,7 +101,7 @@ public:
case KFibsPlayerList::Watches:
case KFibsPlayerList::Client:
case KFibsPlayerList::Email:
case KFibsPlayerList::tqStatus:
case KFibsPlayerList::Status:
case KFibsPlayerList::Host:
s = s.lower();
break;
@ -175,7 +175,7 @@ public:
/*
* Short abbreviations for Blind, Ready, and Away.
*/
TQString mAbrv[KFibsPlayerList::MaxtqStatus];
TQString mAbrv[KFibsPlayerList::MaxStatus];
/*
* Name of the last selected player - for internal purposes
@ -218,7 +218,7 @@ KFibsPlayerList::KFibsPlayerList(TQWidget *parent, const char *name)
d->mCol[Player]->name = i18n("Player");
d->mCol[Opponent]->name = i18n("Opponent");
d->mCol[Watches]->name = i18n("Watches");
d->mCol[tqStatus]->name = i18n("Status");
d->mCol[Status]->name = i18n("Status");
d->mCol[Rating]->name = i18n("Rating");
d->mCol[Experience]->name = i18n("Exp.");
d->mCol[Idle]->name = i18n("Idle");
@ -231,7 +231,7 @@ KFibsPlayerList::KFibsPlayerList(TQWidget *parent, const char *name)
d->mCol[Player]->key = "player";
d->mCol[Opponent]->key = "opponent";
d->mCol[Watches]->key = "watches";
d->mCol[tqStatus]->key = "status";
d->mCol[Status]->key = "status";
d->mCol[Rating]->key = "rating";
d->mCol[Experience]->key = "experience";
d->mCol[Idle]->key = "idle";
@ -592,9 +592,9 @@ void KFibsPlayerList::showContextMenu(KListView *, TQListViewItem *i, const TQPo
d->mMail = (i && d->mCol[Email]->show ? i->text(d->mCol[Email]->index) : TQString());
d->mAct[KFibsPlayerListPrivate::Mail]->setEnabled(!d->mMail.isEmpty());
if (i && d->mCol[tqStatus]->show)
if (i && d->mCol[Status]->show)
d->mAct[KFibsPlayerListPrivate::BlindAct]->setText
((i->text(d->mCol[tqStatus]->index).contains(d->mAbrv[Blind])) ?
((i->text(d->mCol[Status]->index).contains(d->mAbrv[Blind])) ?
i18n("Unblind %1").tqarg(d->mUser) : i18n("Blind %1").tqarg(d->mUser));
else
d->mAct[KFibsPlayerListPrivate::BlindAct]->setText(i18n("Blind"));
@ -721,7 +721,7 @@ void KFibsPlayerList::changePlayer(const TQString &line)
TQDateTime fromEpoch;
TQString str_entry[LVEnd], tmp;
entry[tqStatus][0] = '\0';
entry[Status][0] = '\0';
// the line comes from FIBS and is 7 bit ASCII
sscanf(line.latin1(), "%99s %99s %99s %1s %1s %99s %99s %99s %99s %99s %99s %99s", entry[Player], entry[Opponent],
@ -738,9 +738,9 @@ void KFibsPlayerList::changePlayer(const TQString &line)
if ((str_entry[j] = entry[j]) == "-")
str_entry[j] = "";
}
str_entry[tqStatus].replace(Ready, 1, ready[0] == '0' ? "-" : d->mAbrv[Ready]);
str_entry[tqStatus].replace(Away, 1, away [0] == '0' ? "-" : d->mAbrv[Away ]);
str_entry[tqStatus].replace(Blind, 1, "-");
str_entry[Status].replace(Ready, 1, ready[0] == '0' ? "-" : d->mAbrv[Ready]);
str_entry[Status].replace(Away, 1, away [0] == '0' ? "-" : d->mAbrv[Away ]);
str_entry[Status].replace(Blind, 1, "-");
// disable drawing until the end of update
setUpdatesEnabled(false);
@ -771,7 +771,7 @@ void KFibsPlayerList::changePlayer(const TQString &line)
found:
// getting here means the player is in the list - update private status
str_entry[tqStatus].replace(Blind,1,i->text(tqStatus).contains
str_entry[Status].replace(Blind,1,i->text(Status).contains
(d->mAbrv[Blind]) ? d->mAbrv[Blind] : "-");
update:
@ -808,7 +808,7 @@ void KFibsPlayerList::deletePlayer(const TQString &player)
/*
* Set/Unset the status stat in the corresponding column of the list
*/
void KFibsPlayerList::changePlayertqStatus(const TQString &player, int stat, bool flag)
void KFibsPlayerList::changePlayerStatus(const TQString &player, int stat, bool flag)
{
TQListViewItem *i = 0;
@ -827,7 +827,7 @@ void KFibsPlayerList::changePlayertqStatus(const TQString &player, int stat, boo
/*
* Update the status flag
*/
i->setText(tqStatus, i->text(tqStatus).replace(stat, 1, (flag) ? d->mAbrv[stat] : "-"));
i->setText(Status, i->text(Status).replace(stat, 1, (flag) ? d->mAbrv[stat] : "-"));
}

@ -53,12 +53,12 @@ public:
/**
* Enumerate player status
*/
enum PtqStatus {Ready, Away, Blind, MaxtqStatus};
enum PStatus {Ready, Away, Blind, MaxStatus};
/**
* Enumerate the different columns of the list
*/
enum {Player, Opponent, Watches, tqStatus, Rating, Experience,
enum {Player, Opponent, Watches, Status, Rating, Experience,
Idle, Time, Host, Client, Email, LVEnd};
/**
@ -111,7 +111,7 @@ public slots:
/**
* Change the status of a player
*/
void changePlayertqStatus(const TQString &player, int stat, bool flag);
void changePlayerStatus(const TQString &player, int stat, bool flag);
/**
* Fills the playerlist page into the notebook

@ -35,7 +35,7 @@ class TQPopupMenu;
class KDialogBase;
class KBgtqStatus;
class KBgStatus;
/**
*
@ -249,12 +249,12 @@ signals:
/**
* Emit the most recent game state
*/
void newState (const KBgtqStatus &);
void newState (const KBgStatus &);
/**
* Tell the board that we need the current state of the board.
*/
void getState (KBgtqStatus *);
void getState (KBgStatus *);
/**
* Starts/ends the edit mode of the board

@ -117,7 +117,7 @@ void KBgEngineGNU::handleLine(const TQString &l)
// redoubles mess up the game counter "turn"
//KBgtqStatus st(board);
//KBgStatus st(board);
//st.setCube(32, BOTH);
//emit newState(st);
@ -128,7 +128,7 @@ void KBgEngineGNU::handleLine(const TQString &l)
// can be shared between all engines
#if 0
KBgtqStatus st(board);
KBgStatus st(board);
int ret = KMessageBox::warningYesNoCancel
(0, i18n("gnubg doubles the cube to %1.").tqarg(2*st.cube(THEM)),
@ -164,7 +164,7 @@ void KBgEngineGNU::handleLine(const TQString &l)
*/
if (line.contains(TQRegExp("^board:"))) {
KBgtqStatus st(line);
KBgStatus st(line);
/*
* Do preliminary analysis of board

@ -202,7 +202,7 @@ void KBgEngineNg::setGame()
// we are still having problems with player creation...
// FIXME - which status _game->setGametqStatus(KGame::End);
// FIXME - which status _game->setGameStatus(KGame::End);
}
void KBgEngineNg::slotPlayerJoinedGame(KPlayer *p)

@ -60,7 +60,7 @@ public:
/*
* Store two copies of the game: one backup and a working copy
*/
KBgtqStatus mGame[2];
KBgStatus mGame[2];
/*
* Use the standard method of obtaining random numbers

@ -293,8 +293,8 @@ void KBg::setupEngine()
connect(engine[currEngine], TQT_SIGNAL(redoMove()), board, TQT_SLOT(redoMove()));
connect(engine[currEngine], TQT_SIGNAL(setEditMode(const bool)), board, TQT_SLOT(setEditMode(const bool)));
connect(engine[currEngine], TQT_SIGNAL(allowMoving(const bool)), board, TQT_SLOT(allowMoving(const bool)));
connect(engine[currEngine], TQT_SIGNAL(getState(KBgtqStatus *)), board, TQT_SLOT(getState(KBgtqStatus *)));
connect(engine[currEngine], TQT_SIGNAL(newState(const KBgtqStatus &)), board, TQT_SLOT(setState(const KBgtqStatus &)));
connect(engine[currEngine], TQT_SIGNAL(getState(KBgStatus *)), board, TQT_SLOT(getState(KBgStatus *)));
connect(engine[currEngine], TQT_SIGNAL(newState(const KBgStatus &)), board, TQT_SLOT(setState(const KBgStatus &)));
// now that all signals are connected, start the engine
engine[currEngine]->start();
@ -575,7 +575,7 @@ void KBg::setupDlg()
TQGridLayout *gle = new TQGridLayout(gbe, 1, 1, nb->spacingHint());
KURLLabel *lab = new KURLLabel("kcmshell kcmnotify",
i18n("Klick here to configure the event notification"), gbe);
lab->setMaximumSize(lab->tqsizeHint());
lab->setMaximumSize(lab->sizeHint());
gle->addWidget(lab, 0, 0);
connect(lab, TQT_SIGNAL(leftClickedURL(const TQString &)), TQT_SLOT(startKCM(const TQString &)));
@ -622,7 +622,7 @@ void KBg::setupDlg()
connect(nb, TQT_SIGNAL(finished()), TQT_TQOBJECT(this), TQT_SLOT(setupDone()));
nb->resize(nb->tqminimumSize());
nb->resize(nb->minimumSize());
nb->show();
}

@ -196,7 +196,7 @@ void KBgBoardSetup::getSetupPages(KDialogBase *nb)
"move a checker the shortest possible distance."));
for (int i = 0; i < 3; i++) {
rbMove[i]->setMinimumSize(rbMove[i]->tqsizeHint());
rbMove[i]->setMinimumSize(rbMove[i]->sizeHint());
blm->addWidget(rbMove[i]);
rbMove[i]->setChecked(i == getShortMoveMode());
}
@ -360,7 +360,7 @@ void KBgBoard::setFont(const TQFont& f)
*/
void KBgBoard::queryCube()
{
KBgtqStatus *st = new KBgtqStatus();
KBgStatus *st = new KBgStatus();
getState(st);
KBgBoardQCube *dlg =
new KBgBoardQCube(abs(st->cube()), (st->cube(US) > 0), (st->cube(THEM) > 0));
@ -395,7 +395,7 @@ KBgBoardQCube::KBgBoardQCube(int val, bool us, bool them)
"double. Note that a face value of 1 automatically allows both\n"
"players to double."));
info->setMinimumSize(info->tqsizeHint());
info->setMinimumSize(info->sizeHint());
vbox->addWidget(info, 0);
@ -454,17 +454,17 @@ KBgBoardQCube::KBgBoardQCube(int val, bool us, bool them)
else if (them)
cb[1]->setCurrentItem(THEM);
cb[0]->setMinimumSize(cb[0]->tqsizeHint());
cb[1]->setMinimumSize(cb[1]->tqsizeHint());
cb[0]->setMinimumSize(cb[0]->sizeHint());
cb[1]->setMinimumSize(cb[1]->sizeHint());
ok->setMinimumSize(ok->tqsizeHint());
cancel->setMinimumSize(cancel->tqsizeHint());
ok->setMinimumSize(ok->sizeHint());
cancel->setMinimumSize(cancel->sizeHint());
setMinimumSize(tqchildrenRect().size());
setMinimumSize(childrenRect().size());
vbox->activate();
resize(tqminimumSize());
resize(minimumSize());
ok->setAutoDefault (true);
ok->setDefault(true);
@ -544,7 +544,7 @@ KBgBoardQDice::KBgBoardQDice(const char *name)
info->setText(i18n("Set the face values of the selected dice. The other player's\n"
"dice will be cleared and it will be the dice's owner's turn."));
info->setMinimumSize(info->tqsizeHint());
info->setMinimumSize(info->sizeHint());
vbox->addWidget(info, 0);
@ -560,17 +560,17 @@ KBgBoardQDice::KBgBoardQDice(const char *name)
hbox_2->addWidget(ok);
hbox_2->addWidget(cancel);
sb[0]->setMinimumSize(sb[0]->tqsizeHint());
sb[1]->setMinimumSize(sb[1]->tqsizeHint());
sb[0]->setMinimumSize(sb[0]->sizeHint());
sb[1]->setMinimumSize(sb[1]->sizeHint());
ok->setMinimumSize(ok->tqsizeHint());
cancel->setMinimumSize(cancel->tqsizeHint());
ok->setMinimumSize(ok->sizeHint());
cancel->setMinimumSize(cancel->sizeHint());
setMinimumSize(tqchildrenRect().size());
setMinimumSize(childrenRect().size());
vbox->activate();
resize(tqminimumSize());
resize(minimumSize());
ok->setAutoDefault (true);
ok->setDefault(true);
@ -628,10 +628,10 @@ bool KBgBoard::getEditMode() const
}
/*
* This function takes a KBgtqStatus object and fills it with the current
* This function takes a KBgStatus object and fills it with the current
* board status.
*/
KBgtqStatus* KBgBoard::getState(KBgtqStatus *st) const
KBgStatus* KBgBoard::getState(KBgStatus *st) const
{
st->setColor(color);
st->setDirection(direction);
@ -1337,7 +1337,7 @@ void KBgBoardHome::mouseDoubleClickEvent(TQMouseEvent * e)
KBgBoardQDice *dlg = new KBgBoardQDice();
if (dlg->exec()) {
KBgtqStatus *st = new KBgtqStatus();
KBgStatus *st = new KBgStatus();
board->getState(st);
st->setDice(w, 0, dlg->getDice(0));
st->setDice(w, 1, dlg->getDice(1));