From 9298f2a4e52d8b011b19331041455a45d57678b6 Mon Sep 17 00:00:00 2001 From: David Crocker Date: Tue, 29 Jun 2021 10:58:57 +0100 Subject: Refactored swap-and-delete operations --- src/Comms/PanelDueUpdater.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/Comms') diff --git a/src/Comms/PanelDueUpdater.cpp b/src/Comms/PanelDueUpdater.cpp index d0a85666..21d6de63 100644 --- a/src/Comms/PanelDueUpdater.cpp +++ b/src/Comms/PanelDueUpdater.cpp @@ -115,11 +115,11 @@ PanelDueUpdater::PanelDueUpdater() noexcept PanelDueUpdater::~PanelDueUpdater() noexcept { - DeleteAndClear(samba); - DeleteAndClear(serialPort); - DeleteAndClear(device); - DeleteAndClear(flasherObserver); - DeleteAndClear(flasher); + DeleteObject(samba); + DeleteObject(serialPort); + DeleteObject(device); + DeleteObject(flasherObserver); + DeleteObject(flasher); } void PanelDueUpdater::Start(const StringRef& filenameRef, const uint32_t serialChan) noexcept @@ -270,11 +270,11 @@ void PanelDueUpdater::Spin() noexcept currentBaudRate = 0; // Delete all objects we new'd - DeleteAndClear(samba); - DeleteAndClear(serialPort); - DeleteAndClear(device); - DeleteAndClear(flasherObserver); - DeleteAndClear(flasher); + DeleteObject(samba); + DeleteObject(serialPort); + DeleteObject(device); + DeleteObject(flasherObserver); + DeleteObject(flasher); offset = 0; erasedAndResetAt = 0; @@ -310,11 +310,11 @@ void PanelDueUpdater::Spin() noexcept } // Delete all objects we new'd - DeleteAndClear(samba); - DeleteAndClear(serialPort); - DeleteAndClear(device); - DeleteAndClear(flasherObserver); - DeleteAndClear(flasher); + DeleteObject(samba); + DeleteObject(serialPort); + DeleteObject(device); + DeleteObject(flasherObserver); + DeleteObject(flasher); state = FlashState::done; } -- cgit v1.2.3