From 84f06503c67753325ef792f5234247e94b64e6c1 Mon Sep 17 00:00:00 2001 From: Max-Wilhelm Bruker Date: Fri, 17 Jul 2009 21:32:04 +0200 Subject: [PATCH] Fix for floating point conversion --- cockatrice/src/carditem.cpp | 2 +- cockatrice/src/tablezone.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cockatrice/src/carditem.cpp b/cockatrice/src/carditem.cpp index 31788059..6c6da835 100644 --- a/cockatrice/src/carditem.cpp +++ b/cockatrice/src/carditem.cpp @@ -52,7 +52,7 @@ void CardItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, painter->setFont(f); painter->setBrush(QColor(200, 200, 200)); painter->setPen(QPen(Qt::black)); - painter->drawRect(0.5, 0.5, CARD_WIDTH - 1, CARD_HEIGHT - 1); + painter->drawRect(QRectF(0.5, 0.5, CARD_WIDTH - 1, CARD_HEIGHT - 1)); painter->drawText(QRectF(5, 5, CARD_WIDTH - 15, CARD_HEIGHT - 15), Qt::AlignTop | Qt::AlignLeft | Qt::TextWordWrap, name); } painter->restore(); diff --git a/cockatrice/src/tablezone.cpp b/cockatrice/src/tablezone.cpp index e70a6ec6..529282f9 100644 --- a/cockatrice/src/tablezone.cpp +++ b/cockatrice/src/tablezone.cpp @@ -133,7 +133,7 @@ QPoint TableZone::mapToGrid(const QPointF &mapPoint) const else if (y > height - CARD_HEIGHT) y = height - CARD_HEIGHT; - return QPoint(round(((double) x * gridPointsPerCardX) / CARD_WIDTH), round(((double) y * gridPointsPerCardY) / CARD_HEIGHT)); + return QPoint((int) round(((double) x * gridPointsPerCardX) / CARD_WIDTH), (int) round(((double) y * gridPointsPerCardY) / CARD_HEIGHT)); } QPoint TableZone::getFreeGridPoint(int row) const