From 8212acc9925b28ecd546b01047c6a8fc574326ef Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 25 Oct 2020 09:14:16 +0100 Subject: cleanup: break out event-related code into event.[c|h] In an effort to reduce the size of dive.h and dive.c, break out the event related functions. Moreover event-names were handled by the profile-code, collect that also in the new source files. Signed-off-by: Berthold Stoeger --- profile-widget/diveeventitem.cpp | 4 +--- profile-widget/profilewidget2.cpp | 5 +---- profile-widget/tankitem.cpp | 1 + 3 files changed, 3 insertions(+), 7 deletions(-) (limited to 'profile-widget') diff --git a/profile-widget/diveeventitem.cpp b/profile-widget/diveeventitem.cpp index dcb4d8af0..33f909ecc 100644 --- a/profile-widget/diveeventitem.cpp +++ b/profile-widget/diveeventitem.cpp @@ -3,6 +3,7 @@ #include "qt-models/diveplotdatamodel.h" #include "profile-widget/divecartesianaxis.h" #include "profile-widget/animationfunctions.h" +#include "core/event.h" #include "core/libdivecomputer.h" #include "core/profile.h" #include "core/gettextfromc.h" @@ -12,9 +13,6 @@ #define DEPTH_NOT_FOUND (-2342) -extern struct ev_select *ev_namelist; -extern int evn_used; - DiveEventItem::DiveEventItem(QGraphicsItem *parent) : DivePixmapItem(parent), vAxis(NULL), hAxis(NULL), diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index f3a636fe8..fb2dff744 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include "profile-widget/profilewidget2.h" #include "qt-models/diveplotdatamodel.h" +#include "core/event.h" #include "core/subsurface-string.h" #include "core/qthelper.h" #include "core/picture.h" @@ -1377,10 +1378,6 @@ void ProfileWidget2::setPlanState() } #endif -extern struct ev_select *ev_namelist; -extern int evn_allocated; -extern int evn_used; - bool ProfileWidget2::isPlanner() { return currentState == PLAN; diff --git a/profile-widget/tankitem.cpp b/profile-widget/tankitem.cpp index 4967633ed..adf9ba99c 100644 --- a/profile-widget/tankitem.cpp +++ b/profile-widget/tankitem.cpp @@ -2,6 +2,7 @@ #include "profile-widget/tankitem.h" #include "qt-models/diveplotdatamodel.h" #include "profile-widget/divetextitem.h" +#include "core/event.h" #include "core/profile.h" #include -- cgit v1.2.3-70-g09d2