From 838baf3f99ec5ab81b063eb5449a3381d860f377 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Jun 2011 04:58:26 +0000 Subject: TQt4 port kdegames This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegames@1236074 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- atlantik/libatlantikui/board.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'atlantik/libatlantikui/board.cpp') diff --git a/atlantik/libatlantikui/board.cpp b/atlantik/libatlantikui/board.cpp index 1b9ae0b5..6b48b40d 100644 --- a/atlantik/libatlantikui/board.cpp +++ b/atlantik/libatlantikui/board.cpp @@ -35,7 +35,7 @@ #include "board.h" #include "board.moc" -AtlantikBoard::AtlantikBoard(AtlanticCore *atlanticCore, int maxEstates, DisplayMode mode, TQWidget *parent, const char *name) : TQWidget(parent, name) +AtlantikBoard::AtlantikBoard(AtlanticCore *atlanticCore, int maxEstates, DisplayMode mode, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) { m_atlanticCore = atlanticCore; m_maxEstates = maxEstates; @@ -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()); @@ -560,7 +560,7 @@ void AtlantikBoard::prependEstateDetails(Estate *estate) if (m_displayQueue.getFirst() == m_lastServerDisplay) { - eDetails = new EstateDetails(estate, TQString::null, this); + eDetails = new EstateDetails(estate, TQString(), this); m_displayQueue.prepend(eDetails); connect(eDetails, TQT_SIGNAL(buttonCommand(TQString)), this, TQT_SIGNAL(buttonCommand(TQString))); @@ -572,7 +572,7 @@ void AtlantikBoard::prependEstateDetails(Estate *estate) if (eDetails) { eDetails->setEstate(estate); - eDetails->setText( TQString::null ); + eDetails->setText( TQString() ); // eDetails->clearButtons(); } else -- cgit v1.2.1