core: fold display.h into profile.h

The only things in display.h were profile related, so the
split between these two files is not comprehensible.
In fact profile.h includes display.h, because it needs the
struct defined therein. Let's just merge these two files.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

Subsurface-mobile.pro

@@ -218,7 +218,6 @@ HEADERS += \
 	core/configuredivecomputer.h \
 	core/datatrak.h \
 	core/deco.h \
-	core/display.h \
 	core/divefilter.h \
 	core/filterconstraint.h \
 	core/filterpreset.h \

core/CMakeLists.txt

@@ -59,7 +59,6 @@ set(SUBSURFACE_CORE_LIB_SRCS
 	device.h
 	devicedetails.cpp
 	devicedetails.h
-	display.h
 	dive.c
 	dive.h
 	divecomputer.c

core/display.h

@@ -1,33 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#ifndef DISPLAY_H
-#define DISPLAY_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Plot info with smoothing, velocity indication
- * and one-, two- and three-minute minimums and maximums */
-struct plot_info {
-	int nr;
-	int nr_cylinders;
-	int maxtime;
-	int meandepth, maxdepth;
-	int minpressure, maxpressure;
-	int minhr, maxhr;
-	int mintemp, maxtemp;
-	enum {AIR, NITROX, TRIMIX, FREEDIVING} dive_type;
-	double endtempcoord;
-	double maxpp;
-	bool waypoint_above_ceiling;
-	struct plot_data *entry;
-	struct plot_pressure_data *pressures; /* cylinders.nr blocks of nr entries. */
-};
-
-#define AMB_PERCENTAGE 50.0
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // DISPLAY_H

core/equipment.c

@@ -14,7 +14,6 @@
 #include "equipment.h"
 #include "gettext.h"
 #include "dive.h"
-#include "display.h"
 #include "divelist.h"
 #include "pref.h"
 #include "subsurface-string.h"

core/gaspressures.c

@@ -21,7 +21,6 @@
 #include "ssrf.h"
 #include "dive.h"
 #include "event.h"
-#include "display.h"
 #include "profile.h"
 #include "gaspressures.h"
 #include "pref.h"

core/libdivecomputer.c

@@ -18,7 +18,6 @@
 #include "subsurface-string.h"
 #include "device.h"
 #include "dive.h"
-#include "display.h"
 #include "errorhelper.h"
 #include "event.h"
 #include "sha1.h"

core/profile.c

@@ -9,7 +9,6 @@
 #include <assert.h>
 
 #include "dive.h"
-#include "display.h"
 #include "divelist.h"
 #include "event.h"
 #include "interpolate.h"

core/profile.h

@@ -3,7 +3,6 @@
 #define PROFILE_H
 
 #include "dive.h"
-#include "display.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -26,7 +25,6 @@ enum plot_pressure {
 struct membuffer;
 struct deco_state;
 struct divecomputer;
-struct plot_info;
 
 /*
  * sensor data for a given cylinder
@@ -78,6 +76,26 @@ struct plot_data {
 	bool icd_warning;
 };
 
+/* Plot info with smoothing, velocity indication
+ * and one-, two- and three-minute minimums and maximums */
+struct plot_info {
+	int nr;
+	int nr_cylinders;
+	int maxtime;
+	int meandepth, maxdepth;
+	int minpressure, maxpressure;
+	int minhr, maxhr;
+	int mintemp, maxtemp;
+	enum {AIR, NITROX, TRIMIX, FREEDIVING} dive_type;
+	double endtempcoord;
+	double maxpp;
+	bool waypoint_above_ceiling;
+	struct plot_data *entry;
+	struct plot_pressure_data *pressures; /* cylinders.nr blocks of nr entries. */
+};
+
+#define AMB_PERCENTAGE 50.0
+
 extern void compare_samples(const struct dive *d, const struct plot_info *pi, int idx1, int idx2, char *buf, int bufsize, bool sum);
 extern void init_plot_info(struct plot_info *pi);
 /* when planner_dc is non-null, this is called in planner mode. */

core/save-profiledata.c

@@ -1,5 +1,4 @@
 #include "core/profile.h"
-#include "core/display.h"
 #include "core/errorhelper.h"
 #include "core/file.h"
 #include "core/membuffer.h"

core/statistics.c

@@ -9,7 +9,6 @@
 
 #include "statistics.h"
 #include "dive.h"
-#include "display.h"
 #include "event.h"
 #include "gettext.h"
 #include "sample.h"

core/uploadDiveLogsDE.cpp

@@ -5,7 +5,6 @@
 #include <QTemporaryFile>
 #include <zip.h>
 #include <errno.h>
-#include "core/display.h"
 #include "core/errorhelper.h"
 #include "core/qthelper.h"
 #include "core/dive.h"

desktop-widgets/configuredivecomputerdialog.cpp

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/configuredivecomputerdialog.h"
 
-#include "core/display.h"
 #include "core/qthelper.h"
 #include "core/settings/qPrefDiveComputer.h"
 #include "desktop-widgets/mainwindow.h"

desktop-widgets/divesiteimportdialog.cpp

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/divesiteimportdialog.h"
 #include "commands/command.h"
-#include "core/display.h"
 #include "core/qthelper.h"
 #include "core/metrics.h"
 #include "core/subsurface-string.h"

desktop-widgets/downloadfromdivecomputer.cpp

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/downloadfromdivecomputer.h"
 #include "commands/command.h"
-#include "core/display.h"
 #include "core/qthelper.h"
 #include "core/divelist.h"
 #include "core/settings/qPrefDiveComputer.h"

desktop-widgets/tab-widgets/TabDiveInformation.cpp

@@ -10,7 +10,6 @@
 #include "core/dive.h"
 #include "core/qthelper.h"
 #include "core/statistics.h"
-#include "core/display.h"
 #include "core/divelist.h"
 
 #define COMBO_CHANGED 0

profile-widget/divecartesianaxis.cpp

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "profile-widget/divecartesianaxis.h"
 #include "profile-widget/divetextitem.h"
+#include "core/profile.h"
 #include "core/qthelper.h"
 #include "core/subsurface-string.h"
 #include "profile-widget/animationfunctions.h"

profile-widget/divetooltipitem.cpp

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "profile-widget/divetooltipitem.h"
 #include "profile-widget/divecartesianaxis.h"
-#include "core/profile.h"
 #include "core/membuffer.h"
 #include "core/metrics.h"
 #include "core/settings/qPrefDisplay.h"

profile-widget/divetooltipitem.h

@@ -9,8 +9,9 @@
 #include <QElapsedTimer>
 #include <QPainter>
 #include "backend-shared/roundrectitem.h"
-#include "core/display.h"
+#include "core/profile.h"
 
+struct dive;
 class DiveCartesianAxis;
 class QGraphicsLineItem;
 class QGraphicsSimpleTextItem;

profile-widget/profilescene.h

@@ -5,7 +5,7 @@
 #define PROFILESCENE_H
 
 #include "core/color.h"
-#include "core/display.h"
+#include "core/profile.h"
 
 #include <QGraphicsScene>
 #include <QPainter>

profile-widget/ruleritem.cpp

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "profile-widget/ruleritem.h"
 #include "profile-widget/profilewidget2.h"
-#include "core/display.h"
 #include "core/settings/qPrefTechnicalDetails.h"
 
 #include <qgraphicssceneevent.h>

profile-widget/ruleritem.h

@@ -6,7 +6,7 @@
 #include <QGraphicsEllipseItem>
 #include <QGraphicsObject>
 #include "profile-widget/divecartesianaxis.h"
-#include "core/display.h"
+#include "core/profile.h"
 
 struct plot_data;
 class RulerItem2;

qt-models/filtermodels.cpp

@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "qt-models/filtermodels.h"
-#include "core/display.h"
 #include "core/qthelper.h"
 #include "core/trip.h"
 #include "core/subsurface-string.h"