From 3b0f26e23136e60b61203c26075349f1e541f654 Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Wed, 9 Nov 2011 09:39:58 +0100 Subject: [PATCH] Fix qreal is not double. Change-Id: Ife56e908a67da70ebe5af223b19fc8b99fc3a1d2 Reviewed-by: hjk --- src/plugins/designer/formeditorw.cpp | 4 ++-- src/plugins/help/helpviewer_qwv.cpp | 2 +- .../components/formeditor/anchorlinecontroller.cpp | 4 ++-- src/plugins/valgrind/callgrindhelper.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp index fb4ca6cfaf0..48228baf272 100644 --- a/src/plugins/designer/formeditorw.cpp +++ b/src/plugins/designer/formeditorw.cpp @@ -889,8 +889,8 @@ void FormEditorW::print() const double maxScaling = qMin(page.size().width() / pixmapSize.width(), page.size().height() / pixmapSize.height()); const double scaling = qMin(suggestedScaling, maxScaling); - const double xOffset = page.left() + qMax(qreal(0.0), (page.size().width() - scaling * pixmapSize.width()) / 2.0); - const double yOffset = page.top() + qMax(qreal(0.0), (page.size().height() - scaling * pixmapSize.height()) / 2.0); + const double xOffset = page.left() + qMax(0.0, (page.size().width() - scaling * pixmapSize.width()) / 2.0); + const double yOffset = page.top() + qMax(0.0, (page.size().height() - scaling * pixmapSize.height()) / 2.0); // Draw. painter.translate(xOffset, yOffset); diff --git a/src/plugins/help/helpviewer_qwv.cpp b/src/plugins/help/helpviewer_qwv.cpp index c341c26ae93..22bbe4aca55 100644 --- a/src/plugins/help/helpviewer_qwv.cpp +++ b/src/plugins/help/helpviewer_qwv.cpp @@ -295,7 +295,7 @@ void HelpViewer::scaleUp() void HelpViewer::scaleDown() { - setTextSizeMultiplier(qMax(qreal(0.0), textSizeMultiplier() - 0.1)); + setTextSizeMultiplier(qMax(qreal(0.0), textSizeMultiplier() - qreal(0.1))); } void HelpViewer::resetScale() diff --git a/src/plugins/qmldesigner/components/formeditor/anchorlinecontroller.cpp b/src/plugins/qmldesigner/components/formeditor/anchorlinecontroller.cpp index d4386ec6fae..8acf7daf406 100644 --- a/src/plugins/qmldesigner/components/formeditor/anchorlinecontroller.cpp +++ b/src/plugins/qmldesigner/components/formeditor/anchorlinecontroller.cpp @@ -170,8 +170,8 @@ void AnchorLineController::updatePosition() rightBoundingRect.adjust(0, 7, 5, -7); } else { - double height = qMin(boundingRect.height() / 4., qreal(10.0)); - double width = qMin(boundingRect.width() / 4., qreal(10.0)); + double height = qMin(boundingRect.height() / 4., 10.0); + double width = qMin(boundingRect.width() / 4., 10.0); topBoundingRect.setHeight(height); topBoundingRect.adjust(width, -4, -width, -1); diff --git a/src/plugins/valgrind/callgrindhelper.cpp b/src/plugins/valgrind/callgrindhelper.cpp index 3b362f3d355..a1b2ae213f4 100644 --- a/src/plugins/valgrind/callgrindhelper.cpp +++ b/src/plugins/valgrind/callgrindhelper.cpp @@ -58,7 +58,7 @@ QColor CallgrindHelper::colorForString(const QString &text) QColor CallgrindHelper::colorForCostRatio(qreal ratio) { - ratio = qBound(0.0, ratio, 1.0); + ratio = qBound(qreal(0.0), ratio, qreal(1.0)); return QColor::fromHsv(120 - ratio * 120, 255, 255, (-((ratio-1) * (ratio-1))) * 120 + 120); }