From 69ee785edd4562d49ee7d045d9c165cf51a57006 Mon Sep 17 00:00:00 2001 From: Nav Date: Tue, 8 Feb 2022 16:46:10 +0000 Subject: [PATCH] Tidying --- .../InsightWorker/Tasks/QueryLatestVersionNumber.hpp | 4 ++-- src/Insight/InsightWorker/Tasks/ReadStackPointer.hpp | 2 +- src/Insight/InsightWorker/Tasks/ReadTargetMemory.hpp | 10 +++++----- .../InsightWorker/Tasks/ReadTargetRegisters.hpp | 3 +-- .../InsightWorker/Tasks/RefreshTargetPinStates.hpp | 2 +- src/Insight/InsightWorker/Tasks/SetTargetPinState.hpp | 2 +- .../InsightWorker/Tasks/WriteTargetRegister.hpp | 3 +-- src/SignalHandler/SignalHandler.cpp | 2 +- 8 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/Insight/InsightWorker/Tasks/QueryLatestVersionNumber.hpp b/src/Insight/InsightWorker/Tasks/QueryLatestVersionNumber.hpp index 8972b217..919b5478 100644 --- a/src/Insight/InsightWorker/Tasks/QueryLatestVersionNumber.hpp +++ b/src/Insight/InsightWorker/Tasks/QueryLatestVersionNumber.hpp @@ -11,8 +11,8 @@ namespace Bloom Q_OBJECT public: - QueryLatestVersionNumber(const VersionNumber& currentVersionNumber): - InsightWorkerTask(), currentVersionNumber(currentVersionNumber) {} + explicit QueryLatestVersionNumber(const VersionNumber& currentVersionNumber): + currentVersionNumber(currentVersionNumber) {} signals: void latestVersionNumberRetrieved(const VersionNumber& latestVersionNumber); diff --git a/src/Insight/InsightWorker/Tasks/ReadStackPointer.hpp b/src/Insight/InsightWorker/Tasks/ReadStackPointer.hpp index 65cf9e06..35efa23f 100644 --- a/src/Insight/InsightWorker/Tasks/ReadStackPointer.hpp +++ b/src/Insight/InsightWorker/Tasks/ReadStackPointer.hpp @@ -9,7 +9,7 @@ namespace Bloom Q_OBJECT public: - ReadStackPointer(): InsightWorkerTask() {} + ReadStackPointer() = default; signals: void stackPointerRead(std::uint32_t stackPointer); diff --git a/src/Insight/InsightWorker/Tasks/ReadTargetMemory.hpp b/src/Insight/InsightWorker/Tasks/ReadTargetMemory.hpp index b759b5ef..d09da211 100644 --- a/src/Insight/InsightWorker/Tasks/ReadTargetMemory.hpp +++ b/src/Insight/InsightWorker/Tasks/ReadTargetMemory.hpp @@ -18,11 +18,11 @@ namespace Bloom std::uint32_t startAddress, std::uint32_t size, const std::set& excludedAddressRanges = {} - ): - memoryType(memoryType), - startAddress(startAddress), - size(size), - excludedAddressRanges(excludedAddressRanges) {} + ) + : memoryType(memoryType) + , startAddress(startAddress) + , size(size) + , excludedAddressRanges(excludedAddressRanges) {} signals: void targetMemoryRead(Targets::TargetMemoryBuffer buffer); diff --git a/src/Insight/InsightWorker/Tasks/ReadTargetRegisters.hpp b/src/Insight/InsightWorker/Tasks/ReadTargetRegisters.hpp index 3fccefa9..3c53aacb 100644 --- a/src/Insight/InsightWorker/Tasks/ReadTargetRegisters.hpp +++ b/src/Insight/InsightWorker/Tasks/ReadTargetRegisters.hpp @@ -10,8 +10,7 @@ namespace Bloom Q_OBJECT public: - ReadTargetRegisters(const Targets::TargetRegisterDescriptors& descriptors): - InsightWorkerTask(), descriptors(descriptors) {} + explicit ReadTargetRegisters(const Targets::TargetRegisterDescriptors& descriptors): descriptors(descriptors) {} signals: void targetRegistersRead(Targets::TargetRegisters registers); diff --git a/src/Insight/InsightWorker/Tasks/RefreshTargetPinStates.hpp b/src/Insight/InsightWorker/Tasks/RefreshTargetPinStates.hpp index b6819106..8da6e2c5 100644 --- a/src/Insight/InsightWorker/Tasks/RefreshTargetPinStates.hpp +++ b/src/Insight/InsightWorker/Tasks/RefreshTargetPinStates.hpp @@ -11,7 +11,7 @@ namespace Bloom Q_OBJECT public: - RefreshTargetPinStates(int variantId): InsightWorkerTask(), variantId(variantId) {} + explicit RefreshTargetPinStates(int variantId): variantId(variantId) {} signals: void targetPinStatesRetrieved(Bloom::Targets::TargetPinStateMappingType pinStatesByNumber); diff --git a/src/Insight/InsightWorker/Tasks/SetTargetPinState.hpp b/src/Insight/InsightWorker/Tasks/SetTargetPinState.hpp index 4957f26b..bec29baa 100644 --- a/src/Insight/InsightWorker/Tasks/SetTargetPinState.hpp +++ b/src/Insight/InsightWorker/Tasks/SetTargetPinState.hpp @@ -11,7 +11,7 @@ namespace Bloom public: SetTargetPinState(const Targets::TargetPinDescriptor& pinDescriptor, const Targets::TargetPinState& pinState): - InsightWorkerTask(), pinDescriptor(pinDescriptor), pinState(pinState) {} + pinDescriptor(pinDescriptor), pinState(pinState) {} protected: void run(TargetControllerConsole& targetControllerConsole) override; diff --git a/src/Insight/InsightWorker/Tasks/WriteTargetRegister.hpp b/src/Insight/InsightWorker/Tasks/WriteTargetRegister.hpp index fd86bc6b..ce61129f 100644 --- a/src/Insight/InsightWorker/Tasks/WriteTargetRegister.hpp +++ b/src/Insight/InsightWorker/Tasks/WriteTargetRegister.hpp @@ -10,8 +10,7 @@ namespace Bloom Q_OBJECT public: - WriteTargetRegister(const Targets::TargetRegister& targetRegister): - InsightWorkerTask(), targetRegister(targetRegister) {} + explicit WriteTargetRegister(const Targets::TargetRegister& targetRegister): targetRegister(targetRegister) {} protected: void run(TargetControllerConsole& targetControllerConsole) override; diff --git a/src/SignalHandler/SignalHandler.cpp b/src/SignalHandler/SignalHandler.cpp index 0d593bf3..7924ce50 100644 --- a/src/SignalHandler/SignalHandler.cpp +++ b/src/SignalHandler/SignalHandler.cpp @@ -74,7 +74,7 @@ namespace Bloom if (this->shutdownSignalsReceived > 1) { // User has likely run out of patience Logger::warning("Aborting immediately"); - exit(EXIT_FAILURE); + std::exit(EXIT_FAILURE); } Logger::info("Attempting clean shutdown");