mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Silence warnings in diveplannermodel.cpp

Browse source 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2016-03-09 15:16:27 -03:00 • committed by Dirk Hohndel
parent 8378d3dd4b
commit 6a96fe25ec
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
qt-models/diveplannermodel.cpp
View file

@ -25,7 +25,7 @@ void DivePlannerPointsModel::removeSelectedPoints(const QVector<int> &rows)
void DivePlannerPointsModel::createSimpleDive() void DivePlannerPointsModel::createSimpleDive()
{ {
struct gasmix gas = { 0 }; struct gasmix gas = {};
// initialize the start time in the plan // initialize the start time in the plan
diveplan.when = displayed_dive.when; diveplan.when = displayed_dive.when;
@ -201,6 +201,7 @@ bool DivePlannerPointsModel::recalcQ()
int DivePlannerPointsModel::columnCount(const QModelIndex &parent) const int DivePlannerPointsModel::columnCount(const QModelIndex &parent) const
{ {
Q_UNUSED(parent);
return COLUMNS; // to disable CCSETPOINT subtract one 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) bool DivePlannerPointsModel::setData(const QModelIndex &index, const QVariant &value, int role)
{ {
struct gasmix gas = { 0 }; struct gasmix gas = {};
int i, shift; int i, shift;
if (role == Qt::EditRole) { if (role == Qt::EditRole) {
divedatapoint &p = divepoints[index.row()]; divedatapoint &p = divepoints[index.row()];
@ -295,7 +296,7 @@ void DivePlannerPointsModel::gaschange(const QModelIndex &index, QString newgas)
{ {
int i = index.row(); int i = index.row();
gasmix oldgas = divepoints[i].gasmix; gasmix oldgas = divepoints[i].gasmix;
gasmix gas = { 0 }; gasmix gas = {};
if (!validate_gas(newgas.toUtf8().data(), &gas)) if (!validate_gas(newgas.toUtf8().data(), &gas))
return; return;
while (i < rowCount() && gasmix_distance(&oldgas, &divepoints[i].gasmix) == 0) 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) int DivePlannerPointsModel::addStop(int milimeters, int seconds, gasmix *gas_in, int ccpoint, bool entered)
{ {
struct gasmix air = { 0 }; struct gasmix air = {};
struct gasmix gas = { 0 }; struct gasmix gas = {};
bool usePrevious = false; bool usePrevious = false;
if (gas_in) if (gas_in)
gas = *gas_in; gas = *gas_in;