diff options
Diffstat (limited to 'konquest/gameboard.cc')
| -rw-r--r-- | konquest/gameboard.cc | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/konquest/gameboard.cc b/konquest/gameboard.cc index eb44deb2..9f44f872 100644 --- a/konquest/gameboard.cc +++ b/konquest/gameboard.cc @@ -315,10 +315,10 @@ GameBoard::turn() TQString msg; msg = i18n("The distance from Planet %1 to Planet %2 is %3 light years.\n" "A ship leaving this turn will arrive on turn %4") - .tqarg(sourcePlanet->getName()) - .tqarg(destPlanet->getName()) - .tqarg(KGlobal::locale()->formatNumber( dist, 2 )) - .tqarg(KGlobal::locale()->formatNumber( turnNumber + (int)dist, 0 )); + .arg(sourcePlanet->getName()) + .arg(destPlanet->getName()) + .arg(KGlobal::locale()->formatNumber( dist, 2 )) + .arg(KGlobal::locale()->formatNumber( turnNumber + (int)dist, 0 )); KMessageBox::information( this, msg, i18n("Distance")); gameState = NONE; @@ -431,7 +431,7 @@ GameBoard::turn() } TQString turnStr; - turnStr = i18n("Turn #: %1 of %2").tqarg(turnNumber).tqarg(lastTurn); + turnStr = i18n("Turn #: %1 of %2").arg(turnNumber).arg(lastTurn); turnCounter->setText( turnStr ); @@ -470,15 +470,15 @@ GameBoard::nextTurn() Player *winner = findWinner(); if (winner) { - mapWidget->tqrepaint(true); + mapWidget->repaint(true); KMessageBox::information(this, - i18n("The mighty %1 has conquered the galaxy!").tqarg(winner->getName()), + i18n("The mighty %1 has conquered the galaxy!").arg(winner->getName()), i18n("Game Over")); } if( (turnNumber == lastTurn) && !winner ) { - mapWidget->tqrepaint(true); + mapWidget->repaint(true); GameEndDlg *dlg = new GameEndDlg( this ); if( dlg->exec() == KDialogBase::Yes ) { @@ -492,7 +492,7 @@ GameBoard::nextTurn() { // Game over, man! Game over. - mapWidget->tqrepaint(true); + mapWidget->repaint(true); gameOver(); }; @@ -565,8 +565,8 @@ GameBoard::gameMsg(const TQString &msg, Player *player, Planet *planet, Player * { if (!player->isAiPlayer()) isHumanInvolved = true; - colorMsg = colorMsg.tqarg(playerString(player)); - plainMsg = plainMsg.tqarg(player->getName()); + colorMsg = colorMsg.arg(playerString(player)); + plainMsg = plainMsg.arg(player->getName()); } if (planet) @@ -577,15 +577,15 @@ GameBoard::gameMsg(const TQString &msg, Player *player, Planet *planet, Player * isHumanInvolved = true; TQString color = planetPlayer->getColor().name(); - colorMsg = colorMsg.tqarg(TQString("<font color=\"%1\">%2</font>").tqarg(color, planet->getName())); - plainMsg = plainMsg.tqarg(planet->getName()); + colorMsg = colorMsg.arg(TQString("<font color=\"%1\">%2</font>").arg(color, planet->getName())); + plainMsg = plainMsg.arg(planet->getName()); } - msgWidget->append(("<qt><font color=\"white\">Turn %1:</font> <font color=\""+color+"\">").tqarg(turnNumber)+colorMsg+"</font></qt>"); + msgWidget->append(("<qt><font color=\"white\">Turn %1:</font> <font color=\""+color+"\">").arg(turnNumber)+colorMsg+"</font></qt>"); msgWidget->scrollToBottom(); if (isHumanInvolved) { - mapWidget->tqrepaint(true); + mapWidget->repaint(true); KMessageBox::information(this, plainMsg); } } @@ -660,7 +660,7 @@ GameBoard::doFleetArrival( AttackFleet *arrivingFleet ) TQString msg; msg = i18n("Reinforcements (%1 ships) have arrived for planet %2.") - .tqarg(arrivingFleet->getShipCount()); + .arg(arrivingFleet->getShipCount()); gameMsg(msg, 0, arrivingFleet->destination); } } else { @@ -717,7 +717,7 @@ GameBoard::doFleetArrival( AttackFleet *arrivingFleet ) } } - mapWidget->tqrepaint(true); + mapWidget->repaint(true); } //************************************************************************ |