mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
divelog: turn owning-pointers into unique_ptr<>s
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>
This commit is contained in:
parent
6e352d5281
commit
d242198c99
22 changed files with 113 additions and 138 deletions
|
@ -9,7 +9,7 @@ namespace Command {
|
|||
EditDeviceNickname::EditDeviceNickname(const struct divecomputer *dc, const QString &nicknameIn) :
|
||||
nickname(nicknameIn.toStdString())
|
||||
{
|
||||
index = get_or_add_device_for_dc(divelog.devices, dc);
|
||||
index = get_or_add_device_for_dc(divelog.devices.get(), dc);
|
||||
if (index == -1)
|
||||
return;
|
||||
|
||||
|
@ -18,12 +18,12 @@ EditDeviceNickname::EditDeviceNickname(const struct divecomputer *dc, const QStr
|
|||
|
||||
bool EditDeviceNickname::workToBeDone()
|
||||
{
|
||||
return get_device(divelog.devices, index) != nullptr;
|
||||
return get_device(divelog.devices.get(), index) != nullptr;
|
||||
}
|
||||
|
||||
void EditDeviceNickname::redo()
|
||||
{
|
||||
device *dev = get_device_mutable(divelog.devices, index);
|
||||
device *dev = get_device_mutable(divelog.devices.get(), index);
|
||||
if (!dev)
|
||||
return;
|
||||
std::swap(dev->nickName, nickname);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue