Refactor dctype -> divemode

... and repair a failed rebase (sorry).

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Robert C. Helling 2015-01-11 00:01:15 +01:00 committed by Dirk Hohndel
parent bfe05b4340
commit e219bc70f8
18 changed files with 204 additions and 184 deletions

View file

@ -785,13 +785,13 @@ void DivePlannerPointsModel::setGFLow(const int ghflow)
void DivePlannerPointsModel::setRebreatherMode(QString mode)
{
qDebug() << mode << "selected, was" << displayed_dive.dc.dctype;
qDebug() << mode << "selected, was" << displayed_dive.dc.divemode;
if (mode == "OC")
displayed_dive.dc.dctype = OC;
displayed_dive.dc.divemode = OC;
else if (mode == "pSCR")
displayed_dive.dc.dctype = PSCR;
displayed_dive.dc.divemode = PSCR;
else if (mode == "CCR")
displayed_dive.dc.dctype = CCR;
displayed_dive.dc.divemode = CCR;
plannerModel->emitDataChanged();
}