From e9fcd0011150fd1bc60add28482ecf6e65b5c3f7 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 11 May 2015 11:02:38 +0300 Subject: [PATCH] GCC's warnings. --HG-- branch : develop --- src/app/core/vsettings.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/app/core/vsettings.cpp b/src/app/core/vsettings.cpp index 0aed410cb..e29acd826 100644 --- a/src/app/core/vsettings.cpp +++ b/src/app/core/vsettings.cpp @@ -35,6 +35,12 @@ #include "../xml/vabstractmeasurements.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) +# include "../../utils/vmath.h" +#else +# include +#endif + const QString VSettings::SettingConfigurationOsSeparator = QStringLiteral("configuration/osSeparator"); const QString VSettings::SettingConfigurationAutosaveState = QStringLiteral("configuration/autosave/state"); const QString VSettings::SettingConfigurationAutosaveTime = QStringLiteral("configuration/autosave/time"); @@ -485,7 +491,7 @@ void VSettings::SetUserPassword(const QString &value) //--------------------------------------------------------------------------------------------------------------------- int VSettings::GetLayoutPaperHeight() const { - const int def = VAbstractMeasurements::UnitConvertor(1189/*A0*/, Unit::Mm, Unit::Px); + const int def = qFloor(VAbstractMeasurements::UnitConvertor(1189/*A0*/, Unit::Mm, Unit::Px)); bool ok = false; const int height = value(SettingLayoutPaperHeight, def).toInt(&ok); if (ok) @@ -507,7 +513,7 @@ void VSettings::SetLayoutPaperHeight(int value) //--------------------------------------------------------------------------------------------------------------------- int VSettings::GetLayoutPaperWidth() const { - const int def = VAbstractMeasurements::UnitConvertor(841/*A0*/, Unit::Mm, Unit::Px); + const int def = qFloor(VAbstractMeasurements::UnitConvertor(841/*A0*/, Unit::Mm, Unit::Px)); bool ok = false; const int width = value(SettingLayoutPaperWidth, def).toInt(&ok); if (ok) @@ -545,7 +551,7 @@ unsigned int VSettings::GetLayoutShift() const //--------------------------------------------------------------------------------------------------------------------- unsigned int VSettings::GetDefLayoutShift() { - return VAbstractMeasurements::UnitConvertor(50, Unit::Mm, Unit::Px); + return static_cast(VAbstractMeasurements::UnitConvertor(50, Unit::Mm, Unit::Px)); } //--------------------------------------------------------------------------------------------------------------------- @@ -573,7 +579,7 @@ unsigned int VSettings::GetLayoutWidth() const //--------------------------------------------------------------------------------------------------------------------- unsigned int VSettings::GetDefLayoutWidth() { - return VAbstractMeasurements::UnitConvertor(2.5, Unit::Mm, Unit::Px); + return static_cast(VAbstractMeasurements::UnitConvertor(2.5, Unit::Mm, Unit::Px)); } //---------------------------------------------------------------------------------------------------------------------