Remove additional unneeded tq method conversions

12 files changed, 61 insertions, 61 deletions

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<Event> events = m_eventLog->events();
 		for (TQPtrListIterator<Event> 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<KPopupMenu *>(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."));