diff options
author | Timothy Pearson <[email protected]> | 2011-12-19 11:55:35 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-12-19 11:55:35 -0600 |
commit | c0f375feba0103bed2bac1b1f05e76e9ae28fa89 (patch) | |
tree | 9c30a9097d650343df41d867f0e008769529eb08 /kbackgammon | |
parent | 0e2b76239f354a9eead0b4e37d86d390ec57ffa9 (diff) | |
download | tdegames-c0f375feba0103bed2bac1b1f05e76e9ae28fa89.tar.gz tdegames-c0f375feba0103bed2bac1b1f05e76e9ae28fa89.zip |
Remove additional unneeded tq method conversions
Diffstat (limited to 'kbackgammon')
-rw-r--r-- | kbackgammon/engines/fibs/kbgfibs.cpp | 54 | ||||
-rw-r--r-- | kbackgammon/engines/fibs/kbgfibschat.cpp | 42 | ||||
-rw-r--r-- | kbackgammon/engines/fibs/kplayerlist.cpp | 18 | ||||
-rw-r--r-- | kbackgammon/engines/gnubg/kbggnubg.cpp | 12 | ||||
-rw-r--r-- | kbackgammon/engines/nextgen/kbgng.cpp | 20 | ||||
-rw-r--r-- | kbackgammon/engines/offline/kbgoffline.cpp | 14 | ||||
-rw-r--r-- | kbackgammon/kbg.cpp | 4 | ||||
-rw-r--r-- | kbackgammon/kbgboard.h | 6 |
8 files changed, 85 insertions, 85 deletions
diff --git a/kbackgammon/engines/fibs/kbgfibs.cpp b/kbackgammon/engines/fibs/kbgfibs.cpp index 9a08c8d1..cd0896cd 100644 --- a/kbackgammon/engines/fibs/kbgfibs.cpp +++ b/kbackgammon/engines/fibs/kbgfibs.cpp @@ -81,7 +81,7 @@ void KBgEngineFIBS::start() // == configuration handling =================================================== /* - * Restore settings and ask tqchildren to do the same + * Restore settings and ask children to do the same */ void KBgEngineFIBS::readConfig() { @@ -110,7 +110,7 @@ void KBgEngineFIBS::readConfig() autoMsg[MsgLos] = config->readEntry("msg-los", ""); autoMsg[MsgWin] = config->readEntry("msg-win", ""); - // ask the tqchildren to read their config options + // ask the children to read their config options playerlist->readConfig(); chatWindow->readConfig(); } @@ -145,7 +145,7 @@ void KBgEngineFIBS::saveConfig() config->writeEntry("msg-los", autoMsg[MsgLos]); config->writeEntry("msg-win", autoMsg[MsgWin]); - // ask the tqchildren to read their config options + // ask the children to read their config options playerlist->saveConfig(); chatWindow->saveConfig(); } @@ -343,7 +343,7 @@ void KBgEngineFIBS::getSetupPages(KDialogBase *nb) TQWhatsThis::add(cbk, i18n("Usually, FIBS drops the connection after one hour of inactivity. When " "you check this box, %1 will try to keep the connection alive, even " "if you are not actually playing or chatting. Use this with caution " - "if you do not have flat-rate Internet access.").tqarg(PROG_NAME)); + "if you do not have flat-rate Internet access.").arg(PROG_NAME)); cbk->setChecked(keepalive); @@ -357,7 +357,7 @@ void KBgEngineFIBS::getSetupPages(KDialogBase *nb) tc->addTab(w, i18n("&Connection")); /* - * Ask tqchildren for settings + * Ask children for settings */ chatWindow->getSetupPages(tc, nb->spacingHint()); playerlist->getSetupPages(tc, nb->spacingHint()); @@ -431,28 +431,28 @@ void KBgEngineFIBS::changeJoin(const TQString &info) TQString text, menu; if ((*it).contains(TQRegExp(" r$"))) { - menu = i18n("R means resume", "%1 (R)").tqarg(name); + menu = i18n("R means resume", "%1 (R)").arg(name); text = i18n("%1 (experience %2, rating %3) wants to resume a saved match with you. " "If you want to play, use the corresponding menu entry to join (or type " - "'join %4').").tqarg(name).tqarg(expi_s).tqarg(rate_s).tqarg(name); + "'join %4').").arg(name).arg(expi_s).arg(rate_s).arg(name); KNotifyClient::event("invitation", i18n("%1 wants to resume a saved match with you"). arg(name)); } else if ((*it).contains(TQRegExp(" u$"))) { - menu = i18n("U means unlimited", "%1 (U)").tqarg(name); + menu = i18n("U means unlimited", "%1 (U)").arg(name); text = i18n("%1 (experience %2, rating %3) wants to play an unlimited match with you. " "If you want to play, use the corresponding menu entry to join (or type " - "'join %4').").tqarg(name).tqarg(expi_s).tqarg(rate_s).tqarg(name); + "'join %4').").arg(name).arg(expi_s).arg(rate_s).arg(name); KNotifyClient::event("invitation", i18n("%1 has invited you to an unlimited match"). arg(name)); } else { TQString len = (*it).right((*it).length() - name.length() - 1); menu = i18n("If the format of the (U) and (R) strings is changed, it should also be changed here", - "%1 (%2)").tqarg(name).tqarg(len); + "%1 (%2)").arg(name).arg(len); text = i18n("%1 (experience %2, rating %3) wants to play a %4 point match with you. " "If you want to play, use the corresponding menu entry to join (or type " - "'join %5').").tqarg(name).tqarg(expi_s).tqarg(rate_s).tqarg(len).tqarg(name); + "'join %5').").arg(name).arg(expi_s).arg(rate_s).arg(len).arg(name); KNotifyClient::event("invitation", i18n("%1 has invited you for a %2 point match"). - tqarg(name).tqarg(len)); + arg(name).arg(len)); } emit serverString("rawwho " + name); // this avoids a race if (whoisInvite) { @@ -877,7 +877,7 @@ void KBgEngineFIBS::connectFIBS() /* * Connect */ - emit infoText(i18n("Looking up %1").tqarg(infoFIBS[FIBSHost])); + emit infoText(i18n("Looking up %1").arg(infoFIBS[FIBSHost])); connection->connectToHost(infoFIBS[FIBSHost], infoFIBS[FIBSPort].toUShort()); return; @@ -888,7 +888,7 @@ void KBgEngineFIBS::connectFIBS() */ void KBgEngineFIBS::hostFound() { - emit infoText(i18n("Connecting to %1").tqarg(infoFIBS[FIBSHost])); + emit infoText(i18n("Connecting to %1").arg(infoFIBS[FIBSHost])); } /* @@ -1077,12 +1077,12 @@ bool KBgEngineFIBS::queryConnection(const bool newlogin) text = i18n("Enter the login you would like to use on the server %1. The login may not\n" "contain spaces or colons. If the login you choose is not available, you'll later be\n" - "given the opportunity to pick another one.\n\n").tqarg(infoFIBS[FIBSHost]); + "given the opportunity to pick another one.\n\n").arg(infoFIBS[FIBSHost]); else text = i18n("Enter your login on the server %1. If you don't have a login, you\n" - "should create one using the corresponding menu option.\n\n").tqarg(infoFIBS[FIBSHost]); + "should create one using the corresponding menu option.\n\n").arg(infoFIBS[FIBSHost]); first = true; @@ -1107,12 +1107,12 @@ bool KBgEngineFIBS::queryConnection(const bool newlogin) text = i18n("Enter the password you would like to use with the login %1\n" "on the server %2. It may not contain colons.\n\n"). - tqarg(infoFIBS[FIBSUser]).tqarg(infoFIBS[FIBSHost]); + arg(infoFIBS[FIBSUser]).arg(infoFIBS[FIBSHost]); else text = i18n("Enter the password for the login %1 on the server %2.\n\n"). - tqarg(infoFIBS[FIBSUser]).tqarg(infoFIBS[FIBSHost]); + arg(infoFIBS[FIBSUser]).arg(infoFIBS[FIBSHost]); first = true; do { @@ -1435,7 +1435,7 @@ void KBgEngineFIBS::handleMessageConnect(const TQString &line, const TQString &r int words = sscanf (line.latin1(), "%255s%255s%li%255s", p[0], p[1], &tmp, p[2]); if (words >= 4) { TQDateTime d; d.setTime_t(tmp); - TQString text = i18n("%1, last logged in from %2 at %3.").tqarg(p[1]).tqarg(p[2]).tqarg(d.toString()); + TQString text = i18n("%1, last logged in from %2 at %3.").arg(p[1]).arg(p[2]).arg(d.toString()); emit infoText("<hr><br>" + text); playerlist->setName(p[1]); } @@ -1610,7 +1610,7 @@ void KBgEngineFIBS::handleMessageNewLogin(const TQString &line) TQString text = i18n("Your account has been created. Your new login is <u>%1</u>. To fully activate " "this account, I will now close the connection. Once you reconnect, you can start " - "playing backgammon on FIBS.").tqarg(infoFIBS[FIBSUser]); + "playing backgammon on FIBS.").arg(infoFIBS[FIBSUser]); emit infoText("<br><hr><font color=\"blue\">" + text + "</font><br><hr>"); emit serverString("bye"); rxStatus = RxNormal; @@ -1736,15 +1736,15 @@ void KBgEngineFIBS::handleMessageNormal(TQString &line, TQString &rawline) * Update the caption string */ if (st->turn() < 0) - caption = i18n("%1 (%2) vs. %3 (%4) - game over").tqarg(pname[US]). - tqarg(st->points(US)).tqarg(pname[THEM]).tqarg(st->points(THEM)); + caption = i18n("%1 (%2) vs. %3 (%4) - game over").arg(pname[US]). + arg(st->points(US)).arg(pname[THEM]).arg(st->points(THEM)); else if (st->length() < 0) - caption = i18n("%1 (%2) vs. %3 (%4) - unlimited match").tqarg(pname[US]). - tqarg(st->points(US)).tqarg(pname[THEM]).tqarg(st->points(THEM)); + caption = i18n("%1 (%2) vs. %3 (%4) - unlimited match").arg(pname[US]). + arg(st->points(US)).arg(pname[THEM]).arg(st->points(THEM)); else - caption = i18n("%1 (%2) vs. %3 (%4) - %5 point match").tqarg(pname[US]). - tqarg(st->points(US)).tqarg(pname[THEM]).tqarg(st->points(THEM)). - tqarg(st->length()); + caption = i18n("%1 (%2) vs. %3 (%4) - %5 point match").arg(pname[US]). + arg(st->points(US)).arg(pname[THEM]).arg(st->points(THEM)). + arg(st->length()); emit statText(caption); diff --git a/kbackgammon/engines/fibs/kbgfibschat.cpp b/kbackgammon/engines/fibs/kbgfibschat.cpp index 246e390d..370ee506 100644 --- a/kbackgammon/engines/fibs/kbgfibschat.cpp +++ b/kbackgammon/engines/fibs/kbgfibschat.cpp @@ -200,7 +200,7 @@ KBgChat::KBgChat(TQWidget *parent, const char *name) d->mInvt = new TQPopupMenu(); setAutoAddMessages(false); // we get an echo from FIBS - setFromNickname(i18n("%1 user").tqarg(PROG_NAME)); + setFromNickname(i18n("%1 user").arg(PROG_NAME)); if (!addSendingEntry(i18n("Kibitz to watchers and players"), CLIP_YOU_KIBITZ)) kdDebug(10500) << "adding kibitz" << endl; @@ -450,7 +450,7 @@ void KBgChat::startGame(const TQString &name) if (!id) { id = new int(nextId()); d->mName2ID->insert(name, id); - addSendingEntry(i18n("Talk to %1").tqarg(name), *id); + addSendingEntry(i18n("Talk to %1").arg(name), *id); } setSendingEntry(CLIP_YOU_KIBITZ); } @@ -476,7 +476,7 @@ void KBgChat::fibsTalk(const TQString &name) if (!id) { id = new int(nextId()); d->mName2ID->insert(name, id); - addSendingEntry(i18n("Talk to %1").tqarg(name), *id); + addSendingEntry(i18n("Talk to %1").arg(name), *id); } setSendingEntry(*id); } @@ -549,7 +549,7 @@ void KBgChat::handleData(const TQString &msg) switch (cmd) { case CLIP_SAYS: if (!d->mGag.contains(user)) { - cMsg = i18n("<u>%1 tells you:</u> %2").tqarg(user).tqarg(cMsg.replace(TQRegExp("^" + user), "")); + cMsg = i18n("<u>%1 tells you:</u> %2").arg(user).arg(cMsg.replace(TQRegExp("^" + user), "")); cMsg = "<font color=\"red\">" + cMsg + "</font>"; emit personalMessage(cMsg); } else @@ -558,7 +558,7 @@ void KBgChat::handleData(const TQString &msg) case CLIP_SHOUTS: if ((!((KToggleAction *)d->mAct[KBgChatPrivate::Silent])->isChecked()) && (!d->mGag.contains(user))) { - cMsg = i18n("<u>%1 shouts:</u> %2").tqarg(user).tqarg(cMsg.replace(TQRegExp("^" + user), "")); + cMsg = i18n("<u>%1 shouts:</u> %2").arg(user).arg(cMsg.replace(TQRegExp("^" + user), "")); cMsg = "<font color=\"black\">" + cMsg + "</font>"; } else cMsg = ""; @@ -566,7 +566,7 @@ void KBgChat::handleData(const TQString &msg) case CLIP_WHISPERS: if (!d->mGag.contains(user)) { - cMsg = i18n("<u>%1 whispers:</u> %2").tqarg(user).tqarg(cMsg.replace(TQRegExp("^" + user), "")); + cMsg = i18n("<u>%1 whispers:</u> %2").arg(user).arg(cMsg.replace(TQRegExp("^" + user), "")); cMsg = "<font color=\"red\">" + cMsg + "</font>"; emit personalMessage(cMsg); } else @@ -575,7 +575,7 @@ void KBgChat::handleData(const TQString &msg) case CLIP_KIBITZES: if (!d->mGag.contains(user)) { - cMsg = i18n("<u>%1 kibitzes:</u> %2").tqarg(user).tqarg(cMsg.replace(TQRegExp("^" + user), "")); + cMsg = i18n("<u>%1 kibitzes:</u> %2").arg(user).arg(cMsg.replace(TQRegExp("^" + user), "")); cMsg = "<font color=\"red\">" + cMsg + "</font>"; emit personalMessage(cMsg); } else @@ -583,28 +583,28 @@ void KBgChat::handleData(const TQString &msg) break; case CLIP_YOU_SAY: - cMsg = i18n("<u>You tell %1:</u> %2").tqarg(user).tqarg(cMsg.replace(TQRegExp("^" + user), "")); + cMsg = i18n("<u>You tell %1:</u> %2").arg(user).arg(cMsg.replace(TQRegExp("^" + user), "")); cMsg = "<font color=\"darkgreen\">" + cMsg + "</font>"; emit personalMessage(cMsg); user = TQString(); break; case CLIP_YOU_SHOUT: - cMsg = i18n("<u>You shout:</u> %1").tqarg(cMsg); + cMsg = i18n("<u>You shout:</u> %1").arg(cMsg); cMsg = "<font color=\"darkgreen\">" + cMsg + "</font>"; emit personalMessage(cMsg); user = TQString(); break; case CLIP_YOU_WHISPER: - cMsg = i18n("<u>You whisper:</u> %1").tqarg(cMsg); + cMsg = i18n("<u>You whisper:</u> %1").arg(cMsg); cMsg = "<font color=\"darkgreen\">" + cMsg + "</font>"; emit personalMessage(cMsg); user = TQString(); break; case CLIP_YOU_KIBITZ: - cMsg = i18n("<u>You kibitz:</u> %1").tqarg(cMsg); + cMsg = i18n("<u>You kibitz:</u> %1").arg(cMsg); cMsg = "<font color=\"darkgreen\">" + cMsg + "</font>"; emit personalMessage(cMsg); user = TQString(); @@ -615,21 +615,21 @@ void KBgChat::handleData(const TQString &msg) cMsg.remove(0, cMsg.find(' ')+1); date.setTime_t(cMsg.left(cMsg.find(' ')+1).toUInt()); cMsg.remove(0, cMsg.find(' ')); - cMsg = i18n("<u>User %1 left a message at %2</u>: %3").tqarg(user).tqarg(date.toString()).tqarg(cMsg); + cMsg = i18n("<u>User %1 left a message at %2</u>: %3").arg(user).arg(date.toString()).arg(cMsg); cMsg = "<font color=\"red\">" + cMsg + "</font>"; emit personalMessage(cMsg); user = TQString(); break; case CLIP_MESSAGE_DELIVERED: - cMsg = i18n("Your message for %1 has been delivered.").tqarg(user); + cMsg = i18n("Your message for %1 has been delivered.").arg(user); cMsg = TQString("<font color=\"darkgreen\">") + cMsg + "</font>"; emit personalMessage(cMsg); user = TQString(); break; case CLIP_MESSAGE_SAVED: - cMsg = i18n("Your message for %1 has been saved.").tqarg(user); + cMsg = i18n("Your message for %1 has been saved.").arg(user); cMsg = TQString("<font color=\"darkgreen\">") + cMsg + "</font>"; emit personalMessage(cMsg); user = TQString(); @@ -683,22 +683,22 @@ void KBgChat::contextMenu(TQListBoxItem *i, const TQPoint &p) */ if (!d->mName[0].isNull()) { - d->mAct[KBgChatPrivate::Talk]->setText(i18n("Talk to %1").tqarg(d->mName[0])); + d->mAct[KBgChatPrivate::Talk]->setText(i18n("Talk to %1").arg(d->mName[0])); d->mAct[KBgChatPrivate::Talk]->plug(d->mChat); - d->mAct[KBgChatPrivate::Inquire]->setText(i18n("Info on %1").tqarg(d->mName[0])); + d->mAct[KBgChatPrivate::Inquire]->setText(i18n("Info on %1").arg(d->mName[0])); d->mAct[KBgChatPrivate::Inquire]->plug(d->mChat); // invite menu is always the same - d->mChat->insertItem(i18n("Invite %1").tqarg(d->mName[0]), d->mInvt); + d->mChat->insertItem(i18n("Invite %1").arg(d->mName[0]), d->mInvt); d->mChat->insertSeparator(); if (d->mGag.contains(d->mName[0]) <= 0) { - d->mAct[KBgChatPrivate::Gag]->setText(i18n("Gag %1").tqarg(d->mName[0])); + d->mAct[KBgChatPrivate::Gag]->setText(i18n("Gag %1").arg(d->mName[0])); d->mAct[KBgChatPrivate::Gag]->plug(d->mChat); } else { - d->mAct[KBgChatPrivate::Ungag]->setText(i18n("Ungag %1").tqarg(d->mName[0])); + d->mAct[KBgChatPrivate::Ungag]->setText(i18n("Ungag %1").arg(d->mName[0])); d->mAct[KBgChatPrivate::Ungag]->plug(d->mChat); } } @@ -741,7 +741,7 @@ void KBgChat::slotGag() d->mGag.append(d->mName[0]); TQString msg("<font color=\"blue\">"); - msg += i18n("You won't hear what %1 says and shouts.").tqarg(d->mName[0]); + msg += i18n("You won't hear what %1 says and shouts.").arg(d->mName[0]); msg += "</font>"; addMessage(TQString(), msg); @@ -763,7 +763,7 @@ void KBgChat::slotUngag() d->mGag.remove(d->mName[0]); TQString msg("<font color=\"blue\">"); - msg += i18n("You will again hear what %1 says and shouts.").tqarg(d->mName[0]); + msg += i18n("You will again hear what %1 says and shouts.").arg(d->mName[0]); msg += "</font>"; addMessage(TQString(), msg); diff --git a/kbackgammon/engines/fibs/kplayerlist.cpp b/kbackgammon/engines/fibs/kplayerlist.cpp index 87d7ab22..8505d797 100644 --- a/kbackgammon/engines/fibs/kplayerlist.cpp +++ b/kbackgammon/engines/fibs/kplayerlist.cpp @@ -569,12 +569,12 @@ void KFibsPlayerList::showContextMenu(KListView *, TQListViewItem *i, const TQPo */ d->mUser = (i ? i->text(Player) : TQString()); - d->mAct[KFibsPlayerListPrivate::Info ]->setText(i18n("Info on %1" ).tqarg(d->mUser)); - d->mAct[KFibsPlayerListPrivate::Talk ]->setText(i18n("Talk to %1" ).tqarg(d->mUser)); - d->mAct[KFibsPlayerListPrivate::Mail ]->setText(i18n("Email to %1").tqarg(d->mUser)); - d->mAct[KFibsPlayerListPrivate::Look ]->setText(i18n("Look at %1" ).tqarg(d->mUser)); - d->mAct[KFibsPlayerListPrivate::Watch ]->setText(i18n("Watch %1" ).tqarg(d->mUser)); - d->mAct[KFibsPlayerListPrivate::Update]->setText(i18n("Update %1" ).tqarg(d->mUser)); + d->mAct[KFibsPlayerListPrivate::Info ]->setText(i18n("Info on %1" ).arg(d->mUser)); + d->mAct[KFibsPlayerListPrivate::Talk ]->setText(i18n("Talk to %1" ).arg(d->mUser)); + d->mAct[KFibsPlayerListPrivate::Mail ]->setText(i18n("Email to %1").arg(d->mUser)); + d->mAct[KFibsPlayerListPrivate::Look ]->setText(i18n("Look at %1" ).arg(d->mUser)); + d->mAct[KFibsPlayerListPrivate::Watch ]->setText(i18n("Watch %1" ).arg(d->mUser)); + d->mAct[KFibsPlayerListPrivate::Update]->setText(i18n("Update %1" ).arg(d->mUser)); d->mAct[KFibsPlayerListPrivate::Info ]->setEnabled(i); d->mAct[KFibsPlayerListPrivate::Talk ]->setEnabled(i); @@ -587,7 +587,7 @@ void KFibsPlayerList::showContextMenu(KListView *, TQListViewItem *i, const TQPo d->mAct[KFibsPlayerListPrivate::Unwatch]->setEnabled(d->mWatch); d->mPm[0]->setItemEnabled(d->mInID, i && d->mName != d->mUser); - d->mPm[0]->changeItem(d->mInID, i18n("Invite %1").tqarg(d->mUser)); + d->mPm[0]->changeItem(d->mInID, i18n("Invite %1").arg(d->mUser)); d->mMail = (i && d->mCol[Email]->show ? i->text(d->mCol[Email]->index) : TQString()); d->mAct[KFibsPlayerListPrivate::Mail]->setEnabled(!d->mMail.isEmpty()); @@ -595,7 +595,7 @@ void KFibsPlayerList::showContextMenu(KListView *, TQListViewItem *i, const TQPo if (i && d->mCol[Status]->show) d->mAct[KFibsPlayerListPrivate::BlindAct]->setText ((i->text(d->mCol[Status]->index).contains(d->mAbrv[Blind])) ? - i18n("Unblind %1").tqarg(d->mUser) : i18n("Blind %1").tqarg(d->mUser)); + i18n("Unblind %1").arg(d->mUser) : i18n("Blind %1").arg(d->mUser)); else d->mAct[KFibsPlayerListPrivate::BlindAct]->setText(i18n("Blind")); @@ -886,7 +886,7 @@ void KFibsPlayerList::setName(const TQString &name) */ void KFibsPlayerList::updateCaption() { - setCaption(i18n("Player List - %1 - %2/%3").tqarg(childCount()).tqarg(d->mCount[0]).tqarg(d->mCount[1])); + setCaption(i18n("Player List - %1 - %2/%3").arg(childCount()).arg(d->mCount[0]).arg(d->mCount[1])); } /* diff --git a/kbackgammon/engines/gnubg/kbggnubg.cpp b/kbackgammon/engines/gnubg/kbggnubg.cpp index e8985a2c..e125e4d5 100644 --- a/kbackgammon/engines/gnubg/kbggnubg.cpp +++ b/kbackgammon/engines/gnubg/kbggnubg.cpp @@ -131,7 +131,7 @@ void KBgEngineGNU::handleLine(const TQString &l) KBgStatus st(board); int ret = KMessageBox::warningYesNoCancel - (0, i18n("gnubg doubles the cube to %1.").tqarg(2*st.cube(THEM)), + (0, i18n("gnubg doubles the cube to %1.").arg(2*st.cube(THEM)), i18n("gnubg doubles"), i18n("&Accept"), i18n("Re&double"), i18n("&Reject"), true); @@ -199,7 +199,7 @@ void KBgEngineGNU::handleLine(const TQString &l) case uMove: st.setDice(THEM, 0, 0); st.setDice(THEM, 1, 0); - emit infoText(i18n("You roll %1 and %2.").tqarg(st.dice(US, 0)).tqarg(st.dice(US, 1))); + emit infoText(i18n("You roll %1 and %2.").arg(st.dice(US, 0)).arg(st.dice(US, 1))); switch (st.moves()) { case 0: // get a message @@ -208,7 +208,7 @@ void KBgEngineGNU::handleLine(const TQString &l) emit infoText(i18n("Please move 1 piece.")); break; default: - emit infoText(i18n("Please move %1 pieces.").tqarg(st.moves())); + emit infoText(i18n("Please move %1 pieces.").arg(st.moves())); break; } emit allowCommand(Roll, false); @@ -220,7 +220,7 @@ void KBgEngineGNU::handleLine(const TQString &l) case tMove: st.setDice(US, 0, 0); st.setDice(US, 1, 0); - emit infoText(i18n("gnubg rolls %1 and %2.").tqarg(st.dice(THEM, 0)).tqarg(st.dice(THEM, 1))); + emit infoText(i18n("gnubg rolls %1 and %2.").arg(st.dice(THEM, 0)).arg(st.dice(THEM, 1))); if (st.moves() == 0) emit infoText(i18n("gnubg cannot move.")); @@ -236,7 +236,7 @@ void KBgEngineGNU::handleLine(const TQString &l) emit allowMoving(st.turn() == US); emit newState(st); - emit statText(i18n("%1 vs. %2").tqarg(st.player(US)).tqarg(st.player(THEM))); + emit statText(i18n("%1 vs. %2").arg(st.player(US)).arg(st.player(THEM))); emit allowCommand(Load, true ); emit allowCommand(Undo, false); @@ -533,7 +533,7 @@ void KBgEngineGNU::gnubgExit(KProcess *proc) emit allowMoving(false); emit infoText(TQString("<br/><font color=\"red\">") + i18n("The GNU Backgammon process (%1) has exited. ") - .tqarg(proc->pid()) + "</font><br/>"); + .arg(proc->pid()) + "</font><br/>"); resAction->setEnabled(true); } diff --git a/kbackgammon/engines/nextgen/kbgng.cpp b/kbackgammon/engines/nextgen/kbgng.cpp index d081e9a8..3a3d5188 100644 --- a/kbackgammon/engines/nextgen/kbgng.cpp +++ b/kbackgammon/engines/nextgen/kbgng.cpp @@ -150,7 +150,7 @@ void KBgEngineNg::setGame() emit infoText(i18n("Now waiting for incoming connections on port %1."). arg(_port = port)); else - emit infoText(i18n("Failed to offer connections on port %1.").tqarg(port)); + emit infoText(i18n("Failed to offer connections on port %1.").arg(port)); _game->addPlayer(createPlayer(0, _name[0])); break; @@ -165,7 +165,7 @@ void KBgEngineNg::setGame() } while (host_s.isEmpty()); label = i18n("Type the port number on %1 you want to connect to.\nThe " - "number should be between 1024 and 65535.").tqarg(host_s); + "number should be between 1024 and 65535.").arg(host_s); port_s.setNum(_port); do { port_s = KLineEditDlg::getText(label, port_s, &ret, (TQWidget *)parent()); @@ -183,10 +183,10 @@ void KBgEngineNg::setGame() _game->addPlayer(createPlayer(0, _name[0])); if (_game->connectToServer(host_s, port)) - emit infoText(i18n("Now connected to %1:%2.").tqarg(_host = host_s). + emit infoText(i18n("Now connected to %1:%2.").arg(_host = host_s). arg(_port = port)); else - emit infoText(i18n("Failed to connect to %1:%2.").tqarg(_host = host_s). + emit infoText(i18n("Failed to connect to %1:%2.").arg(_host = host_s). arg(_port = port)); // <HERE> @@ -207,8 +207,8 @@ void KBgEngineNg::setGame() void KBgEngineNg::slotPlayerJoinedGame(KPlayer *p) { - emit infoText(i18n("Player %1 (%2) has joined the game.").tqarg(p->name()).tqarg(p->id())); - cerr << i18n("Player %1 (%2) has joined the game.").tqarg(p->name()).tqarg(p->id()).latin1() << endl; + emit infoText(i18n("Player %1 (%2) has joined the game.").arg(p->name()).arg(p->id())); + cerr << i18n("Player %1 (%2) has joined the game.").arg(p->name()).arg(p->id()).latin1() << endl; } void KBgEngineNg::slotCreatePlayer(KPlayer *&p, int rtti, int io, bool v, KGame *g) @@ -216,7 +216,7 @@ void KBgEngineNg::slotCreatePlayer(KPlayer *&p, int rtti, int io, bool v, KGame Q_UNUSED(rtti) Q_UNUSED(g) Q_UNUSED(io) - emit infoText(i18n("creating player. virtual=%1").tqarg(v)); + emit infoText(i18n("creating player. virtual=%1").arg(v)); p = createPlayer(1); } @@ -507,7 +507,7 @@ void KBgEngineNg::slotPropertyChanged(KGamePropertyBase *p, KPlayer *me) case KGamePropertyBase::IdName: emit infoText(i18n("Player %1 has changed the name to %2.") - .tqarg(_name[player]).tqarg(me->name())); + .arg(_name[player]).arg(me->name())); _name[player] = me->name(); break; @@ -567,8 +567,8 @@ void KBgEngineNg::slotNetworkData(int msgid, const TQByteArray &msg, TQ_UINT32 r case KBgGame::Cmd: emit infoText(msg); - emit infoText(i18n("Players are %1 and %2").tqarg(_player[0]->name()) - .tqarg(_player[1]->name())); + emit infoText(i18n("Players are %1 and %2").arg(_player[0]->name()) + .arg(_player[1]->name())); break; default: diff --git a/kbackgammon/engines/offline/kbgoffline.cpp b/kbackgammon/engines/offline/kbgoffline.cpp index 2c5cd260..5e45f6fa 100644 --- a/kbackgammon/engines/offline/kbgoffline.cpp +++ b/kbackgammon/engines/offline/kbgoffline.cpp @@ -318,14 +318,14 @@ void KBgEngineOffline::newGame() u = getRandom(); t = getRandom(); emit infoText(i18n("%1 rolls %2, %3 rolls %4."). - tqarg(d->mName[0]).tqarg(u).tqarg(d->mName[1]).tqarg(t)); + arg(d->mName[0]).arg(u).arg(d->mName[1]).arg(t)); } if (u > t) { - emit infoText(i18n("%1 makes the first move.").tqarg(d->mName[0])); + emit infoText(i18n("%1 makes the first move.").arg(d->mName[0])); d->mRoll = US; } else { - emit infoText(i18n("%1 makes the first move.").tqarg(d->mName[1])); + emit infoText(i18n("%1 makes the first move.").arg(d->mName[1])); d->mRoll = THEM; int n = u; u = t; t = n; } @@ -338,7 +338,7 @@ void KBgEngineOffline::newGame() /* * tell the user */ - emit statText(i18n("%1 vs. %2").tqarg(d->mName[0]).tqarg(d->mName[1])); + emit statText(i18n("%1 vs. %2").arg(d->mName[0]).arg(d->mName[1])); } /* @@ -722,7 +722,7 @@ bool KBgEngineOffline::queryExit() void KBgEngineOffline::handleCommand(const TQString& cmd) { emit infoText(i18n("Text commands are not yet working. " - "The command '%1' has been ignored.").tqarg(cmd)); + "The command '%1' has been ignored.").arg(cmd)); } /* @@ -791,11 +791,11 @@ void KBgEngineOffline::toggleEditMode() emit allowCommand(Roll, false); emit allowCommand(Done, false); emit allowCommand(Cube, false); - emit statText(i18n("%1 vs. %2 - Edit Mode").tqarg(d->mName[0]).tqarg(d->mName[1])); + emit statText(i18n("%1 vs. %2 - Edit Mode").arg(d->mName[0]).arg(d->mName[1])); } else { d->mNew->setEnabled(true); d->mSwap->setEnabled(true); - emit statText(i18n("%1 vs. %2").tqarg(d->mName[0]).tqarg(d->mName[1])); + emit statText(i18n("%1 vs. %2").arg(d->mName[0]).arg(d->mName[1])); emit getState(&d->mGame[1]); d->mGame[0] = d->mGame[1]; emit allowCommand(Done, d->mDoneFlag); diff --git a/kbackgammon/kbg.cpp b/kbackgammon/kbg.cpp index 98bf16c5..b25153ee 100644 --- a/kbackgammon/kbg.cpp +++ b/kbackgammon/kbg.cpp @@ -421,7 +421,7 @@ void KBg::setupOk() if (cbm->isChecked()) KMessageBox::enableAllMessages(); - // tell tqchildren to read their changes + // tell children to read their changes board->setupOk(); // engines @@ -646,7 +646,7 @@ void KBg::print() prt->setPageSize((KPrinter::PageSize) config->readNumEntry("pagesize", KPrinter::A4)); prt->setOrientation((KPrinter::Orientation)config->readNumEntry("orientation", KPrinter::Landscape)); - if (prt->setup(this, i18n("Print %1").tqarg(baseCaption))) { + if (prt->setup(this, i18n("Print %1").arg(baseCaption))) { TQPainter p; p.begin(prt); board->print(&p); diff --git a/kbackgammon/kbgboard.h b/kbackgammon/kbgboard.h index d0d25121..ed5feeea 100644 --- a/kbackgammon/kbgboard.h +++ b/kbackgammon/kbgboard.h @@ -552,7 +552,7 @@ protected: int cellID; /** - * Indicates whether this cell needs to tqrepaint itself after + * Indicates whether this cell needs to repaint itself after * the board has been processed. */ bool stateChanged; @@ -837,7 +837,7 @@ public: protected: /** - * Spin boxes and buttons are tqchildren + * Spin boxes and buttons are children */ TQSpinBox *sb[2]; TQPushButton *ok; @@ -871,7 +871,7 @@ public: protected: /** - * Spin boxes and buttons are tqchildren + * Spin boxes and buttons are children */ TQComboBox *cb[2]; TQPushButton *ok; |