summaryrefslogtreecommitdiffstats
path: root/atlantik/libatlantikui
diff options
context:
space:
mode:
Diffstat (limited to 'atlantik/libatlantikui')
-rw-r--r--atlantik/libatlantikui/auction_widget.cpp4
-rw-r--r--atlantik/libatlantikui/auction_widget.h2
-rw-r--r--atlantik/libatlantikui/board.cpp12
-rw-r--r--atlantik/libatlantikui/board.h2
-rw-r--r--atlantik/libatlantikui/estatedetails.cpp14
-rw-r--r--atlantik/libatlantikui/estateview.cpp20
-rw-r--r--atlantik/libatlantikui/portfolioview.cpp6
-rw-r--r--atlantik/libatlantikui/token.cpp2
-rw-r--r--atlantik/libatlantikui/trade_widget.cpp10
9 files changed, 36 insertions, 36 deletions
diff --git a/atlantik/libatlantikui/auction_widget.cpp b/atlantik/libatlantikui/auction_widget.cpp
index 68ded495..d4d7bdfa 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").arg(estate->name()) : i18n("Auction"), this, "groupBox");
+ m_playerGroupBox = new TQVGroupBox(estate ? i18n("Auction: %1").tqarg(estate->name()) : i18n("Auction"), this, "groupBox");
m_mainLayout->addWidget(m_playerGroupBox);
m_playerList = new KListView(m_playerGroupBox);
@@ -80,7 +80,7 @@ AuctionWidget::AuctionWidget(AtlanticCore *atlanticCore, Auction *auction, TQWid
KPushButton *bidButton = new KPushButton(i18n("Make Bid"), bidBox, "bidButton");
connect(bidButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBidButtonClicked()));
- // Status label
+ // tqStatus label
m_statusLabel = new TQLabel(this, "statusLabel");
m_mainLayout->addWidget(m_statusLabel);
}
diff --git a/atlantik/libatlantikui/auction_widget.h b/atlantik/libatlantikui/auction_widget.h
index 7250a6e5..8c77d025 100644
--- a/atlantik/libatlantikui/auction_widget.h
+++ b/atlantik/libatlantikui/auction_widget.h
@@ -18,7 +18,7 @@
#define ATLANTIK_AUCTION_WIDGET_H
#include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqmap.h>
#include <klistview.h>
diff --git a/atlantik/libatlantikui/board.cpp b/atlantik/libatlantikui/board.cpp
index 89581a35..c2c8fded 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->geometry().right() - token->width() - 2;
- y = evDest->geometry().top();
+ x = evDest->tqgeometry().right() - token->width() - 2;
+ y = evDest->tqgeometry().top();
}
else
{
- x = evDest->geometry().center().x() - (token->width()/2);
- y = evDest->geometry().center().y() - (token->height()/2);
+ x = evDest->tqgeometry().center().x() - (token->width()/2);
+ y = evDest->tqgeometry().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->geometry().x();
- int yCurrent = m_movingToken->geometry().y();
+ int xCurrent = m_movingToken->tqgeometry().x();
+ int yCurrent = m_movingToken->tqgeometry().y();
// Where do we want to go today?
Estate *eDest = m_atlanticCore->estateAfter(m_movingToken->location());
diff --git a/atlantik/libatlantikui/board.h b/atlantik/libatlantikui/board.h
index c14f384a..c9e160ac 100644
--- a/atlantik/libatlantikui/board.h
+++ b/atlantik/libatlantikui/board.h
@@ -19,7 +19,7 @@
#include <tqwidget.h>
#include <tqtimer.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqptrlist.h>
#include "libatlantikui_export.h"
class TQPoint;
diff --git a/atlantik/libatlantikui/estatedetails.cpp b/atlantik/libatlantikui/estatedetails.cpp
index 9b94ae9d..c92b5cc2 100644
--- a/atlantik/libatlantikui/estatedetails.cpp
+++ b/atlantik/libatlantikui/estatedetails.cpp
@@ -16,7 +16,7 @@
#include <tqpainter.h>
#include <tqpixmap.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqptrlist.h>
#include <tqregexp.h>
#include <tqvgroupbox.h>
@@ -114,7 +114,7 @@ void EstateDetails::paintEvent(TQPaintEvent *)
TQColor greenHouse(0, 255, 0);
TQColor redHotel(255, 51, 51);
TQPainter painter;
- painter.begin(TQT_TQPAINTDEVICE(m_pixmap), this);
+ painter.tqbegin(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.begin(TQT_TQPAINTDEVICE(quartzBuffer), this);
+ quartzPainter.tqbegin(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").arg(m_estate->price()));
+ infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Price: %1").tqarg(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").arg(m_estate->owner() ? m_estate->owner()->name() : i18n("unowned")));
+ infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Owner: %1").tqarg(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").arg(m_estate->houses()));
+ infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Houses: %1").tqarg(m_estate->houses()));
infoText->setPixmap(0, TQPixmap(SmallIcon("info")));
- infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Mortgaged: %1").arg(m_estate->isMortgaged() ? i18n("Yes") : i18n("No")));
+ infoText = new TQListViewItem(m_infoListView, m_infoListView->lastItem(), i18n("Mortgaged: %1").tqarg(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 82586002..2307ef6b 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").arg( m_estate->owner()->name() ) );
+ toolTip.append( "\n" + i18n("Owner: %1").tqarg( m_estate->owner()->name() ) );
if ( m_estate->isMortgaged() )
- toolTip.append( "\n" + i18n("Unmortgage Price: %1").arg( m_estate->unmortgagePrice() ) );
+ toolTip.append( "\n" + i18n("Unmortgage Price: %1").tqarg( m_estate->unmortgagePrice() ) );
else
- toolTip.append( "\n" + i18n("Mortgage Value: %1").arg( m_estate->mortgagePrice() ) );
+ toolTip.append( "\n" + i18n("Mortgage Value: %1").tqarg( m_estate->mortgagePrice() ) );
if ( m_estate->canSellHouses() )
- toolTip.append( "\n" + i18n("House Value: %1").arg( m_estate->houseSellPrice() ) );
+ toolTip.append( "\n" + i18n("House Value: %1").tqarg( m_estate->houseSellPrice() ) );
if ( m_estate->canBuyHouses() )
- toolTip.append( "\n" + i18n("House Price: %1").arg( m_estate->housePrice() ) );
+ toolTip.append( "\n" + i18n("House Price: %1").tqarg( m_estate->housePrice() ) );
}
else if ( m_estate->canBeOwned() )
- toolTip.append( "\n" + i18n("Price: %1").arg( m_estate->price() ) );
+ toolTip.append( "\n" + i18n("Price: %1").tqarg( m_estate->price() ) );
else if ( m_estate->money() )
- toolTip.append( "\n" + i18n("Money: %1").arg( m_estate->money() ) );
+ toolTip.append( "\n" + i18n("Money: %1").tqarg( 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.begin(TQT_TQPAINTDEVICE(qpixmap), this);
+ painter.tqbegin(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.begin(TQT_TQPAINTDEVICE(quartzBuffer), this);
+ quartzPainter.tqbegin(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").arg(player->name()), 3);
+ rmbMenu->insertItem(i18n("Request Trade with %1").tqarg(player->name()), 3);
}
KPopupMenu *pm = dynamic_cast<KPopupMenu *>(rmbMenu);
diff --git a/atlantik/libatlantikui/portfolioview.cpp b/atlantik/libatlantikui/portfolioview.cpp
index 1cd6d2e8..f73d2999 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.begin(TQT_TQPAINTDEVICE(qpixmap), this);
+ painter.tqbegin(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").arg(m_player->name()), 0);
+ rmbMenu->insertItem(i18n("Request Trade with %1").tqarg(m_player->name()), 0);
}
else
{
// Kick player
- rmbMenu->insertItem(i18n("Boot Player %1 to Lounge").arg(m_player->name()), 0);
+ rmbMenu->insertItem(i18n("Boot Player %1 to Lounge").tqarg(m_player->name()), 0);
rmbMenu->setItemEnabled( 0, m_atlanticCore->selfIsMaster() );
}
diff --git a/atlantik/libatlantikui/token.cpp b/atlantik/libatlantikui/token.cpp
index bb60e5ed..d6df61dc 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.begin(TQT_TQPAINTDEVICE(qpixmap), this);
+ painter.tqbegin(TQT_TQPAINTDEVICE(qpixmap), this);
if (m_image)
{
diff --git a/atlantik/libatlantikui/trade_widget.cpp b/atlantik/libatlantikui/trade_widget.cpp
index fc99da50..d6cfe4d4 100644
--- a/atlantik/libatlantikui/trade_widget.cpp
+++ b/atlantik/libatlantikui/trade_widget.cpp
@@ -16,7 +16,7 @@
#include <iostream>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqhgroupbox.h>
#include <tqheader.h>
#include <tqpopupmenu.h>
@@ -52,7 +52,7 @@ TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *p
m_trade = trade;
m_atlanticCore = atlanticCore;
- setCaption(i18n("Trade %1").arg(trade->tradeId()));
+ setCaption(i18n("Trade %1").tqarg(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." ).arg( m_trade->count( true ) ).arg( m_trade->count( false ) ) );
+ m_status->setText( i18n( "%1 out of %2 players accept current trade proposal." ).tqarg( m_trade->count( true ) ).tqarg( 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." ).arg( m_trade->count( true ) ).arg( m_trade->count( false ) ) );
+ m_status->setText( i18n( "%1 out of %2 players accept current trade proposal." ).tqarg( m_trade->count( true ) ).tqarg( 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.").arg(player->name()));
+ m_status->setText(i18n("Trade proposal was rejected by %1.").tqarg(player->name()));
else
m_status->setText(i18n("Trade proposal was rejected."));
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-16 13:59:02 +0000