diff --git a/src/animations/splineanimation.cpp b/src/animations/splineanimation.cpp index 2ae2c80..3472cd9 100644 --- a/src/animations/splineanimation.cpp +++ b/src/animations/splineanimation.cpp @@ -144,10 +144,10 @@ QVariant SplineAnimation::interpolated(const QVariant &start, const QVariant &en continue; x = startPair.second[i * 2].x() + ((endPair.second[i * 2].x() - startPair.second[i * 2].x()) * progress); y = startPair.second[i * 2].y() + ((endPair.second[i * 2].y() - startPair.second[i * 2].y()) * progress); - result.second << QPoint(x,y); + result.second << QPointF(x,y); x = startPair.second[i * 2 + 1].x() + ((endPair.second[i * 2 + 1].x() - startPair.second[i * 2 + 1].x()) * progress); y = startPair.second[i * 2 + 1].y() + ((endPair.second[i * 2 + 1].y() - startPair.second[i * 2 + 1].y()) * progress); - result.second << QPoint(x,y); + result.second << QPointF(x,y); } } diff --git a/src/legend/legendlayout.cpp b/src/legend/legendlayout.cpp index b2cbfcc..cc32a03 100644 --- a/src/legend/legendlayout.cpp +++ b/src/legend/legendlayout.cpp @@ -119,7 +119,7 @@ void LegendLayout::setAttachedGeometry(const QRectF& rect) QPointF point(0,0); foreach (LegendMarker* marker, m_legend->d_ptr->markers()) { if (marker->isVisible()) { - marker->setGeometry(QRectF(QPoint(0,0),marker->effectiveSizeHint(Qt::PreferredSize))); + marker->setGeometry(QRectF(QPointF(0,0),marker->effectiveSizeHint(Qt::PreferredSize))); marker->setPos(point.x(),rect.height()/2 - marker->boundingRect().height()/2); const QRectF& rect = marker->boundingRect(); size = size.expandedTo(rect.size()); @@ -143,7 +143,7 @@ void LegendLayout::setAttachedGeometry(const QRectF& rect) QPointF point(0,0); foreach (LegendMarker* marker, m_legend->d_ptr->markers()) { if (marker->isVisible()) { - marker->setGeometry(QRectF(QPoint(0,0),marker->effectiveSizeHint(Qt::PreferredSize))); + marker->setGeometry(QRectF(QPointF(0,0),marker->effectiveSizeHint(Qt::PreferredSize))); marker->setPos(point); const QRectF& rect = marker->boundingRect(); qreal h = rect.height(); @@ -195,7 +195,7 @@ void LegendLayout::setDettachedGeometry(const QRectF& rect) for (int i=0; iisVisible()) { - marker->setGeometry(QRectF(QPoint(0,0),marker->effectiveSizeHint(Qt::PreferredSize))); + marker->setGeometry(QRectF(QPointF(0,0),marker->effectiveSizeHint(Qt::PreferredSize))); marker->setPos(point.x(),point.y()); const QRectF& boundingRect = marker->boundingRect(); qreal w = boundingRect.width(); @@ -228,7 +228,7 @@ void LegendLayout::setDettachedGeometry(const QRectF& rect) for (int i=0; iisVisible()) { - marker->setGeometry(QRectF(QPoint(0,0),marker->effectiveSizeHint(Qt::PreferredSize))); + marker->setGeometry(QRectF(QPointF(0,0),marker->effectiveSizeHint(Qt::PreferredSize))); const QRectF& boundingRect = marker->boundingRect(); qreal w = boundingRect.width(); qreal h = boundingRect.height(); @@ -262,7 +262,7 @@ void LegendLayout::setDettachedGeometry(const QRectF& rect) for (int i=0; iisVisible()) { - marker->setGeometry(QRectF(QPoint(0,0),marker->effectiveSizeHint(Qt::PreferredSize))); + marker->setGeometry(QRectF(QPointF(0,0),marker->effectiveSizeHint(Qt::PreferredSize))); const QRectF& boundingRect = marker->boundingRect(); qreal w = boundingRect.width(); qreal h = boundingRect.height(); @@ -298,7 +298,7 @@ void LegendLayout::setDettachedGeometry(const QRectF& rect) for (int i=0; iisVisible()) { - marker->setGeometry(QRectF(QPoint(0,0),marker->effectiveSizeHint(Qt::PreferredSize))); + marker->setGeometry(QRectF(QPointF(0,0),marker->effectiveSizeHint(Qt::PreferredSize))); const QRectF& boundingRect = marker->boundingRect(); qreal w = boundingRect.width(); qreal h = boundingRect.height(); diff --git a/src/scroller.cpp b/src/scroller.cpp index 66319b8..a0c8f2b 100644 --- a/src/scroller.cpp +++ b/src/scroller.cpp @@ -55,7 +55,7 @@ void Scroller::mousePressEvent(QGraphicsSceneMouseEvent* event) case Scroll: { m_state = Stop; - m_speed = QPoint(0, 0); + m_speed = QPointF(0, 0); m_offset = offset(); m_press = event->pos(); event->accept();