From c0f375feba0103bed2bac1b1f05e76e9ae28fa89 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:55:35 -0600 Subject: Remove additional unneeded tq method conversions --- konquest/fleetdlg.cc | 8 ++++---- konquest/gameboard.cc | 34 +++++++++++++++++----------------- konquest/gamecore.cc | 2 +- konquest/gameenddlg.cc | 2 +- konquest/map_widget.cc | 2 +- konquest/newgamedlg.cc | 12 ++++++------ konquest/planet_info.cc | 12 ++++++------ konquest/scoredlg.cc | 10 +++++----- 8 files changed, 41 insertions(+), 41 deletions(-) (limited to 'konquest') diff --git a/konquest/fleetdlg.cc b/konquest/fleetdlg.cc index 20cb2e0c..2e18d0bc 100644 --- a/konquest/fleetdlg.cc +++ b/konquest/fleetdlg.cc @@ -79,10 +79,10 @@ FleetDlg::init() while( (curFleet = nextFleet())) { fleetNumber++; new FleetDlgListViewItem(fleetTable, - TQString("%1").tqarg(fleetNumber), + TQString("%1").arg(fleetNumber), curFleet->destination->getName(), - TQString("%1").tqarg(curFleet->getShipCount()), - TQString("%1").tqarg(KGlobal::locale()->formatNumber(curFleet->killPercentage, 3)), - TQString("%1").tqarg((int)ceil(curFleet->arrivalTurn))); + TQString("%1").arg(curFleet->getShipCount()), + TQString("%1").arg(KGlobal::locale()->formatNumber(curFleet->killPercentage, 3)), + TQString("%1").arg((int)ceil(curFleet->arrivalTurn))); } } 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("%2").tqarg(color, planet->getName())); - plainMsg = plainMsg.tqarg(planet->getName()); + colorMsg = colorMsg.arg(TQString("%2").arg(color, planet->getName())); + plainMsg = plainMsg.arg(planet->getName()); } - msgWidget->append(("Turn %1: ").tqarg(turnNumber)+colorMsg+""); + msgWidget->append(("Turn %1: ").arg(turnNumber)+colorMsg+""); 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); } //************************************************************************ diff --git a/konquest/gamecore.cc b/konquest/gamecore.cc index e02c115f..6696cbea 100644 --- a/konquest/gamecore.cc +++ b/konquest/gamecore.cc @@ -482,7 +482,7 @@ Player::getName() TQString Player::getColoredName() { - return TQString("%2").tqarg(color.name(), name); + return TQString("%2").arg(color.name(), name); } Player *Player::createPlayer( TQString newName, TQColor color, int playerNum, bool isAi ) diff --git a/konquest/gameenddlg.cc b/konquest/gameenddlg.cc index c9aa374a..fee61c36 100644 --- a/konquest/gameenddlg.cc +++ b/konquest/gameenddlg.cc @@ -71,6 +71,6 @@ GameEndDlg::extraTurns() void GameEndDlg::turnCountChange( int newTurnCount ) { - TQString newLbl = i18n("Extra turns: %1").tqarg( newTurnCount ); + TQString newLbl = i18n("Extra turns: %1").arg( newTurnCount ); turnCountLbl->setText( newLbl); } diff --git a/konquest/map_widget.cc b/konquest/map_widget.cc index 3d0cd67e..a8aa33de 100644 --- a/konquest/map_widget.cc +++ b/konquest/map_widget.cc @@ -149,7 +149,7 @@ ConquestMap::squareBlink() void ConquestMap::mapUpdate() { - viewport()->tqrepaint(false); + viewport()->repaint(false); } diff --git a/konquest/newgamedlg.cc b/konquest/newgamedlg.cc index a3d2718b..ac336c73 100644 --- a/konquest/newgamedlg.cc +++ b/konquest/newgamedlg.cc @@ -96,7 +96,7 @@ NewGameDlg::init() for( TQListViewItem *item = w->listPlayers->firstChild(); item; item = item->nextSibling(), plrNum++ ) { - TQString key = TQString("Player_%1").tqarg(plrNum); + TQString key = TQString("Player_%1").arg(plrNum); TQString playerName = config->readEntry(key); if (playerName.isEmpty()) @@ -184,7 +184,7 @@ NewGameDlg::setPlayerCount(int playerCount) while(w->listPlayers->childCount() < playerCount) { - TQString playerName = i18n("Generated AI player name", "Comp%1").tqarg(i+1); + TQString playerName = i18n("Generated AI player name", "Comp%1").arg(i+1); TQPixmap pm(16,16); TQColor color(PlayerColors[i]); pm.fill(color); @@ -229,9 +229,9 @@ NewGameDlg::turns() void NewGameDlg::updateLabels() { - w->labelPlayers->setText(i18n("Number of &players: %1").tqarg(w->sliderPlayers->value())); - w->labelPlanets->setText(i18n("Number of neutral p&lanets: %1").tqarg(w->sliderPlanets->value())); - w->labelTurns->setText(i18n("Number of &turns: %1").tqarg(w->sliderTurns->value())); + w->labelPlayers->setText(i18n("Number of &players: %1").arg(w->sliderPlayers->value())); + w->labelPlanets->setText(i18n("Number of neutral p&lanets: %1").arg(w->sliderPlanets->value())); + w->labelTurns->setText(i18n("Number of &turns: %1").arg(w->sliderTurns->value())); } void @@ -269,7 +269,7 @@ NewGameDlg::save() for( TQListViewItem *item = w->listPlayers->firstChild(); item; item = item->nextSibling() ) { - TQString key = TQString("Player_%1").tqarg(plrNum); + TQString key = TQString("Player_%1").arg(plrNum); TQString playerName = item->text(0); bool ai = (item->text(2) == "A"); if (ai) diff --git a/konquest/planet_info.cc b/konquest/planet_info.cc index a45b0b0f..0d4df824 100644 --- a/konquest/planet_info.cc +++ b/konquest/planet_info.cc @@ -126,7 +126,7 @@ void PlanetInfo::showPlanet( Planet *planet ) TQString temp; - temp = "" + i18n("Planet name: %1").tqarg(planet->getName()); + temp = "" + i18n("Planet name: %1").arg(planet->getName()); name->setText( temp ); return; } @@ -141,19 +141,19 @@ void PlanetInfo::showPlanet( Planet *planet ) TQString temp; - temp = "" + i18n("Planet name: %1").tqarg(p->planet->getName()); + temp = "" + i18n("Planet name: %1").arg(p->planet->getName()); name->setText( temp ); - temp = "" + i18n("Owner: %1").tqarg(p->planet->getPlayer()->getColoredName()); + temp = "" + i18n("Owner: %1").arg(p->planet->getPlayer()->getColoredName()); owner->setText( temp ); - temp = "" + i18n("Ships: %1").tqarg( KGlobal::locale()->formatNumber(p->ships, 0) ); + temp = "" + i18n("Ships: %1").arg( KGlobal::locale()->formatNumber(p->ships, 0) ); ships->setText( temp ); - temp = "" + i18n("Production: %1").tqarg( KGlobal::locale()->formatNumber(p->production, 0) ); + temp = "" + i18n("Production: %1").arg( KGlobal::locale()->formatNumber(p->production, 0) ); production->setText( temp ); - temp = "" + i18n("Kill percent: %1").tqarg( KGlobal::locale()->formatNumber(p->killRate, 3) ); + temp = "" + i18n("Kill percent: %1").arg( KGlobal::locale()->formatNumber(p->killRate, 3) ); kill_percent->setText( temp ); } } diff --git a/konquest/scoredlg.cc b/konquest/scoredlg.cc index 1b4f06d0..116f88c6 100644 --- a/konquest/scoredlg.cc +++ b/konquest/scoredlg.cc @@ -71,10 +71,10 @@ ScoreDlg::init() for( ;(curPlayer = itr()); ) new ScoreDlgListViewItem(scoreTable, curPlayer->getName(), - TQString("%1").tqarg(curPlayer->getShipsBuilt()), - TQString("%1").tqarg(curPlayer->getPlanetsConquered()), - TQString("%1").tqarg(curPlayer->getFleetsLaunched()), - TQString("%1").tqarg(curPlayer->getEnemyFleetsDestroyed()), - TQString("%1").tqarg(curPlayer->getEnemyShipsDestroyed())); + TQString("%1").arg(curPlayer->getShipsBuilt()), + TQString("%1").arg(curPlayer->getPlanetsConquered()), + TQString("%1").arg(curPlayer->getFleetsLaunched()), + TQString("%1").arg(curPlayer->getEnemyFleetsDestroyed()), + TQString("%1").arg(curPlayer->getEnemyShipsDestroyed())); } -- cgit v1.2.1