diff --git a/atlantik/client/atlantik.cpp b/atlantik/client/atlantik.cpp index dd61f3f3..5c923a07 100644 --- a/atlantik/client/atlantik.cpp +++ b/atlantik/client/atlantik.cpp @@ -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); diff --git a/atlantik/client/eventlogwidget.cpp b/atlantik/client/eventlogwidget.cpp index 800478b3..6bc81b04 100644 --- a/atlantik/client/eventlogwidget.cpp +++ b/atlantik/client/eventlogwidget.cpp @@ -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 events = m_eventLog->events(); for (TQPtrListIterator it( events ); (*it) ; ++it) diff --git a/atlantik/client/selectgame_widget.cpp b/atlantik/client/selectgame_widget.cpp index a4072044..0769dfc2 100644 --- a/atlantik/client/selectgame_widget.cpp +++ b/atlantik/client/selectgame_widget.cpp @@ -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(); diff --git a/atlantik/libatlantic/trade.cpp b/atlantik/libatlantic/trade.cpp index 7bd3aee1..7bd638c9 100644 --- a/atlantik/libatlantic/trade.cpp +++ b/atlantik/libatlantic/trade.cpp @@ -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); } diff --git a/atlantik/libatlantikclient/atlantik_network.cpp b/atlantik/libatlantikclient/atlantik_network.cpp index 4a5e42c2..51347f84 100644 --- a/atlantik/libatlantikclient/atlantik_network.cpp +++ b/atlantik/libatlantikclient/atlantik_network.cpp @@ -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" diff --git a/atlantik/libatlantikui/auction_widget.cpp b/atlantik/libatlantikui/auction_widget.cpp index a287badc..68ded495 100644 --- a/atlantik/libatlantikui/auction_widget.cpp +++ b/atlantik/libatlantikui/auction_widget.cpp @@ -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); diff --git a/atlantik/libatlantikui/board.cpp b/atlantik/libatlantikui/board.cpp index c2c8fded..89581a35 100644 --- a/atlantik/libatlantikui/board.cpp +++ b/atlantik/libatlantikui/board.cpp @@ -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()); diff --git a/atlantik/libatlantikui/estatedetails.cpp b/atlantik/libatlantikui/estatedetails.cpp index c92b5cc2..a8c51826 100644 --- a/atlantik/libatlantikui/estatedetails.cpp +++ b/atlantik/libatlantikui/estatedetails.cpp @@ -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"))); } } diff --git a/atlantik/libatlantikui/estateview.cpp b/atlantik/libatlantikui/estateview.cpp index 2307ef6b..82586002 100644 --- a/atlantik/libatlantikui/estateview.cpp +++ b/atlantik/libatlantikui/estateview.cpp @@ -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(rmbMenu); diff --git a/atlantik/libatlantikui/portfolioview.cpp b/atlantik/libatlantikui/portfolioview.cpp index f73d2999..1cd6d2e8 100644 --- a/atlantik/libatlantikui/portfolioview.cpp +++ b/atlantik/libatlantikui/portfolioview.cpp @@ -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() ); } diff --git a/atlantik/libatlantikui/token.cpp b/atlantik/libatlantikui/token.cpp index d6df61dc..bb60e5ed 100644 --- a/atlantik/libatlantikui/token.cpp +++ b/atlantik/libatlantikui/token.cpp @@ -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) { diff --git a/atlantik/libatlantikui/trade_widget.cpp b/atlantik/libatlantikui/trade_widget.cpp index d6cfe4d4..be8b2749 100644 --- a/atlantik/libatlantikui/trade_widget.cpp +++ b/atlantik/libatlantikui/trade_widget.cpp @@ -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.")); diff --git a/kasteroids/sprites/rock1/rock1.pov b/kasteroids/sprites/rock1/rock1.pov index bcf4c8a7..58298c05 100644 --- a/kasteroids/sprites/rock1/rock1.pov +++ b/kasteroids/sprites/rock1/rock1.pov @@ -1,5 +1,5 @@ #include "colors.inc" -#include "tqshapes.inc" +#include "shapes.inc" #include "textures.inc" // #include "stones.inc" diff --git a/kasteroids/sprites/rock2/rock2.pov b/kasteroids/sprites/rock2/rock2.pov index 625c7854..2f37a206 100644 --- a/kasteroids/sprites/rock2/rock2.pov +++ b/kasteroids/sprites/rock2/rock2.pov @@ -1,5 +1,5 @@ #include "colors.inc" -#include "tqshapes.inc" +#include "shapes.inc" #include "textures.inc" // #include "stones.inc" diff --git a/kasteroids/sprites/rock3/rock3.pov b/kasteroids/sprites/rock3/rock3.pov index 625c7854..2f37a206 100644 --- a/kasteroids/sprites/rock3/rock3.pov +++ b/kasteroids/sprites/rock3/rock3.pov @@ -1,5 +1,5 @@ #include "colors.inc" -#include "tqshapes.inc" +#include "shapes.inc" #include "textures.inc" // #include "stones.inc" diff --git a/kasteroids/toplevel.cpp b/kasteroids/toplevel.cpp index 3cbc4dfa..5cd48ed5 100644 --- a/kasteroids/toplevel.cpp +++ b/kasteroids/toplevel.cpp @@ -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 ); } diff --git a/katomic/gamewidget.cpp b/katomic/gamewidget.cpp index daeb9438..194ff3f6 100644 --- a/katomic/gamewidget.cpp +++ b/katomic/gamewidget.cpp @@ -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(); } diff --git a/katomic/molek.cpp b/katomic/molek.cpp index 6731962f..4a0562c2 100644 --- a/katomic/molek.cpp +++ b/katomic/molek.cpp @@ -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)); 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("

" + 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 %1. 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("
" + text + "
"); 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("%1 tells you: %2").tqarg(user).tqarg(cMsg.replace(TQRegExp("^" + user), "")); + cMsg = i18n("%1 tells you: %2").arg(user).arg(cMsg.replace(TQRegExp("^" + user), "")); cMsg = "" + cMsg + ""; 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("%1 shouts: %2").tqarg(user).tqarg(cMsg.replace(TQRegExp("^" + user), "")); + cMsg = i18n("%1 shouts: %2").arg(user).arg(cMsg.replace(TQRegExp("^" + user), "")); cMsg = "" + cMsg + ""; } else cMsg = ""; @@ -566,7 +566,7 @@ void KBgChat::handleData(const TQString &msg) case CLIP_WHISPERS: if (!d->mGag.contains(user)) { - cMsg = i18n("%1 whispers: %2").tqarg(user).tqarg(cMsg.replace(TQRegExp("^" + user), "")); + cMsg = i18n("%1 whispers: %2").arg(user).arg(cMsg.replace(TQRegExp("^" + user), "")); cMsg = "" + cMsg + ""; emit personalMessage(cMsg); } else @@ -575,7 +575,7 @@ void KBgChat::handleData(const TQString &msg) case CLIP_KIBITZES: if (!d->mGag.contains(user)) { - cMsg = i18n("%1 kibitzes: %2").tqarg(user).tqarg(cMsg.replace(TQRegExp("^" + user), "")); + cMsg = i18n("%1 kibitzes: %2").arg(user).arg(cMsg.replace(TQRegExp("^" + user), "")); cMsg = "" + cMsg + ""; emit personalMessage(cMsg); } else @@ -583,28 +583,28 @@ void KBgChat::handleData(const TQString &msg) break; case CLIP_YOU_SAY: - cMsg = i18n("You tell %1: %2").tqarg(user).tqarg(cMsg.replace(TQRegExp("^" + user), "")); + cMsg = i18n("You tell %1: %2").arg(user).arg(cMsg.replace(TQRegExp("^" + user), "")); cMsg = "" + cMsg + ""; emit personalMessage(cMsg); user = TQString(); break; case CLIP_YOU_SHOUT: - cMsg = i18n("You shout: %1").tqarg(cMsg); + cMsg = i18n("You shout: %1").arg(cMsg); cMsg = "" + cMsg + ""; emit personalMessage(cMsg); user = TQString(); break; case CLIP_YOU_WHISPER: - cMsg = i18n("You whisper: %1").tqarg(cMsg); + cMsg = i18n("You whisper: %1").arg(cMsg); cMsg = "" + cMsg + ""; emit personalMessage(cMsg); user = TQString(); break; case CLIP_YOU_KIBITZ: - cMsg = i18n("You kibitz: %1").tqarg(cMsg); + cMsg = i18n("You kibitz: %1").arg(cMsg); cMsg = "" + cMsg + ""; 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("User %1 left a message at %2: %3").tqarg(user).tqarg(date.toString()).tqarg(cMsg); + cMsg = i18n("User %1 left a message at %2: %3").arg(user).arg(date.toString()).arg(cMsg); cMsg = "" + cMsg + ""; 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("") + cMsg + ""; 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("") + cMsg + ""; 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(""); - 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 += ""; addMessage(TQString(), msg); @@ -763,7 +763,7 @@ void KBgChat::slotUngag() d->mGag.remove(d->mName[0]); TQString msg(""); - 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 += ""; 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("
") + i18n("The GNU Backgammon process (%1) has exited. ") - .tqarg(proc->pid()) + "
"); + .arg(proc->pid()) + "
"); 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)); // @@ -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; diff --git a/kbattleship/kbattleship/dialogs/connectDlg.ui b/kbattleship/kbattleship/dialogs/connectDlg.ui index 2bf0e8d5..40ec9609 100644 --- a/kbattleship/kbattleship/dialogs/connectDlg.ui +++ b/kbattleship/kbattleship/dialogs/connectDlg.ui @@ -38,7 +38,7 @@ &Nick name: - + AlignVCenter|AlignLeft @@ -73,7 +73,7 @@ &Server: - + AlignVCenter|AlignLeft @@ -135,7 +135,7 @@ &Port: - + AlignVCenter|AlignLeft diff --git a/kbattleship/kbattleship/dialogs/serverDlg.ui b/kbattleship/kbattleship/dialogs/serverDlg.ui index e1888e8d..daf40894 100644 --- a/kbattleship/kbattleship/dialogs/serverDlg.ui +++ b/kbattleship/kbattleship/dialogs/serverDlg.ui @@ -63,7 +63,7 @@ &Port: - + AlignVCenter|AlignLeft @@ -95,7 +95,7 @@ &Nick name: - + AlignVCenter|AlignLeft diff --git a/kbattleship/kbattleship/dialogs/statDlg.ui b/kbattleship/kbattleship/dialogs/statDlg.ui index db36ec28..dc863d24 100644 --- a/kbattleship/kbattleship/dialogs/statDlg.ui +++ b/kbattleship/kbattleship/dialogs/statDlg.ui @@ -97,7 +97,7 @@ : - + AlignCenter @@ -116,7 +116,7 @@ 0 - + AlignVCenter|AlignRight diff --git a/kbattleship/kbattleship/kbattleship.cpp b/kbattleship/kbattleship/kbattleship.cpp index 62952b19..c2eefa31 100644 --- a/kbattleship/kbattleship/kbattleship.cpp +++ b/kbattleship/kbattleship/kbattleship.cpp @@ -84,8 +84,8 @@ void KBattleshipWindow::initStatusBar() { m_ownNickname = "-"; m_enemyNickname = "-"; - statusBar()->insertItem(i18n(" Player 1: %1 ").tqarg(m_ownNickname), ID_PLAYER_OWN, 0, true); - statusBar()->insertItem(i18n(" Player 2: %1 ").tqarg(m_enemyNickname), ID_PLAYER_ENEMY, 0, true); + statusBar()->insertItem(i18n(" Player 1: %1 ").arg(m_ownNickname), ID_PLAYER_OWN, 0, true); + statusBar()->insertItem(i18n(" Player 2: %1 ").arg(m_enemyNickname), ID_PLAYER_ENEMY, 0, true); statusBar()->insertItem(i18n("Ready"), ID_STATUS_MSG, 1); statusBar()->setItemAlignment(ID_STATUS_MSG, AlignLeft); } @@ -1075,14 +1075,14 @@ void KBattleshipWindow::parseCommandLine() { if( !u.isValid()) { KMessageBox::sorry(this, i18n("The URL passed to KDE Battleship '%1' is not a valid url") - .tqarg(args->arg(0))); + .arg(args->arg(0))); return; } if( u.protocol() != "kbattleship" ) { KMessageBox::sorry(this, i18n("The URL passed to KDE Battleship '%1' is not recognised " "as a Battleship game.") - .tqarg(args->arg(0))); + .arg(args->arg(0))); return; } @@ -1198,13 +1198,13 @@ void KBattleshipWindow::slotStatusMsg(const TQString &text) void KBattleshipWindow::slotChangeOwnPlayer(const TQString &text) { statusBar()->clear(); - statusBar()->changeItem(i18n(" Player 1: %1 ").tqarg(text), ID_PLAYER_OWN); + statusBar()->changeItem(i18n(" Player 1: %1 ").arg(text), ID_PLAYER_OWN); } void KBattleshipWindow::slotChangeEnemyPlayer(const TQString &text) { statusBar()->clear(); - statusBar()->changeItem(i18n(" Player 2: %1 ").tqarg(text), ID_PLAYER_ENEMY); + statusBar()->changeItem(i18n(" Player 2: %1 ").arg(text), ID_PLAYER_ENEMY); } void KBattleshipWindow::slotSinglePlayer() diff --git a/kbattleship/kbattleship/kbattleshipserver.cpp b/kbattleship/kbattleship/kbattleshipserver.cpp index 7b10d4fd..85e90ffa 100644 --- a/kbattleship/kbattleship/kbattleshipserver.cpp +++ b/kbattleship/kbattleship/kbattleshipserver.cpp @@ -41,7 +41,7 @@ void KBattleshipServer::init() { if(listen()) { - KMessageBox::error(0L, i18n("Failed to bind to local port \"%1\"\n\nPlease check if another KBattleship server instance\nis running or another application uses this port.").tqarg(m_port)); + KMessageBox::error(0L, i18n("Failed to bind to local port \"%1\"\n\nPlease check if another KBattleship server instance\nis running or another application uses this port.").arg(m_port)); emit sigServerFailure(); return; } diff --git a/kbattleship/kbattleship/kbattleshipview.cpp b/kbattleship/kbattleship/kbattleshipview.cpp index 3e70a2a4..f746e2ab 100644 --- a/kbattleship/kbattleship/kbattleshipview.cpp +++ b/kbattleship/kbattleship/kbattleshipview.cpp @@ -106,11 +106,11 @@ void KBattleshipView::drawEnemyShipsHuman(KMessage *msg, KShipList *list) int posx, posy, placedLeft; bool left; int i = 3; - while (!msg->field(TQString("ship%1").tqarg(i)).isNull()) + while (!msg->field(TQString("ship%1").arg(i)).isNull()) { - posx = msg->field(TQString("ship%1").tqarg(i)).section(" ", 0, 0).toInt(); - posy = msg->field(TQString("ship%1").tqarg(i)).section(" ", 1, 1).toInt(); - placedLeft = msg->field(TQString("ship%1").tqarg(i)).section(" ", 2, 2).toInt(); + posx = msg->field(TQString("ship%1").arg(i)).section(" ", 0, 0).toInt(); + posy = msg->field(TQString("ship%1").arg(i)).section(" ", 1, 1).toInt(); + placedLeft = msg->field(TQString("ship%1").arg(i)).section(" ", 2, 2).toInt(); if (placedLeft == 0) left = false; else left = true; list->addNewShip(!left, posx, posy); diff --git a/kbattleship/kbattleship/konnectionhandling.cpp b/kbattleship/kbattleship/konnectionhandling.cpp index d58841e2..5d5c1026 100644 --- a/kbattleship/kbattleship/konnectionhandling.cpp +++ b/kbattleship/kbattleship/konnectionhandling.cpp @@ -94,7 +94,7 @@ void KonnectionHandling::slotNewMessage(KMessage *msg) case KMessage::DISCARD: if(msg->field("kmversion") == TQString("true")) { - KMessageBox::error(0L, i18n("Connection dropped by enemy. The client's protocol implementation (%1) is not compatible with our (%2) version.").tqarg(msg->field("reason")).tqarg(protocolVersion)); + KMessageBox::error(0L, i18n("Connection dropped by enemy. The client's protocol implementation (%1) is not compatible with our (%2) version.").arg(msg->field("reason")).arg(protocolVersion)); emit sigAbortNetworkGame(); } else @@ -159,7 +159,7 @@ void KonnectionHandling::slotNewMessage(KMessage *msg) if(msg->field("protocolVersion") != TQString::fromLatin1(protocolVersion)) { m_kbserver->slotDiscardClient(protocolVersion, true, false); - KMessageBox::error(0L, i18n("Connection to client dropped. The client's protocol implementation (%1) is not compatible with our (%2) version.").tqarg(msg->field("protocolVersion")).tqarg(protocolVersion)); + KMessageBox::error(0L, i18n("Connection to client dropped. The client's protocol implementation (%1) is not compatible with our (%2) version.").arg(msg->field("protocolVersion")).arg(protocolVersion)); } else emit sigClientInformation(msg->field("clientName"), msg->field("clientVersion"), msg->field("clientDescription"), msg->field("protocolVersion")); @@ -232,7 +232,7 @@ void KonnectionHandling::slotSocketError(int error) break; default: - KMessageBox::error(0L, i18n("Unknown error; No: %1").tqarg(error)); + KMessageBox::error(0L, i18n("Unknown error; No: %1").arg(error)); break; } diff --git a/kblackbox/kbbgame.cpp b/kblackbox/kbbgame.cpp index 988a74fd..dbaf2bc7 100644 --- a/kblackbox/kbbgame.cpp +++ b/kblackbox/kbbgame.cpp @@ -298,7 +298,7 @@ void KBBGame::newGame() randomBalls( balls ); remap( gameBoard, gr->getGraphicBoard() ); - gr->tqrepaint( TRUE ); + gr->repaint( TRUE ); setScore( 0 ); detourCounter = -1; ballsPlaced = 0; @@ -326,12 +326,12 @@ void KBBGame::gameFinished() "I guess you need more practice."); KMessageBox::information(this, - s.tqarg(KGlobal::locale()->formatNumber(score, 0))); + s.arg(KGlobal::locale()->formatNumber(score, 0))); } else { s = i18n( "You should place %1 balls!\n" "You have placed %2.") - .tqarg(KGlobal::locale()->formatNumber(balls, 0)) - .tqarg(KGlobal::locale()->formatNumber(ballsPlaced, 0)); + .arg(KGlobal::locale()->formatNumber(balls, 0)) + .arg(KGlobal::locale()->formatNumber(ballsPlaced, 0)); KMessageBox::sorry(this, s); } @@ -428,7 +428,7 @@ void KBBGame::updateStats() void KBBGame::setScore( int n ) { score = n; - statusBar()->changeItem( i18n("Score: %1").tqarg(n), SSCORE ); + statusBar()->changeItem( i18n("Score: %1").arg(n), SSCORE ); } /* @@ -454,7 +454,7 @@ bool KBBGame::setSize( int w, int h ) gameBoard = new RectOnArray( gr->numC(), gr->numR() ); if (running) abortGame(); newGame(); - // gr->tqrepaint( TRUE ); + // gr->repaint( TRUE ); } } return ok; diff --git a/kblackbox/kbbgfx.cpp b/kblackbox/kbbgfx.cpp index 90134362..0becd126 100644 --- a/kblackbox/kbbgfx.cpp +++ b/kblackbox/kbbgfx.cpp @@ -434,7 +434,7 @@ void KBBGraphic::moveSelection(int drow, int dcol) void KBBGraphic::focusInEvent( TQFocusEvent* ) { - tqrepaint( FALSE ); + repaint( FALSE ); } @@ -444,7 +444,7 @@ void KBBGraphic::focusInEvent( TQFocusEvent* ) void KBBGraphic::focusOutEvent( TQFocusEvent* ) { - tqrepaint( FALSE ); + repaint( FALSE ); } /* diff --git a/kbounce/game.cpp b/kbounce/game.cpp index 065b2657..a223fea8 100644 --- a/kbounce/game.cpp +++ b/kbounce/game.cpp @@ -406,7 +406,7 @@ JezzGame::JezzGame( const TQPixmap &background, int ballNum, TQWidget *parent, c connect( m_clock, TQT_SIGNAL(timeout()), this, TQT_SLOT(tick()) ); m_clock->start( GAME_DELAY ); - // setup tqgeometry + // setup geometry setFixedSize( m_view->size() ); } @@ -500,7 +500,7 @@ void JezzGame::makeBlack() } m_field->update(); - m_view->tqrepaint(); + m_view->repaint(); // count percent value of occupied area int p = percent(); @@ -586,7 +586,7 @@ void JezzGame::ballCollision( Ball */*ball*/, int /*x*/, int /*y*/, int tile ) // update view m_field->update(); - m_view->tqrepaint(); + m_view->repaint(); // send death msg emit died(); @@ -671,7 +671,7 @@ void JezzGame::wallFinished( Wall *wall, int tile ) } m_field->update(); - m_view->tqrepaint(); + m_view->repaint(); makeBlack(); } diff --git a/kbounce/kbounce.cpp b/kbounce/kbounce.cpp index 2d4fe887..5c4fc7f2 100644 --- a/kbounce/kbounce.cpp +++ b/kbounce/kbounce.cpp @@ -100,7 +100,7 @@ KJezzball::KJezzball() // create demo game createLevel( 1 ); statusBar()->message( i18n("Press %1 to start a game!") - .tqarg(m_newAction->shortcut().toString()) ); + .arg(m_newAction->shortcut().toString()) ); //m_gameWidget->display( i18n("Press to start a game!") ); setFocusPolicy(TQ_StrongFocus); @@ -228,7 +228,7 @@ void KJezzball::gameOverNow() TQString score; score.setNum( m_game.score ); - KMessageBox::information( this, i18n("Game Over! Score: %1").tqarg(score) ); + KMessageBox::information( this, i18n("Game Over! Score: %1").arg(score) ); statusBar()->message( i18n("Game over. Press for a new game") ); //m_gameWidget->display( i18n("Game over. Press for a new game!") ); highscore(); @@ -461,16 +461,16 @@ void KJezzball::switchLevel() TQString foo = TQString( i18n("You have successfully cleared more than 75% of the board.\n") + -i18n("%1 points: 15 points per remaining life\n").tqarg(m_level.lifes*15) + -i18n("%1 points: Bonus\n").tqarg((m_gameWidget->percent()-75)*2*(m_game.level+5)) + -i18n("%1 points: Total score for this level\n").tqarg(score) + -i18n("On to level %1. Remember you get %2 lives this time!")).tqarg(m_game.level+1).tqarg(m_game.level+2); +i18n("%1 points: 15 points per remaining life\n").arg(m_level.lifes*15) + +i18n("%1 points: Bonus\n").arg((m_gameWidget->percent()-75)*2*(m_game.level+5)) + +i18n("%1 points: Total score for this level\n").arg(score) + +i18n("On to level %1. Remember you get %2 lives this time!")).arg(m_game.level+1).arg(m_game.level+2); KMessageBox::information( this,foo ); // KMessageBox::information( this, i18n("You've completed level %1 with " - // "a score of %2.\nGet ready for the next one!").tqarg(level).tqarg(score)); + // "a score of %2.\nGet ready for the next one!").arg(level).arg(score)); m_game.level++; m_levelLCD->display( m_game.level ); diff --git a/kenolaba/AbTop.cpp b/kenolaba/AbTop.cpp index 1cc39c8a..1a921b34 100644 --- a/kenolaba/AbTop.cpp +++ b/kenolaba/AbTop.cpp @@ -381,7 +381,7 @@ void AbTop::setupStatusBar() { TQString tmp; - TQString t = i18n("Press %1 for a new game").tqarg( newAction->shortcut().toString()); + TQString t = i18n("Press %1 for a new game").arg( newAction->shortcut().toString()); statusLabel = new TQLabel( t, statusBar(), "statusLabel" ); statusBar()->addWidget(statusLabel,1,false); @@ -405,7 +405,7 @@ void AbTop::setupStatusBar() ballLabel->setAlignment( AlignCenter ); statusBar()->addWidget(ballLabel, 0, true); - moveLabel = new TQLabel( i18n("Move %1").tqarg("--"), statusBar(), "moveLabel" ); + moveLabel = new TQLabel( i18n("Move %1").arg("--"), statusBar(), "moveLabel" ); statusBar()->addWidget(moveLabel, 0, true); #ifdef MYTRACE @@ -464,11 +464,11 @@ void AbTop::updateStatus() bool showValid = false; if (!editMode && timerState == noGame) { - tmp = i18n("Move %1").tqarg("--"); + tmp = i18n("Move %1").arg("--"); ballLabel->setPixmap(noBall); } else { - tmp = i18n("Move %1").tqarg(moveNo/2 + 1); + tmp = i18n("Move %1").arg(moveNo/2 + 1); ballLabel->setPixmap( (board->actColor() == Board::color1) ? redBall : yellowBall); } @@ -476,15 +476,15 @@ void AbTop::updateStatus() if (editMode) { tmp = TQString("%1: %2 %3 - %4 %5") - .tqarg( i18n("Edit") ) - .tqarg( i18n("Red") ).tqarg(boardWidget->getColor1Count()) - .tqarg( i18n("Yellow") ).tqarg(boardWidget->getColor2Count()); + .arg( i18n("Edit") ) + .arg( i18n("Red") ).arg(boardWidget->getColor1Count()) + .arg( i18n("Yellow") ).arg(boardWidget->getColor2Count()); validLabel->setPixmap( (board->validState() == Board::invalid) ? warningPix:okPix ); showValid = true; } else if (timerState == noGame) { - tmp = i18n("Press %1 for a new game").tqarg( newAction->shortcut().toString()); + tmp = i18n("Press %1 for a new game").arg( newAction->shortcut().toString()); } else { if (timerState == gameOver) { @@ -495,9 +495,9 @@ void AbTop::updateStatus() } else { tmp = TQString("%1 - %2") - .tqarg( (board->actColor() == Board::color1) ? + .arg( (board->actColor() == Board::color1) ? i18n("Red"):i18n("Yellow") ) - .tqarg( iPlayNow() ? + .arg( iPlayNow() ? i18n("I am thinking...") : i18n("It is your turn!") ); } } @@ -514,7 +514,7 @@ void AbTop::updateStatus() validShown = showValid; } statusBar()->clear(); - statusBar()->tqrepaint(); + statusBar()->repaint(); } void AbTop::edited(int vState) diff --git a/kenolaba/Ball.cpp b/kenolaba/Ball.cpp index 39448305..392a61c5 100644 --- a/kenolaba/Ball.cpp +++ b/kenolaba/Ball.cpp @@ -21,14 +21,14 @@ void Ball::setSize(int x, int y) sizeX = x; sizeY = y; - tqinvalidate(); + invalidate(); } -void Ball::tqinvalidate() +void Ball::invalidate() { Ball *b; - /* tqinvalidate all Balls... */ + /* invalidate all Balls... */ for(b=first;b!=0;b=b->next) b->pm.resize(0,0); } @@ -43,7 +43,7 @@ void Ball::setLight(int x, int y, int z, const TQColor& c) lightColor = c; - tqinvalidate(); + invalidate(); } @@ -52,7 +52,7 @@ void Ball::setTexture(double c, double d) rippleCount = c; rippleDepth = d; - tqinvalidate(); + invalidate(); } @@ -309,7 +309,7 @@ void BallWidget::resizeEvent(TQResizeEvent *) realSize = (w>h) ? h:w; Ball::setSize( realSize/ballFraction, realSize/ballFraction ); - tqrepaint(); + repaint(); } void BallWidget::paintEvent(TQPaintEvent *) @@ -414,7 +414,7 @@ void BallWidget::animate() timer->start(1000/freq,true); } - // tqrepaint( false ); + // repaint( false ); } diff --git a/kenolaba/Ball.h b/kenolaba/Ball.h index 9cdfe344..6558a600 100644 --- a/kenolaba/Ball.h +++ b/kenolaba/Ball.h @@ -49,7 +49,7 @@ class Ball { private: void render(); - static void tqinvalidate(); + static void invalidate(); //static TQImage back; static int sizeX, sizeY; diff --git a/kenolaba/BoardWidget.cpp b/kenolaba/BoardWidget.cpp index 06a5f520..744ccb16 100644 --- a/kenolaba/BoardWidget.cpp +++ b/kenolaba/BoardWidget.cpp @@ -345,7 +345,7 @@ void BoardWidget::draw() if (renderMode) { updateBalls(); - tqrepaint(false); + repaint(false); return; } @@ -889,7 +889,7 @@ void BoardWidget::mousePressEvent( TQMouseEvent* pEvent ) TQString tmp; actValue = - board.calcEvaluation(); - tmp = i18n("Board value: %1").tqarg(actValue); + tmp = i18n("Board value: %1").arg(actValue); emit updateSpy(tmp); } @@ -930,7 +930,7 @@ void BoardWidget::mouseMoveEvent( TQMouseEvent* pEvent ) TQString tmp; actValue = - board.calcEvaluation(); - tmp = i18n("Board value: %1").tqarg(actValue); + tmp = i18n("Board value: %1").arg(actValue); emit updateSpy(tmp); return; } @@ -948,7 +948,7 @@ void BoardWidget::mouseMoveEvent( TQMouseEvent* pEvent ) TQString tmp; tmp.sprintf("%+d", v-actValue); - TQString str = TQString("%1 : %2").tqarg(actMove.name()).tqarg(tmp); + TQString str = TQString("%1 : %2").arg(actMove.name()).arg(tmp); emit updateSpy(str); showMove(actMove,3); @@ -961,7 +961,7 @@ void BoardWidget::mouseMoveEvent( TQMouseEvent* pEvent ) if (pos == startPos) { showStart(actMove,1); startShown = true; - tmp = i18n("Board value: %1").tqarg(actValue); + tmp = i18n("Board value: %1").arg(actValue); } else draw(); diff --git a/kenolaba/EvalDlg.ui b/kenolaba/EvalDlg.ui index 46e5c056..a98354d4 100644 --- a/kenolaba/EvalDlg.ui +++ b/kenolaba/EvalDlg.ui @@ -96,7 +96,7 @@ 32767 - + AlignLeft @@ -131,7 +131,7 @@ 32767 - + AlignLeft @@ -166,7 +166,7 @@ 32767 - + AlignLeft @@ -269,7 +269,7 @@ Push Out - + AlignTop|AlignLeft @@ -293,7 +293,7 @@ Push - + AlignTop|AlignLeft @@ -366,7 +366,7 @@ 32767 - + AlignLeft @@ -390,7 +390,7 @@ 32767 - + AlignLeft @@ -480,7 +480,7 @@ 32767 - + AlignLeft @@ -648,7 +648,7 @@ 32767 - + AlignLeft @@ -694,7 +694,7 @@ 32767 - + AlignLeft @@ -740,7 +740,7 @@ 32767 - + AlignLeft @@ -810,7 +810,7 @@ Normal - + AlignTop|AlignLeft @@ -831,7 +831,7 @@ For every move possible the given points are added to the Evaluation. - + WordBreak|AlignTop|AlignLeft @@ -926,7 +926,7 @@ 32767 - + AlignLeft @@ -942,7 +942,7 @@ 32767 - + AlignLeft @@ -958,7 +958,7 @@ 32767 - + AlignLeft @@ -982,7 +982,7 @@ 32767 - + AlignLeft @@ -998,7 +998,7 @@ 32767 - + AlignLeft @@ -1014,7 +1014,7 @@ 32767 - + AlignLeft @@ -1038,7 +1038,7 @@ 32767 - + AlignLeft @@ -1054,7 +1054,7 @@ 32767 - + AlignLeft @@ -1094,7 +1094,7 @@ 32767 - + AlignLeft @@ -1146,7 +1146,7 @@ For every ball, the given points are added to the evaluation depending on the balls position. The bonus for a given position is changed randomly in the +/- range. - + WordBreak|AlignTop|AlignLeft @@ -1233,7 +1233,7 @@ 32767 - + AlignLeft @@ -1249,7 +1249,7 @@ 32767 - + AlignLeft @@ -1265,7 +1265,7 @@ 32767 - + AlignLeft @@ -1281,7 +1281,7 @@ 32767 - + AlignLeft @@ -1341,7 +1341,7 @@ For a number of balls In-a-Row, the given points are added to the evaluation - + WordBreak|AlignTop|AlignLeft @@ -1428,7 +1428,7 @@ 32767 - + AlignLeft @@ -1452,7 +1452,7 @@ 32767 - + AlignLeft @@ -1468,7 +1468,7 @@ 32767 - + AlignLeft @@ -1500,7 +1500,7 @@ 32767 - + AlignLeft @@ -1524,7 +1524,7 @@ 32767 - + AlignLeft @@ -1560,7 +1560,7 @@ For a difference in the number of balls, the given points are added to the evaluation. A difference of 6 only can be a lost/won game. - + WordBreak|AlignTop|AlignLeft @@ -1642,7 +1642,7 @@ Your evaluation scheme, defined in all other tabs of this dialog, can be stored here. - + WordBreak|AlignTop|AlignLeft diff --git a/kenolaba/EvalScheme.cpp b/kenolaba/EvalScheme.cpp index 0d179a85..d884f398 100644 --- a/kenolaba/EvalScheme.cpp +++ b/kenolaba/EvalScheme.cpp @@ -76,7 +76,7 @@ void EvalScheme::setDefaults() void EvalScheme::read(KConfig *config) { - TQString confSection = TQString("%1 Evaluation Scheme").tqarg(_name); + TQString confSection = TQString("%1 Evaluation Scheme").arg(_name); config->setGroup(confSection); TQStringList list; @@ -117,7 +117,7 @@ void EvalScheme::read(KConfig *config) void EvalScheme::save(KConfig* config) { - TQString confSection = TQString("%1 Evaluation Scheme").tqarg(_name); + TQString confSection = TQString("%1 Evaluation Scheme").arg(_name); config->setGroup(confSection); TQString entry; @@ -128,12 +128,12 @@ void EvalScheme::save(KConfig* config) entry.sprintf("%d", _moveValue[0]); for(int i=1;iwriteEntry("MoveValues", entry); entry.sprintf("%d", _inARowValue[0]); for(int i=1;iwriteEntry("InARowValues", entry); entry.sprintf("%d,%d,%d,%d,%d", _ringValue[0], _ringValue[1], @@ -217,15 +217,15 @@ TQString EvalScheme::ascii() res.sprintf("%s=%d", _name.ascii(), _stoneValue[1]); for(i=1;i<6;i++) - res += TQString(",%1").tqarg( _stoneValue[i] ); + res += TQString(",%1").arg( _stoneValue[i] ); for(i=0;ichangeItem - (i18n("Press \"%1\" to RESUME").tqarg(pauseKeys), ID_MSG); + (i18n("Press \"%1\" to RESUME").arg(pauseKeys), ID_MSG); else statusBar()->changeItem - (i18n("Press \"%1\" to PAUSE").tqarg(pauseKeys), ID_MSG); + (i18n("Press \"%1\" to PAUSE").arg(pauseKeys), ID_MSG); } void KGoldrunner::adjustHintAction (bool hintAvailable) @@ -849,7 +849,7 @@ bool KGoldrunner::getDirectories() KGrMessage::information (this, i18n("Get Folders"), i18n("Cannot find documentation sub-folder 'en/%1/' " "in area '%2' of the KDE folder ($TDEDIRS).") - .tqarg(myDir).tqarg(dirs->kde_default ("html"))); + .arg(myDir).arg(dirs->kde_default ("html"))); // result = FALSE; // Don't abort if the doc is missing. } else @@ -861,7 +861,7 @@ bool KGoldrunner::getDirectories() KGrMessage::information (this, i18n("Get Folders"), i18n("Cannot find system games sub-folder '%1/system/' " "in area '%2' of the KDE folder ($TDEDIRS).") - .tqarg(myDir).tqarg(dirs->kde_default ("data"))); + .arg(myDir).arg(dirs->kde_default ("data"))); result = FALSE; // ABORT if the games data is missing. } else @@ -874,7 +874,7 @@ bool KGoldrunner::getDirectories() KGrMessage::information (this, i18n("Get Folders"), i18n("Cannot find or create user games sub-folder '%1/user/' " "in area '%2' of the KDE user area ($TDEHOME).") - .tqarg(myDir).tqarg(dirs->kde_default ("data"))); + .arg(myDir).arg(dirs->kde_default ("data"))); // result = FALSE; // Don't abort if user area is missing. } else { @@ -882,7 +882,7 @@ bool KGoldrunner::getDirectories() if (! create) { KGrMessage::information (this, i18n("Get Folders"), i18n("Cannot find or create 'levels/' folder in " - "sub-folder '%1/user/' in the KDE user area ($TDEHOME).").tqarg(myDir)); + "sub-folder '%1/user/' in the KDE user area ($TDEHOME).").arg(myDir)); // result = FALSE; // Don't abort if user area is missing. } } diff --git a/kgoldrunner/src/kgrdialog.cpp b/kgoldrunner/src/kgrdialog.cpp index 862889c7..4a58b235 100644 --- a/kgoldrunner/src/kgrdialog.cpp +++ b/kgoldrunner/src/kgrdialog.cpp @@ -132,7 +132,7 @@ KGrSLDialog::KGrSLDialog (int action, int requestedLevel, int collnIndex, TQPoint p = parent->mapToGlobal (TQPoint (0,0)); - // Base the tqgeometry of the dialog box on the playing area. + // Base the geometry of the dialog box on the playing area. int cell = parent->width() / (FIELDWIDTH + 4); dad-> move (p.x()+2*cell, p.y()+2*cell); dad-> setMinimumSize ((FIELDWIDTH*cell/2), (FIELDHEIGHT-1)*cell); @@ -357,7 +357,7 @@ void KGrSLDialog::slAboutColln () { // User clicked the "About" button ... int n = slCollnIndex; - TQString title = i18n("About \"%1\"").tqarg(collections.at(n)->name); + TQString title = i18n("About \"%1\"").arg(collections.at(n)->name); if (collections.at(n)->about.length() > 0) { // Convert game description to ASCII and UTF-8 codes, then translate it. @@ -404,7 +404,7 @@ void KGrSLDialog::slPaintLevel () TQString filePath = game->getFilePath (collections.at(n)->owner, collections.at(n), number->value()); thumbNail->setFilePath (filePath, slName); - thumbNail->tqrepaint(); // Will call "drawContents (p)". + thumbNail->repaint(); // Will call "drawContents (p)". } void KGrSLDialog::slotHelp () @@ -537,7 +537,7 @@ KGrNHDialog::KGrNHDialog(const TQString & levelName, const TQString & levelHint, dad-> setCaption (i18n("Edit Name & Hint")); #endif - // Base the tqgeometry of the text box on the playing area. + // Base the geometry of the text box on the playing area. TQPoint p = parent->mapToGlobal (TQPoint (0,0)); int c = parent->width() / (FIELDWIDTH + 4); dad-> move (p.x()+4*c, p.y()+4*c); @@ -642,7 +642,7 @@ KGrECDialog::KGrECDialog (int action, int collnIndex, TQPoint p = parent->mapToGlobal (TQPoint (0,0)); - // Base the tqgeometry of the dialog box on the playing area. + // Base the geometry of the dialog box on the playing area. int cell = parent->width() / (FIELDWIDTH + 4); dad-> move (p.x()+2*cell, p.y()+2*cell); dad-> setMinimumSize ((FIELDWIDTH*cell/2), (FIELDHEIGHT-1)*cell); @@ -669,7 +669,7 @@ KGrECDialog::KGrECDialog (int action, int collnIndex, collections.at(defaultGame)->nLevels)); #else nLevL-> setText (i18n("%1 levels") - .tqarg(collections.at(defaultGame)->nLevels)); + .arg(collections.at(defaultGame)->nLevels)); #endif OKText = i18n("Save Changes"); } @@ -802,7 +802,7 @@ KGrLGDialog::KGrLGDialog (TQFile * savedGames, dad-> setCaption (i18n("Select Saved Game")); - // Base the tqgeometry of the list box on the playing area. + // Base the geometry of the list box on the playing area. TQPoint p = parent->mapToGlobal (TQPoint (0,0)); int c = parent->width() / (FIELDWIDTH + 4); dad-> move (p.x()+2*c, p.y()+2*c); @@ -942,7 +942,7 @@ void KGrMessage::wrapped (TQWidget * parent, TQString title, TQString contents) mm-> setCaption (title); - // Base the tqgeometry of the text box on the playing area. + // Base the geometry of the text box on the playing area. TQPoint p = parent->mapToGlobal (TQPoint (0,0)); int c = parent->width() / (FIELDWIDTH + 4); mm-> move (p.x()+4*c, p.y()+4*c); diff --git a/kgoldrunner/src/kgrgame.cpp b/kgoldrunner/src/kgrgame.cpp index 4b0a18b8..6962d7a1 100644 --- a/kgoldrunner/src/kgrgame.cpp +++ b/kgoldrunner/src/kgrgame.cpp @@ -190,7 +190,7 @@ void KGrGame::goUpOneLevel() KGrMessage::information (view, collection->name, i18n("CONGRATULATIONS !!!!" "

You have conquered the last level in the %1 game !!

") - .tqarg("\"" + collection->name + "\"")); + .arg("\"" + collection->name + "\"")); checkHighScore(); // Check if there is a high score for this game. unfreeze(); @@ -384,7 +384,7 @@ void KGrGame::startTutorial() KGrMessage::information (view, i18n("Start Tutorial"), i18n("Cannot find the tutorial game (file-prefix %1) in " "the %2 files.") - .tqarg("'tute'").tqarg("'games.dat'")); + .arg("'tute'").arg("'games.dat'")); } } @@ -514,14 +514,14 @@ bool KGrGame::openLevelFile (int levelNo, TQFile & openlevel) KGrMessage::information (view, i18n("Load Level"), i18n("Cannot find file '%1'. Please make sure '%2' has been " "run in the '%3' folder.") - .tqarg(filePath).tqarg("tar xf levels.tar").tqarg(systemDataDir.myStr())); + .arg(filePath).arg("tar xf levels.tar").arg(systemDataDir.myStr())); return (FALSE); } // �ffne Level zum lesen if (! openlevel.open (IO_ReadOnly)) { KGrMessage::information (view, i18n("Load Level"), - i18n("Cannot open file '%1' for read-only.").tqarg(filePath)); + i18n("Cannot open file '%1' for read-only.").arg(filePath)); return (FALSE); } @@ -769,7 +769,7 @@ void KGrGame::saveGame() // Save game ID, score and level. { if (editMode) {myMessage (view, i18n("Save Game"), i18n("Sorry, you cannot save your game play while you are editing. " - "Please try menu item %1.").tqarg("\"" + i18n("&Save Edits...") + "\"")); + "Please try menu item %1.").arg("\"" + i18n("&Save Edits...") + "\"")); return; } if (hero->started) {myMessage (view, i18n("Save Game"), @@ -800,7 +800,7 @@ void KGrGame::saveGame() // Save game ID, score and level. if (! file2.open (IO_WriteOnly)) { KGrMessage::information (view, i18n("Save Game"), i18n("Cannot open file '%1' for output.") - .tqarg(userDataDir + "savegame.tmp")); + .arg(userDataDir + "savegame.tmp")); return; } TQTextStream text2 (&file2); @@ -810,7 +810,7 @@ void KGrGame::saveGame() // Save game ID, score and level. if (! file1.open (IO_ReadOnly)) { KGrMessage::information (view, i18n("Save Game"), i18n("Cannot open file '%1' for read-only.") - .tqarg(userDataDir + "savegame.dat")); + .arg(userDataDir + "savegame.dat")); return; } @@ -848,7 +848,7 @@ void KGrGame::loadGame() // Re-load game, score and level. if (! savedGames.open (IO_ReadOnly)) { KGrMessage::information (view, i18n("Load Game"), i18n("Cannot open file '%1' for read-only.") - .tqarg(userDataDir + "savegame.dat")); + .arg(userDataDir + "savegame.dat")); return; } @@ -899,7 +899,7 @@ void KGrGame::loadGame() // Re-load game, score and level. } else { KGrMessage::information (view, i18n("Load Game"), - i18n("Cannot find the game with prefix '%1'.").tqarg(pr)); + i18n("Cannot find the game with prefix '%1'.").arg(pr)); } } @@ -947,7 +947,7 @@ void KGrGame::checkHighScore() if (! high1.open (IO_ReadOnly)) { TQString high1_name = high1.name(); KGrMessage::information (view, i18n("Check for High Score"), - i18n("Cannot open file '%1' for read-only.").tqarg(high1_name)); + i18n("Cannot open file '%1' for read-only.").arg(high1_name)); return; } @@ -987,7 +987,7 @@ void KGrGame::checkHighScore() if (! high2.open (IO_WriteOnly)) { KGrMessage::information (view, i18n("Check for High Score"), i18n("Cannot open file '%1' for output.") - .tqarg(userDataDir + "hi_" + collection->prefix + ".tmp")); + .arg(userDataDir + "hi_" + collection->prefix + ".tmp")); return; } @@ -1132,7 +1132,7 @@ void KGrGame::showHighScores() if (! high1.exists()) { KGrMessage::information (view, i18n("Show High Scores"), i18n("Sorry, there are no high scores for the %1 game yet.") - .tqarg("\"" + collection->name + "\"")); + .arg("\"" + collection->name + "\"")); return; } } @@ -1140,7 +1140,7 @@ void KGrGame::showHighScores() if (! high1.open (IO_ReadOnly)) { TQString high1_name = high1.name(); KGrMessage::information (view, i18n("Show High Scores"), - i18n("Cannot open file '%1' for read-only.").tqarg(high1_name)); + i18n("Cannot open file '%1' for read-only.").arg(high1_name)); return; } @@ -1154,7 +1154,7 @@ void KGrGame::showHighScores() TQLabel * hsHeader = new TQLabel (i18n ( "

KGoldrunner Hall of Fame


" "

\"%1\" Game

") - .tqarg(collection->name), + .arg(collection->name), hs); TQLabel * hsColHeader = new TQLabel ( i18n(" Name " @@ -1584,7 +1584,7 @@ bool KGrGame::saveLevelFile() // Open the output file. if (! levelFile.open (IO_WriteOnly)) { KGrMessage::information (view, i18n("Save Level"), - i18n("Cannot open file '%1' for output.").tqarg(filePath)); + i18n("Cannot open file '%1' for output.").arg(filePath)); return (FALSE); } @@ -1642,8 +1642,8 @@ void KGrGame::moveLevelFile () KGrMessage::information (view, i18n("Move Level"), i18n("You must first load a level to be moved. Use " "the %1 or %2 menu.") - .tqarg("\"" + i18n("Game") + "\"") - .tqarg("\"" + i18n("Editor") + "\"")); + .arg("\"" + i18n("Game") + "\"") + .arg("\"" + i18n("Editor") + "\"")); return; } @@ -1780,7 +1780,7 @@ void KGrGame::deleteLevelFile () } else { KGrMessage::information (view, i18n("Delete Level"), - i18n("Cannot find file '%1' to be deleted.").tqarg(filePath)); + i18n("Cannot find file '%1' to be deleted.").arg(filePath)); return; } @@ -1883,7 +1883,7 @@ void KGrGame::editCollection (int action) if (duplicatePrefix) { KGrMessage::information (view, i18n("Save Game Info"), i18n("The filename prefix '%1' is already in use.") - .tqarg(ecPrefix)); + .arg(ecPrefix)); continue; } } @@ -2061,7 +2061,7 @@ bool KGrGame::reNumberLevels (int cIndex, int first, int last, int inc) if (! dir.rename (file1, file2, TRUE)) { // Allow absolute paths. KGrMessage::information (view, i18n("Save Level"), i18n("Cannot rename file '%1' to '%2'.") - .tqarg(file1).tqarg(file2)); + .arg(file1).arg(file2)); return (FALSE); } i = i + step; @@ -2181,8 +2181,8 @@ int KGrGame::selectLevel (int action, int requestedLevel) KGrMessage::information (view, i18n("Select Level"), i18n("There is no level %1 in %2, " "so you cannot play or edit it.") - .tqarg(selectedLevel) - .tqarg("\"" + collections.at(selectedGame)->name + "\"")); + .arg(selectedLevel) + .arg("\"" + collections.at(selectedGame)->name + "\"")); selectedLevel = 0; // Set an invalid selection. continue; // Re-run the dialog box. } @@ -2372,10 +2372,10 @@ void KGrGame::mapCollections() i18n("There is no folder '%1' to hold levels for" " the '%2' game. Please make sure '%3' " "has been run in the '%4' folder.") - .tqarg(d_path) - .tqarg(colln->name) - .tqarg("tar xf levels.tar") - .tqarg(systemDataDir)); + .arg(d_path) + .arg(colln->name) + .arg("tar xf levels.tar") + .arg(systemDataDir)); } continue; } @@ -2388,9 +2388,9 @@ void KGrGame::mapCollections() if ((files->count() <= 0) && (colln->nLevels > 0)) { KGrMessage::information (view, i18n("Check Games & Levels"), i18n("There are no files '%1/%2???.grl' for the %3 game.") - .tqarg(d_path) - .tqarg(colln->prefix) - .tqarg("\"" + colln->name + "\"")); + .arg(d_path) + .arg(colln->prefix) + .arg("\"" + colln->name + "\"")); continue; } @@ -2413,8 +2413,8 @@ void KGrGame::mapCollections() i18n("Check Games & Levels"), i18n("File '%1' is beyond the highest level for " "the %2 game and cannot be played.") - .tqarg(fileName1) - .tqarg("\"" + colln->name + "\"")); + .arg(fileName1) + .arg("\"" + colln->name + "\"")); break; } else if (fileName1 == fileName2) { @@ -2426,16 +2426,16 @@ void KGrGame::mapCollections() i18n("Check Games & Levels"), i18n("File '%1' is before the lowest level for " "the %2 game and cannot be played.") - .tqarg(fileName1) - .tqarg("\"" + colln->name + "\"")); + .arg(fileName1) + .arg("\"" + colln->name + "\"")); break; } else { KGrMessage::information (view, i18n("Check Games & Levels"), i18n("Cannot find file '%1' for the %2 game.") - .tqarg(fileName2) - .tqarg("\"" + colln->name + "\"")); + .arg(fileName2) + .arg("\"" + colln->name + "\"")); lev++; } } @@ -2457,14 +2457,14 @@ bool KGrGame::loadCollections (Owner o) if (o == SYSTEM) { KGrMessage::information (view, i18n("Load Game Info"), i18n("Cannot find game info file '%1'.") - .tqarg(filePath)); + .arg(filePath)); } return (FALSE); } if (! c.open (IO_ReadOnly)) { KGrMessage::information (view, i18n("Load Game Info"), - i18n("Cannot open file '%1' for read-only.").tqarg(filePath)); + i18n("Cannot open file '%1' for read-only.").arg(filePath)); return (FALSE); } @@ -2513,7 +2513,7 @@ bool KGrGame::loadCollections (Owner o) // Not EOF: it's an empty line or out-of-context "about" line. KGrMessage::information (view, i18n("Load Game Info"), i18n("Format error in game info file '%1'.") - .tqarg(filePath)); + .arg(filePath)); c.close(); return (FALSE); } @@ -2542,7 +2542,7 @@ bool KGrGame::saveCollections (Owner o) // Open the output file. if (! c.open (IO_WriteOnly)) { KGrMessage::information (view, i18n("Save Game Info"), - i18n("Cannot open file '%1' for output.").tqarg(filePath)); + i18n("Cannot open file '%1' for output.").arg(filePath)); return (FALSE); } diff --git a/kgoldrunner/src/kgrgame.h b/kgoldrunner/src/kgrgame.h index 2b0f26c8..a9f269c3 100644 --- a/kgoldrunner/src/kgrgame.h +++ b/kgoldrunner/src/kgrgame.h @@ -17,7 +17,7 @@ // "endData" checks for an end-of-file condition. // #define myStr latin1 -#define myChar(i) tqat((i)).latin1() +#define myChar(i) at((i)).latin1() #define endData atEnd #include diff --git a/kjumpingcube/kcubewidget.cpp b/kjumpingcube/kcubewidget.cpp index 9757da99..f3db2828 100644 --- a/kjumpingcube/kcubewidget.cpp +++ b/kjumpingcube/kcubewidget.cpp @@ -93,7 +93,7 @@ KCubeWidget::KCubeWidget(TQWidget* parent,const char* name setPalette(kapp->palette()); // show values - tqrepaint(false); + repaint(false); } KCubeWidget::~KCubeWidget() diff --git a/kjumpingcube/kjumpingcube.cpp b/kjumpingcube/kjumpingcube.cpp index deede438..32b19673 100644 --- a/kjumpingcube/kjumpingcube.cpp +++ b/kjumpingcube/kjumpingcube.cpp @@ -123,7 +123,7 @@ void KJumpingCube::saveGame(bool saveAs) if(KIO::NetAccess::exists(url,false,this)) { TQString mes=i18n("The file %1 exists.\n" - "Do you want to overwrite it?").tqarg(url.url()); + "Do you want to overwrite it?").arg(url.url()); result = KMessageBox::warningContinueCancel(this, mes, TQString(), i18n("Overwrite")); if(result==KMessageBox::Cancel) return; @@ -147,12 +147,12 @@ void KJumpingCube::saveGame(bool saveAs) if(KIO::NetAccess::upload( tempFile.name(),gameURL,this )) { TQString s=i18n("game saved as %1"); - s=s.tqarg(gameURL.url()); + s=s.arg(gameURL.url()); statusBar()->message(s,MESSAGE_TIME); } else { - KMessageBox::sorry(this,i18n("There was an error in saving file\n%1").tqarg(gameURL.url())); + KMessageBox::sorry(this,i18n("There was an error in saving file\n%1").arg(gameURL.url())); } } @@ -168,7 +168,7 @@ void KJumpingCube::openGame() return; if(!KIO::NetAccess::exists(url,true,this)) { - TQString mes=i18n("The file %1 does not exist!").tqarg(url.url()); + TQString mes=i18n("The file %1 does not exist!").arg(url.url()); KMessageBox::sorry(this,mes); fileOk=false; } @@ -183,7 +183,7 @@ void KJumpingCube::openGame() if(!config.hasKey("Version")) { TQString mes=i18n("The file %1 isn't a KJumpingCube gamefile!") - .tqarg(url.url()); + .arg(url.url()); KMessageBox::sorry(this,mes); return; } @@ -197,7 +197,7 @@ void KJumpingCube::openGame() KIO::NetAccess::removeTempFile( tempFile ); } else - KMessageBox::sorry(this,i18n("There was an error loading file\n%1").tqarg( url.url() )); + KMessageBox::sorry(this,i18n("There was an error loading file\n%1").arg( url.url() )); } void KJumpingCube::stop() @@ -223,11 +223,11 @@ void KJumpingCube::changePlayer(int newPlayer) { undoAction->setEnabled(true); currentPlayer->setBackgroundColor(newPlayer == 1 ? Prefs::color1() : Prefs::color2()); - currentPlayer->tqrepaint(); + currentPlayer->repaint(); } void KJumpingCube::showWinner(int player) { - TQString s=i18n("Winner is Player %1!").tqarg(player); + TQString s=i18n("Winner is Player %1!").arg(player); KMessageBox::information(this,s,i18n("Winner")); view->reset(); } diff --git a/kjumpingcube/settings.ui b/kjumpingcube/settings.ui index a8c05921..b0d16132 100644 --- a/kjumpingcube/settings.ui +++ b/kjumpingcube/settings.ui @@ -94,7 +94,7 @@ 10x10 - + AlignVCenter|AlignRight @@ -180,7 +180,7 @@ Average - + AlignCenter @@ -199,7 +199,7 @@ Expert - + AlignVCenter|AlignRight diff --git a/klickety/piece.cpp b/klickety/piece.cpp index 2d35300b..fcc2fdff 100644 --- a/klickety/piece.cpp +++ b/klickety/piece.cpp @@ -17,7 +17,7 @@ TQColor KLPieceInfo::defaultColor(uint i) const TQString KLPieceInfo::colorLabel(uint i) const { - return i18n("Color #%1:").tqarg(i+1); + return i18n("Color #%1:").arg(i+1); } void KLPieceInfo::draw(TQPixmap *pixmap, uint blockType, uint bMode, diff --git a/klines/field.cpp b/klines/field.cpp index 088febc2..ef509a33 100644 --- a/klines/field.cpp +++ b/klines/field.cpp @@ -73,7 +73,7 @@ void Field::putBall(int x, int y, char color) if( checkBounds(x,y) ){ field[y][x].setColor(color); erase5Balls(); - tqrepaint(FALSE); + repaint(FALSE); } }*/ void Field::moveBall(int xa, int ya, int xb, int yb) diff --git a/klines/klines.cpp b/klines/klines.cpp index bebc14fe..b0bbe51f 100644 --- a/klines/klines.cpp +++ b/klines/klines.cpp @@ -164,7 +164,7 @@ void KLines::startGame() void KLines::setLevel(int level) { levelStr = i18n(LEVEL[level+2]); - statusBar()->changeItem(i18n(" Level: %1").tqarg(levelStr), 0); + statusBar()->changeItem(i18n(" Level: %1").arg(levelStr), 0); } void KLines::startDemo() @@ -183,7 +183,7 @@ void KLines::startDemo() bFirst = true; levelStr = i18n("Tutorial"); - statusBar()->changeItem(i18n(" Level: %1").tqarg(levelStr), 0); + statusBar()->changeItem(i18n(" Level: %1").arg(levelStr), 0); lsb->startDemoMode(); lsb->setGameOver(false); @@ -202,7 +202,7 @@ void KLines::stopDemo() bDemo = false; lsb->hideDemoText(); demoTimer.stop(); - statusBar()->changeItem(i18n(" Level: %1").tqarg(i18n("Tutorial - Stopped")), 0); + statusBar()->changeItem(i18n(" Level: %1").arg(i18n("Tutorial - Stopped")), 0); act_demo->setText(i18n("Start &Tutorial")); } @@ -419,7 +419,7 @@ void KLines::focusOutEvent(TQFocusEvent *ev) { lsb->hideDemoText(); demoTimer.stop(); - statusBar()->changeItem(i18n(" Level: %1").tqarg(i18n("Tutorial - Paused")), 0); + statusBar()->changeItem(i18n(" Level: %1").arg(i18n("Tutorial - Paused")), 0); } KMainWindow::focusOutEvent(ev); } @@ -428,7 +428,7 @@ void KLines::focusInEvent(TQFocusEvent *ev) { if (bDemo) { - statusBar()->changeItem(i18n(" Level: %1").tqarg(levelStr), 0); + statusBar()->changeItem(i18n(" Level: %1").arg(levelStr), 0); slotDemo(); } KMainWindow::focusInEvent(ev); @@ -528,7 +528,7 @@ void KLines::addScore(int ballsErased) void KLines::updateStat() { - statusBar()->changeItem(i18n(" Score: %1").tqarg(score), 1); + statusBar()->changeItem(i18n(" Score: %1").arg(score), 1); } void KLines::viewHighScore() @@ -540,7 +540,7 @@ void KLines::viewHighScore() void KLines::endGame() { lsb->setGameOver(true); - lsb->tqrepaint(false); + lsb->repaint(false); if (bDemo) return; diff --git a/klines/linesboard.cpp b/klines/linesboard.cpp index 768965fa..bd5610cb 100644 --- a/klines/linesboard.cpp +++ b/klines/linesboard.cpp @@ -163,7 +163,7 @@ void LinesBoard::placeBall( ) /*id LinesBoard::doAfterBalls() { erase5Balls(); - tqrepaint(FALSE); + repaint(FALSE); } */ /* @@ -306,7 +306,7 @@ void LinesBoard::moveFocus(int dx, int dy) focusX = (focusX + dx + NUMCELLSW) % NUMCELLSW; focusY = (focusY + dy + NUMCELLSH) % NUMCELLSH; } - tqrepaint(FALSE); + repaint(FALSE); } void LinesBoard::moveLeft() @@ -401,7 +401,7 @@ int LinesBoard::AnimEnd( ) else if ( oldanim == ANIM_BURN ) { emit eraseLine( deleteAnimatedBalls() ); - tqrepaint(FALSE); + repaint(FALSE); if ( nextBallToPlace < BALLSDROP ) { placeBall(); @@ -455,7 +455,7 @@ void LinesBoard::AnimNext() { if ( (direction > 0 && animstep == animmax) || ( direction < 0 && animstep == 0)) direction = -direction; animstep += direction; - tqrepaint(FALSE); + repaint(FALSE); } else { if ( animstep >= animmax ) AnimEnd(); @@ -466,7 +466,7 @@ void LinesBoard::AnimNext() { moveBall(way[animstep].x,way[animstep].y,way[animstep+1].x,way[animstep+1].y); animstep++; animdelaycount = animdelaystart; - tqrepaint( FALSE ); + repaint( FALSE ); } } } @@ -698,7 +698,7 @@ void LinesBoard::undo() AnimEnd(); restoreUndo(); restoreRandomState(); - tqrepaint( FALSE ); + repaint( FALSE ); } void LinesBoard::showDemoText(const TQString &text) diff --git a/klines/povray/balls.sh b/klines/povray/balls.sh index 66b6ddc2..1897afaa 100755 --- a/klines/povray/balls.sh +++ b/klines/povray/balls.sh @@ -7,7 +7,7 @@ povray -w30 -h30 -V1 -P +A +KI5 +KF6 +KFF6 +SF2 +EF5 -Iball.pov +Ob$1.tga #### burning balls balls povray -w30 -h30 -V1 -P +A +KI0 +KF1 +KFF11 +SF1 +EF5 -Iball.pov +Oe$1.tga -montage -tqgeometry 30x30 -tile 100x1 -page 570x30 a$1??.tga b$1?.tga e$1??.tga bl_$1.tga +montage -geometry 30x30 -tile 100x1 -page 570x30 a$1??.tga b$1?.tga e$1??.tga bl_$1.tga mogrify -crop 570x30+0+0 bl_$1.tga diff --git a/klines/povray/fire.sh b/klines/povray/fire.sh index c3eaa319..2b6b5f9a 100755 --- a/klines/povray/fire.sh +++ b/klines/povray/fire.sh @@ -3,7 +3,7 @@ echo "#declare BallColor = White" >clr.inc if (povray -w30 -h30 -V1 -P +A +KI0 +KF1 +KFF11 +SF6 +EF10 -Iball.pov \ +Ofire.tga) then # mogrify -raise 1x1 e$1??.tga - montage -tqgeometry 30x30 -tile 100x1 -page 150x30 fire*.tga fire.tga + montage -geometry 30x30 -tile 100x1 -page 150x30 fire*.tga fire.tga mogrify -crop 150x30+0+0 fire.tga # animate -delay 7 $1??.tga fi diff --git a/klines/povray/makeballs.sh b/klines/povray/makeballs.sh index 0d937415..62769605 100755 --- a/klines/povray/makeballs.sh +++ b/klines/povray/makeballs.sh @@ -17,7 +17,7 @@ balls.sh Brown "rgb<1/2,1/3,0>" #### montage balls ( 20x7 cells each 30x30) -montage -tqgeometry 570x30 -tile 1x10 bl_*.tga balls.tga +montage -geometry 570x30 -tile 1x10 bl_*.tga balls.tga mogrify -crop 570x210+0+0 balls.tga #### convert to jpeg diff --git a/kmahjongg/Editor.cpp b/kmahjongg/Editor.cpp index 14038f5d..0c6333c5 100644 --- a/kmahjongg/Editor.cpp +++ b/kmahjongg/Editor.cpp @@ -209,19 +209,19 @@ void Editor::topToolbarOption(int option) { break; case ID_TOOL_LEFT: theBoard.shiftLeft(); - tqrepaint(false); + repaint(false); break; case ID_TOOL_RIGHT: theBoard.shiftRight(); - tqrepaint(false); + repaint(false); break; case ID_TOOL_UP: theBoard.shiftUp(); - tqrepaint(false); + repaint(false); break; case ID_TOOL_DOWN: theBoard.shiftDown(); - tqrepaint(false); + repaint(false); break; case ID_TOOL_DEL: mode=remove; @@ -260,7 +260,7 @@ TQString Editor::statusText() { if (x >=BoardLayout::width || x <0 || y >=BoardLayout::height || y <0) x = y = z = 0; - buf = i18n("Tiles: %1 Pos: %2,%3,%4").tqarg(numTiles).tqarg(x).tqarg(y).tqarg(z); + buf = i18n("Tiles: %1 Pos: %2,%3,%4").arg(numTiles).arg(x).arg(y).arg(z); return buf; } @@ -283,7 +283,7 @@ void Editor::loadBoard() { theBoard.loadBoardLayout( url.path() ); - tqrepaint(false); + repaint(false); } @@ -302,7 +302,7 @@ void Editor::newBoard() { clean=true; numTiles=0; statusChanged(); - tqrepaint(false); + repaint(false); } bool Editor::saveBoard() { @@ -386,7 +386,7 @@ void Editor::paintEvent( TQPaintEvent* ) { drawTiles(&buff); bitBlt(dest, 0,0,&buff, 0,0,buff.width(), buff.height(), CopyROP); - drawFrame->tqrepaint(false); + drawFrame->repaint(false); } void Editor::drawBackground(TQPixmap *pixmap) { @@ -564,7 +564,7 @@ void Editor::drawFrameMousePressEvent( TQMouseEvent* e ) numTiles--; statusChanged(); drawFrameMouseMovedEvent(e); - tqrepaint(false); + repaint(false); } break; case insert: { @@ -577,7 +577,7 @@ void Editor::drawFrameMousePressEvent( TQMouseEvent* e ) theBoard.insertTile(n); numTiles++; statusChanged(); - tqrepaint(false); + repaint(false); } } break; @@ -599,7 +599,7 @@ void Editor::drawCursor(POSITION &p, bool visible) if (p.e==100 || !visible) x = -1; drawFrame->setRect(x,y,w,h, tiles.shadowSize(), mode-remove); - drawFrame->tqrepaint(false); + drawFrame->repaint(false); diff --git a/kmahjongg/HighScore.cpp b/kmahjongg/HighScore.cpp index d0e64042..33d0d096 100644 --- a/kmahjongg/HighScore.cpp +++ b/kmahjongg/HighScore.cpp @@ -396,7 +396,7 @@ void HighScore::copyTableToScreen(const TQString &name) { elapsedWidgets[p]->setText(buff); } - tqrepaint(false); + repaint(false); } int HighScore::exec(TQString &tqlayout) { diff --git a/kmahjongg/Preview.cpp b/kmahjongg/Preview.cpp index d775eda5..f6ff021a 100644 --- a/kmahjongg/Preview.cpp +++ b/kmahjongg/Preview.cpp @@ -52,7 +52,7 @@ void Preview::selectionChanged(int which) { m_selectedFile = m_fileList[which]; drawPreview(); - m_drawFrame->tqrepaint(0,0,-1,-1,false); + m_drawFrame->repaint(0,0,-1,-1,false); markChanged(); } @@ -162,7 +162,7 @@ void Preview::load() { if ( !url.isEmpty() ) { m_selectedFile = url.path(); drawPreview(); - m_drawFrame->tqrepaint(0,0,-1,-1,false); + m_drawFrame->repaint(0,0,-1,-1,false); markChanged(); } } @@ -255,7 +255,7 @@ void Preview::drawPreview() } void Preview::paintEvent( TQPaintEvent* ){ - m_drawFrame->tqrepaint(false); + m_drawFrame->repaint(false); } // the user selected ok, or apply. This method passes the changes diff --git a/kmahjongg/boardwidget.cpp b/kmahjongg/boardwidget.cpp index aca8c302..7b4d8270 100644 --- a/kmahjongg/boardwidget.cpp +++ b/kmahjongg/boardwidget.cpp @@ -45,7 +45,7 @@ BoardWidget::BoardWidget( TQWidget* parent, const char *name ) if (!loadTileset(tFile)){ KMessageBox::error(this, i18n("An error occurred when loading the tileset file %1\n" - "KMahjongg will now terminate.").tqarg(tFile)); + "KMahjongg will now terminate.").arg(tFile)); kapp->quit(); } @@ -55,7 +55,7 @@ BoardWidget::BoardWidget( TQWidget* parent, const char *name ) if( ! loadBackground(tFile, false ) ) { KMessageBox::error(this, - i18n("An error occurred when loading the background image\n%1").tqarg(tFile)+ + i18n("An error occurred when loading the background image\n%1").arg(tFile)+ i18n("KMahjongg will now terminate.")); kapp->quit(); } @@ -65,7 +65,7 @@ BoardWidget::BoardWidget( TQWidget* parent, const char *name ) { KMessageBox::error(this, i18n("An error occurred when loading the board tqlayout %1\n" - "KMahjongg will now terminate.").tqarg(tFile)); + "KMahjongg will now terminate.").arg(tFile)); kapp->quit(); } setDisplayedWidth(); @@ -111,7 +111,7 @@ void BoardWidget::getFileOrDefault(TQString filename, TQString type, TQString &r if (res.isEmpty()) { KMessageBox::error(this, i18n("KMahjongg could not locate the file: %1\n" "or the default file of type: %2\n" - "KMahjongg will now terminate").tqarg(filename).tqarg(type) ); + "KMahjongg will now terminate").arg(filename).arg(type) ); kapp->quit(); } } @@ -264,7 +264,7 @@ void BoardWidget::paintEvent( TQPaintEvent* pa ) return; } - // if the tqrepaint is because of a window redraw after a move + // if the repaint is because of a window redraw after a move // or a menu roll up, then just blit in the last rendered image if (!updateBackBuffer) { bitBlt(this, xx,pa->rect().top(), @@ -1804,7 +1804,7 @@ bool BoardWidget::loadBackground( if( ! theBackground.load( pszFileName, requiredWidth(), requiredHeight()) ) { if( bShowError ) - KMessageBox::sorry(this, i18n("Failed to load image:\n%1").tqarg(pszFileName) ); + KMessageBox::sorry(this, i18n("Failed to load image:\n%1").arg(pszFileName) ); return( false ); } Prefs::setBackground(pszFileName); @@ -2010,7 +2010,7 @@ void BoardWidget::shuffle() { // force a redraw updateBackBuffer=true; - tqrepaint(false); + repaint(false); // I consider this s very bad cheat so, I punish the user diff --git a/kmahjongg/boardwidget.h b/kmahjongg/boardwidget.h index bee14b49..62907097 100644 --- a/kmahjongg/boardwidget.h +++ b/kmahjongg/boardwidget.h @@ -205,7 +205,7 @@ class BoardWidget : public TQWidget - bool updateBackBuffer; // does board need redrawing. Not if it is just a tqrepaint + bool updateBackBuffer; // does board need redrawing. Not if it is just a repaint bool gamePaused; diff --git a/kmahjongg/kmahjongg.cpp b/kmahjongg/kmahjongg.cpp index 541a6193..536fa99b 100644 --- a/kmahjongg/kmahjongg.cpp +++ b/kmahjongg/kmahjongg.cpp @@ -397,7 +397,7 @@ void KMahjongg::gameOver( void KMahjongg::showStatusText( const TQString &msg, long board ) { statusLabel->setText(msg); - TQString str = i18n("Game number: %1").tqarg(board); + TQString str = i18n("Game number: %1").arg(board); gameNumLabel->setText(str); } @@ -406,8 +406,8 @@ void KMahjongg::showStatusText( const TQString &msg, long board ) void KMahjongg::showTileNumber( int iMaximum, int iCurrent, int iLeft ) { // Hmm... seems iCurrent is the number of remaining tiles, not removed ... - //TQString szBuffer = i18n("Removed: %1/%2").tqarg(iCurrent).tqarg(iMaximum); - TQString szBuffer = i18n("Removed: %1/%2 Combinations left: %3").tqarg(iMaximum-iCurrent).tqarg(iMaximum).tqarg(iLeft); + //TQString szBuffer = i18n("Removed: %1/%2").arg(iCurrent).arg(iMaximum); + TQString szBuffer = i18n("Removed: %1/%2 Combinations left: %3").arg(iMaximum-iCurrent).arg(iMaximum).arg(iLeft); tilesLeftLabel->setText(szBuffer); // Update here since undo allow is effected by demo mode diff --git a/kmines/dialogs.cpp b/kmines/dialogs.cpp index 7fb5dec9..581c2ecd 100644 --- a/kmines/dialogs.cpp +++ b/kmines/dialogs.cpp @@ -165,7 +165,7 @@ void CustomConfig::updateNbMines() Level l(_width->value(), _height->value(), _mines->value()); _mines->setRange(1, Level::maxNbMines(l.width(), l.height())); _mines->setLabel(i18n("Mines (%1%):") - .tqarg( (100*l.nbMines()) / (l.width() * l.height()) )); + .arg( (100*l.nbMines()) / (l.width() * l.height()) )); _gameType->setCurrentItem(l.type()); _block = false; } diff --git a/kmines/solver/solver.cpp b/kmines/solver/solver.cpp index 0c90b747..f8607b79 100644 --- a/kmines/solver/solver.cpp +++ b/kmines/solver/solver.cpp @@ -198,13 +198,13 @@ SolvingRateDialog::SolvingRateDialog(const BaseField &field, TQWidget *parent) setButtonOK(item); TQVBoxLayout *top = new TQVBoxLayout(plainPage(), 0, spacingHint()); - TQLabel *label = new TQLabel(i18n("Width: %1").tqarg(field.width()), + TQLabel *label = new TQLabel(i18n("Width: %1").arg(field.width()), plainPage()); top->addWidget(label); - label = new TQLabel(i18n("Height: %1").tqarg(field.height()), plainPage()); + label = new TQLabel(i18n("Height: %1").arg(field.height()), plainPage()); top->addWidget(label); - label = new TQLabel(i18n("Mines: %1 (%2%)").tqarg(field.nbMines()) - .tqarg( field.nbMines() * 100.0 / field.size()), + label = new TQLabel(i18n("Mines: %1 (%2%)").arg(field.nbMines()) + .arg( field.nbMines() * 100.0 / field.size()), plainPage()); top->addWidget(label); @@ -243,7 +243,7 @@ void SolvingRateDialog::solvingDone(bool success) { if (success) _success++; _label->setText(i18n("Success rate: %1%") - .tqarg(_success * 100.0 / _i, 0, 'f', 3)); + .arg(_success * 100.0 / _i, 0, 'f', 3)); _progress->advance(1); TQTimer::singleShot(0, this, TQT_SLOT(step())); } diff --git a/kmines/status.cpp b/kmines/status.cpp index 2d081628..7940a388 100644 --- a/kmines/status.cpp +++ b/kmines/status.cpp @@ -368,7 +368,7 @@ void Status::loadLog() bool ok = doc.setContent(&file, 0, &errorLine); if ( !ok ) { KMessageBox::sorry(this, i18n("Cannot read XML file on line %1") - .tqarg(errorLine)); + .arg(errorLine)); return; } success = true; diff --git a/knetwalk/src/mainwindow.cpp b/knetwalk/src/mainwindow.cpp index 2bd3838b..24d2a528 100644 --- a/knetwalk/src/mainwindow.cpp +++ b/knetwalk/src/mainwindow.cpp @@ -149,7 +149,7 @@ void MainWindow::newGame(int sk) m_clickcount = 0; TQString clicks = i18n("Click: %1"); - statusBar()->changeItem(clicks.tqarg(TQString::number(m_clickcount)),1); + statusBar()->changeItem(clicks.arg(TQString::number(m_clickcount)),1); KNotifyClient::event(winId(), "startsound", i18n("New Game")); for(int i = 0; i < MasterBoardSize * MasterBoardSize; i++) @@ -370,7 +370,7 @@ void MainWindow::rotate(int index, bool toleft) m_clickcount++; TQString clicks = i18n("Click: %1"); - statusBar()->changeItem(clicks.tqarg(TQString::number(m_clickcount)),1); + statusBar()->changeItem(clicks.arg(TQString::number(m_clickcount)),1); if (isGameOver()) { diff --git a/kolf/game.cpp b/kolf/game.cpp index f590f0d2..a9a33f03 100644 --- a/kolf/game.cpp +++ b/kolf/game.cpp @@ -58,12 +58,12 @@ inline TQString makeGroup(int id, int hole, TQString name, int x, int y) { - return TQString("%1-%2@%3,%4|%5").tqarg(hole).tqarg(name).tqarg(x).tqarg(y).tqarg(id); + return TQString("%1-%2@%3,%4|%5").arg(hole).arg(name).arg(x).arg(y).arg(id); } inline TQString makeStateGroup(int id, const TQString &name) { - return TQString("%1|%2").tqarg(name).tqarg(id); + return TQString("%1|%2").arg(name).arg(id); } ///////////////////////// @@ -2311,7 +2311,7 @@ void KolfGame::startFirstHole(int hole) { for (; scoreboardHoles < curHole; ++scoreboardHoles) { - cfg->setGroup(TQString("%1-hole@-50,-50|0").tqarg(scoreboardHoles + 1)); + cfg->setGroup(TQString("%1-hole@-50,-50|0").arg(scoreboardHoles + 1)); emit newHole(cfg->readNumEntry("par", 3)); } @@ -2553,7 +2553,7 @@ void KolfGame::handleMouseMoveEvent(TQMouseEvent *e) highlighter->moveBy(-(double)moveX, -(double)moveY); movingItem->moveBy(-(double)moveX, -(double)moveY); TQRect brect = movingItem->boundingRect(); - emit newStatusText(TQString("%1x%2").tqarg(brect.x()).tqarg(brect.y())); + emit newStatusText(TQString("%1x%2").arg(brect.x()).arg(brect.y())); storedMousePos = mouse; } @@ -3136,7 +3136,7 @@ void KolfGame::shotDone() const TQString placeOutside = i18n("Drop Outside of Hazard"); const TQString rehit = i18n("Rehit From Last Location"); options << placeOutside << rehit; - const TQString choice = KComboBoxDialog::getItem(i18n("What would you like to do for your next shot?"), i18n("%1 is in a Hazard").tqarg((*it).name()), options, placeOutside, "hazardOptions"); + const TQString choice = KComboBoxDialog::getItem(i18n("What would you like to do for your next shot?"), i18n("%1 is in a Hazard").arg((*it).name()), options, placeOutside, "hazardOptions"); if (choice == placeOutside) { @@ -3303,7 +3303,7 @@ void KolfGame::sayWhosGoing() { if (players->count() >= 2) { - KMessageBox::information(this, i18n("%1 will start off.").tqarg((*curPlayer).name()), i18n("New Hole"), "newHole"); + KMessageBox::information(this, i18n("%1 will start off.").arg((*curPlayer).name()), i18n("New Hole"), "newHole"); } } @@ -3429,7 +3429,7 @@ void KolfGame::startNextHole() for (; scoreboardHoles < curHole; ++scoreboardHoles) { - cfg->setGroup(TQString("%1-hole@-50,-50|0").tqarg(scoreboardHoles + 1)); + cfg->setGroup(TQString("%1-hole@-50,-50|0").arg(scoreboardHoles + 1)); emit newHole(cfg->readNumEntry("par", 3)); } @@ -3451,7 +3451,7 @@ void KolfGame::startNextHole() void KolfGame::showInfo() { - TQString text = i18n("Hole %1: par %2, maximum %3 strokes").tqarg(curHole).tqarg(holeInfo.par()).tqarg(holeInfo.maxStrokes()); + TQString text = i18n("Hole %1: par %2, maximum %3 strokes").arg(curHole).arg(holeInfo.par()).arg(holeInfo.maxStrokes()); infoText->move((width - TQFontMetrics(infoText->font()).width(text)) / 2, infoText->y()); infoText->setText(text); // I hate this text! Let's not show it @@ -3463,9 +3463,9 @@ void KolfGame::showInfo() void KolfGame::showInfoDlg(bool addDontShowAgain) { KMessageBox::information(parentWidget(), - i18n("Course name: %1").tqarg(holeInfo.name()) + TQString("\n") - + i18n("Created by %1").tqarg(holeInfo.author()) + TQString("\n") - + i18n("%1 holes").tqarg(highestHole), + i18n("Course name: %1").arg(holeInfo.name()) + TQString("\n") + + i18n("Created by %1").arg(holeInfo.author()) + TQString("\n") + + i18n("%1 holes").arg(highestHole), i18n("Course Information"), addDontShowAgain? holeInfo.name() + TQString(" ") + holeInfo.author() : TQString()); } @@ -3514,7 +3514,7 @@ void KolfGame::openFile() holeInfo.setUntranslatedName(cfg->readEntryUntranslated("Name", holeInfo.untranslatedName())); emit titleChanged(holeInfo.name()); - cfg->setGroup(TQString("%1-hole@-50,-50|0").tqarg(curHole)); + cfg->setGroup(TQString("%1-hole@-50,-50|0").arg(curHole)); curPar = cfg->readNumEntry("par", 3); holeInfo.setPar(curPar); holeInfo.borderWallsChanged(cfg->readBoolEntry("borderWalls", holeInfo.borderWalls())); @@ -3616,7 +3616,7 @@ void KolfGame::openFile() if (!missingPlugins.empty()) { - KMessageBox::informationList(this, TQString("

<http://katzbrown.com/kolf/Plugins/>

") + i18n("This hole uses the following plugins, which you do not have installed:") + TQString("

"), missingPlugins, TQString(), TQString("%1 warning").tqarg(holeInfo.untranslatedName() + TQString::number(curHole))); + KMessageBox::informationList(this, TQString("

<http://katzbrown.com/kolf/Plugins/>

") + i18n("This hole uses the following plugins, which you do not have installed:") + TQString("

"), missingPlugins, TQString(), TQString("%1 warning").arg(holeInfo.untranslatedName() + TQString::number(curHole))); } lastDelId = -1; @@ -3995,7 +3995,7 @@ void KolfGame::save() } // save where ball starts (whiteBall tells all) - cfg->setGroup(TQString("%1-ball@%2,%3").tqarg(curHole).tqarg((int)whiteBall->x()).tqarg((int)whiteBall->y())); + cfg->setGroup(TQString("%1-ball@%2,%3").arg(curHole).arg((int)whiteBall->x()).arg((int)whiteBall->y())); cfg->writeEntry("dummykey", true); cfg->setGroup("0-course@-50,-50"); @@ -4003,7 +4003,7 @@ void KolfGame::save() cfg->writeEntry("Name", holeInfo.untranslatedName()); // save hole info - cfg->setGroup(TQString("%1-hole@-50,-50|0").tqarg(curHole)); + cfg->setGroup(TQString("%1-hole@-50,-50|0").arg(curHole)); cfg->writeEntry("par", holeInfo.par()); cfg->writeEntry("maxstrokes", holeInfo.maxStrokes()); cfg->writeEntry("borderWalls", holeInfo.borderWalls()); @@ -4160,7 +4160,7 @@ void KolfGame::print(KPrinter &pr) if (pr.option("kde-kolf-title") == "true") { - TQString text = i18n("%1 - Hole %2; by %3").tqarg(holeInfo.name()).tqarg(curHole).tqarg(holeInfo.author()); + TQString text = i18n("%1 - Hole %2; by %3").arg(holeInfo.name()).arg(curHole).arg(holeInfo.author()); TQFont font(kapp->font()); font.setPointSize(18); TQRect rect = TQFontMetrics(font).boundingRect(text); @@ -4219,7 +4219,7 @@ void KolfGame::courseInfo(CourseInfo &info, const TQString& filename) unsigned int par= 0; while (1) { - TQString group = TQString("%1-hole@-50,-50|0").tqarg(hole); + TQString group = TQString("%1-hole@-50,-50|0").arg(hole); if (!cfg.hasGroup(group)) { hole--; diff --git a/kolf/kcomboboxdialog.cpp b/kolf/kcomboboxdialog.cpp index 99d86cf8..5882e257 100644 --- a/kolf/kcomboboxdialog.cpp +++ b/kolf/kcomboboxdialog.cpp @@ -124,8 +124,8 @@ TQString KComboBoxDialog::getText(const TQString &_caption, const TQString &_tex KHistoryCombo * const box = dlg.comboBox(); box->setEditable(true); - const TQString historyItem = TQString("%1History").tqarg(configName); - const TQString completionItem = TQString("%1Completion").tqarg(configName); + const TQString historyItem = TQString("%1History").arg(configName); + const TQString completionItem = TQString("%1Completion").arg(configName); if(!configName.isNull()) { diff --git a/kolf/kolf.cpp b/kolf/kolf.cpp index 3707f12d..fba028cb 100644 --- a/kolf/kolf.cpp +++ b/kolf/kolf.cpp @@ -431,10 +431,10 @@ void Kolf::gameOver() if (names.count() > 1) { TQString winners = names.join(i18n(" and ")); - KMessageBox::information(this, i18n("%1 tied").tqarg(winners)); + KMessageBox::information(this, i18n("%1 tied").arg(winners)); } else - KMessageBox::information(this, i18n("%1 won!").tqarg(names.first())); + KMessageBox::information(this, i18n("%1 won!").arg(names.first())); } if (competition) @@ -459,7 +459,7 @@ void Kolf::gameOver() scoreDialog->addScore((*it).score, info, false, true); } - scoreDialog->setComment(i18n("High Scores for %1").tqarg(courseInfo.name)); + scoreDialog->setComment(i18n("High Scores for %1").arg(courseInfo.name)); scoreDialog->show(); } @@ -475,7 +475,7 @@ void Kolf::showHighScores() game->courseInfo(courseInfo, game->curFilename()); scoreDialog->setConfigGroup(courseInfo.untranslatedName + TQString(" Highscores")); - scoreDialog->setComment(i18n("High Scores for %1").tqarg(courseInfo.name)); + scoreDialog->setComment(i18n("High Scores for %1").arg(courseInfo.name)); scoreDialog->show(); } @@ -572,7 +572,7 @@ void Kolf::openURL(KURL url) void Kolf::newPlayersTurn(Player *player) { - tempStatusBarText = i18n("%1's turn").tqarg(player->name()); + tempStatusBarText = i18n("%1's turn").arg(player->name()); if (showInfoAction->isChecked()) statusBar()->message(tempStatusBarText, 5 * 1000); @@ -643,7 +643,7 @@ void Kolf::inPlayEnd() void Kolf::maxStrokesReached(const TQString &name) { - KMessageBox::sorry(this, i18n("%1's score has reached the maximum for this hole.").tqarg(name)); + KMessageBox::sorry(this, i18n("%1's score has reached the maximum for this hole.").arg(name)); } void Kolf::updateHoleMenu(int largest) @@ -697,7 +697,7 @@ void Kolf::print() KPrinter pr; pr.addDialogPage(new PrintDialogPage()); - if (pr.setup(this, i18n("Print %1 - Hole %2").tqarg(game->courseName()).tqarg(game->currentHole()))) + if (pr.setup(this, i18n("Print %1 - Hole %2").arg(game->courseName()).arg(game->currentHole()))) { pr.newPage(); if (game) @@ -785,14 +785,14 @@ void Kolf::initPlugins() void Kolf::showPlugins() { - TQString text = TQString("

%1

    ").tqarg(i18n("Currently Loaded Plugins")); + TQString text = TQString("

    %1

      ").arg(i18n("Currently Loaded Plugins")); Object *object = 0; for (object = plugins.first(); object; object = plugins.next()) { text.append("
    1. "); text.append(object->name()); text.append(" - "); - text.append(i18n("by %1").tqarg(object->author())); + text.append(i18n("by %1").arg(object->author())); text.append("
      2. "); } text.append("
    "); diff --git a/kolf/main.cpp b/kolf/main.cpp index 137121c4..4f15d026 100644 --- a/kolf/main.cpp +++ b/kolf/main.cpp @@ -57,16 +57,16 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) KolfGame::courseInfo(info, filename); cout << info.name.latin1() - << " - " << i18n("By %1").tqarg(info.author).latin1() - << " - " << i18n("%1 holes").tqarg(info.holes).latin1() - << " - " << i18n("par %1").tqarg(info.par).latin1() + << " - " << i18n("By %1").arg(info.author).latin1() + << " - " << i18n("%1 holes").arg(info.holes).latin1() + << " - " << i18n("par %1").arg(info.par).latin1() << endl; return 0; } else { - KCmdLineArgs::usage(i18n("Course %1 does not exist.").tqarg(filename.latin1())); + KCmdLineArgs::usage(i18n("Course %1 does not exist.").arg(filename.latin1())); } } diff --git a/kolf/newgame.cpp b/kolf/newgame.cpp index 6bd6951b..7251fa0c 100644 --- a/kolf/newgame.cpp +++ b/kolf/newgame.cpp @@ -212,11 +212,11 @@ void NewGameDialog::courseSelected(int index) CourseInfo &curinfo = info[currentCourse]; - name->setText(TQString("%1").tqarg(curinfo.name)); + name->setText(TQString("%1").arg(curinfo.name)); - author->setText(i18n("By %1").tqarg(curinfo.author)); - par->setText(i18n("Par %1").tqarg(curinfo.par)); - holes->setText(i18n("%1 Holes").tqarg(curinfo.holes)); + author->setText(i18n("By %1").arg(curinfo.author)); + par->setText(i18n("Par %1").arg(curinfo.par)); + holes->setText(i18n("%1 Holes").arg(curinfo.holes)); } void NewGameDialog::showHighscores() @@ -224,7 +224,7 @@ void NewGameDialog::showHighscores() KScoreDialog *scoreDialog = new KScoreDialog(KScoreDialog::Name | KScoreDialog::Custom1 | KScoreDialog::Score, this); scoreDialog->addField(KScoreDialog::Custom1, i18n("Par"), "Par"); scoreDialog->setConfigGroup(info[currentCourse].untranslatedName + TQString(" Highscores")); - scoreDialog->setComment(i18n("High Scores for %1").tqarg(info[currentCourse].name)); + scoreDialog->setComment(i18n("High Scores for %1").arg(info[currentCourse].name)); scoreDialog->show(); } @@ -287,7 +287,7 @@ void NewGameDialog::addPlayer() if (editors.count() >= startColors.count()) return; - editors.append(new PlayerEditor(i18n("Player %1").tqarg(editors.count() + 1), *startColors.at(editors.count()), tqlayout)); + editors.append(new PlayerEditor(i18n("Player %1").arg(editors.count() + 1), *startColors.at(editors.count()), tqlayout)); editors.last()->show(); connect(editors.last(), TQT_SIGNAL(deleteEditor(PlayerEditor *)), this, TQT_SLOT(deleteEditor(PlayerEditor *))); diff --git a/kolf/objects/test/test.cpp b/kolf/objects/test/test.cpp index bb3af320..9a959694 100644 --- a/kolf/objects/test/test.cpp +++ b/kolf/objects/test/test.cpp @@ -41,7 +41,7 @@ void Test::advance(int phase) // random color const TQColor myColor((TQRgb)(kapp->random() % 0x01000000)); - // set the brush, so our tqshape is drawn + // set the brush, so our shape is drawn // with the random color setBrush(TQBrush(myColor)); 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())); } diff --git a/kpat/card.cpp b/kpat/card.cpp index 30f5d81d..d3dba426 100644 --- a/kpat/card.cpp +++ b/kpat/card.cpp @@ -45,7 +45,7 @@ Card::Card( Rank r, Suit s, TQCanvas* _parent ) { // Set the name of the card // FIXME: i18n() - m_name = TQString("%1 %2").tqarg(suit_names[s-1]).tqarg(rank_names[r-1]).utf8(); + m_name = TQString("%1 %2").arg(suit_names[s-1]).arg(rank_names[r-1]).utf8(); // Default for the card is face up, standard size. m_faceup = true; diff --git a/kpat/dealer.cpp b/kpat/dealer.cpp index d49c3f15..dbd27787 100644 --- a/kpat/dealer.cpp +++ b/kpat/dealer.cpp @@ -1160,14 +1160,14 @@ void Dealer::won() { // wrap in own scope to make KConfigGroupSave work KConfig *config = kapp->config(); KConfigGroupSaver kcs(config, scores_group); - unsigned int n = config->readUnsignedNumEntry(TQString("won%1").tqarg(_id),0) + 1; - config->writeEntry(TQString("won%1").tqarg(_id),n); - n = config->readUnsignedNumEntry(TQString("winstreak%1").tqarg(_id),0) + 1; - config->writeEntry(TQString("winstreak%1").tqarg(_id),n); - unsigned int m = config->readUnsignedNumEntry(TQString("maxwinstreak%1").tqarg(_id),0); + unsigned int n = config->readUnsignedNumEntry(TQString("won%1").arg(_id),0) + 1; + config->writeEntry(TQString("won%1").arg(_id),n); + n = config->readUnsignedNumEntry(TQString("winstreak%1").arg(_id),0) + 1; + config->writeEntry(TQString("winstreak%1").arg(_id),n); + unsigned int m = config->readUnsignedNumEntry(TQString("maxwinstreak%1").arg(_id),0); if (n>m) - config->writeEntry(TQString("maxwinstreak%1").tqarg(_id),n); - config->writeEntry(TQString("loosestreak%1").tqarg(_id),0); + config->writeEntry(TQString("maxwinstreak%1").arg(_id),n); + config->writeEntry(TQString("loosestreak%1").arg(_id),0); } // sort cards by increasing z @@ -1430,9 +1430,9 @@ void Dealer::countGame() kdDebug(11111) << "counting game as played." << endl; KConfig *config = kapp->config(); KConfigGroupSaver kcs(config, scores_group); - unsigned int Total = config->readUnsignedNumEntry(TQString("total%1").tqarg(_id),0); + unsigned int Total = config->readUnsignedNumEntry(TQString("total%1").arg(_id),0); ++Total; - config->writeEntry(TQString("total%1").tqarg(_id),Total); + config->writeEntry(TQString("total%1").arg(_id),Total); _gameRecorded = true; } } @@ -1443,12 +1443,12 @@ void Dealer::countLoss() // update score KConfig *config = kapp->config(); KConfigGroupSaver kcs(config, scores_group); - unsigned int n = config->readUnsignedNumEntry(TQString("loosestreak%1").tqarg(_id),0) + 1; - config->writeEntry(TQString("loosestreak%1").tqarg(_id),n); - unsigned int m = config->readUnsignedNumEntry(TQString("maxloosestreak%1").tqarg(_id),0); + unsigned int n = config->readUnsignedNumEntry(TQString("loosestreak%1").arg(_id),0) + 1; + config->writeEntry(TQString("loosestreak%1").arg(_id),n); + unsigned int m = config->readUnsignedNumEntry(TQString("maxloosestreak%1").arg(_id),0); if (n>m) - config->writeEntry(TQString("maxloosestreak%1").tqarg(_id),n); - config->writeEntry(TQString("winstreak%1").tqarg(_id),0); + config->writeEntry(TQString("maxloosestreak%1").arg(_id),n); + config->writeEntry(TQString("winstreak%1").arg(_id),0); } } diff --git a/kpat/freecell-solver/caas.c b/kpat/freecell-solver/caas.c index 8e8f5ebb..82492f34 100644 --- a/kpat/freecell-solver/caas.c +++ b/kpat/freecell-solver/caas.c @@ -531,7 +531,7 @@ GCC_INLINE int freecell_solver_check_and_add_state( /* The new state was not found in the cache, and it was already inserted */ if (new_state->parent) { - new_state->parent->num_active_tqchildren++; + new_state->parent->num_active_children++; } instance->num_states_in_collection++; diff --git a/kpat/freecell-solver/pqueue.c b/kpat/freecell-solver/pqueue.c index 90afc168..47e6280d 100644 --- a/kpat/freecell-solver/pqueue.c +++ b/kpat/freecell-solver/pqueue.c @@ -145,7 +145,7 @@ void *freecell_solver_PQueuePop( PTQUEUE *pq) for( i=PTQ_FIRST_ENTRY; (child = PTQ_LEFT_CHILD_INDEX(i)) <= CurrentSize; i=child ) { - /* set child to the smaller of the two tqchildren... */ + /* set child to the smaller of the two children... */ if( (child != CurrentSize) && (PGetRating(Elements[child + 1]) > PGetRating(Elements[child])) ) diff --git a/kpat/freecell-solver/pqueue.h b/kpat/freecell-solver/pqueue.h index 875741ae..cef1b854 100644 --- a/kpat/freecell-solver/pqueue.h +++ b/kpat/freecell-solver/pqueue.h @@ -47,7 +47,7 @@ typedef struct _PTQUEUE #define PTQ_PARENT_INDEX(i) ((i)>>1) #define PTQ_FIRST_ENTRY (1) -/* left and right tqchildren are index * 2 and (index * 2) +1 respectively */ +/* left and right children are index * 2 and (index * 2) +1 respectively */ #define PTQ_LEFT_CHILD_INDEX(i) ((i)<<1) #define PTQ_RIGHT_CHILD_INDEX(i) (((i)<<1)+1) diff --git a/kpat/freecell-solver/state.h b/kpat/freecell-solver/state.h index 302d6d9a..e52b717c 100644 --- a/kpat/freecell-solver/state.h +++ b/kpat/freecell-solver/state.h @@ -77,7 +77,7 @@ struct fcs_struct_state_with_locations_t int depth; int visited; int visited_iter; - int num_active_tqchildren; + int num_active_children; int scan_visited[MAX_NUM_SCANS_BUCKETS]; }; @@ -237,7 +237,7 @@ struct fcs_struct_state_with_locations_t int depth; int visited; int visited_iter; - int num_active_tqchildren; + int num_active_children; int scan_visited[MAX_NUM_SCANS_BUCKETS]; }; @@ -508,11 +508,11 @@ struct fcs_struct_state_with_locations_t * */ int visited_iter; /* - * This is the number of direct tqchildren of this state which were not + * This is the number of direct children of this state which were not * yet declared as dead ends. Once this counter reaches zero, this * state too is declared as a dead end. * */ - int num_active_tqchildren; + int num_active_children; /* * This is a vector of flags - one for each scan. Each indicates whether * its scan has already visited this state diff --git a/kpat/freecell-solver/test_arr.h b/kpat/freecell-solver/test_arr.h index 911ff511..cfc5cd12 100644 --- a/kpat/freecell-solver/test_arr.h +++ b/kpat/freecell-solver/test_arr.h @@ -88,8 +88,8 @@ extern freecell_solver_solve_for_state_test_t freecell_solver_sfs_tests[FCS_TEST if (ptr_state != NULL) \ { \ /* Decrease the refcount of the state */ \ - ptr_state->num_active_tqchildren--; \ - while((ptr_state->num_active_tqchildren == 0) && (ptr_state->visited & FCS_VISITED_ALL_TESTS_DONE)) \ + ptr_state->num_active_children--; \ + while((ptr_state->num_active_children == 0) && (ptr_state->visited & FCS_VISITED_ALL_TESTS_DONE)) \ { \ /* Mark as dead end */ \ ptr_state->visited |= FCS_VISITED_DEAD_END; \ @@ -100,7 +100,7 @@ extern freecell_solver_solve_for_state_test_t freecell_solver_sfs_tests[FCS_TEST break; \ } \ /* Decrease the refcount */ \ - ptr_state->num_active_tqchildren--; \ + ptr_state->num_active_children--; \ } \ } \ } \ diff --git a/kpat/freecell-solver/tests.h b/kpat/freecell-solver/tests.h index 0293ed85..ce0b35b5 100644 --- a/kpat/freecell-solver/tests.h +++ b/kpat/freecell-solver/tests.h @@ -66,8 +66,8 @@ extern "C" { ptr_new_state_with_locations->depth = ptr_state_with_locations->depth + 1; \ /* Mark this state as a state that was not yet visited */ \ ptr_new_state_with_locations->visited = 0; \ - /* It's a newly created state which does not have tqchildren yet. */ \ - ptr_new_state_with_locations->num_active_tqchildren = 0; \ + /* It's a newly created state which does not have children yet. */ \ + ptr_new_state_with_locations->num_active_children = 0; \ memset(ptr_new_state_with_locations->scan_visited, '\0', \ sizeof(ptr_new_state_with_locations->scan_visited) \ ); \ @@ -119,13 +119,13 @@ fcs_move_stack_push(moves, temp_move); \ ); \ if (!(existing_state->visited & FCS_VISITED_DEAD_END)) \ { \ - if ((--existing_state->parent->num_active_tqchildren) == 0) \ + if ((--existing_state->parent->num_active_children) == 0) \ { \ mark_as_dead_end( \ existing_state->parent \ ); \ } \ - ptr_state_with_locations->num_active_tqchildren++; \ + ptr_state_with_locations->num_active_children++; \ } \ existing_state->parent = ptr_state_with_locations; \ existing_state->depth = ptr_state_with_locations->depth + 1; \ diff --git a/kpat/freecell.cpp b/kpat/freecell.cpp index 56f9a043..4575d95b 100644 --- a/kpat/freecell.cpp +++ b/kpat/freecell.cpp @@ -280,8 +280,8 @@ void FreecellBase::resumeSolution() return; emit gameInfo(i18n("%1 tries - depth %2") - .tqarg(freecell_solver_user_get_num_times(solver_instance)) - .tqarg(freecell_solver_user_get_current_depth(solver_instance))); + .arg(freecell_solver_user_get_num_times(solver_instance)) + .arg(freecell_solver_user_get_current_depth(solver_instance))); if (solver_ret == FCS_STATE_WAS_SOLVED) { @@ -296,7 +296,7 @@ void FreecellBase::resumeSolution() int moves = freecell_solver_user_get_num_times(solver_instance); freeSolution(); emit gameInfo(i18n("unsolved after %1 moves") - .tqarg(moves)); + .arg(moves)); stopDemo(); return; } @@ -379,7 +379,7 @@ TQString FreecellBase::solverFormat() const tmp += suitToString(target[i]->top()->suit()) + "-" + rankToString(target[i]->top()->rank()) + " "; } if (!tmp.isEmpty()) - output += TQString::fromLatin1("Foundations: %1\n").tqarg(tmp); + output += TQString::fromLatin1("Foundations: %1\n").arg(tmp); tmp.truncate(0); for (uint i = 0; i < freecell.count(); i++) { @@ -389,7 +389,7 @@ TQString FreecellBase::solverFormat() const tmp += rankToString(freecell[i]->top()->rank()) + suitToString(freecell[i]->top()->suit()) + " "; } if (!tmp.isEmpty()) - output += TQString::fromLatin1("Freecells: %1\n").tqarg(tmp); + output += TQString::fromLatin1("Freecells: %1\n").arg(tmp); for (uint i = 0; i < store.count(); i++) { @@ -544,7 +544,7 @@ MoveHint *FreecellBase::chooseHint() { if (solver_instance && freecell_solver_user_get_moves_left(solver_instance)) { - emit gameInfo(i18n("%1 moves before finish").tqarg(freecell_solver_user_get_moves_left(solver_instance))); + emit gameInfo(i18n("%1 moves before finish").arg(freecell_solver_user_get_moves_left(solver_instance))); fcs_move_t move; if (!freecell_solver_user_get_next_move(solver_instance, &move)) { diff --git a/kpat/gamestats.ui b/kpat/gamestats.ui index 14daf215..9ad673ea 100644 --- a/kpat/gamestats.ui +++ b/kpat/gamestats.ui @@ -84,7 +84,7 @@ %1 - + AlignVCenter|AlignRight @@ -119,7 +119,7 @@ %1 - + AlignVCenter|AlignRight @@ -138,7 +138,7 @@ %1 - + AlignVCenter|AlignRight @@ -157,7 +157,7 @@ %1 - + AlignVCenter|AlignRight diff --git a/kpat/gamestatsimpl.cpp b/kpat/gamestatsimpl.cpp index 2850da01..11b95fee 100644 --- a/kpat/gamestatsimpl.cpp +++ b/kpat/gamestatsimpl.cpp @@ -42,16 +42,16 @@ void GameStatsImpl::setGameType(int id) languageChange(); KConfig *config = kapp->config(); KConfigGroupSaver kcs(config, scores_group); - unsigned int t = config->readUnsignedNumEntry(TQString("total%1").tqarg(id),0); - Played->setText(Played->text().tqarg(t)); - unsigned int w = config->readUnsignedNumEntry(TQString("won%1").tqarg(id),0); - Won->setText(Won->text().tqarg(w)); + unsigned int t = config->readUnsignedNumEntry(TQString("total%1").arg(id),0); + Played->setText(Played->text().arg(t)); + unsigned int w = config->readUnsignedNumEntry(TQString("won%1").arg(id),0); + Won->setText(Won->text().arg(w)); if (t) - WonPerc->setText(WonPerc->text().tqarg(w*100/t)); + WonPerc->setText(WonPerc->text().arg(w*100/t)); else - WonPerc->setText(WonPerc->text().tqarg(0)); + WonPerc->setText(WonPerc->text().arg(0)); WinStreak->setText( - WinStreak->text().tqarg(config->readUnsignedNumEntry(TQString("maxwinstreak%1").tqarg(id),0))); + WinStreak->text().arg(config->readUnsignedNumEntry(TQString("maxwinstreak%1").arg(id),0))); LooseStreak->setText( - LooseStreak->text().tqarg(config->readUnsignedNumEntry(TQString("maxloosestreak%1").tqarg(id),0))); + LooseStreak->text().arg(config->readUnsignedNumEntry(TQString("maxloosestreak%1").arg(id),0))); } diff --git a/kpat/pwidget.cpp b/kpat/pwidget.cpp index d51b67f6..4901d75f 100644 --- a/kpat/pwidget.cpp +++ b/kpat/pwidget.cpp @@ -239,7 +239,7 @@ void pWidget::changeWallpaper() return; background = TQPixmap(bgpath); if (background.isNull()) { - KMessageBox::sorry(this, i18n("Couldn't load wallpaper
    %1    ").tqarg(bgpath)); + KMessageBox::sorry(this, i18n("Couldn't load wallpaper
    %1    ").arg(bgpath)); return; } diff --git a/kpoker/betbox.cpp b/kpoker/betbox.cpp index cbdcad12..91fcab8b 100644 --- a/kpoker/betbox.cpp +++ b/kpoker/betbox.cpp @@ -46,10 +46,10 @@ BetBox::BetBox(TQWidget* parent, const char* name) foldButton = new TQPushButton(this); l->addWidget(foldButton, 0); - bet5Up->setText(TQString("+%1").tqarg(KGlobal::locale()->formatMoney(5))); - bet10Up->setText(TQString("+%1").tqarg(KGlobal::locale()->formatMoney(10))); - bet5Down->setText(TQString("-%1").tqarg(KGlobal::locale()->formatMoney(5))); - bet10Down->setText(TQString("-%1").tqarg(KGlobal::locale()->formatMoney(10))); + bet5Up->setText(TQString("+%1").arg(KGlobal::locale()->formatMoney(5))); + bet10Up->setText(TQString("+%1").arg(KGlobal::locale()->formatMoney(10))); + bet5Down->setText(TQString("-%1").arg(KGlobal::locale()->formatMoney(5))); + bet10Down->setText(TQString("-%1").arg(KGlobal::locale()->formatMoney(10))); adjustBet->setText(i18n("Adjust Bet")); foldButton->setText(i18n("Fold")); diff --git a/kpoker/kpaint.cpp b/kpoker/kpaint.cpp index cecfc4b6..86406dea 100644 --- a/kpoker/kpaint.cpp +++ b/kpoker/kpaint.cpp @@ -173,7 +173,7 @@ void CardWidget::repaintDeck() setPixmap(*m_pm); setFixedSize(cardImages->getWidth(), cardImages->getHeight()); - ((TQWidget*) parent())->tqlayout()->tqinvalidate(); + ((TQWidget*) parent())->tqlayout()->invalidate(); ((TQWidget*) parent())->setFixedSize( ((TQWidget*) parent())->sizeHint()); } diff --git a/kpoker/kpoker.cpp b/kpoker/kpoker.cpp index ebaad07f..73321bdf 100644 --- a/kpoker/kpoker.cpp +++ b/kpoker/kpoker.cpp @@ -178,7 +178,7 @@ kpok::kpok(TQWidget *parent, const char *name) // ...and the rest to computer players. for (int unsigned i = 1; i < m_numPlayers; i++) - m_players[i].setName(TQString("Computer %1").tqarg(i-1)); + m_players[i].setName(TQString("Computer %1").arg(i-1)); lastHandText = ""; @@ -269,7 +269,7 @@ void kpok::initWindow() mWonWidget = new TQWidget(this); inputLayout->addWidget(mWonWidget, 2); mWonWidget->setMinimumHeight(50); //FIXME hardcoded value for the wave - mWonWidget->setMinimumWidth(tmp.width(i18n("You won %1").tqarg(KGlobal::locale()->formatMoney(100))) + 20); // workaround for width problem in wave + mWonWidget->setMinimumWidth(tmp.width(i18n("You won %1").arg(KGlobal::locale()->formatMoney(100))) + 20); // workaround for width problem in wave TQHBoxLayout* wonLayout = new TQHBoxLayout(mWonWidget); wonLayout->setAutoAdd(true); @@ -686,7 +686,7 @@ void kpok::paintCash() for (unsigned int i = 0; i < m_numPlayers; i++) { playerBox[i]->showCash(); } - potLabel->setText(i18n("Pot: %1").tqarg(KGlobal::locale()->formatMoney(m_game.getPot()))); + potLabel->setText(i18n("Pot: %1").arg(KGlobal::locale()->formatMoney(m_game.getPot()))); } @@ -805,9 +805,9 @@ void kpok::displayWinner_Computer(PokerPlayer* winner, bool othersPassed) // Generate a string with winner info and show it. TQString label; if (winner->getHuman()) - label = i18n("You won %1").tqarg(KGlobal::locale()->formatMoney(m_game.getPot())); + label = i18n("You won %1").arg(KGlobal::locale()->formatMoney(m_game.getPot())); else - label = i18n("%1 won %2").tqarg(winner->getName()).tqarg(KGlobal::locale()->formatMoney(m_game.getPot())); + label = i18n("%1 won %2").arg(winner->getName()).arg(KGlobal::locale()->formatMoney(m_game.getPot())); wonLabel->setText(label); // Start the waving motion of the text. @@ -1028,7 +1028,7 @@ void kpok::stopWave() { waveTimer->stop(); fCount = -1; /* clear image */ - tqrepaint ( FALSE ); + repaint ( FALSE ); waveActive = false; } @@ -1042,7 +1042,7 @@ void kpok::stopDrawing() void kpok::waveTimerEvent() { fCount = (fCount + 1) & 15; - tqrepaint( FALSE ); + repaint( FALSE ); } @@ -1072,7 +1072,7 @@ void kpok::displayWin(const TQString& hand, int cashWon) if (cashWon) { playSound("win.wav"); - buf = i18n("You won %1!").tqarg(KGlobal::locale()->formatMoney(cashWon)); + buf = i18n("You won %1!").arg(KGlobal::locale()->formatMoney(cashWon)); } else { playSound("lose.wav"); buf = i18n("Game Over"); // locale @@ -1307,9 +1307,9 @@ void kpok::saveGame(KConfig* conf) conf->writeEntry("lastHandText", lastHandText); for (int i = 0; i < players; i++) { - conf->writeEntry(TQString("Name_%1").tqarg(i), m_players[i].getName()); - conf->writeEntry(TQString("Human_%1").tqarg(i), m_players[i].getHuman()); - conf->writeEntry(TQString("Cash_%1").tqarg(i), m_players[i].getCash()); + conf->writeEntry(TQString("Name_%1").arg(i), m_players[i].getName()); + conf->writeEntry(TQString("Human_%1").arg(i), m_players[i].getHuman()); + conf->writeEntry(TQString("Cash_%1").arg(i), m_players[i].getCash()); } m_game.clearDirty(); @@ -1407,14 +1407,14 @@ bool kpok::loadGame(KConfig* conf) if (numPlayers > 0) { for (int i = 0; i < numPlayers; i++) { - TQString buf = conf->readEntry(TQString("Name_%1").tqarg(i), + TQString buf = conf->readEntry(TQString("Name_%1").arg(i), "Player"); m_players[i].setName(buf); - bool human = conf->readBoolEntry(TQString("Human_%1").tqarg(i), + bool human = conf->readBoolEntry(TQString("Human_%1").arg(i), false); if (human) m_players[i].setHuman(); // i == 0 - int cash = conf->readNumEntry(TQString("Cash_%1").tqarg(i), + int cash = conf->readNumEntry(TQString("Cash_%1").arg(i), START_MONEY); m_players[i].setCash(cash); m_game.setDirty(); diff --git a/kpoker/newgamedlg.cpp b/kpoker/newgamedlg.cpp index ef2bfe0a..80a9a501 100644 --- a/kpoker/newgamedlg.cpp +++ b/kpoker/newgamedlg.cpp @@ -75,7 +75,7 @@ NewGameDlg::NewGameDlg(TQWidget* parent) l = new TQHBoxLayout(topLayout); l->addWidget(new TQLabel(i18n("Players' starting money:"), plainPage())); - moneyOfPlayers = new TQLineEdit(TQString("%1").tqarg(money), plainPage()); + moneyOfPlayers = new TQLineEdit(TQString("%1").arg(money), plainPage()); moneyOfPlayers->setValidator( new KIntValidator( 0,999999,moneyOfPlayers ) ); l->addWidget(moneyOfPlayers); @@ -127,7 +127,7 @@ void NewGameDlg::setPlayerNames(int no, TQString playerName) player1Name->setText(kapp->config()->readEntry("Name_0", i18n("You"))); computerNames->clear(); for (int i = 1; i < MAX_PLAYERS; i++) { - computerNames->insertItem(kapp->config()->readEntry(TQString("Name_%1").tqarg(i), i18n("Computer %1").tqarg(i))); + computerNames->insertItem(kapp->config()->readEntry(TQString("Name_%1").arg(i), i18n("Computer %1").arg(i))); } } else if (no == 0) { player1Name->setText(playerName); diff --git a/kpoker/playerbox.cpp b/kpoker/playerbox.cpp index 2c2d7789..66ffd5a7 100644 --- a/kpoker/playerbox.cpp +++ b/kpoker/playerbox.cpp @@ -91,7 +91,7 @@ PlayerBox::PlayerBox(bool playerOne, TQWidget* parent, const char* name) } TQToolTip::add(m_cashLabel, - i18n("Money of %1").tqarg("Player"));//change via showName() + i18n("Money of %1").arg("Player"));//change via showName() // Assume that we have a multiplayer game. m_singlePlayer = false; @@ -122,7 +122,7 @@ void PlayerBox::showCash() { // Show the amount of cash the player has. m_cashLabel->setText(i18n("Cash: %1") - .tqarg(KGlobal::locale()->formatMoney(m_player->getCash()))); + .arg(KGlobal::locale()->formatMoney(m_player->getCash()))); // Show how much we have bet during this round. if (m_player->out()) @@ -130,10 +130,10 @@ void PlayerBox::showCash() else { if (m_singlePlayer) m_betLabel->setText(i18n("Cash per round: %1") - .tqarg(KGlobal::locale()->formatMoney(m_cashPerRound))); + .arg(KGlobal::locale()->formatMoney(m_cashPerRound))); else m_betLabel->setText(i18n("Bet: %1") - .tqarg(KGlobal::locale()-> formatMoney(m_player->getCurrentBet()))); + .arg(KGlobal::locale()-> formatMoney(m_player->getCurrentBet()))); } } @@ -145,7 +145,7 @@ void PlayerBox::showName() { setTitle(m_player->getName()); TQToolTip::remove(m_cashLabel); - TQToolTip::add(m_cashLabel, i18n("Money of %1").tqarg(m_player->getName())); + TQToolTip::add(m_cashLabel, i18n("Money of %1").arg(m_player->getName())); } diff --git a/kreversi/Move.cpp b/kreversi/Move.cpp index f1f50872..3916925e 100644 --- a/kreversi/Move.cpp +++ b/kreversi/Move.cpp @@ -66,7 +66,7 @@ TQString SimpleMove::asString() const if (m_x == -1) return TQString("pass"); else - return TQString("%1%2").tqarg(" ABCDEFGH"[m_x]).tqarg(" 12345678"[m_y]); + return TQString("%1%2").arg(" ABCDEFGH"[m_x]).arg(" 12345678"[m_y]); } diff --git a/kreversi/board.cpp b/kreversi/board.cpp index d24dccd1..8950fc8f 100644 --- a/kreversi/board.cpp +++ b/kreversi/board.cpp @@ -308,7 +308,7 @@ void QReversiBoardView::updateBoard (bool force) // If we are showing legal moves, we have to erase the old ones // before we can show the new ones. The easiest way to do that is - // to tqrepaint everything. + // to repaint everything. // // FIXME: A better way, perhaps, is to do the repainting in // drawPiece (which should be renamed drawSquare). @@ -498,7 +498,7 @@ void QReversiBoardView::drawOnePiece(uint row, uint col, int i) } -// We got a tqrepaint event. We make it easy for us and redraw the +// We got a repaint event. We make it easy for us and redraw the // entire board. // diff --git a/kreversi/kreversi.cpp b/kreversi/kreversi.cpp index 4c72251b..eee245b0 100644 --- a/kreversi/kreversi.cpp +++ b/kreversi/kreversi.cpp @@ -329,9 +329,9 @@ void KReversi::slotUndo() } if (m_game->toMove() == computerColor()) { - // Must tqrepaint so that the new move is not shown before the old + // Must repaint so that the new move is not shown before the old // one is removed on the screen. - m_gameView->tqrepaint(); + m_gameView->repaint(); computerMakeMove(); } else @@ -609,21 +609,21 @@ void KReversi::showGameOver(Color color) if ( color == Nobody ) { KNotifyClient::event(winId(), "draw", i18n("Draw!")); TQString s = i18n("Game is drawn!\n\nYou : %1\nComputer: %2") - .tqarg(human).tqarg(computer); + .arg(human).arg(computer); KMessageBox::information(this, s, i18n("Game Ended")); score.setType(KExtHighscore::Draw); } else if ( humanColor() == color ) { KNotifyClient::event(winId(), "won", i18n("Game won!")); TQString s = i18n("Congratulations, you have won!\n\nYou : %1\nComputer: %2") - .tqarg(human).tqarg(computer); + .arg(human).arg(computer); KMessageBox::information(this, s, i18n("Game Ended")); score.setType(KExtHighscore::Won); } else { KNotifyClient::event(winId(), "lost", i18n("Game lost!")); TQString s = i18n("You have lost the game!\n\nYou : %1\nComputer: %2") - .tqarg(human).tqarg(computer); + .arg(human).arg(computer); KMessageBox::information(this, s, i18n("Game Ended")); score.setType(KExtHighscore::Lost); } diff --git a/kreversi/qreversigameview.cpp b/kreversi/qreversigameview.cpp index 0d0ea728..7581ddf0 100644 --- a/kreversi/qreversigameview.cpp +++ b/kreversi/qreversigameview.cpp @@ -213,10 +213,10 @@ void QReversiGameView::moveMade(uint moveNum, Move &move) // Insert the new move in the listbox and mark it as the current one. m_movesView->insertItem(TQString("%1. %2 %3") - .tqarg(moveNum) - .tqarg(Prefs::grayscale() ? colorsWB[move.color()] + .arg(moveNum) + .arg(Prefs::grayscale() ? colorsWB[move.color()] : colorsRB[move.color()]) - .tqarg(move.asString())); + .arg(move.asString())); m_movesView->setCurrentItem(moveNum - 1); m_movesView->ensureCurrentVisible(); diff --git a/kreversi/settings.ui b/kreversi/settings.ui index fe7dc1a5..ead4757a 100644 --- a/kreversi/settings.ui +++ b/kreversi/settings.ui @@ -143,7 +143,7 @@ Beginner - + AlignVCenter|AlignLeft @@ -154,7 +154,7 @@ Expert - + AlignVCenter|AlignRight @@ -165,7 +165,7 @@ Average - + AlignCenter @@ -189,7 +189,7 @@ Slow - + AlignVCenter|AlignLeft @@ -200,7 +200,7 @@ Fast - + AlignVCenter|AlignRight diff --git a/ksame/KSameWidget.cpp b/ksame/KSameWidget.cpp index 4cbcad57..a49db4f7 100644 --- a/ksame/KSameWidget.cpp +++ b/ksame/KSameWidget.cpp @@ -121,11 +121,11 @@ void KSameWidget::showNumberRemainingToggled() if(showNumberRemaining->isChecked()){ TQStringList list; for(int i=1;i<=stone->colors();i++) - list.append(TQString("%1").tqarg(stone->count(i))); - TQString count = TQString(" (%1)").tqarg(list.join(",")); - status->changeItem(i18n("%1 Colors%2").tqarg(stone->colors()).tqarg(count),1); + list.append(TQString("%1").arg(stone->count(i))); + TQString count = TQString(" (%1)").arg(list.join(",")); + status->changeItem(i18n("%1 Colors%2").arg(stone->colors()).arg(count),1); } - else status->changeItem(i18n("%1 Colors").tqarg(stone->colors()),1); + else status->changeItem(i18n("%1 Colors").arg(stone->colors()),1); KConfig *cfg = kapp->config(); cfg->writeEntry("showRemaining", showNumberRemaining->isChecked()); @@ -188,15 +188,15 @@ void KSameWidget::m_showhs() { } void KSameWidget::setColors(int colors) { - status->changeItem(i18n("%1 Colors").tqarg(colors),1); + status->changeItem(i18n("%1 Colors").arg(colors),1); } void KSameWidget::setBoard(int board) { - status->changeItem(i18n("Board: %1").tqarg(board, 6), 2); + status->changeItem(i18n("Board: %1").arg(board, 6), 2); } void KSameWidget::setMarked(int m) { - status->changeItem(i18n("Marked: %1").tqarg(m, 6),3); + status->changeItem(i18n("Marked: %1").arg(m, 6),3); m_markedStones=m; } @@ -209,11 +209,11 @@ void KSameWidget::setScore(int score) { if(showNumberRemaining->isChecked()){ TQStringList list; for(int i=1;i<=stone->colors();i++) - list.append(TQString("%1").tqarg(stone->count(i))); - TQString count = TQString(" (%1)").tqarg(list.join(",")); - status->changeItem(i18n("%1 Colors%2").tqarg(stone->colors()).tqarg(count),1); + list.append(TQString("%1").arg(stone->count(i))); + TQString count = TQString(" (%1)").arg(list.join(",")); + status->changeItem(i18n("%1 Colors%2").arg(stone->colors()).arg(count),1); } - status->changeItem(i18n("Score: %1").tqarg(score, 6),4); + status->changeItem(i18n("Score: %1").arg(score, 6),4); undo->setEnabled(stone->undoPossible()); restart->setEnabled(!stone->isOriginalBoard()); } @@ -222,11 +222,11 @@ void KSameWidget::gameover() { if (stone->hasBonus()) { KNotifyClient::event(winId(), "game won", i18n("You even removed the last stone, great job! " - "This gave you a score of %1 in total.").tqarg(stone->score())); + "This gave you a score of %1 in total.").arg(stone->score())); } else { KNotifyClient::event(winId(), "game over", i18n("There are no more removeable stones. " - "You got a score of %1 in total.").tqarg(stone->score())); + "You got a score of %1 in total.").arg(stone->score())); } stone->unmark(); KScoreDialog d(KScoreDialog::Name | KScoreDialog::Score, this); diff --git a/kshisen/app.cpp b/kshisen/app.cpp index 5f54a75d..98a40dde 100644 --- a/kshisen/app.cpp +++ b/kshisen/app.cpp @@ -299,9 +299,9 @@ void App::slotEndOfGame() else { TQString s = i18n("Congratulations! You made it in %1:%2:%3") - .tqarg(TQString().sprintf("%02d", board->getTimeForGame()/3600)) - .tqarg(TQString().sprintf("%02d", (board->getTimeForGame() / 60) % 60)) - .tqarg(TQString().sprintf("%02d", board->getTimeForGame() % 60)); + .arg(TQString().sprintf("%02d", board->getTimeForGame()/3600)) + .arg(TQString().sprintf("%02d", (board->getTimeForGame() / 60) % 60)) + .arg(TQString().sprintf("%02d", board->getTimeForGame() % 60)); KMessageBox::information(this, s, i18n("End of Game")); } @@ -315,18 +315,18 @@ void App::updateScore() { int t = board->getTimeForGame(); TQString s = i18n(" Your time: %1:%2:%3 %4") - .tqarg(TQString().sprintf("%02d", t / 3600 )) - .tqarg(TQString().sprintf("%02d", (t / 60) % 60 )) - .tqarg(TQString().sprintf("%02d", t % 60 )) - .tqarg(board->isPaused()?i18n("(Paused) "):TQString()); + .arg(TQString().sprintf("%02d", t / 3600 )) + .arg(TQString().sprintf("%02d", (t / 60) % 60 )) + .arg(TQString().sprintf("%02d", t % 60 )) + .arg(board->isPaused()?i18n("(Paused) "):TQString()); statusBar()->changeItem(s, SBI_TIME); // Number of tiles int tl = (board->x_tiles() * board->y_tiles()); s = i18n(" Removed: %1/%2 ") - .tqarg(TQString().sprintf("%d", tl - board->tilesLeft())) - .tqarg(TQString().sprintf("%d", tl )); + .arg(TQString().sprintf("%d", tl - board->tilesLeft())) + .arg(TQString().sprintf("%d", tl )); statusBar()->changeItem(s, SBI_TILES); } @@ -685,8 +685,8 @@ void App::showHighscore(int focusitem) if(i < highscore.size()) { s = TQString("%1 %2") - .tqarg(getScore(hs)) - .tqarg(hs.gravity ? i18n("(gravity)") : TQString("")); + .arg(getScore(hs)) + .arg(hs.gravity ? i18n("(gravity)") : TQString("")); } else { diff --git a/kshisen/board.cpp b/kshisen/board.cpp index a7d39640..ae2fd750 100644 --- a/kshisen/board.cpp +++ b/kshisen/board.cpp @@ -444,7 +444,7 @@ void Board::updateField(int x, int y, bool erase) tiles.tileWidth(), tiles.tileHeight()); - tqrepaint(r, erase); + repaint(r, erase); } void Board::paintEvent(TQPaintEvent *e) @@ -900,7 +900,7 @@ void Board::dumpBoard() const if(tile == EMPTY) row += " --"; else - row += TQString("%1").tqarg(getField(x, y), 3); + row += TQString("%1").arg(getField(x, y), 3); } kdDebug() << row << endl; } diff --git a/kshisen/settings.ui b/kshisen/settings.ui index d0c9f2b3..9fdac201 100644 --- a/kshisen/settings.ui +++ b/kshisen/settings.ui @@ -78,7 +78,7 @@ Hard - + AlignVCenter|AlignRight @@ -130,7 +130,7 @@ Fast - + AlignVCenter|AlignRight @@ -170,7 +170,7 @@ 18x8 - + AlignCenter @@ -181,7 +181,7 @@ 26x14 - + AlignCenter @@ -192,7 +192,7 @@ 30x16 - + AlignVCenter|AlignRight @@ -226,7 +226,7 @@ 24x12 - + AlignCenter diff --git a/ksmiletris/gamewidget.cpp b/ksmiletris/gamewidget.cpp index 04d5e543..b0cc3316 100644 --- a/ksmiletris/gamewidget.cpp +++ b/ksmiletris/gamewidget.cpp @@ -206,9 +206,9 @@ void GameWidget::newGame() void GameWidget::repaintChilds() { - screen->tqrepaint(false); - mirror->tqrepaint(false); - next->tqrepaint(false); + screen->repaint(false); + mirror->repaint(false); + next->repaint(false); } void GameWidget::putPiece() @@ -218,7 +218,7 @@ void GameWidget::putPiece() if (piece[2] != bg_sprite) ref(xpos + 0, ypos + 1) = piece[2]; if (piece[3] != bg_sprite) ref(xpos + 1, ypos + 1) = piece[3]; updateMirror(); - screen->tqrepaint(false); + screen->repaint(false); } void GameWidget::getPiece() @@ -241,7 +241,7 @@ void GameWidget::newPiece() next_piece[i] = (Sprite)(Sprite_Block1 + random.getLong(num_pieces_level)); else next_piece[i] = bg_sprite; - next->tqrepaint(false); + next->repaint(false); } void GameWidget::nextPiece() @@ -272,7 +272,7 @@ void GameWidget::updateMirror() mirror_sprites[x] = bg_sprite; mirror_sprites[xpos] = piece[2] == bg_sprite ? piece[0] : piece[2]; mirror_sprites[xpos+1] = piece[3] == bg_sprite ? piece[1] : piece[3]; - mirror->tqrepaint(false); + mirror->repaint(false); } void GameWidget::keyUp() @@ -390,7 +390,7 @@ void GameWidget::broke(int x, int y, bool *xmap) emit changedStats(num_level, num_points); #ifdef HAVE_USLEEP - screen->tqrepaint(false); + screen->repaint(false); usleep(75 * 1000); #endif } diff --git a/ksmiletris/gamewindow.cpp b/ksmiletris/gamewindow.cpp index 2d5824c8..004c60e2 100644 --- a/ksmiletris/gamewindow.cpp +++ b/ksmiletris/gamewindow.cpp @@ -182,8 +182,8 @@ void GameWindow::updateStats(int level, int points) TQString l, p; l.setNum(level); p.setNum(points); - status->changeItem(i18n("Level: %1").tqarg(l), 1); - status->changeItem(i18n("Score: %1").tqarg(p), 2); + status->changeItem(i18n("Level: %1").arg(l), 1); + status->changeItem(i18n("Score: %1").arg(p), 2); } void GameWindow::gameOver() diff --git a/ksnake/ball.cpp b/ksnake/ball.cpp index dc86d7a0..2881beb9 100644 --- a/ksnake/ball.cpp +++ b/ksnake/ball.cpp @@ -73,7 +73,7 @@ void Ball::nextMove() } } -void Ball::tqrepaint() +void Ball::repaint() { static int i = 0; static bool rotate = true; diff --git a/ksnake/ball.h b/ksnake/ball.h index 609eef95..e7796354 100644 --- a/ksnake/ball.h +++ b/ksnake/ball.h @@ -33,7 +33,7 @@ public: Ball(Board *b, PixServer *p); virtual ~Ball(){} virtual void nextMove(); - void tqrepaint(); + void repaint(); void zero(); protected: Board *board; diff --git a/ksnake/basket.cpp b/ksnake/basket.cpp index 8d124a45..138336cd 100644 --- a/ksnake/basket.cpp +++ b/ksnake/basket.cpp @@ -81,7 +81,7 @@ void Basket::newApples() } } -void Basket::tqrepaint(bool dirty ) +void Basket::repaint(bool dirty ) { Kaffee *g; for ( g = list->first(); g != 0; g = list->next()) { diff --git a/ksnake/basket.h b/ksnake/basket.h index 18386acc..5275d8a8 100644 --- a/ksnake/basket.h +++ b/ksnake/basket.h @@ -56,7 +56,7 @@ class Basket : public TQObject public: Basket(Board *b, PixServer *p); ~Basket(); - void tqrepaint(bool); + void repaint(bool); void newApples(); void clear(); Fruits eaten( int i); diff --git a/ksnake/game.cpp b/ksnake/game.cpp index c1f66680..dfae1a4b 100644 --- a/ksnake/game.cpp +++ b/ksnake/game.cpp @@ -88,11 +88,11 @@ Game::~Game() } void Game::scoreChanged(int score){ - statusBar()->changeItem(i18n("Score: %1").tqarg(score), SCORE); + statusBar()->changeItem(i18n("Score: %1").arg(score), SCORE); } void Game::setTrys(int tries){ - statusBar()->changeItem(i18n("Lives: %1").tqarg(tries), LIVES); + statusBar()->changeItem(i18n("Lives: %1").arg(tries), LIVES); } void Game::gameEnd(int score){ diff --git a/ksnake/general.ui b/ksnake/general.ui index e3a50cce..9d1eff19 100644 --- a/ksnake/general.ui +++ b/ksnake/general.ui @@ -59,7 +59,7 @@ Fast - + AlignVCenter|AlignRight diff --git a/ksnake/pixServer.cpp b/ksnake/pixServer.cpp index ed9a2113..244ff17d 100644 --- a/ksnake/pixServer.cpp +++ b/ksnake/pixServer.cpp @@ -181,7 +181,7 @@ void PixServer::initBrickPixmap() { TQPixmap pm = TQPixmap(locate("appdata", "pics/brick.png")); if (pm.isNull()) { - kdFatal() << i18n("error loading %1, aborting\n").tqarg("brick.png"); + kdFatal() << i18n("error loading %1, aborting\n").arg("brick.png"); } int pw = pm.width(); int ph = pm.height(); diff --git a/ksnake/rattler.cpp b/ksnake/rattler.cpp index 97c166f8..86ab1528 100644 --- a/ksnake/rattler.cpp +++ b/ksnake/rattler.cpp @@ -114,7 +114,7 @@ void Rattler::paintEvent( TQPaintEvent *e) return; TQPixmap levelPix = pix->levelPix(); - basket->tqrepaint(true); + basket->repaint(true); bitBlt(this, rect.x(), rect.y(), &levelPix, rect.x(), rect.y(), rect.width(), rect.height()); @@ -130,14 +130,14 @@ void Rattler::timerEvent( TQTimerEvent * ) for (CompuSnake *c = computerSnakes->first(); c != 0; c = computerSnakes->next()){ if(c) { c->nextMove(); - c->tqrepaint(false); + c->repaint(false); } } for (Ball *b = balls->first(); b != 0; b = balls->next()){ if (b) { b->nextMove(); - b->tqrepaint(); + b->repaint(); } } @@ -147,10 +147,10 @@ void Rattler::timerEvent( TQTimerEvent * ) if(!gameState.testBit(Demo)) { state = samy->nextMove(direction); - samy->tqrepaint( false ); + samy->repaint( false ); } - basket->tqrepaint( false); + basket->repaint( false); if (state == ko) newTry(); @@ -313,7 +313,7 @@ void Rattler::pause() label = new TQLabel(this); label->setFont( TQFont( "Times", 14, TQFont::Bold ) ); label->setText(i18n("Game Paused\n Press %1 to resume\n") - .tqarg(tempPauseAction->shortcutText())); + .arg(tempPauseAction->shortcutText())); label->setAlignment( AlignCenter ); label->setFrameStyle( TQFrame::Panel | TQFrame::Raised ); label->setGeometry(182, 206, 198, 80); @@ -351,7 +351,7 @@ void Rattler::restartDemo() level->create(Intro); pix->initRoomPixmap(); init(false); - tqrepaint(); + repaint(); start(); } @@ -374,7 +374,7 @@ void Rattler::demo() level->create(Intro); pix->initRoomPixmap(); } - tqrepaint(rect(), false); + repaint(rect(), false); init(false); run(); first_time = false; @@ -413,7 +413,7 @@ void Rattler::restart() cleanLabel(); - tqrepaint(); + repaint(); TQTimer::singleShot( 2000, this, TQT_SLOT(showRoom()) ); } @@ -426,7 +426,7 @@ void Rattler::newTry() gameState.setBit(Over); level->create(GameOver); pix->initRoomPixmap(); - tqrepaint(); + repaint(); TQTimer::singleShot( 5000, this, TQT_SLOT(demo()) ); emit setScore(points); return; @@ -439,7 +439,7 @@ void Rattler::newTry() level->create(Room); pix->initRoomPixmap(); init(true); - tqrepaint(); + repaint(); TQTimer::singleShot( 1000, this, TQT_SLOT(run()) ); } @@ -456,7 +456,7 @@ void Rattler::levelUp() level->nextLevel(); level->create(Banner); pix->initRoomPixmap(); - tqrepaint(); + repaint(); TQTimer::singleShot( 2000, this, TQT_SLOT(showRoom()) ); } @@ -493,7 +493,7 @@ void Rattler::showRoom() level->create(Room); pix->initRoomPixmap(); init(true); - tqrepaint(); + repaint(); TQTimer::singleShot( 1000, this, TQT_SLOT(run()) ); } diff --git a/ksnake/snake.cpp b/ksnake/snake.cpp index 2d6337ac..c892452b 100644 --- a/ksnake/snake.cpp +++ b/ksnake/snake.cpp @@ -143,7 +143,7 @@ void Snake::reset(int index, int border) } } -void Snake::tqrepaint( bool dirty) +void Snake::repaint( bool dirty) { int x = 0; for ( Samy *sam = list.first(); sam != 0; sam = list.next(), x++) { diff --git a/ksnake/snake.h b/ksnake/snake.h index 206ea126..9b5c1087 100644 --- a/ksnake/snake.h +++ b/ksnake/snake.h @@ -46,7 +46,7 @@ signals: public: Snake(Board *b, PixServer *p, Gate g, PixMap x); ~Snake() {} - void tqrepaint( bool ); + void repaint( bool ); void zero(); protected: diff --git a/ksokoban/PlayField.cpp b/ksokoban/PlayField.cpp index c3fe57fe..77c3b69b 100644 --- a/ksokoban/PlayField.cpp +++ b/ksokoban/PlayField.cpp @@ -599,7 +599,7 @@ PlayField::keyPressEvent(TQKeyEvent * e) { case Key_X: levelMap_->random(); levelChange(); - tqrepaint(false); + repaint(false); break; case Key_R: @@ -620,7 +620,7 @@ PlayField::keyPressEvent(TQKeyEvent * e) { break; case Key_I: history_->redo(levelMap_); - tqrepaint(false); + repaint(false); return; break; @@ -644,7 +644,7 @@ PlayField::keyPressEvent(TQKeyEvent * e) { } updateStepsXpm(); updatePushesXpm(); - tqrepaint(false); + repaint(false); return; break; #endif @@ -855,7 +855,7 @@ this level yet."), this); level(levelMap_->level()+1); levelChange(); - tqrepaint(false); + repaint(false); } void @@ -868,7 +868,7 @@ the current collection."), this); } level(levelMap_->level()-1); levelChange(); - tqrepaint(false); + repaint(false); } void @@ -892,7 +892,7 @@ PlayField::restartLevel() { level(levelMap_->level()); updateStepsXpm(); updatePushesXpm(); - tqrepaint(false); + repaint(false); } void @@ -901,7 +901,7 @@ PlayField::changeCollection(LevelCollection *collection) { levelMap_->changeCollection(collection); levelChange(); //erase(collRect_); - tqrepaint(false); + repaint(false); } void @@ -1030,7 +1030,7 @@ PlayField::goToBookmark(Bookmark *bm) { //updateLevelXpm(); updateStepsXpm(); updatePushesXpm(); - tqrepaint(false); + repaint(false); } bool diff --git a/kspaceduel/mainview.cpp b/kspaceduel/mainview.cpp index 63d1c666..5b02fc75 100644 --- a/kspaceduel/mainview.cpp +++ b/kspaceduel/mainview.cpp @@ -492,7 +492,7 @@ void MyMainView::newRound() field.update(); TQString str = i18n("Press %1 to start") - .tqarg(KShortcut(GAME_START_SHORTCUT).toString()); + .arg(KShortcut(GAME_START_SHORTCUT).toString()); emit(setStatusText(str,IDS_MAIN)); emit( setStatusText( "", IDS_PAUSE ) ); stop( ); @@ -557,7 +557,7 @@ void MyMainView::timerEvent(TQTimerEvent *event) emit(wins(0,w)); } TQString str = i18n("Press %1 for new round") - .tqarg(KShortcut(GAME_START_SHORTCUT).toString()); + .arg(KShortcut(GAME_START_SHORTCUT).toString()); emit(setStatusText(str,IDS_MAIN)); stop( ); } diff --git a/kspaceduel/playerinfo.cpp b/kspaceduel/playerinfo.cpp index 38d9a68e..2e1ef91d 100644 --- a/kspaceduel/playerinfo.cpp +++ b/kspaceduel/playerinfo.cpp @@ -35,8 +35,8 @@ PlayerInfo::PlayerInfo(int pnr,TQWidget *parent,const char *name) for(i=0;i<4;i++) { str = TQString::fromLatin1("sprites/playerinfo/ship%1%2.pnm") - .tqarg(pnr+1) - .tqarg(i); + .arg(pnr+1) + .arg(i); pix[i]=new TQPixmap(locate("appdata", str)); } diff --git a/ktron/appearance.ui b/ktron/appearance.ui index c97ccb04..0c817317 100644 --- a/ktron/appearance.ui +++ b/ktron/appearance.ui @@ -90,7 +90,7 @@ Large - + AlignVCenter|AlignRight @@ -101,7 +101,7 @@ Small - + AlignVCenter|AlignLeft @@ -112,7 +112,7 @@ Medium - + AlignCenter diff --git a/ktron/general.ui b/ktron/general.ui index c89b4b01..2db1b4ae 100644 --- a/ktron/general.ui +++ b/ktron/general.ui @@ -175,7 +175,7 @@ Default - + AlignCenter @@ -186,7 +186,7 @@ Fast - + AlignVCenter|AlignRight diff --git a/ktron/ktron.cpp b/ktron/ktron.cpp index 91ccdcc5..31437999 100644 --- a/ktron/ktron.cpp +++ b/ktron/ktron.cpp @@ -108,12 +108,12 @@ void KTron::updateStatusbar(){ TQString name; if(tron->isComputer(Both)) - name=i18n("Computer(%1)").tqarg(i+1); + name=i18n("Computer(%1)").arg(i+1); else if(tron->isComputer(player)) name=i18n("Computer"); else name=playerName[i]; - TQString string = TQString("%1: %2").tqarg(name).tqarg(playerPoints[i]); + TQString string = TQString("%1: %2").arg(name).arg(playerPoints[i]); statusBar()->changeItem(string,ID_STATUS_BASE+i+1); } } @@ -158,12 +158,12 @@ void KTron::showWinner(Player winner){ if(!tron->isComputer(winner)) winnerName = playerName[winner]; - TQString message=i18n("%1 has won!").tqarg(winnerName); + TQString message=i18n("%1 has won!").arg(winnerName); statusBar()->message(message,MESSAGE_TIME); message = i18n("%1 has won versus %2 with %3 : %4 points!"); - message=message.tqarg(winnerName).tqarg(loserName); - message=message.tqarg(playerPoints[winner]).tqarg(playerPoints[loser]); + message=message.arg(winnerName).arg(loserName); + message=message.arg(playerPoints[winner]).arg(playerPoints[loser]); KMessageBox::information(this, message, i18n("Winner")); tron->newGame(); diff --git a/ktron/tron.cpp b/ktron/tron.cpp index 4f40dc99..40a384e4 100644 --- a/ktron/tron.cpp +++ b/ktron/tron.cpp @@ -81,7 +81,7 @@ void Tron::loadSettings(){ // Style if(pixmap){ updatePixmap(); - tqrepaint(); + repaint(); } // Backgroundimage @@ -96,7 +96,7 @@ void Tron::loadSettings(){ setBackgroundPix(pix); } else { TQString msg=i18n("Wasn't able to load wallpaper\n%1"); - msg=msg.tqarg(tmpFile); + msg=msg.arg(tmpFile); KMessageBox::sorry(this, msg); } KIO::NetAccess::removeTempFile(tmpFile); @@ -268,7 +268,7 @@ void Tron::showWinner(Player player) updatePixmap(); } - tqrepaint(); + repaint(); emit gameEnds(player); @@ -810,7 +810,7 @@ void Tron::showBeginHint() if(players[0].score==0 && players[1].score==0) { beginHint=true; - tqrepaint(); + repaint(); } } } diff --git a/ktuberling/playground.cpp b/ktuberling/playground.cpp index 586f143f..62d2b107 100644 --- a/ktuberling/playground.cpp +++ b/ktuberling/playground.cpp @@ -94,7 +94,7 @@ void PlayGround::repaintAll() editableArea.width() + 20, editableArea.height() + 20); - tqrepaint(dirtyArea, false); + repaint(dirtyArea, false); } // Undo last action @@ -255,10 +255,10 @@ void PlayGround::mousePressEvent( TQMouseEvent *event ) int draggedNumber = draggedObject.getNumber(); TQPixmap object(objectsLayout[draggedNumber].size()); - TQBitmap tqshape(objectsLayout[draggedNumber].size()); + TQBitmap shape(objectsLayout[draggedNumber].size()); bitBlt(&object, TQPoint(0, 0), &gameboard, objectsLayout[draggedNumber], TQt::CopyROP); - bitBlt(&tqshape, TQPoint(0, 0), &masks, objectsLayout[draggedNumber], TQt::CopyROP); - object.setMask(tqshape); + bitBlt(&shape, TQPoint(0, 0), &masks, objectsLayout[draggedNumber], TQt::CopyROP); + object.setMask(shape); draggedCursor = new TQCursor(object, position.x(), position.y()); setCursor(*draggedCursor); @@ -320,7 +320,7 @@ void PlayGround::mouseReleaseEvent( TQMouseEvent *event ) // Repaint the editable area position.moveBy(XMARGIN, YMARGIN); - tqrepaint(position, false); + repaint(position, false); } @@ -506,7 +506,7 @@ void PlayGround::loadFailure() exit(-1); } -// Set up play ground's tqgeometry +// Set up play ground's geometry void PlayGround::setupGeometry() { int width = gameboard.width() + 2 * XMARGIN, @@ -547,15 +547,15 @@ bool PlayGround::zone(TQPoint &position) draggedObject = *currentObject; draggedNumber = draggedObject.getNumber(); - TQBitmap tqshape(objectsLayout[draggedNumber].size()); + TQBitmap shape(objectsLayout[draggedNumber].size()); TQPoint relative(position.x() - toUpdate.x(), position.y() - toUpdate.y()); - bitBlt(&tqshape, TQPoint(0, 0), &masks, objectsLayout[draggedNumber], TQt::CopyROP); - if (!tqshape.convertToImage().pixelIndex(relative.x(), relative.y())) continue; + bitBlt(&shape, TQPoint(0, 0), &masks, objectsLayout[draggedNumber], TQt::CopyROP); + if (!shape.convertToImage().pixelIndex(relative.x(), relative.y())) continue; toDraw.remove(draggedZOrder); toUpdate.moveBy(XMARGIN, YMARGIN); - tqrepaint(toUpdate, false); + repaint(toUpdate, false); position = relative; diff --git a/ktuberling/playground.h b/ktuberling/playground.h index 4bd8c210..2883ff1f 100644 --- a/ktuberling/playground.h +++ b/ktuberling/playground.h @@ -62,7 +62,7 @@ private: private: TQPixmap gameboard; // Picture of the game board - TQBitmap masks; // Pictures of the objects' tqshapes + TQBitmap masks; // Pictures of the objects' shapes TQRect editableArea; // Part of the gameboard where the player can lay down objects TQString menuItem, // Menu item describing describing this gameboard editableSound; // Sound associated with this area @@ -73,7 +73,7 @@ private: TQString *textsList, // List of the message numbers associated with categories *soundsList; // List of sounds associated with each object - TQCursor *draggedCursor; // Cursor's tqshape for currently dragged object + TQCursor *draggedCursor; // Cursor's shape for currently dragged object ToDraw draggedObject; // Object currently dragged int draggedZOrder; // Z-order (in to-draw buffer) of this object diff --git a/ktuberling/todraw.cpp b/ktuberling/todraw.cpp index cec7b014..2523a203 100644 --- a/ktuberling/todraw.cpp +++ b/ktuberling/todraw.cpp @@ -49,11 +49,11 @@ void ToDraw::draw(TQPainter &artist, const TQRect &area, if (!position.intersects(area)) return; TQPixmap objectPixmap(objectsLayout[number].size()); - TQBitmap tqshapeBitmap(objectsLayout[number].size()); + TQBitmap shapeBitmap(objectsLayout[number].size()); bitBlt(&objectPixmap, TQPoint(0, 0), gameboard, objectsLayout[number], TQt::CopyROP); - bitBlt(&tqshapeBitmap, TQPoint(0, 0), masks, objectsLayout[number], TQt::CopyROP); - objectPixmap.setMask(tqshapeBitmap); + bitBlt(&shapeBitmap, TQPoint(0, 0), masks, objectsLayout[number], TQt::CopyROP); + objectPixmap.setMask(shapeBitmap); artist.drawPixmap(position.topLeft(), objectPixmap); } diff --git a/ktuberling/toplevel.cpp b/ktuberling/toplevel.cpp index fc0939f0..ab7eb9dd 100644 --- a/ktuberling/toplevel.cpp +++ b/ktuberling/toplevel.cpp @@ -408,9 +408,9 @@ void TopLevel::filePrint() KPrinter printer; bool ok; - ok = printer.setup(this, i18n("Print %1").tqarg(actionCollection()->action(gameboardActions[selectedGameboard].latin1())->plainText())); + ok = printer.setup(this, i18n("Print %1").arg(actionCollection()->action(gameboardActions[selectedGameboard].latin1())->plainText())); if (!ok) return; - playGround->tqrepaint(true); + playGround->repaint(true); if (!playGround->printPicture(printer)) KMessageBox::error(this, i18n("Could not print picture.")); diff --git a/libksirtet/base/field.cpp b/libksirtet/base/field.cpp index ec5b4f23..f31ec06c 100644 --- a/libksirtet/base/field.cpp +++ b/libksirtet/base/field.cpp @@ -41,8 +41,8 @@ void BaseField::init(bool AI, bool multiplayer, bool server, bool first, _flags.multiplayer = multiplayer; _flags.server = server; _flags.first = first; - TQString text = (AI ? i18n("%1\n(AI player)").tqarg(name) - : (multiplayer ? i18n("%1\n(Human player)").tqarg(name) + TQString text = (AI ? i18n("%1\n(AI player)").arg(name) + : (multiplayer ? i18n("%1\n(Human player)").arg(name) : TQString())); if ( first && !server ) text += i18n("\nWaiting for server"); setMessage(text, (first && server ? StartButton : NoButton)); @@ -128,7 +128,7 @@ void BaseField::stop(bool gameover) if ( board->arcadeStage()==bfactory->bbi.nbArcadeStages ) msg = i18n("The End"); else { - msg = i18n("Stage #%1 done").tqarg(board->arcadeStage()); + msg = i18n("Stage #%1 done").arg(board->arcadeStage()); button = ProceedButton; } } diff --git a/libksirtet/common/ai.cpp b/libksirtet/common/ai.cpp index 3960291e..3f48035f 100644 --- a/libksirtet/common/ai.cpp +++ b/libksirtet/common/ai.cpp @@ -343,14 +343,14 @@ TQCString AIConfig::coefficientKey(const char *name) double AIConfig::coefficient(const AI::Data &data) { - KConfigSkeletonItem *item = CommonPrefs::self()->findItem( TQString("Coefficient_%1").tqarg(data.name) ); + KConfigSkeletonItem *item = CommonPrefs::self()->findItem( TQString("Coefficient_%1").arg(data.name) ); assert(item); return item->property().toDouble(); } int AIConfig::trigger(const AI::Data &data) { - KConfigSkeletonItem *item = CommonPrefs::self()->findItem( TQString("Trigger_%1").tqarg(data.name) ); + KConfigSkeletonItem *item = CommonPrefs::self()->findItem( TQString("Trigger_%1").arg(data.name) ); assert(item); return item->property().toInt(); } diff --git a/libksirtet/common/highscores.cpp b/libksirtet/common/highscores.cpp index fb1642c0..bd9be550 100644 --- a/libksirtet/common/highscores.cpp +++ b/libksirtet/common/highscores.cpp @@ -23,13 +23,13 @@ void CommonHighscores::convertLegacy(uint) KConfigGroupSaver cg(kapp->config(), "High Scores"); for (uint i=0; i<10; i++) { TQString name - = cg.config()->readEntry(TQString("name%1").tqarg(i), TQString()); + = cg.config()->readEntry(TQString("name%1").arg(i), TQString()); if ( name.isNull() ) break; if ( name.isEmpty() ) name = i18n("anonymous"); uint score - = cg.config()->readUnsignedNumEntry(TQString("score%1").tqarg(i), 0); + = cg.config()->readUnsignedNumEntry(TQString("score%1").arg(i), 0); uint level - = cg.config()->readUnsignedNumEntry(TQString("level%1").tqarg(i), 1); + = cg.config()->readUnsignedNumEntry(TQString("level%1").arg(i), 1); Score s(Won); s.setScore(score); s.setData("name", name); diff --git a/libksirtet/common/misc_ui.cpp b/libksirtet/common/misc_ui.cpp index f6426a4d..376c0c57 100644 --- a/libksirtet/common/misc_ui.cpp +++ b/libksirtet/common/misc_ui.cpp @@ -88,9 +88,9 @@ class Led : public TQWidget { return TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); } TQSize sizeHint() const { return TQSize(LED_WIDTH, LED_HEIGHT); } - void on() { if (!_on) { _on = TRUE; tqrepaint(); } } - void off() { if (_on) {_on = FALSE; tqrepaint(); } } - void setColor(const TQColor &c) { if (c!=col) { col = c; tqrepaint(); } } + void on() { if (!_on) { _on = TRUE; repaint(); } } + void off() { if (_on) {_on = FALSE; repaint(); } } + void setColor(const TQColor &c) { if (c!=col) { col = c; repaint(); } } protected: void paintEvent(TQPaintEvent *) { diff --git a/libksirtet/lib/defines.cpp b/libksirtet/lib/defines.cpp index 7eef441e..baf91083 100644 --- a/libksirtet/lib/defines.cpp +++ b/libksirtet/lib/defines.cpp @@ -6,7 +6,7 @@ void errorBox(const TQString &msg1, const TQString &msg2, TQWidget *parent) { TQString str; if ( msg2.isNull() ) str = msg1; - else str = i18n("%1:\n%2").tqarg(msg1).tqarg(msg2); + else str = i18n("%1:\n%2").arg(msg1).arg(msg2); KMessageBox::error(parent, str); } diff --git a/libksirtet/lib/keys.cpp b/libksirtet/lib/keys.cpp index 599f7372..acf4d7ac 100644 --- a/libksirtet/lib/keys.cpp +++ b/libksirtet/lib/keys.cpp @@ -46,7 +46,7 @@ void KeyData::createActionCollection(uint index, TQWidget *receiver) _cols[index] = new KActionCollection(receiver, this); for (uint k=0; k<_data.size(); k++) { TQString label = i18n(_data[k].label); - TQString name = TQString("%2 %3").tqarg(index+1).tqarg(_data[k].name); + TQString name = TQString("%2 %3").arg(index+1).arg(_data[k].name); const char *slot = (_data[k].slotRelease ? 0 : _data[k].slot); KAction *a = new KAction(label, _keycodes[_cols.size()-1][index][k], TQT_TQOBJECT(receiver), slot, _cols[index], name.utf8()); @@ -78,8 +78,8 @@ void KeyData::setEnabled(uint index, bool enabled) void KeyData::addKeys(KKeyDialog &d) { for (uint i=0; i<_cols.size(); i++) - d.insert(_cols[i], i18n("Shortcuts for player #%1/%2").tqarg(i+1) - .tqarg(_cols.size())); + d.insert(_cols[i], i18n("Shortcuts for player #%1/%2").arg(i+1) + .arg(_cols.size())); } void KeyData::save() diff --git a/libksirtet/lib/keys.h b/libksirtet/lib/keys.h index a5227a9b..52099228 100644 --- a/libksirtet/lib/keys.h +++ b/libksirtet/lib/keys.h @@ -37,7 +37,7 @@ class KeyData : public TQObject TQMap _specActions; TQString group() const - { return TQString("Keys (%1 humans)").tqarg(_cols.size()); } + { return TQString("Keys (%1 humans)").arg(_cols.size()); } }; #endif // KEYS_H diff --git a/libksirtet/lib/meeting.cpp b/libksirtet/lib/meeting.cpp index c6c81cbe..58acf205 100644 --- a/libksirtet/lib/meeting.cpp +++ b/libksirtet/lib/meeting.cpp @@ -68,7 +68,7 @@ void NetMeeting::appendLine(const MeetingLineData &pld, bool server) if (pld.own) connect(pl, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChanged(const TQString &))); else message(i18n("A new client has just arrived (#%1)") - .tqarg(wl->size()+1)); + .arg(wl->size()+1)); pl->setData(pld.ed); connect(pl, TQT_SIGNAL(typeChanged(MeetingCheckBox::Type)), TQT_SLOT(typeChanged(MeetingCheckBox::Type))); @@ -241,7 +241,7 @@ void ServerNetMeeting::writeToAll(uint i) void ServerNetMeeting::netError(uint i, const TQString &type) { Q_ASSERT( i!=0 ); - disconnectHost(i, i18n("%1 client #%2: disconnect it").tqarg(type).tqarg(i)); + disconnectHost(i, i18n("%1 client #%2: disconnect it").arg(type).arg(i)); } void ServerNetMeeting::disconnectHost(uint i, const TQString &str) @@ -265,7 +265,7 @@ void ServerNetMeeting::newHost(int) int res = sm[0]->accept(s); if ( res!=0 ) { message(i18n("Failed to accept incoming client:\n%1") - .tqarg(socketError(s))); + .arg(socketError(s))); return; } players.append(NewPlayer); @@ -301,7 +301,7 @@ void ServerNetMeeting::idFlag(uint i) void ServerNetMeeting::endFlag(uint i) { - disconnectHost(i, i18n("Client #%1 has left").tqarg(i)); + disconnectHost(i, i18n("Client #%1 has left").arg(i)); } void ServerNetMeeting::newFlag(uint i) @@ -462,7 +462,7 @@ ClientNetMeeting::ClientNetMeeting(const cId &id, void ClientNetMeeting::netError(uint, const TQString &str) { - cleanReject(i18n("%1 server: aborting connection.").tqarg(str)); + cleanReject(i18n("%1 server: aborting connection.").arg(str)); } void ClientNetMeeting::writeToAll(uint) @@ -529,7 +529,7 @@ void ClientNetMeeting::delFlag(uint) sm[0]->readingStream() >> k; CHECK_READ(0); removeLine(k-1); - message(i18n("Client %1 has left").tqarg(k)); + message(i18n("Client %1 has left").arg(k)); } void ClientNetMeeting::textChanged(const TQString &text) diff --git a/libksirtet/lib/mp_interface.cpp b/libksirtet/lib/mp_interface.cpp index e28ebdf8..1799c270 100644 --- a/libksirtet/lib/mp_interface.cpp +++ b/libksirtet/lib/mp_interface.cpp @@ -100,14 +100,14 @@ void MPInterface::specialLocalGame(uint nbHumans, uint nbAIs) bd.type = (ireadNumEntry(TQString(MP_PLAYER_TYPE).tqarg(i), + cg.config()->readNumEntry(TQString(MP_PLAYER_TYPE).arg(i), PlayerComboBox::None); if ( bd.type==t ) - bd.name = cg.config()->readEntry(TQString(MP_PLAYER_NAME).tqarg(i), + bd.name = cg.config()->readEntry(TQString(MP_PLAYER_NAME).arg(i), TQString()); if ( bd.name.isNull() ) - bd.name = (isetText(i18n("Hu=%1").tqarg(nbh)); - labAI->setText(i18n("AI=%1").tqarg(nba)); + labH->setText(i18n("Hu=%1").arg(nbh)); + labAI->setText(i18n("AI=%1").arg(nba)); lname->setText(bds[0].name); setType(ed.type); setText(ed.text); diff --git a/libksirtet/lib/types.cpp b/libksirtet/lib/types.cpp index 86f7bfba..9d2149d8 100644 --- a/libksirtet/lib/types.cpp +++ b/libksirtet/lib/types.cpp @@ -23,13 +23,13 @@ TQString cId::errorMessage(const cId &id) const case Accepted: return TQString(); case LibIdClash: return i18n("The MultiPlayer library of the server is incompatible") - + str.tqarg(libId).tqarg(id.libId); + + str.arg(libId).arg(id.libId); case GameNameClash: return i18n("Trying to connect a server for another game type") - + str.tqarg(gameName).tqarg(id.gameName); + + str.arg(gameName).arg(id.gameName); case GameIdClash: return i18n("The server game version is incompatible") - + str.tqarg(gameId).tqarg(id.gameId); + + str.arg(gameId).arg(id.gameId); } Q_ASSERT(0); return TQString(); diff --git a/libksirtet/lib/wizard.cpp b/libksirtet/lib/wizard.cpp index 29508e26..a3fd4f2b 100644 --- a/libksirtet/lib/wizard.cpp +++ b/libksirtet/lib/wizard.cpp @@ -94,10 +94,10 @@ void MPWizard::setupLocalPage(const MPGameInfo &gi) Q_ASSERT( gi.maxNbLocalPlayers>0 ); for (uint i=0; ireadNumEntry(TQString(MP_PLAYER_TYPE).tqarg(i), + cg.config()->readNumEntry(TQString(MP_PLAYER_TYPE).arg(i), (i==0 ? PlayerComboBox::Human : PlayerComboBox::None)); - n = cg.config()->readEntry(TQString(MP_PLAYER_NAME).tqarg(i), - i18n("Player #%1").tqarg(i)); + n = cg.config()->readEntry(TQString(MP_PLAYER_NAME).arg(i), + i18n("Player #%1").arg(i)); pl = new PlayerLine(type, n, gi.humanSettingSlot, gi.AISettingSlot, i!=0, gi.AIAllowed, wl); @@ -122,7 +122,7 @@ void MPWizard::setupLocalPage(const MPGameInfo &gi) TQString MPWizard::name(uint i) const { TQString s = wl->widget(i)->name(); - if ( s.length()==0 ) s = i18n("Player #%1").tqarg(i); + if ( s.length()==0 ) s = i18n("Player #%1").arg(i); return s; } @@ -177,7 +177,7 @@ void MPWizard::accept() // do lookup int res = socket->lookup(); if ( checkSocket(res, socket, i18n("Error looking up for \"%1\"") - .tqarg(host), this) ) { + .arg(host), this) ) { delete socket; return; } @@ -206,9 +206,9 @@ void MPWizard::accept() cg.config()->writeEntry(MP_GAMETYPE, (int)type); for (uint i=0; isize(); i++) { - cg.config()->writeEntry(TQString(MP_PLAYER_TYPE).tqarg(i), + cg.config()->writeEntry(TQString(MP_PLAYER_TYPE).arg(i), (int)wl->widget(i)->type()); - cg.config()->writeEntry(TQString(MP_PLAYER_NAME).tqarg(i), name(i)); + cg.config()->writeEntry(TQString(MP_PLAYER_NAME).arg(i), name(i)); } KWizard::accept(); diff --git a/libtdegames/carddecks/convertpysols b/libtdegames/carddecks/convertpysols index f2434475..5ed10b25 100755 --- a/libtdegames/carddecks/convertpysols +++ b/libtdegames/carddecks/convertpysols @@ -2,68 +2,68 @@ cd $1 -convert -format png -tqgeometry "72x96" 01c.gif 1.png -convert -format png -tqgeometry "72x96" 01s.gif 2.png -convert -format png -tqgeometry "72x96" 01h.gif 3.png -convert -format png -tqgeometry "72x96" 01d.gif 4.png +convert -format png -geometry "72x96" 01c.gif 1.png +convert -format png -geometry "72x96" 01s.gif 2.png +convert -format png -geometry "72x96" 01h.gif 3.png +convert -format png -geometry "72x96" 01d.gif 4.png -convert -format png -tqgeometry "72x96" 13c.gif 5.png -convert -format png -tqgeometry "72x96" 13s.gif 6.png -convert -format png -tqgeometry "72x96" 13h.gif 7.png -convert -format png -tqgeometry "72x96" 13d.gif 8.png +convert -format png -geometry "72x96" 13c.gif 5.png +convert -format png -geometry "72x96" 13s.gif 6.png +convert -format png -geometry "72x96" 13h.gif 7.png +convert -format png -geometry "72x96" 13d.gif 8.png -convert -format png -tqgeometry "72x96" 12c.gif 9.png -convert -format png -tqgeometry "72x96" 12s.gif 10.png -convert -format png -tqgeometry "72x96" 12h.gif 11.png -convert -format png -tqgeometry "72x96" 12d.gif 12.png +convert -format png -geometry "72x96" 12c.gif 9.png +convert -format png -geometry "72x96" 12s.gif 10.png +convert -format png -geometry "72x96" 12h.gif 11.png +convert -format png -geometry "72x96" 12d.gif 12.png -convert -format png -tqgeometry "72x96" 11c.gif 13.png -convert -format png -tqgeometry "72x96" 11s.gif 14.png -convert -format png -tqgeometry "72x96" 11h.gif 15.png -convert -format png -tqgeometry "72x96" 11d.gif 16.png +convert -format png -geometry "72x96" 11c.gif 13.png +convert -format png -geometry "72x96" 11s.gif 14.png +convert -format png -geometry "72x96" 11h.gif 15.png +convert -format png -geometry "72x96" 11d.gif 16.png -convert -format png -tqgeometry "72x96" 10c.gif 17.png -convert -format png -tqgeometry "72x96" 10s.gif 18.png -convert -format png -tqgeometry "72x96" 10h.gif 19.png -convert -format png -tqgeometry "72x96" 10d.gif 20.png +convert -format png -geometry "72x96" 10c.gif 17.png +convert -format png -geometry "72x96" 10s.gif 18.png +convert -format png -geometry "72x96" 10h.gif 19.png +convert -format png -geometry "72x96" 10d.gif 20.png -convert -format png -tqgeometry "72x96" 09c.gif 21.png -convert -format png -tqgeometry "72x96" 09s.gif 22.png -convert -format png -tqgeometry "72x96" 09h.gif 23.png -convert -format png -tqgeometry "72x96" 09d.gif 24.png +convert -format png -geometry "72x96" 09c.gif 21.png +convert -format png -geometry "72x96" 09s.gif 22.png +convert -format png -geometry "72x96" 09h.gif 23.png +convert -format png -geometry "72x96" 09d.gif 24.png -convert -format png -tqgeometry "72x96" 08c.gif 25.png -convert -format png -tqgeometry "72x96" 08s.gif 26.png -convert -format png -tqgeometry "72x96" 08h.gif 27.png -convert -format png -tqgeometry "72x96" 08d.gif 28.png +convert -format png -geometry "72x96" 08c.gif 25.png +convert -format png -geometry "72x96" 08s.gif 26.png +convert -format png -geometry "72x96" 08h.gif 27.png +convert -format png -geometry "72x96" 08d.gif 28.png -convert -format png -tqgeometry "72x96" 07c.gif 29.png -convert -format png -tqgeometry "72x96" 07s.gif 30.png -convert -format png -tqgeometry "72x96" 07h.gif 31.png -convert -format png -tqgeometry "72x96" 07d.gif 32.png +convert -format png -geometry "72x96" 07c.gif 29.png +convert -format png -geometry "72x96" 07s.gif 30.png +convert -format png -geometry "72x96" 07h.gif 31.png +convert -format png -geometry "72x96" 07d.gif 32.png -convert -format png -tqgeometry "72x96" 06c.gif 33.png -convert -format png -tqgeometry "72x96" 06s.gif 34.png -convert -format png -tqgeometry "72x96" 06h.gif 35.png -convert -format png -tqgeometry "72x96" 06d.gif 36.png +convert -format png -geometry "72x96" 06c.gif 33.png +convert -format png -geometry "72x96" 06s.gif 34.png +convert -format png -geometry "72x96" 06h.gif 35.png +convert -format png -geometry "72x96" 06d.gif 36.png -convert -format png -tqgeometry "72x96" 05c.gif 37.png -convert -format png -tqgeometry "72x96" 05s.gif 38.png -convert -format png -tqgeometry "72x96" 05h.gif 39.png -convert -format png -tqgeometry "72x96" 05d.gif 40.png +convert -format png -geometry "72x96" 05c.gif 37.png +convert -format png -geometry "72x96" 05s.gif 38.png +convert -format png -geometry "72x96" 05h.gif 39.png +convert -format png -geometry "72x96" 05d.gif 40.png -convert -format png -tqgeometry "72x96" 04c.gif 41.png -convert -format png -tqgeometry "72x96" 04s.gif 42.png -convert -format png -tqgeometry "72x96" 04h.gif 43.png -convert -format png -tqgeometry "72x96" 04d.gif 44.png +convert -format png -geometry "72x96" 04c.gif 41.png +convert -format png -geometry "72x96" 04s.gif 42.png +convert -format png -geometry "72x96" 04h.gif 43.png +convert -format png -geometry "72x96" 04d.gif 44.png -convert -format png -tqgeometry "72x96" 03c.gif 45.png -convert -format png -tqgeometry "72x96" 03s.gif 46.png -convert -format png -tqgeometry "72x96" 03h.gif 47.png -convert -format png -tqgeometry "72x96" 03d.gif 48.png +convert -format png -geometry "72x96" 03c.gif 45.png +convert -format png -geometry "72x96" 03s.gif 46.png +convert -format png -geometry "72x96" 03h.gif 47.png +convert -format png -geometry "72x96" 03d.gif 48.png -convert -format png -tqgeometry "72x96" 02c.gif 49.png -convert -format png -tqgeometry "72x96" 02s.gif 50.png -convert -format png -tqgeometry "72x96" 02h.gif 51.png -convert -format png -tqgeometry "72x96" 02d.gif 52.png +convert -format png -geometry "72x96" 02c.gif 49.png +convert -format png -geometry "72x96" 02s.gif 50.png +convert -format png -geometry "72x96" 02h.gif 51.png +convert -format png -geometry "72x96" 02d.gif 52.png diff --git a/libtdegames/highscore/kexthighscore_gui.cpp b/libtdegames/highscore/kexthighscore_gui.cpp index 02ea99b6..a7e1fe57 100644 --- a/libtdegames/highscore/kexthighscore_gui.cpp +++ b/libtdegames/highscore/kexthighscore_gui.cpp @@ -92,7 +92,7 @@ void ScoresList::addLineItem(const ItemArray &items, if (line) line->setText(k, itemText(container, index)); else { addColumn( container.item()->label() ); - setColumnAlignment(k, container.item()->tqalignment()); + setColumnAlignment(k, container.item()->alignment()); } k++; } @@ -289,7 +289,7 @@ void LastMultipleScoresList::addLineItem(const ItemArray &si, if (line) line->setText(i, itemText(*container, index)); else { addColumn( container->item()->label() ); - setColumnAlignment(i, container->item()->tqalignment()); + setColumnAlignment(i, container->item()->alignment()); } } } @@ -333,7 +333,7 @@ void TotalMultipleScoresList::addLineItem(const ItemArray &si, TQString label = (i==2 ? i18n("Won Games") : container->item()->label()); addColumn(label); - setColumnAlignment(i, container->item()->tqalignment()); + setColumnAlignment(i, container->item()->alignment()); } } } diff --git a/libtdegames/highscore/kexthighscore_internal.cpp b/libtdegames/highscore/kexthighscore_internal.cpp index 388c8a88..dbc3db58 100644 --- a/libtdegames/highscore/kexthighscore_internal.cpp +++ b/libtdegames/highscore/kexthighscore_internal.cpp @@ -314,7 +314,7 @@ PlayerInfos::PlayerInfos() #ifdef HIGHSCORE_DIRECTORY if (_oldLocalPlayer) { // player already exists in local config file // copy player data - TQString prefix = TQString("%1_").tqarg(_oldLocalId+1); + TQString prefix = TQString("%1_").arg(_oldLocalId+1); TQMap entries = cg.config()->entryMap("KHighscore_players"); TQMap::const_iterator it; @@ -378,8 +378,8 @@ TQString PlayerInfos::histoName(uint i) const const TQMemArray &sh = _histogram; Q_ASSERT( ireadEntry(sk, TQString()).isEmpty() ); cg.config()->writeEntry(sk, key()); - cg.config()->writeEntry(str.tqarg(HS_REGISTERED_NAME).tqarg(i), + cg.config()->writeEntry(str.arg(HS_REGISTERED_NAME).arg(i), registeredName()); // clear current key/nickname @@ -609,7 +609,7 @@ bool ManagerPrivate::doQuery(const KURL &url, TQWidget *parent, TQString tmpFile; if ( !KIO::NetAccess::download(url, tmpFile, parent) ) { - TQString details = i18n("Server URL: %1").tqarg(url.host()); + TQString details = i18n("Server URL: %1").arg(url.host()); KMessageBox::detailedSorry(parent, i18n(UNABLE_TO_CONTACT), details); return false; } @@ -647,7 +647,7 @@ bool ManagerPrivate::doQuery(const KURL &url, TQWidget *parent, } } TQString msg = i18n("Invalid answer from world-wide highscores server."); - TQString details = i18n("Raw message: %1").tqarg(content); + TQString details = i18n("Raw message: %1").arg(content); KMessageBox::detailedSorry(parent, msg, details); return false; } @@ -660,7 +660,7 @@ bool ManagerPrivate::getFromQuery(const TQDomNamedNodeMap &map, if ( attr.isNull() ) { KMessageBox::sorry(parent, i18n("Invalid answer from world-wide " - "highscores server (missing item: %1).").tqarg(name)); + "highscores server (missing item: %1).").arg(name)); return false; } value = attr.value(); diff --git a/libtdegames/highscore/kexthighscore_item.cpp b/libtdegames/highscore/kexthighscore_item.cpp index 4b48a0ee..98a42a10 100644 --- a/libtdegames/highscore/kexthighscore_item.cpp +++ b/libtdegames/highscore/kexthighscore_item.cpp @@ -33,8 +33,8 @@ namespace KExtHighscore { //----------------------------------------------------------------------------- -Item::Item(const TQVariant &def, const TQString &label, int tqalignment) - : _default(def), _label(label), _tqalignment(tqalignment), +Item::Item(const TQVariant &def, const TQString &label, int alignment) + : _default(def), _label(label), _alignment(alignment), _format(NoFormat), _special(NoSpecial) {} @@ -287,7 +287,7 @@ void MultiplayerScores::show(TQWidget *parent) vbox = new TQVBox(dialog.plainPage()); hbox->addWidget(vbox); (void)new TQLabel(i18n("Scores for the last %1 games:") - .tqarg(_nbGames[0]), vbox); + .arg(_nbGames[0]), vbox); (void)new TotalMultipleScoresList(ordered, vbox); } diff --git a/libtdegames/highscore/kexthighscore_item.h b/libtdegames/highscore/kexthighscore_item.h index b32f32e7..8379433b 100644 --- a/libtdegames/highscore/kexthighscore_item.h +++ b/libtdegames/highscore/kexthighscore_item.h @@ -79,10 +79,10 @@ class KDE_EXPORT Item * Be sure to cast the value to the required type (for e.g. with uint). * @param label the label corresponding to the item. If empty, the item * is not shown. - * @param tqalignment the tqalignment of the item. + * @param alignment the alignment of the item. */ Item(const TQVariant &def = TQVariant::Invalid, - const TQString &label = TQString(), int tqalignment = TQt::AlignRight); + const TQString &label = TQString(), int alignment = TQt::AlignRight); virtual ~Item(); @@ -114,9 +114,9 @@ class KDE_EXPORT Item TQString label() const { return _label; } /** - * @return the tqalignment. + * @return the alignment. */ - int tqalignment() const { return _tqalignment; } + int alignment() const { return _alignment; } /** * Set default value. @@ -149,7 +149,7 @@ class KDE_EXPORT Item private: TQVariant _default; TQString _label; - int _tqalignment; + int _alignment; Format _format; Special _special; diff --git a/libtdegames/highscore/kexthighscore_tab.cpp b/libtdegames/highscore/kexthighscore_tab.cpp index d47b35a6..b3fdecd1 100644 --- a/libtdegames/highscore/kexthighscore_tab.cpp +++ b/libtdegames/highscore/kexthighscore_tab.cpp @@ -97,7 +97,7 @@ void AdditionalTab::allSelected() TQString AdditionalTab::percent(uint n, uint total, bool withBraces) { if ( n==0 || total==0 ) return TQString(); - TQString s = TQString("%1%").tqarg(100.0 * n / total, 0, 'f', 1); + TQString s = TQString("%1%").arg(100.0 * n / total, 0, 'f', 1); return (withBraces ? TQString("(") + s + ")" : s); } diff --git a/libtdegames/highscore/khighscore.cpp b/libtdegames/highscore/khighscore.cpp index 6d696020..3ff2d248 100644 --- a/libtdegames/highscore/khighscore.cpp +++ b/libtdegames/highscore/khighscore.cpp @@ -96,7 +96,7 @@ void KHighscore::init(const char *appname) { #ifdef HIGHSCORE_DIRECTORY const TQString filename = TQString::fromLocal8Bit("%1/%2.scores") - .tqarg(HIGHSCORE_DIRECTORY).tqarg(appname); + .arg(HIGHSCORE_DIRECTORY).arg(appname); int fd = open(filename.local8Bit(), O_RDWR); if ( fd<0 ) kdFatal(11002) << "cannot open global highscore file \"" << filename << "\"" << endl; @@ -169,7 +169,7 @@ void KHighscore::writeEntry(int entry, const TQString& key, const TQVariant& val { Q_ASSERT( isLocked() ); KConfigGroupSaver cg(config(), group()); - TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(key); + TQString confKey = TQString("%1_%2").arg(entry).arg(key); cg.config()->writeEntry(confKey, value); } @@ -177,7 +177,7 @@ void KHighscore::writeEntry(int entry, const TQString& key, int value) { Q_ASSERT( isLocked() ); KConfigGroupSaver cg(config(), group()); - TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(key); + TQString confKey = TQString("%1_%2").arg(entry).arg(key); cg.config()->writeEntry(confKey, value); } @@ -185,35 +185,35 @@ void KHighscore::writeEntry(int entry, const TQString& key, const TQString &valu { Q_ASSERT (isLocked() ); KConfigGroupSaver cg(config(), group()); - TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(key); + TQString confKey = TQString("%1_%2").arg(entry).arg(key); cg.config()->writeEntry(confKey, value); } TQVariant KHighscore::readPropertyEntry(int entry, const TQString& key, const TQVariant& pDefault) const { KConfigGroupSaver cg(config(), group()); - TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(key); + TQString confKey = TQString("%1_%2").arg(entry).arg(key); return cg.config()->readPropertyEntry(confKey, pDefault); } TQString KHighscore::readEntry(int entry, const TQString& key, const TQString& pDefault) const { KConfigGroupSaver cg(config(), group()); - TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(key); + TQString confKey = TQString("%1_%2").arg(entry).arg(key); return cg.config()->readEntry(confKey, pDefault); } int KHighscore::readNumEntry(int entry, const TQString& key, int pDefault) const { KConfigGroupSaver cg(config(), group()); - TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(key); + TQString confKey = TQString("%1_%2").arg(entry).arg(key); return cg.config()->readNumEntry(confKey, pDefault); } bool KHighscore::hasEntry(int entry, const TQString& key) const { KConfigGroupSaver cg(config(), group()); - TQString confKey = TQString("%1_%2").tqarg(entry).tqarg(key); + TQString confKey = TQString("%1_%2").arg(entry).arg(key); return cg.config()->hasKey(confKey); } @@ -248,7 +248,7 @@ TQString KHighscore::group() const if ( highscoreGroup().isNull() ) return (d->global ? TQString() : GROUP); return (d->global ? highscoreGroup() - : TQString("%1_%2").tqarg(GROUP).tqarg(highscoreGroup())); + : TQString("%1_%2").arg(GROUP).arg(highscoreGroup())); } bool KHighscore::hasTable() const diff --git a/libtdegames/highscore/khighscore.h b/libtdegames/highscore/khighscore.h index b7b6fb5e..3cd14e8c 100644 --- a/libtdegames/highscore/khighscore.h +++ b/libtdegames/highscore/khighscore.h @@ -67,7 +67,7 @@ class KHighscorePrivate; * single player, so the "best times" of a player. To write highscores for a * specific player in a specific level you will have to use a more complex way: * \code - * TQString group = TQString("%1_%2").tqarg(player).tqarg(level); + * TQString group = TQString("%1_%2").arg(player).arg(level); * table->setGroup(group); * writeHighscore(table, player, level); * \endcode diff --git a/libtdegames/highscore/kscoredialog.cpp b/libtdegames/highscore/kscoredialog.cpp index 365e7aed..03170939 100644 --- a/libtdegames/highscore/kscoredialog.cpp +++ b/libtdegames/highscore/kscoredialog.cpp @@ -164,7 +164,7 @@ void KScoreDialog::setupDialog() for (int i = 1; i <= 10; ++i) { TQLabel *label; num.setNum(i); - label = new TQLabel(i18n("#%1").tqarg(num), d->page); + label = new TQLabel(i18n("#%1").arg(num), d->page); d->labels.insert((i-1)*d->nrCols + 0, label); d->tqlayout->addWidget(label, i+4, 0); if (d->fields & Name) diff --git a/libtdegames/kchatbase.cpp b/libtdegames/kchatbase.cpp index f08f3a55..e105989c 100644 --- a/libtdegames/kchatbase.cpp +++ b/libtdegames/kchatbase.cpp @@ -73,14 +73,14 @@ void KChatBaseText::init() void KChatBaseText::setName(const TQString& n) { // d->mName = n; - d->mName = TQString("%1: ").tqarg(n); - setText(TQString("%1: %2").tqarg(name()).tqarg(message())); // esp. for sorting + d->mName = TQString("%1: ").arg(n); + setText(TQString("%1: %2").arg(name()).arg(message())); // esp. for sorting } void KChatBaseText::setMessage(const TQString& m) { d->mMessage = m; - setText(TQString("%1: %2").tqarg(name()).tqarg(message())); // esp. for sorting + setText(TQString("%1: %2").arg(name()).arg(message())); // esp. for sorting } const TQString& KChatBaseText::name() const @@ -368,7 +368,7 @@ TQListBoxItem* KChatBase::layoutMessage(const TQString& fromName, const TQString //TODO KChatBasePixmap? Should change the font here! - message = (TQListBoxItem*)new TQListBoxPixmap(pix, i18n("%1 %2").tqarg(fromName).tqarg(text.mid(3))); + message = (TQListBoxItem*)new TQListBoxPixmap(pix, i18n("%1 %2").arg(fromName).arg(text.mid(3))); } else { // the text is not edited in any way. just return an item KChatBaseText* m = new KChatBaseText(fromName, text); @@ -384,7 +384,7 @@ TQListBoxItem* KChatBase::layoutSystemMessage(const TQString& fromName, const TQ //TODO: KChatBaseConfigure? - e.g. color // no need to check for /me etc. - KChatBaseText* m = new KChatBaseText(i18n("--- %1").tqarg(fromName), text); + KChatBaseText* m = new KChatBaseText(i18n("--- %1").arg(fromName), text); m->setNameFont(&d->mSystemNameFont); m->setMessageFont(&d->mSystemMessageFont); return (TQListBoxItem*)m; @@ -406,7 +406,7 @@ void KChatBase::slotReturnPressed(const TQString& text) TQString KChatBase::comboBoxItem(const TQString& name) const { // TODO: such a function for "send to all" and "send to my group" - return i18n("Send to %1").tqarg(name); + return i18n("Send to %1").arg(name); } void KChatBase::slotClear() diff --git a/libtdegames/kchatbase.h b/libtdegames/kchatbase.h index 892e5859..33ba3d76 100644 --- a/libtdegames/kchatbase.h +++ b/libtdegames/kchatbase.h @@ -471,7 +471,7 @@ protected: /** * Replace to customise the combo box. * - * Default: i18n("Send to %1).tqarg(name) + * Default: i18n("Send to %1).arg(name) * @param name The name of the player * @return The string as it will be shown in the combo box **/ diff --git a/libtdegames/kgame/dialogs/kgamedialogconfig.cpp b/libtdegames/kgame/dialogs/kgamedialogconfig.cpp index f6845650..a3f11835 100644 --- a/libtdegames/kgame/dialogs/kgamedialogconfig.cpp +++ b/libtdegames/kgame/dialogs/kgamedialogconfig.cpp @@ -743,7 +743,7 @@ void KGameDialogConnectionConfig::slotKickPlayerOut(TQListBoxItem* item) return; } - if (KMessageBox::questionYesNo(this, i18n("Do you want to ban player \"%1\" from the game?").tqarg( + if (KMessageBox::questionYesNo(this, i18n("Do you want to ban player \"%1\" from the game?").arg( p->name()), TQString(), i18n("Ban Player"), i18n("Do Not Ban")) == KMessageBox::Yes) { kdDebug(11001) << "will remove player " << p << endl; game()->removePlayer(p); diff --git a/libtdegames/kgame/dialogs/kgameerrordialog.cpp b/libtdegames/kgame/dialogs/kgameerrordialog.cpp index 6ab9d71c..e22211c3 100644 --- a/libtdegames/kgame/dialogs/kgameerrordialog.cpp +++ b/libtdegames/kgame/dialogs/kgameerrordialog.cpp @@ -86,7 +86,7 @@ void KGameErrorDialog::slotClientConnectionLost(TQ_UINT32 /*id*/,bool) //TODO: add IP/port of the client TQString message; // if (c) { -// message = i18n("Connection to client has been lost!\nID: %1\nIP: %2").tqarg(c->id()).tqarg(c->IP()); +// message = i18n("Connection to client has been lost!\nID: %1\nIP: %2").arg(c->id()).arg(c->IP()); // } else { // message = i18n("Connection to client has been lost!"); // } @@ -96,7 +96,7 @@ void KGameErrorDialog::slotClientConnectionLost(TQ_UINT32 /*id*/,bool) void KGameErrorDialog::slotError(int errorNo, TQString text) { - TQString message = i18n("Received a network error!\nError number: %1\nError message: %2").tqarg(errorNo).tqarg(text); + TQString message = i18n("Received a network error!\nError number: %1\nError message: %2").arg(errorNo).arg(text); error(message, (TQWidget*)parent()); } @@ -106,7 +106,7 @@ void KGameErrorDialog::connectionError(TQString s) if (s.isNull()) { message = i18n("No connection could be created."); } else { - message = i18n("No connection could be created.\nThe error message was:\n%1").tqarg(s); + message = i18n("No connection could be created.\nThe error message was:\n%1").arg(s); } error(message, (TQWidget*)parent()); } diff --git a/libtdegames/kgame/kgame.h b/libtdegames/kgame/kgame.h index 486397e2..7ad010fc 100644 --- a/libtdegames/kgame/kgame.h +++ b/libtdegames/kgame/kgame.h @@ -433,7 +433,7 @@ public: * @param msg the message which will be send. See messages.txt for contents * @param msgid an id for this message * @param sender the id of the sender - * @param group the group of the tqreceivers + * @param group the group of the receivers * @return true if worked */ bool sendGroupMessage(const TQByteArray& msg, int msgid, TQ_UINT32 sender, const TQString& group); diff --git a/libtdegames/kgame/kgamechat.cpp b/libtdegames/kgame/kgamechat.cpp index 11f47f7b..c2469906 100644 --- a/libtdegames/kgame/kgamechat.cpp +++ b/libtdegames/kgame/kgamechat.cpp @@ -92,7 +92,7 @@ void KGameChat::addMessage(int fromId, const TQString& text) { if (!d->mGame) { kdWarning(11001) << "no KGame object has been set" << endl; - addMessage(i18n("Player %1").tqarg(fromId), text); + addMessage(i18n("Player %1").arg(fromId), text); } else { KPlayer* p = d->mGame->findPlayer(fromId); if (p) { @@ -165,7 +165,7 @@ bool KGameChat::isToPlayerMessage(int id) const return d->mSendId2PlayerId.contains(id); } TQString KGameChat::sendToPlayerEntry(const TQString& name) const -{ return i18n("Send to %1").tqarg(name); } +{ return i18n("Send to %1").arg(name); } int KGameChat::playerId(int id) const { @@ -211,7 +211,7 @@ void KGameChat::setFromPlayer(KPlayer* p) removeSendingEntry(d->mToMyGroup); } d->mToMyGroup = nextId(); - addSendingEntry(i18n("Send to My Group (\"%1\")").tqarg(p->group()), d->mToMyGroup); + addSendingEntry(i18n("Send to My Group (\"%1\")").arg(p->group()), d->mToMyGroup); } d->mFromPlayer = p; kdDebug(11001) << k_funcinfo << " player=" << p << endl; diff --git a/libtdegames/kgame/kgameerror.cpp b/libtdegames/kgame/kgameerror.cpp index ef6145fb..4ed64e0d 100644 --- a/libtdegames/kgame/kgameerror.cpp +++ b/libtdegames/kgame/kgameerror.cpp @@ -60,7 +60,7 @@ TQString KGameError::errorText(int errorCode, TQDataStream& s) TQ_INT32 cookie2; s >> cookie1; s >> cookie2; - text = i18n("Cookie mismatch!\nExpected Cookie: %1\nReceived Cookie: %2").tqarg(cookie1).tqarg(cookie2); + text = i18n("Cookie mismatch!\nExpected Cookie: %1\nReceived Cookie: %2").arg(cookie1).arg(cookie2); break; } case Version: @@ -69,11 +69,11 @@ TQString KGameError::errorText(int errorCode, TQDataStream& s) TQ_INT32 version2; s >> version1; s >> version2; - text = i18n("KGame Version mismatch!\nExpected Version: %1\nReceived Version: %2\n").tqarg(version1).tqarg(version2); + text = i18n("KGame Version mismatch!\nExpected Version: %1\nReceived Version: %2\n").arg(version1).arg(version2); break; } default: - text = i18n("Unknown error code %1").tqarg(errorCode); + text = i18n("Unknown error code %1").arg(errorCode); } return text; } diff --git a/libtdegames/kgame/kgamepropertyhandler.cpp b/libtdegames/kgame/kgamepropertyhandler.cpp index 405d433e..9ad43a69 100644 --- a/libtdegames/kgame/kgamepropertyhandler.cpp +++ b/libtdegames/kgame/kgamepropertyhandler.cpp @@ -174,13 +174,13 @@ TQString KGamePropertyHandler::propertyName(int id) const TQString s; if (d->mIdDict.find(id)) { if (d->mNameMap.contains(id)) { - s = i18n("%1 (%2)").tqarg(d->mNameMap[id]).tqarg(id); + s = i18n("%1 (%2)").arg(d->mNameMap[id]).arg(id); } else { - s = i18n("Unnamed - ID: %1").tqarg(id); + s = i18n("Unnamed - ID: %1").arg(id); } } else { // Should _never_ happen - s = i18n("%1 unregistered").tqarg(id); + s = i18n("%1 unregistered").arg(id); } return s; } diff --git a/libtdegames/kgame/kmessageclient.cpp b/libtdegames/kgame/kmessageclient.cpp index ca90bbd1..056ca879 100644 --- a/libtdegames/kgame/kmessageclient.cpp +++ b/libtdegames/kgame/kmessageclient.cpp @@ -228,9 +228,9 @@ void KMessageClient::processMessage (const TQByteArray &msg) case KMessageServer::MSG_FORWARD: { TQ_UINT32 clientID; - TQValueList tqreceivers; - in_stream >> clientID >> tqreceivers; - emit forwardReceived (in_buffer.readAll(), clientID, tqreceivers); + TQValueList receivers; + in_stream >> clientID >> receivers; + emit forwardReceived (in_buffer.readAll(), clientID, receivers); } break; diff --git a/libtdegames/kgame/kmessageclient.h b/libtdegames/kgame/kmessageclient.h index 8a35234d..da15f16d 100644 --- a/libtdegames/kgame/kmessageclient.h +++ b/libtdegames/kgame/kmessageclient.h @@ -284,7 +284,7 @@ signals: senderID contains the ID of the client that sent the broadcast message. You can use this e.g. to send a reply message to only that client. - tqreceivers contains the list of the clients that got the message. (If this list + receivers contains the list of the clients that got the message. (If this list only contains one number, this will be your client ID, and it was exclusivly sent to you.) @@ -302,9 +302,9 @@ signals: Then connect the broadcast signal to your slot that analyzes the message. @param msg The message that has been sent to us @param senderID The ID of the client which sent the message - @param tqreceivers All clients which receive this message + @param receivers All clients which receive this message */ - void forwardReceived (const TQByteArray &msg, TQ_UINT32 senderID, const TQValueList &tqreceivers); + void forwardReceived (const TQByteArray &msg, TQ_UINT32 senderID, const TQValueList &receivers); /** This signal is emitted when the connection to the KMessageServer is broken. diff --git a/libtdegames/kgame/kmessageio.cpp b/libtdegames/kgame/kmessageio.cpp index b35382b0..b3dd1875 100644 --- a/libtdegames/kgame/kmessageio.cpp +++ b/libtdegames/kgame/kmessageio.cpp @@ -245,7 +245,7 @@ KMessageProcess::KMessageProcess(TQObject *parent, TQString file) : KMessageIO(p mProcessName=file; mProcess=new KProcess; int id=0; - *mProcess << mProcessName << TQString("%1").tqarg(id); + *mProcess << mProcessName << TQString("%1").arg(id); kdDebug(11001) << "@@@KMessageProcess::Init:Id= " << id << endl; kdDebug(11001) << "@@@KMessgeProcess::Init:Processname: " << mProcessName << endl; connect(mProcess, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )), diff --git a/libtdegames/kgame/kmessageserver.h b/libtdegames/kgame/kmessageserver.h index 9042fca2..067ea3f9 100644 --- a/libtdegames/kgame/kmessageserver.h +++ b/libtdegames/kgame/kmessageserver.h @@ -83,7 +83,7 @@ class KMessageServerPrivate; TQ_UINT32 clientID; // the ID of the client that sent the broadcast request - TQByteArray << static_cast<TQ_UINT32>( RETQ_FORWARD ) << client_list << raw_data - TQValueList <TQ_UINT32> client_list; // list of tqreceivers + TQValueList <TQ_UINT32> client_list; // list of receivers When the server receives this message, it sends the following message to the clients in client_list: diff --git a/libtdegames/kgameprogress.cpp b/libtdegames/kgameprogress.cpp index 0bb56014..de32cd14 100644 --- a/libtdegames/kgameprogress.cpp +++ b/libtdegames/kgameprogress.cpp @@ -196,13 +196,13 @@ int KGameProgress::recalcValue(int range) void KGameProgress::valueChange() { - tqrepaint(contentsRect(), FALSE); + repaint(contentsRect(), FALSE); emit percentageChanged(recalcValue(100)); } void KGameProgress::rangeChange() { - tqrepaint(contentsRect(), FALSE); + repaint(contentsRect(), FALSE); emit percentageChanged(recalcValue(100)); } diff --git a/lskat/lskat/lskat.cpp b/lskat/lskat/lskat.cpp index a1caa748..af0768e9 100644 --- a/lskat/lskat/lskat.cpp +++ b/lskat/lskat/lskat.cpp @@ -587,7 +587,7 @@ void LSkatApp::slotStatusNames(){ if (!doc->IsRunning()) msg=i18n("No game running"); else { - msg=i18n("%1 to move...").tqarg(doc->GetName(doc->GetCurrentPlayer())); + msg=i18n("%1 to move...").arg(doc->GetName(doc->GetCurrentPlayer())); } slotStatusMover(msg); } @@ -677,11 +677,11 @@ bool LSkatApp::MakeInputDevice(int no) tim=10000; if (!host.isEmpty()) { - s=i18n("Remote connection to %1:%2...").tqarg(host).tqarg(port); + s=i18n("Remote connection to %1:%2...").arg(host).arg(port); } else { - s=i18n("Offering remote connection on port %1...").tqarg(port); + s=i18n("Offering remote connection on port %1...").arg(port); } progress=new TQProgressDialog(s, i18n("Abort"), tim, this,0,true ); progress->setCaption(i18n("Lieutenant Skat")); diff --git a/lskat/lskat/lskatdoc.cpp b/lskat/lskat/lskatdoc.cpp index 18ddb59b..1de66668 100644 --- a/lskat/lskat/lskatdoc.cpp +++ b/lskat/lskat/lskatdoc.cpp @@ -135,7 +135,7 @@ void LSkatDoc::slotUpdateAllViews(LSkatView *sender) for(w=pViewList->first(); w!=0; w=pViewList->next()) { if(w!=sender) - w->tqrepaint(); + w->repaint(); } } } diff --git a/lskat/lskat/lskatdoc.h b/lskat/lskat/lskatdoc.h index 062b00be..a90c7ec9 100644 --- a/lskat/lskat/lskatdoc.h +++ b/lskat/lskat/lskatdoc.h @@ -216,7 +216,7 @@ public: int cardvalues[14]; public slots: - /** calls tqrepaint() on all views connected to the document object and is called by the view by which the document has been changed. + /** calls repaint() on all views connected to the document object and is called by the view by which the document has been changed. * As this view normally repaints itself, it is excluded from the paintEvent. */ void slotUpdateAllViews(LSkatView *sender); diff --git a/lskat/lskat/lskatview.cpp b/lskat/lskat/lskatview.cpp index 4ad9bf92..72b5ffd1 100644 --- a/lskat/lskat/lskatview.cpp +++ b/lskat/lskat/lskatview.cpp @@ -403,7 +403,7 @@ void LSkatView::drawFinal(TQPainter *p) TQRect brect1_3,brect2_3,brect3_3,brect4_3; TQRect brect1_4,brect2_4,brect3_4,brect4_4; - // Calculate tqgeometry + // Calculate geometry line1=i18n("Game over"); rect=p->window(); //rect1.moveBy(0,FINAL_Y0-24); @@ -429,11 +429,11 @@ void LSkatView::drawFinal(TQPainter *p) } else if (sc0>sc1) { - line2=i18n("Player 1 - %1 won ").tqarg(getDocument()->GetName(0)); + line2=i18n("Player 1 - %1 won ").arg(getDocument()->GetName(0)); } else { - line2=i18n("Player 2 - %1 won ").tqarg(getDocument()->GetName(1)); + line2=i18n("Player 2 - %1 won ").arg(getDocument()->GetName(1)); } int hp=getDocument()->mPixTrump[trump].height()+5; rect=TQRect(0,hp>sumrect.height()?hp:sumrect.height(),p->window().width(),p->window().height()); @@ -469,11 +469,11 @@ void LSkatView::drawFinal(TQPainter *p) rect=brect3_3|brect3_4; ts[2]=ts[1]+rect.width()+30; - col4_3=i18n("%1 points").tqarg(pt0); + col4_3=i18n("%1 points").arg(pt0); rect=TQRect(0,0,p->window().width(),p->window().height()); brect4_3=p->boundingRect(rect,TQt::AlignLeft|TQt::SingleLine|TQt::AlignTop,col4_3); - col4_4=i18n("%1 points").tqarg(pt1); + col4_4=i18n("%1 points").arg(pt1); rect=TQRect(0,0,p->window().width(),p->window().height()); brect4_4=p->boundingRect(rect,TQt::AlignLeft|TQt::SingleLine|TQt::AlignTop,col4_4); @@ -492,7 +492,7 @@ void LSkatView::drawFinal(TQPainter *p) p->setFont(font14); if (sc0>=120) { - line5=i18n("%1 won to nil. Congratulations!").tqarg(getDocument()->GetName(0)); + line5=i18n("%1 won to nil. Congratulations!").arg(getDocument()->GetName(0)); rect=TQRect(0,sumrect.height()+10,p->window().width(),p->window().height()); brect5=p->boundingRect(rect,TQt::AlignHCenter|TQt::SingleLine|TQt::AlignTop,line5); sumrect|=brect5; @@ -500,16 +500,16 @@ void LSkatView::drawFinal(TQPainter *p) else if (sc0>=90) { if (sc0==90) - line5=i18n("%1 won with 90 points. Super!").tqarg(getDocument()->GetName(0)); + line5=i18n("%1 won with 90 points. Super!").arg(getDocument()->GetName(0)); else - line5=i18n("%1 won over 90 points. Super!").tqarg(getDocument()->GetName(0)); + line5=i18n("%1 won over 90 points. Super!").arg(getDocument()->GetName(0)); rect=TQRect(0,sumrect.height()+10,p->window().width(),p->window().height()); brect5=p->boundingRect(rect,TQt::AlignHCenter|TQt::SingleLine|TQt::AlignTop,line5); sumrect|=brect5; } if (sc1>=120) { - line5=i18n("%1 won to nil. Congratulations!").tqarg(getDocument()->GetName(1)); + line5=i18n("%1 won to nil. Congratulations!").arg(getDocument()->GetName(1)); rect=TQRect(0,sumrect.height()+10,p->window().width(),p->window().height()); brect5=p->boundingRect(rect,TQt::AlignHCenter|TQt::SingleLine|TQt::AlignTop,line5); sumrect|=brect5; @@ -517,9 +517,9 @@ void LSkatView::drawFinal(TQPainter *p) else if (sc1>=90) { if (sc1==90) - line5=i18n("%1 won with 90 points. Super!").tqarg(getDocument()->GetName(1)); + line5=i18n("%1 won with 90 points. Super!").arg(getDocument()->GetName(1)); else - line5=i18n("%1 won over 90 points. Super!").tqarg(getDocument()->GetName(1)); + line5=i18n("%1 won over 90 points. Super!").arg(getDocument()->GetName(1)); rect=TQRect(0,sumrect.height()+10,p->window().width(),p->window().height()); brect5=p->boundingRect(rect,TQt::AlignHCenter|TQt::SingleLine|TQt::AlignTop,line5); sumrect|=brect5; @@ -760,7 +760,7 @@ void LSkatView::paintEvent( TQPaintEvent * e) TQPixmap pm(this->rect().size()); TQPainter p; TQBrush brush; - p.tqbegin(TQT_TQPAINTDEVICE(&pm),this); + p.begin(TQT_TQPAINTDEVICE(&pm),this); brush.setPixmap( getDocument()->mPixBackground ); p.fillRect(0,0,this->rect().width(),this->rect().height(),brush); drawIntro(&p); @@ -890,7 +890,7 @@ void LSkatView::introTimerReady() } else if (introcnt Host: - + AlignVCenter|AlignLeft @@ -194,7 +194,7 @@ Port: - + AlignVCenter|AlignLeft diff --git a/twin4/twin4/kspritecache.cpp b/twin4/twin4/kspritecache.cpp index bd55c418..9e3abddc 100644 --- a/twin4/twin4/kspritecache.cpp +++ b/twin4/twin4/kspritecache.cpp @@ -90,7 +90,7 @@ void KSpriteCache::deleteAllItems() void KSpriteCache::deleteItem(TQString s,int no) { TQCanvasItem *item; - TQString name=s+TQString("_%1").tqarg(no); + TQString name=s+TQString("_%1").arg(no); //kdDebug(11002) << "KSpriteCache::deleteItem name=" << name << endl; item=mItemDict[name]; if (item) @@ -122,7 +122,7 @@ void KSpriteCache::deleteItem(TQCanvasItem *item) TQCanvasItem *KSpriteCache::getItem(TQString name,int no) { - TQString dictname=name+TQString("_%1").tqarg(no); + TQString dictname=name+TQString("_%1").arg(no); TQCanvasItem *item=mItemDict[dictname]; //kdDebug(11002) << " -> getItem("<"<hasKey(anim)) { //kdDebug(11002) << "Found animation key " << anim << endl; diff --git a/twin4/twin4/scorewidget.cpp b/twin4/twin4/scorewidget.cpp index a8733583..41384da4 100644 --- a/twin4/twin4/scorewidget.cpp +++ b/twin4/twin4/scorewidget.cpp @@ -148,12 +148,12 @@ void ScoreWidget::Paint(TQPainter *p,TQRect /*cliprect*/) void ScoreWidget::setMove(int i) { - TextLabel5->setText( TQString("%1").tqarg(i)); + TextLabel5->setText( TQString("%1").arg(i)); } void ScoreWidget::setLevel(int i) { - TextLabel4->setText( TQString("%1").tqarg(i)); + TextLabel4->setText( TQString("%1").arg(i)); } void ScoreWidget::setChance(int i) @@ -165,7 +165,7 @@ void ScoreWidget::setChance(int i) else if (i<=-999) TextLabel6->setText(i18n("Loser")); else - TextLabel6->setText(TQString("%1").tqarg(i)); + TextLabel6->setText(TQString("%1").arg(i)); } void ScoreWidget::setPlayer(TQString s,int no) diff --git a/twin4/twin4/settings.ui b/twin4/twin4/settings.ui index d873f04a..7b0568de 100644 --- a/twin4/twin4/settings.ui +++ b/twin4/twin4/settings.ui @@ -81,7 +81,7 @@ Hard - + AlignVCenter|AlignRight diff --git a/twin4/twin4/statistics.ui b/twin4/twin4/statistics.ui index bb32c249..1744158a 100644 --- a/twin4/twin4/statistics.ui +++ b/twin4/twin4/statistics.ui @@ -70,7 +70,7 @@ Name - + AlignCenter @@ -81,7 +81,7 @@ Won - + AlignCenter @@ -97,7 +97,7 @@ Lost - + AlignCenter @@ -118,7 +118,7 @@ Sum - + AlignCenter @@ -129,7 +129,7 @@ Aborted - + AlignCenter @@ -201,7 +201,7 @@ Drawn - + AlignCenter diff --git a/twin4/twin4/statuswidget.ui b/twin4/twin4/statuswidget.ui index 8d0da299..a7d2fa6e 100644 --- a/twin4/twin4/statuswidget.ui +++ b/twin4/twin4/statuswidget.ui @@ -69,7 +69,7 @@ W - + AlignCenter @@ -80,7 +80,7 @@ D - + AlignCenter @@ -91,7 +91,7 @@ L - + AlignCenter @@ -102,7 +102,7 @@ No - + AlignCenter @@ -113,7 +113,7 @@ Bk - + AlignCenter diff --git a/twin4/twin4/twin4.cpp b/twin4/twin4/twin4.cpp index 25754554..dd8b3359 100644 --- a/twin4/twin4/twin4.cpp +++ b/twin4/twin4/twin4.cpp @@ -509,7 +509,7 @@ void Kwin4App::slotGameOver(int status, KPlayer * p, KGame * /*me*/) EndGame(TWin); else EndGame(TLost); - TQString msg=i18n("%1 won the game. Please restart next round.").tqarg(doc->QueryName(((FARBE)p->userId()))); + TQString msg=i18n("%1 won the game. Please restart next round.").arg(doc->QueryName(((FARBE)p->userId()))); slotStatusMsg(msg); } else if (status==2) // Abort diff --git a/twin4/twin4/twin4view.cpp b/twin4/twin4/twin4view.cpp index f8d542a2..6ee09cc4 100644 --- a/twin4/twin4/twin4view.cpp +++ b/twin4/twin4/twin4view.cpp @@ -601,7 +601,7 @@ bool Kwin4View::wrongPlayer(KPlayer *player,KGameIO::IOMode io) clearError(); int rnd=(kapp->random()%4) +1; TQString m; - m=TQString("text%1").tqarg(rnd); + m=TQString("text%1").arg(rnd); TQString ms; if (rnd==1) ms=i18n("Hold on... the other player has not been yet..."); else if (rnd==2) ms=i18n("Hold your horses...");