mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 05:00:20 +00:00
d242198c99
Since everything is C++ now, we can use unique_ptr<>s. This makes the code significantly shorter, because we can now use the default move constructor and assignment operators. This has a semantic change when std::move()-ing the divelog: now not the contents of the tables are moved, but the pointers. That is, the moved-from object now has no more tables and must not be used anymore. This made it necessary to replace std::move()s by std::swap()s. In that regard, the old code was in principle broken: it used moved-from objects, which may work but usually doesn't. This commit adds a myriad of .get() function calls where the code expects a C-style pointer. The plan is to remove virtually all of them, when we move free-standing functions into the class it acts on. Or, replace C-style pointers by references where we don't support NULL. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
60 lines
1.5 KiB
C++
60 lines
1.5 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
#include "divelog.h"
|
|
#include "divelist.h"
|
|
#include "divesite.h"
|
|
#include "device.h"
|
|
#include "errorhelper.h"
|
|
#include "filterpreset.h"
|
|
#include "trip.h"
|
|
|
|
struct divelog divelog;
|
|
|
|
divelog::divelog() :
|
|
dives(std::make_unique<dive_table>()),
|
|
trips(std::make_unique<trip_table>()),
|
|
sites(std::make_unique<dive_site_table>()),
|
|
devices(std::make_unique<device_table>()),
|
|
filter_presets(std::make_unique<filter_preset_table>()),
|
|
autogroup(false)
|
|
{
|
|
*dives = empty_dive_table;
|
|
*trips = empty_trip_table;
|
|
}
|
|
|
|
divelog::~divelog()
|
|
{
|
|
if (dives)
|
|
clear_dive_table(dives.get());
|
|
if (trips)
|
|
clear_trip_table(trips.get());
|
|
}
|
|
|
|
divelog::divelog(divelog &&) = default;
|
|
struct divelog &divelog::operator=(divelog &&) = default;
|
|
|
|
/* this implements the mechanics of removing the dive from the
|
|
* dive log and the trip, but doesn't deal with updating dive trips, etc */
|
|
void divelog::delete_single_dive(int idx)
|
|
{
|
|
if (idx < 0 || idx > dives->nr) {
|
|
report_info("Warning: deleting unexisting dive with index %d", idx);
|
|
return;
|
|
}
|
|
struct dive *dive = dives->dives[idx];
|
|
remove_dive_from_trip(dive, trips.get());
|
|
unregister_dive_from_dive_site(dive);
|
|
delete_dive_from_table(dives.get(), idx);
|
|
}
|
|
|
|
void divelog::clear()
|
|
{
|
|
while (dives->nr > 0)
|
|
delete_single_dive(dives->nr - 1);
|
|
sites->clear();
|
|
if (trips->nr != 0) {
|
|
report_info("Warning: trip table not empty in divelog::clear()!");
|
|
trips->nr = 0;
|
|
}
|
|
clear_device_table(devices.get());
|
|
filter_presets->clear();
|
|
}
|