feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix qreal is not double.

Browse Source 
Change-Id: Ife56e908a67da70ebe5af223b19fc8b99fc3a1d2
Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from commit 3b0f26e231)
This commit is contained in:
Felix Geyer
2011-11-09 09:39:58 +01:00
committed by Eike Ziller
parent 371ae894f0
commit 28b920ecd4
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/designer/formeditorw.cpp
View File

@@ -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);

2
src/plugins/help/helpviewer_qwv.cpp
View File

@@ -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()

4
src/plugins/qmldesigner/components/formeditor/anchorlinecontroller.cpp
View File

@@ -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);

2
src/plugins/valgrind/callgrindhelper.cpp
View File

@@ -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);
}