From 2c6cb6df51e5542ce08576cad2745e553ea7153d Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Wed, 9 Mar 2016 15:16:27 -0300 Subject: [PATCH 04/18] Fix warnings in diveplannermodel.cpp Signed-off-by: Tomaz Canabrava --- qt-models/diveplannermodel.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp index 7fbf2e3..f7570fd 100644 --- a/qt-models/diveplannermodel.cpp +++ b/qt-models/diveplannermodel.cpp @@ -25,7 +25,7 @@ void DivePlannerPointsModel::removeSelectedPoints(const QVector &rows) void DivePlannerPointsModel::createSimpleDive() { - struct gasmix gas = { 0 }; + struct gasmix gas = {}; // initialize the start time in the plan diveplan.when = displayed_dive.when; @@ -201,6 +201,7 @@ bool DivePlannerPointsModel::recalcQ() int DivePlannerPointsModel::columnCount(const QModelIndex &parent) const { + Q_UNUSED(parent); return COLUMNS; // to disable CCSETPOINT subtract one } @@ -253,7 +254,7 @@ QVariant DivePlannerPointsModel::data(const QModelIndex &index, int role) const bool DivePlannerPointsModel::setData(const QModelIndex &index, const QVariant &value, int role) { - struct gasmix gas = { 0 }; + struct gasmix gas = {}; int i, shift; if (role == Qt::EditRole) { divedatapoint &p = divepoints[index.row()]; @@ -295,7 +296,7 @@ void DivePlannerPointsModel::gaschange(const QModelIndex &index, QString newgas) { int i = index.row(); gasmix oldgas = divepoints[i].gasmix; - gasmix gas = { 0 }; + gasmix gas = {}; if (!validate_gas(newgas.toUtf8().data(), &gas)) return; while (i < rowCount() && gasmix_distance(&oldgas, &divepoints[i].gasmix) == 0) @@ -587,8 +588,8 @@ int DivePlannerPointsModel::lastEnteredPoint() int DivePlannerPointsModel::addStop(int milimeters, int seconds, gasmix *gas_in, int ccpoint, bool entered) { - struct gasmix air = { 0 }; - struct gasmix gas = { 0 }; + struct gasmix air = {}; + struct gasmix gas = {}; bool usePrevious = false; if (gas_in) gas = *gas_in; -- 2.5.4 (Apple Git-61)