diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2017-12-01 17:57:32 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-12-01 15:47:51 -0800 |
| commit | c38e0f225f4eb18083ed9eb32e7480ac8230c457 (patch) | |
| tree | eb22b4934d561607796b2d25503a559b7808b4c4 | |
| parent | 511ee9ddeb64ff7cf9c5fe50c491c0e335365ced (diff) | |
| download | subsurface-c38e0f225f4eb18083ed9eb32e7480ac8230c457.tar.gz | |
Remove unnecessary #include and correct whitespace
Signed-off-by: Robert C. Helling <helling@atdotde.de>
| -rw-r--r-- | core/deco.c | 2 | ||||
| -rw-r--r-- | qt-models/diveplannermodel.cpp | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/core/deco.c b/core/deco.c index 44103cb47..b276e3e82 100644 --- a/core/deco.c +++ b/core/deco.c @@ -501,7 +501,7 @@ void add_segment(struct deco_state *ds, double pressure, const struct gasmix *ga ds->tissue_inertgas_saturation[ci] = ds->tissue_n2_sat[ci] + ds->tissue_he_sat[ci]; } - if(decoMode() == VPMB) + if (decoMode() == VPMB) calc_crushing_pressure(ds, pressure); return; } diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp index 25d0d662b..6f03fb073 100644 --- a/qt-models/diveplannermodel.cpp +++ b/qt-models/diveplannermodel.cpp @@ -11,7 +11,6 @@ #include <QApplication> #include <QTextDocument> #include <QtConcurrent> -#include "desktop-widgets/mainwindow.h" #define VARIATIONS_IN_BACKGROUND 1 @@ -1031,12 +1030,11 @@ void DivePlannerPointsModel::computeVariations(struct diveplan *original_plan, s struct divedatapoint *last_segment; struct deco_state ds = *previos_ds; - if(!original_plan) { -// setRecalc(oldRecalc); + if (!original_plan) return; - } - if(in_planner() && prefs.display_variations && decoMode() != RECREATIONAL) { + + if (in_planner() && prefs.display_variations && decoMode() != RECREATIONAL) { int my_instance = ++instanceCounter; cache_deco_state(&ds, &save); |