diff options
Diffstat (limited to 'kbackgammon/engines/fibs')
-rw-r--r-- | kbackgammon/engines/fibs/kbgfibs.cpp | 46 | ||||
-rw-r--r-- | kbackgammon/engines/fibs/kbgfibs.h | 8 | ||||
-rw-r--r-- | kbackgammon/engines/fibs/kbgfibschat.cpp | 2 | ||||
-rw-r--r-- | kbackgammon/engines/fibs/kbginvite.cpp | 4 | ||||
-rw-r--r-- | kbackgammon/engines/fibs/kplayerlist.cpp | 26 | ||||
-rw-r--r-- | kbackgammon/engines/fibs/kplayerlist.h | 6 |
6 files changed, 46 insertions, 46 deletions
diff --git a/kbackgammon/engines/fibs/kbgfibs.cpp b/kbackgammon/engines/fibs/kbgfibs.cpp index 57eb6666..9a08c8d1 100644 --- a/kbackgammon/engines/fibs/kbgfibs.cpp +++ b/kbackgammon/engines/fibs/kbgfibs.cpp @@ -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> " + 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 &))); diff --git a/kbackgammon/engines/fibs/kbgfibs.h b/kbackgammon/engines/fibs/kbgfibs.h index 24555ef2..db79ce51 100644 --- a/kbackgammon/engines/fibs/kbgfibs.h +++ b/kbackgammon/engines/fibs/kbgfibs.h @@ -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; diff --git a/kbackgammon/engines/fibs/kbgfibschat.cpp b/kbackgammon/engines/fibs/kbgfibschat.cpp index c3490cec..246e390d 100644 --- a/kbackgammon/engines/fibs/kbgfibschat.cpp +++ b/kbackgammon/engines/fibs/kbgfibschat.cpp @@ -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: diff --git a/kbackgammon/engines/fibs/kbginvite.cpp b/kbackgammon/engines/fibs/kbginvite.cpp index 3870a6d2..f43c3b6a 100644 --- a/kbackgammon/engines/fibs/kbginvite.cpp +++ b/kbackgammon/engines/fibs/kbginvite.cpp @@ -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 diff --git a/kbackgammon/engines/fibs/kplayerlist.cpp b/kbackgammon/engines/fibs/kplayerlist.cpp index 62fb9a95..87d7ab22 100644 --- a/kbackgammon/engines/fibs/kplayerlist.cpp +++ b/kbackgammon/engines/fibs/kplayerlist.cpp @@ -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] : "-")); } diff --git a/kbackgammon/engines/fibs/kplayerlist.h b/kbackgammon/engines/fibs/kplayerlist.h index 793e1b39..63724e06 100644 --- a/kbackgammon/engines/fibs/kplayerlist.h +++ b/kbackgammon/engines/fibs/kplayerlist.h @@ -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 |