From 406e4287eb96e10ddfd22163f0e863e353470c68 Mon Sep 17 00:00:00 2001 From: Jeremie Guichard Date: Wed, 8 Mar 2017 13:41:41 +0700 Subject: Change calls to rint into lrint avoiding conversion warnings Using gcc option "-Wfloat-conversion" is useful to catch potential conversion errors (where lrint should be used). rint returns double and still raises the same warning, this is why this change updates all rint calls to lrint. In few places, where input type is a float, corresponding lrinf is used. Signed-off-by: Jeremie Guichard --- desktop-widgets/preferences/preferences_graph.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'desktop-widgets/preferences') diff --git a/desktop-widgets/preferences/preferences_graph.cpp b/desktop-widgets/preferences/preferences_graph.cpp index 062f30a6f..8245e59a6 100644 --- a/desktop-widgets/preferences/preferences_graph.cpp +++ b/desktop-widgets/preferences/preferences_graph.cpp @@ -41,7 +41,7 @@ void PreferencesGraph::refreshSettings() ui->show_ccr_sensors->setChecked(prefs.show_ccr_sensors); ui->defaultSetpoint->setValue((double)prefs.defaultsetpoint / 1000.0); ui->psro2rate->setValue(prefs.o2consumption / 1000.0); - ui->pscrfactor->setValue(rint(1000.0 / prefs.pscr_ratio)); + ui->pscrfactor->setValue(lrint(1000.0 / prefs.pscr_ratio)); ui->display_unused_tanks->setChecked(prefs.display_unused_tanks); ui->show_average_depth->setChecked(prefs.show_average_depth); @@ -50,9 +50,9 @@ void PreferencesGraph::refreshSettings() void PreferencesGraph::syncSettings() { auto general = SettingsObjectWrapper::instance()->general_settings; - general->setDefaultSetPoint(rint(ui->defaultSetpoint->value() * 1000.0)); - general->setO2Consumption(rint(ui->psro2rate->value() *1000.0)); - general->setPscrRatio(rint(1000.0 / ui->pscrfactor->value())); + general->setDefaultSetPoint(lrint(ui->defaultSetpoint->value() * 1000.0)); + general->setO2Consumption(lrint(ui->psro2rate->value() *1000.0)); + general->setPscrRatio(lrint(1000.0 / ui->pscrfactor->value())); auto pp_gas = SettingsObjectWrapper::instance()->pp_gas; pp_gas->setPheThreshold(ui->pheThreshold->value()); -- cgit v1.2.3-70-g09d2