mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
core: turn C dive-table into an owning table
This is a humongous commit, because it touches all parts of the code. It removes the last user of our horrible TABLE macros, which simulate std::vector<> in a very clumsy way. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
parent
f00c30ad4a
commit
b95ac3f79c
73 changed files with 1030 additions and 1230 deletions
|
@ -3,17 +3,18 @@
|
|||
#ifndef DIVELOG_H
|
||||
#define DIVELOG_H
|
||||
|
||||
#include "divelist.h"
|
||||
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
struct dive_table;
|
||||
struct trip_table;
|
||||
class dive_site_table;
|
||||
struct device;
|
||||
struct filter_preset_table;
|
||||
|
||||
struct divelog {
|
||||
std::unique_ptr<dive_table> dives;
|
||||
dive_table dives;
|
||||
std::unique_ptr<trip_table> trips;
|
||||
std::unique_ptr<dive_site_table> sites;
|
||||
std::vector<device> devices;
|
||||
|
@ -26,7 +27,9 @@ struct divelog {
|
|||
divelog &operator=(divelog &&); // move assignment (argument is consumed).
|
||||
|
||||
void delete_single_dive(int idx);
|
||||
void delete_multiple_dives(const std::vector<dive *> &dives);
|
||||
void clear();
|
||||
bool is_trip_before_after(const struct dive *dive, bool before) const;
|
||||
};
|
||||
|
||||
extern struct divelog divelog;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue