Browse Source

Remove additional unneeded tq method conversions

pull/1/head
Timothy Pearson 9 years ago
parent
commit
c0f375feba
178 changed files with 868 additions and 868 deletions
  1. +3
    -3
      atlantik/client/atlantik.cpp
  2. +1
    -1
      atlantik/client/eventlogwidget.cpp
  3. +5
    -5
      atlantik/client/selectgame_widget.cpp
  4. +1
    -1
      atlantik/libatlantic/trade.cpp
  5. +20
    -20
      atlantik/libatlantikclient/atlantik_network.cpp
  6. +1
    -1
      atlantik/libatlantikui/auction_widget.cpp
  7. +6
    -6
      atlantik/libatlantikui/board.cpp
  8. +6
    -6
      atlantik/libatlantikui/estatedetails.cpp
  9. +10
    -10
      atlantik/libatlantikui/estateview.cpp
  10. +3
    -3
      atlantik/libatlantikui/portfolioview.cpp
  11. +1
    -1
      atlantik/libatlantikui/token.cpp
  12. +4
    -4
      atlantik/libatlantikui/trade_widget.cpp
  13. +1
    -1
      kasteroids/sprites/rock1/rock1.pov
  14. +1
    -1
      kasteroids/sprites/rock2/rock2.pov
  15. +1
    -1
      kasteroids/sprites/rock3/rock3.pov
  16. +6
    -6
      kasteroids/toplevel.cpp
  17. +12
    -12
      katomic/gamewidget.cpp
  18. +4
    -4
      katomic/molek.cpp
  19. +27
    -27
      kbackgammon/engines/fibs/kbgfibs.cpp
  20. +21
    -21
      kbackgammon/engines/fibs/kbgfibschat.cpp
  21. +9
    -9
      kbackgammon/engines/fibs/kplayerlist.cpp
  22. +6
    -6
      kbackgammon/engines/gnubg/kbggnubg.cpp
  23. +10
    -10
      kbackgammon/engines/nextgen/kbgng.cpp
  24. +7
    -7
      kbackgammon/engines/offline/kbgoffline.cpp
  25. +2
    -2
      kbackgammon/kbg.cpp
  26. +3
    -3
      kbackgammon/kbgboard.h
  27. +3
    -3
      kbattleship/kbattleship/dialogs/connectDlg.ui
  28. +2
    -2
      kbattleship/kbattleship/dialogs/serverDlg.ui
  29. +2
    -2
      kbattleship/kbattleship/dialogs/statDlg.ui
  30. +6
    -6
      kbattleship/kbattleship/kbattleship.cpp
  31. +1
    -1
      kbattleship/kbattleship/kbattleshipserver.cpp
  32. +4
    -4
      kbattleship/kbattleship/kbattleshipview.cpp
  33. +3
    -3
      kbattleship/kbattleship/konnectionhandling.cpp
  34. +6
    -6
      kblackbox/kbbgame.cpp
  35. +2
    -2
      kblackbox/kbbgfx.cpp
  36. +4
    -4
      kbounce/game.cpp
  37. +7
    -7
      kbounce/kbounce.cpp
  38. +11
    -11
      kenolaba/AbTop.cpp
  39. +7
    -7
      kenolaba/Ball.cpp
  40. +1
    -1
      kenolaba/Ball.h
  41. +5
    -5
      kenolaba/BoardWidget.cpp
  42. +35
    -35
      kenolaba/EvalDlg.ui
  43. +9
    -9
      kenolaba/EvalScheme.cpp
  44. +1
    -1
      kfouleggs/piece.cpp
  45. BIN
      kgoldrunner/gamedata/levels.tar
  46. +6
    -6
      kgoldrunner/src/kgoldrunner.cpp
  47. +8
    -8
      kgoldrunner/src/kgrdialog.cpp
  48. +39
    -39
      kgoldrunner/src/kgrgame.cpp
  49. +1
    -1
      kgoldrunner/src/kgrgame.h
  50. +1
    -1
      kjumpingcube/kcubewidget.cpp
  51. +8
    -8
      kjumpingcube/kjumpingcube.cpp
  52. +3
    -3
      kjumpingcube/settings.ui
  53. +1
    -1
      klickety/piece.cpp
  54. +1
    -1
      klines/field.cpp
  55. +7
    -7
      klines/klines.cpp
  56. +6
    -6
      klines/linesboard.cpp
  57. +1
    -1
      klines/povray/balls.sh
  58. +1
    -1
      klines/povray/fire.sh
  59. +1
    -1
      klines/povray/makeballs.sh
  60. +11
    -11
      kmahjongg/Editor.cpp
  61. +1
    -1
      kmahjongg/HighScore.cpp
  62. +3
    -3
      kmahjongg/Preview.cpp
  63. +7
    -7
      kmahjongg/boardwidget.cpp
  64. +1
    -1
      kmahjongg/boardwidget.h
  65. +3
    -3
      kmahjongg/kmahjongg.cpp
  66. +1
    -1
      kmines/dialogs.cpp
  67. +5
    -5
      kmines/solver/solver.cpp
  68. +1
    -1
      kmines/status.cpp
  69. +2
    -2
      knetwalk/src/mainwindow.cpp
  70. +17
    -17
      kolf/game.cpp
  71. +2
    -2
      kolf/kcomboboxdialog.cpp
  72. +9
    -9
      kolf/kolf.cpp
  73. +4
    -4
      kolf/main.cpp
  74. +6
    -6
      kolf/newgame.cpp
  75. +1
    -1
      kolf/objects/test/test.cpp
  76. +4
    -4
      konquest/fleetdlg.cc
  77. +17
    -17
      konquest/gameboard.cc
  78. +1
    -1
      konquest/gamecore.cc
  79. +1
    -1
      konquest/gameenddlg.cc
  80. +1
    -1
      konquest/map_widget.cc
  81. +6
    -6
      konquest/newgamedlg.cc
  82. +6
    -6
      konquest/planet_info.cc
  83. +5
    -5
      konquest/scoredlg.cc
  84. +1
    -1
      kpat/card.cpp
  85. +14
    -14
      kpat/dealer.cpp
  86. +1
    -1
      kpat/freecell-solver/caas.c
  87. +1
    -1
      kpat/freecell-solver/pqueue.c
  88. +1
    -1
      kpat/freecell-solver/pqueue.h
  89. +4
    -4
      kpat/freecell-solver/state.h
  90. +3
    -3
      kpat/freecell-solver/test_arr.h
  91. +4
    -4
      kpat/freecell-solver/tests.h
  92. +6
    -6
      kpat/freecell.cpp
  93. +4
    -4
      kpat/gamestats.ui
  94. +8
    -8
      kpat/gamestatsimpl.cpp
  95. +1
    -1
      kpat/pwidget.cpp
  96. +4
    -4
      kpoker/betbox.cpp
  97. +1
    -1
      kpoker/kpaint.cpp
  98. +14
    -14
      kpoker/kpoker.cpp
  99. +2
    -2
      kpoker/newgamedlg.cpp
  100. +5
    -5
      kpoker/playerbox.cpp
  101. +1
    -1
      kreversi/Move.cpp
  102. +2
    -2
      kreversi/board.cpp
  103. +5
    -5
      kreversi/kreversi.cpp
  104. +3
    -3
      kreversi/qreversigameview.cpp
  105. +5
    -5
      kreversi/settings.ui
  106. +13
    -13
      ksame/KSameWidget.cpp
  107. +11
    -11
      kshisen/app.cpp
  108. +2
    -2
      kshisen/board.cpp
  109. +6
    -6
      kshisen/settings.ui
  110. +7
    -7
      ksmiletris/gamewidget.cpp
  111. +2
    -2
      ksmiletris/gamewindow.cpp
  112. +1
    -1
      ksnake/ball.cpp
  113. +1
    -1
      ksnake/ball.h
  114. +1
    -1
      ksnake/basket.cpp
  115. +1
    -1
      ksnake/basket.h
  116. +2
    -2
      ksnake/game.cpp
  117. +1
    -1
      ksnake/general.ui
  118. +1
    -1
      ksnake/pixServer.cpp
  119. +13
    -13
      ksnake/rattler.cpp
  120. +1
    -1
      ksnake/snake.cpp
  121. +1
    -1
      ksnake/snake.h
  122. +8
    -8
      ksokoban/PlayField.cpp
  123. +2
    -2
      kspaceduel/mainview.cpp
  124. +2
    -2
      kspaceduel/playerinfo.cpp
  125. +3
    -3
      ktron/appearance.ui
  126. +2
    -2
      ktron/general.ui
  127. +5
    -5
      ktron/ktron.cpp
  128. +4
    -4
      ktron/tron.cpp
  129. +10
    -10
      ktuberling/playground.cpp
  130. +2
    -2
      ktuberling/playground.h
  131. +3
    -3
      ktuberling/todraw.cpp
  132. +2
    -2
      ktuberling/toplevel.cpp
  133. +3
    -3
      libksirtet/base/field.cpp
  134. +2
    -2
      libksirtet/common/ai.cpp
  135. +3
    -3
      libksirtet/common/highscores.cpp
  136. +3
    -3
      libksirtet/common/misc_ui.cpp
  137. +1
    -1
      libksirtet/lib/defines.cpp
  138. +3
    -3
      libksirtet/lib/keys.cpp
  139. +1
    -1
      libksirtet/lib/keys.h
  140. +6
    -6
      libksirtet/lib/meeting.cpp
  141. +4
    -4
      libksirtet/lib/mp_interface.cpp
  142. +2
    -2
      libksirtet/lib/pline.cpp
  143. +3
    -3
      libksirtet/lib/types.cpp
  144. +7
    -7
      libksirtet/lib/wizard.cpp
  145. +52
    -52
      libtdegames/carddecks/convertpysols
  146. +3
    -3
      libtdegames/highscore/kexthighscore_gui.cpp
  147. +8
    -8
      libtdegames/highscore/kexthighscore_internal.cpp
  148. +3
    -3
      libtdegames/highscore/kexthighscore_item.cpp
  149. +5
    -5
      libtdegames/highscore/kexthighscore_item.h
  150. +1
    -1
      libtdegames/highscore/kexthighscore_tab.cpp
  151. +9
    -9
      libtdegames/highscore/khighscore.cpp
  152. +1
    -1
      libtdegames/highscore/khighscore.h
  153. +1
    -1
      libtdegames/highscore/kscoredialog.cpp
  154. +6
    -6
      libtdegames/kchatbase.cpp
  155. +1
    -1
      libtdegames/kchatbase.h
  156. +1
    -1
      libtdegames/kgame/dialogs/kgamedialogconfig.cpp
  157. +3
    -3
      libtdegames/kgame/dialogs/kgameerrordialog.cpp
  158. +1
    -1
      libtdegames/kgame/kgame.h
  159. +3
    -3
      libtdegames/kgame/kgamechat.cpp
  160. +3
    -3
      libtdegames/kgame/kgameerror.cpp
  161. +3
    -3
      libtdegames/kgame/kgamepropertyhandler.cpp
  162. +3
    -3
      libtdegames/kgame/kmessageclient.cpp
  163. +3
    -3
      libtdegames/kgame/kmessageclient.h
  164. +1
    -1
      libtdegames/kgame/kmessageio.cpp
  165. +1
    -1
      libtdegames/kgame/kmessageserver.h
  166. +2
    -2
      libtdegames/kgameprogress.cpp
  167. +3
    -3
      lskat/lskat/lskat.cpp
  168. +1
    -1
      lskat/lskat/lskatdoc.cpp
  169. +1
    -1
      lskat/lskat/lskatdoc.h
  170. +13
    -13
      lskat/lskat/lskatview.cpp
  171. +2
    -2
      lskat/lskat/networkdlgbase.ui
  172. +3
    -3
      twin4/twin4/kspritecache.cpp
  173. +3
    -3
      twin4/twin4/scorewidget.cpp
  174. +1
    -1
      twin4/twin4/settings.ui
  175. +6
    -6
      twin4/twin4/statistics.ui
  176. +5
    -5
      twin4/twin4/statuswidget.ui
  177. +1
    -1
      twin4/twin4/twin4.cpp
  178. +1
    -1
      twin4/twin4/twin4view.cpp

+ 3
- 3
atlantik/client/atlantik.cpp View File

@ -475,12 +475,12 @@ void Atlantik::networkClosed(int status)
switch( status )
{
case KBufferedIO::involuntary:
slotMsgStatus( 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.").arg(m_atlantikNetwork->host()).arg(m_atlantikNetwork->port()), TQString("connect_no") );
showSelectServer();
break;
default:
if ( !m_atlantikNetwork->host().isEmpty() )
slotMsgStatus( i18n("Disconnected from %1:%2.").tqarg(m_atlantikNetwork->host()).tqarg(m_atlantikNetwork->port()), TQString("connect_no") );
slotMsgStatus( i18n("Disconnected from %1:%2.").arg(m_atlantikNetwork->host()).arg(m_atlantikNetwork->port()), TQString("connect_no") );
break;
}
}
@ -636,7 +636,7 @@ void Atlantik::slotMsgChat(TQString player, TQString msg)
if (m_config.chatTimestamps)
{
TQTime time = TQTime::currentTime();
serverMsgsAppend(TQString("[%1] %2: %3").tqarg(time.toString("hh:mm")).tqarg(player).tqarg(msg));
serverMsgsAppend(TQString("[%1] %2: %3").arg(time.toString("hh:mm")).arg(player).arg(msg));
}
else
serverMsgsAppend(player + ": " + msg);


+ 1
- 1
atlantik/client/eventlogwidget.cpp View File

@ -113,7 +113,7 @@ void EventLogWidget::save()
{
TQTextStream stream(&file);
stream << i18n( "Atlantik log file, saved at %1." ).tqarg( TQDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss") ) << endl;
stream << i18n( "Atlantik log file, saved at %1." ).arg( TQDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss") ) << endl;
TQPtrList<Event> events = m_eventLog->events();
for (TQPtrListIterator<Event> it( events ); (*it) ; ++it)


+ 5
- 5
atlantik/client/selectgame_widget.cpp View File

@ -80,13 +80,13 @@ void SelectGame::addGame(Game *game)
if (game->id() == -1)
{
TQListViewItem *item = new TQListViewItem( m_gameList, i18n("Create a new %1 Game").tqarg(game->name()), game->description(), TQString(), TQString(), game->type() );
TQListViewItem *item = new TQListViewItem( m_gameList, i18n("Create a new %1 Game").arg(game->name()), game->description(), TQString(), TQString(), game->type() );
item->setPixmap(0, TQPixmap(SmallIcon("filenew")));
}
else
{
Player *master = game->master();
TQListViewItem *item = new TQListViewItem( m_gameList, i18n("Join %1's %2 Game").tqarg( (master ? master->name() : TQString()), game->name() ), game->description(), TQString::number(game->id()), TQString::number(game->players()), game->type() );
TQListViewItem *item = new TQListViewItem( m_gameList, i18n("Join %1's %2 Game").arg( (master ? master->name() : TQString()), game->name() ), game->description(), TQString::number(game->id()), TQString::number(game->players()), game->type() );
item->setPixmap( 0, TQPixmap(SmallIcon("atlantik")) );
item->setEnabled(game->canBeJoined());
@ -118,11 +118,11 @@ void SelectGame::updateGame(Game *game)
item->setText( 1, game->description() );
if (game->id() == -1)
item->setText(0, i18n("Create a new %1 Game").tqarg(game->name()));
item->setText(0, i18n("Create a new %1 Game").arg(game->name()));
else
{
Player *master = game->master();
item->setText( 0, i18n("Join %1's %2 Game").tqarg( (master ? master->name() : TQString()), game->name() ) );
item->setText( 0, i18n("Join %1's %2 Game").arg( (master ? master->name() : TQString()), game->name() ) );
item->setText( 3, TQString::number( game->players() ) );
item->setEnabled( game->canBeJoined() );
@ -143,7 +143,7 @@ void SelectGame::playerChanged(Player *player)
game = m_atlanticCore->findGame( item->text(2).toInt() );
if ( game && game->master() == player )
{
item->setText( 0, i18n("Join %1's %2 Game").tqarg( player->name(), game->name() ) );
item->setText( 0, i18n("Join %1's %2 Game").arg( player->name(), game->name() ) );
return;
}
item = item->nextSibling();


+ 1
- 1
atlantik/libatlantic/trade.cpp View File

@ -196,5 +196,5 @@ void TradeMoney::setMoney(unsigned int money)
TQString TradeMoney::text() const
{
return TQString("$%1").tqarg(m_money);
return TQString("$%1").arg(m_money);
}

+ 20
- 20
atlantik/libatlantikclient/atlantik_network.cpp View File

@ -95,37 +95,37 @@ void AtlantikNetwork::endTurn()
void AtlantikNetwork::setName(TQString name)
{
// Almost deprecated, will be replaced by libmonopdprotocol
writeData(TQString(".n%1").tqarg(name));
writeData(TQString(".n%1").arg(name));
}
void AtlantikNetwork::tokenConfirmation(Estate *estate)
{
writeData(TQString(".t%1").tqarg(estate ? estate->id() : -1));
writeData(TQString(".t%1").arg(estate ? estate->id() : -1));
}
void AtlantikNetwork::estateToggleMortgage(Estate *estate)
{
writeData(TQString(".em%1").tqarg(estate ? estate->id() : -1));
writeData(TQString(".em%1").arg(estate ? estate->id() : -1));
}
void AtlantikNetwork::estateHouseBuy(Estate *estate)
{
writeData(TQString(".hb%1").tqarg(estate ? estate->id() : -1));
writeData(TQString(".hb%1").arg(estate ? estate->id() : -1));
}
void AtlantikNetwork::estateHouseSell(Estate *estate)
{
writeData(TQString(".hs%1").tqarg(estate ? estate->id() : -1));
writeData(TQString(".hs%1").arg(estate ? estate->id() : -1));
}
void AtlantikNetwork::newGame(const TQString &gameType)
{
writeData(TQString(".gn%1").tqarg(gameType));
writeData(TQString(".gn%1").arg(gameType));
}
void AtlantikNetwork::joinGame(int gameId)
{
writeData(TQString(".gj%1").tqarg(gameId));
writeData(TQString(".gj%1").arg(gameId));
}
void AtlantikNetwork::cmdChat(TQString msg)
@ -135,42 +135,42 @@ void AtlantikNetwork::cmdChat(TQString msg)
void AtlantikNetwork::newTrade(Player *player)
{
writeData(TQString(".Tn%1").tqarg(player ? player->id() : -1));
writeData(TQString(".Tn%1").arg(player ? player->id() : -1));
}
void AtlantikNetwork::kickPlayer(Player *player)
{
writeData(TQString(".gk%1").tqarg(player ? player->id() : -1));
writeData(TQString(".gk%1").arg(player ? player->id() : -1));
}
void AtlantikNetwork::tradeUpdateEstate(Trade *trade, Estate *estate, Player *player)
{
writeData(TQString(".Te%1:%2:%3").tqarg(trade ? trade->tradeId() : -1).tqarg(estate ? estate->id() : -1).tqarg(player ? player->id() : -1));
writeData(TQString(".Te%1:%2:%3").arg(trade ? trade->tradeId() : -1).arg(estate ? estate->id() : -1).arg(player ? player->id() : -1));
}
void AtlantikNetwork::tradeUpdateMoney(Trade *trade, unsigned int money, Player *pFrom, Player *pTo)
{
writeData(TQString(".Tm%1:%2:%3:%4").tqarg(trade ? trade->tradeId() : -1).tqarg(pFrom ? pFrom->id() : -1).tqarg(pTo ? pTo->id() : -1).tqarg(money));
writeData(TQString(".Tm%1:%2:%3:%4").arg(trade ? trade->tradeId() : -1).arg(pFrom ? pFrom->id() : -1).arg(pTo ? pTo->id() : -1).arg(money));
}
void AtlantikNetwork::tradeReject(Trade *trade)
{
writeData(TQString(".Tr%1").tqarg(trade ? trade->tradeId() : -1));
writeData(TQString(".Tr%1").arg(trade ? trade->tradeId() : -1));
}
void AtlantikNetwork::tradeAccept(Trade *trade)
{
writeData(TQString(".Ta%1:%2").tqarg(trade ? trade->tradeId() : -1).tqarg(trade ? trade->revision() : -1));
writeData(TQString(".Ta%1:%2").arg(trade ? trade->tradeId() : -1).arg(trade ? trade->revision() : -1));
}
void AtlantikNetwork::auctionBid(Auction *auction, int amount)
{
writeData(TQString(".ab%1:%2").tqarg(auction ? auction->auctionId() : -1).tqarg(amount));
writeData(TQString(".ab%1:%2").arg(auction ? auction->auctionId() : -1).arg(amount));
}
void AtlantikNetwork::setImage(const TQString &name)
{
writeData(TQString(".pi%1").tqarg(name));
writeData(TQString(".pi%1").arg(name));
}
void AtlantikNetwork::jailPay()
@ -190,7 +190,7 @@ void AtlantikNetwork::jailCard()
void AtlantikNetwork::changeOption(int configId, const TQString &value)
{
writeData( TQString(".gc%1:%2").tqarg(configId).tqarg(value) );
writeData( TQString(".gc%1:%2").arg(configId).arg(value) );
}
void AtlantikNetwork::writeData(TQString msg)
@ -607,7 +607,7 @@ void AtlantikNetwork::processNode(TQDomNode n)
Estate *estate = 0;
bool b_newEstate = false;
// FIXME: allow any estateId, GUI should not use it to determin its tqgeometry
// FIXME: allow any estateId, GUI should not use it to determin its geometry
if (estateId >= 0 && estateId < 100 && !(estate = m_atlanticCore->findEstate(a.value().toInt())))
{
// Create estate object
@ -906,7 +906,7 @@ void AtlantikNetwork::serverConnect(const TQString host, int port)
{
setAddress(host, port);
enableRead(true);
emit msgStatus(i18n("Connecting to %1:%2...").tqarg(host).tqarg(TQString::number(port)), "connect_creating");
emit msgStatus(i18n("Connecting to %1:%2...").arg(host).arg(TQString::number(port)), "connect_creating");
startAsyncConnect();
}
@ -917,12 +917,12 @@ void AtlantikNetwork::slotLookupFinished(int count)
void AtlantikNetwork::slotConnectionSuccess()
{
emit msgStatus(i18n("Connected to %1:%2.").tqarg(host()).tqarg(port()), "connect_established");
emit msgStatus(i18n("Connected to %1:%2.").arg(host()).arg(port()), "connect_established");
}
void AtlantikNetwork::slotConnectionFailed(int error)
{
emit msgStatus(i18n("Connection failed! Error code: %1").tqarg(error), "connect_no");
emit msgStatus(i18n("Connection failed! Error code: %1").arg(error), "connect_no");
}
#include "atlantik_network.moc"

+ 1
- 1
atlantik/libatlantikui/auction_widget.cpp View File

@ -47,7 +47,7 @@ AuctionWidget::AuctionWidget(AtlanticCore *atlanticCore, Auction *auction, TQWid
// Player list
Estate *estate = auction->estate();
m_playerGroupBox = new TQVGroupBox(estate ? i18n("Auction: %1").tqarg(estate->name()) : i18n("Auction"), this, "groupBox");
m_playerGroupBox = new TQVGroupBox(estate ? i18n("Auction: %1").arg(estate->name()) : i18n("Auction"), this, "groupBox");
m_mainLayout->addWidget(m_playerGroupBox);
m_playerList = new KListView(m_playerGroupBox);


+ 6
- 6
atlantik/libatlantikui/board.cpp View File

@ -351,13 +351,13 @@ TQPoint AtlantikBoard::calculateTokenDestination(Token *token, Estate *eDest)
int x = 0, y = 0;
if (token->player()->inJail())
{
x = evDest->tqgeometry().right() - token->width() - 2;
y = evDest->tqgeometry().top();
x = evDest->geometry().right() - token->width() - 2;
y = evDest->geometry().top();
}
else
{
x = evDest->tqgeometry().center().x() - (token->width()/2);
y = evDest->tqgeometry().center().y() - (token->height()/2);
x = evDest->geometry().center().x() - (token->width()/2);
y = evDest->geometry().center().y() - (token->height()/2);
/*
// Re-center because of EstateView headers
@ -394,8 +394,8 @@ void AtlantikBoard::slotMoveToken()
}
// Where are we?
int xCurrent = m_movingToken->tqgeometry().x();
int yCurrent = m_movingToken->tqgeometry().y();
int xCurrent = m_movingToken->geometry().x();
int yCurrent = m_movingToken->geometry().y();
// Where do we want to go today?
Estate *eDest = m_atlanticCore->estateAfter(m_movingToken->location());


+ 6
- 6
atlantik/libatlantikui/estatedetails.cpp View File

@ -114,7 +114,7 @@ void EstateDetails::paintEvent(TQPaintEvent *)
TQColor greenHouse(0, 255, 0);
TQColor redHotel(255, 51, 51);
TQPainter painter;
painter.tqbegin(TQT_TQPAINTDEVICE(m_pixmap), this);
painter.begin(TQT_TQPAINTDEVICE(m_pixmap), this);
painter.setPen(TQt::black);
@ -136,7 +136,7 @@ void EstateDetails::paintEvent(TQPaintEvent *)
quartzBuffer->resize(25, (height()/4)-2);
TQPainter quartzPainter;
quartzPainter.tqbegin(TQT_TQPAINTDEVICE(quartzBuffer), this);
quartzPainter.begin(TQT_TQPAINTDEVICE(quartzBuffer), this);
painter.setBrush(titleColor);
painter.drawRect(0, 0, width(), titleHeight);
@ -217,22 +217,22 @@ void EstateDetails::addDetails()
// Price
if (m_estate->price())
{
infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Price: %1").tqarg(m_estate->price()));
infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Price: %1").arg(m_estate->price()));
infoText->setPixmap(0, TQPixmap(SmallIcon("info")));
}
// Owner, houses, isMortgaged
if (m_estate && m_estate->canBeOwned())
{
infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Owner: %1").tqarg(m_estate->owner() ? m_estate->owner()->name() : i18n("unowned")));
infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Owner: %1").arg(m_estate->owner() ? m_estate->owner()->name() : i18n("unowned")));
infoText->setPixmap(0, TQPixmap(SmallIcon("info")));
if (m_estate->isOwned())
{
infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Houses: %1").tqarg(m_estate->houses()));
infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Houses: %1").arg(m_estate->houses()));
infoText->setPixmap(0, TQPixmap(SmallIcon("info")));
infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Mortgaged: %1").tqarg(m_estate->isMortgaged() ? i18n("Yes") : i18n("No")));
infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Mortgaged: %1").arg(m_estate->isMortgaged() ? i18n("Yes") : i18n("No")));
infoText->setPixmap(0, TQPixmap(SmallIcon("info")));
}
}


+ 10
- 10
atlantik/libatlantikui/estateview.cpp View File

@ -72,20 +72,20 @@ void EstateView::updateToolTip()
TQString toolTip = m_estate->name();
if ( m_estate->isOwned() )
{
toolTip.append( "\n" + i18n("Owner: %1").tqarg( m_estate->owner()->name() ) );
toolTip.append( "\n" + i18n("Owner: %1").arg( m_estate->owner()->name() ) );
if ( m_estate->isMortgaged() )
toolTip.append( "\n" + i18n("Unmortgage Price: %1").tqarg( m_estate->unmortgagePrice() ) );
toolTip.append( "\n" + i18n("Unmortgage Price: %1").arg( m_estate->unmortgagePrice() ) );
else
toolTip.append( "\n" + i18n("Mortgage Value: %1").tqarg( m_estate->mortgagePrice() ) );
toolTip.append( "\n" + i18n("Mortgage Value: %1").arg( m_estate->mortgagePrice() ) );
if ( m_estate->canSellHouses() )
toolTip.append( "\n" + i18n("House Value: %1").tqarg( m_estate->houseSellPrice() ) );
toolTip.append( "\n" + i18n("House Value: %1").arg( m_estate->houseSellPrice() ) );
if ( m_estate->canBuyHouses() )
toolTip.append( "\n" + i18n("House Price: %1").tqarg( m_estate->housePrice() ) );
toolTip.append( "\n" + i18n("House Price: %1").arg( m_estate->housePrice() ) );
}
else if ( m_estate->canBeOwned() )
toolTip.append( "\n" + i18n("Price: %1").tqarg( m_estate->price() ) );
toolTip.append( "\n" + i18n("Price: %1").arg( m_estate->price() ) );
else if ( m_estate->money() )
toolTip.append( "\n" + i18n("Money: %1").tqarg( m_estate->money() ) );
toolTip.append( "\n" + i18n("Money: %1").arg( m_estate->money() ) );
TQToolTip::add( this, toolTip );
}
@ -255,7 +255,7 @@ void EstateView::paintEvent(TQPaintEvent *)
TQColor greenHouse(0, 255, 0);
TQColor redHotel(255, 51, 51);
TQPainter painter;
painter.tqbegin(TQT_TQPAINTDEVICE(qpixmap), this);
painter.begin(TQT_TQPAINTDEVICE(qpixmap), this);
painter.setPen(TQt::black);
@ -281,7 +281,7 @@ void EstateView::paintEvent(TQPaintEvent *)
quartzBuffer->resize(m_titleWidth-2, 25);
TQPainter quartzPainter;
quartzPainter.tqbegin(TQT_TQPAINTDEVICE(quartzBuffer), this);
quartzPainter.begin(TQT_TQPAINTDEVICE(quartzBuffer), this);
painter.setBrush(m_estate->color());
switch(m_orientation)
@ -477,7 +477,7 @@ void EstateView::mousePressEvent(TQMouseEvent *e)
{
// Request trade
if (Player *player = m_estate->owner())
rmbMenu->insertItem(i18n("Request Trade with %1").tqarg(player->name()), 3);
rmbMenu->insertItem(i18n("Request Trade with %1").arg(player->name()), 3);
}
KPopupMenu *pm = dynamic_cast<KPopupMenu *>(rmbMenu);


+ 3
- 3
atlantik/libatlantikui/portfolioview.cpp View File

@ -196,7 +196,7 @@ void PortfolioView::paintEvent(TQPaintEvent *)
qpixmap = new TQPixmap(width(), height());
TQPainter painter;
painter.tqbegin(TQT_TQPAINTDEVICE(qpixmap), this);
painter.begin(TQT_TQPAINTDEVICE(qpixmap), this);
painter.setPen(TQt::white);
painter.setBrush(TQt::white);
@ -260,12 +260,12 @@ void PortfolioView::mousePressEvent(TQMouseEvent *e)
if ( m_portfolioEstates.count() )
{
// Start trade
rmbMenu->insertItem(i18n("Request Trade with %1").tqarg(m_player->name()), 0);
rmbMenu->insertItem(i18n("Request Trade with %1").arg(m_player->name()), 0);
}
else
{
// Kick player
rmbMenu->insertItem(i18n("Boot Player %1 to Lounge").tqarg(m_player->name()), 0);
rmbMenu->insertItem(i18n("Boot Player %1 to Lounge").arg(m_player->name()), 0);
rmbMenu->setItemEnabled( 0, m_atlanticCore->selfIsMaster() );
}


+ 1
- 1
atlantik/libatlantikui/token.cpp View File

@ -127,7 +127,7 @@ void Token::paintEvent(TQPaintEvent *)
qpixmap = new TQPixmap(width(), height());
TQPainter painter;
painter.tqbegin(TQT_TQPAINTDEVICE(qpixmap), this);
painter.begin(TQT_TQPAINTDEVICE(qpixmap), this);
if (m_image)
{


+ 4
- 4
atlantik/libatlantikui/trade_widget.cpp View File

@ -52,7 +52,7 @@ TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *p
m_trade = trade;
m_atlanticCore = atlanticCore;
setCaption(i18n("Trade %1").tqarg(trade->tradeId()));
setCaption(i18n("Trade %1").arg(trade->tradeId()));
TQVBoxLayout *listCompBox = new TQVBoxLayout(this, KDialog::marginHint());
@ -143,7 +143,7 @@ TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *p
m_status = new TQLabel(this);
listCompBox->addWidget(m_status);
m_status->setText( i18n( "%1 out of %2 players accept current trade proposal." ).tqarg( m_trade->count( true ) ).tqarg( m_trade->count( false ) ) );
m_status->setText( i18n( "%1 out of %2 players accept current trade proposal." ).arg( m_trade->count( true ) ).arg( m_trade->count( false ) ) );
// mPlayerList->header()->hide();
// mPlayerList->setRootIsDecorated(true);
@ -216,7 +216,7 @@ void TradeDisplay::tradeChanged()
{
// TODO: add notification whether playerSelf has accepted or not and
// enable/disable accept button based on that
m_status->setText( i18n( "%1 out of %2 players accept current trade proposal." ).tqarg( m_trade->count( true ) ).tqarg( m_trade->count( false ) ) );
m_status->setText( i18n( "%1 out of %2 players accept current trade proposal." ).arg( m_trade->count( true ) ).arg( m_trade->count( false ) ) );
}
void TradeDisplay::playerChanged(Player *player)
@ -232,7 +232,7 @@ void TradeDisplay::playerChanged(Player *player)
void TradeDisplay::tradeRejected(Player *player)
{
if (player)
m_status->setText(i18n("Trade proposal was rejected by %1.").tqarg(player->name()));
m_status->setText(i18n("Trade proposal was rejected by %1.").arg(player->name()));
else
m_status->setText(i18n("Trade proposal was rejected."));


+ 1
- 1
kasteroids/sprites/rock1/rock1.pov View File

@ -1,5 +1,5 @@
#include "colors.inc"
#include "tqshapes.inc"
#include "shapes.inc"
#include "textures.inc"
// #include "stones.inc"


+ 1
- 1
kasteroids/sprites/rock2/rock2.pov View File

@ -1,5 +1,5 @@
#include "colors.inc"
#include "tqshapes.inc"
#include "shapes.inc"
#include "textures.inc"
// #include "stones.inc"


+ 1
- 1
kasteroids/sprites/rock3/rock3.pov View File

@ -1,5 +1,5 @@
#include "colors.inc"
#include "tqshapes.inc"
#include "shapes.inc"
#include "textures.inc"
// #include "stones.inc"


+ 6
- 6
kasteroids/toplevel.cpp View File

@ -484,7 +484,7 @@ void KAstTopLevel::slotNewGame()
view->setRockSpeed( levels[0].rockSpeed );
view->addRocks( levels[0].nrocks );
view->showText( i18n( "Press %1 to launch." )
.tqarg(launchAction->shortcut().seq(0).toString()),
.arg(launchAction->shortcut().seq(0).toString()),
yellow );
waitShip = true;
gameOver = false;
@ -509,7 +509,7 @@ void KAstTopLevel::slotShipKilled()
{
waitShip = true;
view->showText( i18n( "Ship Destroyed. Press %1 to launch.")
.tqarg(launchAction->shortcut().seq(0).toString()),
.arg(launchAction->shortcut().seq(0).toString()),
yellow );
}
else
@ -577,7 +577,7 @@ void KAstTopLevel::slotKeyConfig()
{
KKeyDialog::configure( actionCollection(), this );
if ( waitShip ) view->showText( i18n( "Press %1 to launch." )
.tqarg(launchAction->shortcut().seq(0).toString()),
.arg(launchAction->shortcut().seq(0).toString()),
yellow, false );
}
@ -637,9 +637,9 @@ void KAstTopLevel::doStats()
" Hit:\t%2\n"
" Missed:\t%3\n"
"Hit ratio:\t%4 %\t\t")
.tqarg(view->shots()).tqarg(view->hits())
.tqarg(view->shots() - view->hits())
.tqarg(r);
.arg(view->shots()).arg(view->hits())
.arg(view->shots() - view->hits())
.arg(r);
view->showText( s, green, FALSE );
}


+ 12
- 12
katomic/gamewidget.cpp View File

@ -95,11 +95,11 @@ void GameWidget::doRedo ()
}
void GameWidget::gameOver(int moves) {
KMessageBox::information(this, i18n("You solved level %1 with %2 moves!").tqarg(level).tqarg(moves), i18n("Congratulations"));
KMessageBox::information(this, i18n("You solved level %1 with %2 moves!").arg(level).arg(moves), i18n("Congratulations"));
KScoreDialog high(KScoreDialog::Name | KScoreDialog::Score, this);
high.setCaption(i18n("Level %1 Highscores").tqarg(level));
high.setConfigGroup(TQString("Highscores Level %1").tqarg(level));
high.setCaption(i18n("Level %1 Highscores").arg(level));
high.setConfigGroup(TQString("Highscores Level %1").arg(level));
KScoreDialog::FieldInfo scoreInfo;
@ -118,8 +118,8 @@ void GameWidget::getMoves(int moves)
void GameWidget::mergeHighScores(int l)
{
KConfigGroup oldConfig(kapp->config(), TQString("High Scores Level %1").tqarg(l).utf8());
KConfigGroup newConfig(kapp->config(), TQString("Highscores Level %1").tqarg(l).utf8());
KConfigGroup oldConfig(kapp->config(), TQString("High Scores Level %1").arg(l).utf8());
KConfigGroup newConfig(kapp->config(), TQString("Highscores Level %1").arg(l).utf8());
newConfig.writeEntry("LastPlayer", oldConfig.readEntry("LastPlayer"));
@ -138,7 +138,7 @@ void GameWidget::mergeHighScores(int l)
void GameWidget::updateLevel (int l)
{
level=l;
TQString levelFile = locate("appdata", TQString("levels/level_%1").tqarg(l));
TQString levelFile = locate("appdata", TQString("levels/level_%1").arg(l));
if (levelFile.isNull()) {
return updateLevel(1);
}
@ -147,11 +147,11 @@ void GameWidget::updateLevel (int l)
cfg.setGroup("Level");
feld->load(cfg);
if (!kapp->config()->hasGroup(TQString("Highscores Level %1").tqarg(level)) &&
kapp->config()->hasGroup(TQString("High Scores Level %1").tqarg(level)))
if (!kapp->config()->hasGroup(TQString("Highscores Level %1").arg(level)) &&
kapp->config()->hasGroup(TQString("High Scores Level %1").arg(level)))
mergeHighScores(level);
highScore->setConfigGroup(TQString("Highscores Level %1").tqarg(level));
highScore->setConfigGroup(TQString("Highscores Level %1").arg(level));
highest.setNum(highScore->highScore());
if (highest != "0" ) hs->setText(highest);
@ -159,7 +159,7 @@ void GameWidget::updateLevel (int l)
ys->setText("0");
scrl->setValue(level);
feld->tqrepaint();
feld->repaint();
}
void GameWidget::restartLevel()
@ -245,8 +245,8 @@ GameWidget::~GameWidget()
void GameWidget::showHighscores ()
{
KScoreDialog high(KScoreDialog::Name | KScoreDialog::Score, this);
high.setCaption(i18n("Level %1 Highscores").tqarg(level));
high.setConfigGroup(TQString("Highscores Level %1").tqarg(level));
high.setCaption(i18n("Level %1 Highscores").arg(level));
high.setConfigGroup(TQString("Highscores Level %1").arg(level));
high.exec();
}


+ 4
- 4
katomic/molek.cpp View File

@ -62,7 +62,7 @@ void Molek::load (const KSimpleConfig& config)
if (value.isEmpty())
break;
current.obj = value.tqat(0).latin1();
current.obj = value.at(0).latin1();
value = value.mid(2);
if (value.isNull())
value = "";
@ -82,7 +82,7 @@ void Molek::load (const KSimpleConfig& config)
line = config.readEntry(key);
for (int i = 0; i < MOLEK_SIZE; i++)
molek[i][j] = atom2int(line.tqat(i).latin1());
molek[i][j] = atom2int(line.at(i).latin1());
}
mname = i18n(config.readEntry("Name", I18N_NOOP("Noname")).latin1());
@ -103,12 +103,12 @@ void Molek::load (const KSimpleConfig& config)
height++;
width++;
tqrepaint ();
repaint ();
}
void Molek::paintEvent( TQPaintEvent * )
{
TQString st = i18n("Level: %1").tqarg(level);
TQString st = i18n("Level: %1").arg(level);
TQPainter paint (this);
paint.setPen (TQColor (190, 190, 190));


+ 27
- 27
kbackgammon/engines/fibs/kbgfibs.cpp View File

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


+ 21
- 21
kbackgammon/engines/fibs/kbgfibschat.cpp View File

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


+ 9
- 9
kbackgammon/engines/fibs/kplayerlist.cpp View File

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


+ 6
- 6
kbackgammon/engines/gnubg/kbggnubg.cpp View File

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