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

Remove unnecessary #include and correct whitespace

Browse source 
Signed-off-by: Robert C. Helling <helling@atdotde.de>
This commit is contained in:
Robert C. Helling 2017-12-01 17:57:32 +01:00 • committed by Dirk Hohndel
parent 511ee9ddeb
commit c38e0f225f
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/deco.c
View file

@ -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]; 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); calc_crushing_pressure(ds, pressure);
return; return;
} }

8
qt-models/diveplannermodel.cpp
View file

@ -11,7 +11,6 @@
#include <QApplication> #include <QApplication>
#include <QTextDocument> #include <QTextDocument>
#include <QtConcurrent> #include <QtConcurrent>
#include "desktop-widgets/mainwindow.h"
#define VARIATIONS_IN_BACKGROUND 1 #define VARIATIONS_IN_BACKGROUND 1
@ -1031,12 +1030,11 @@ void DivePlannerPointsModel::computeVariations(struct diveplan *original_plan, s
struct divedatapoint *last_segment; struct divedatapoint *last_segment;
struct deco_state ds = *previos_ds; struct deco_state ds = *previos_ds;
if(!original_plan) { if (!original_plan)
// setRecalc(oldRecalc);
return; return;
}
if(in_planner() && prefs.display_variations && decoMode() != RECREATIONAL) {
if (in_planner() && prefs.display_variations && decoMode() != RECREATIONAL) {
int my_instance = ++instanceCounter; int my_instance = ++instanceCounter;
cache_deco_state(&ds, &save); cache_deco_state(&ds, &save);