From 8d089a750e0fded49e0fb531b3cde689f71ece4f Mon Sep 17 00:00:00 2001 From: Nav Date: Sun, 20 Mar 2022 17:43:51 +0000 Subject: [PATCH] Removed unused EventManager class member from TargetControllerConsole --- src/DebugServers/DebugServer.hpp | 5 +---- src/Insight/Insight.hpp | 5 +---- src/Insight/InsightWorker/InsightWorker.hpp | 5 +---- src/TargetController/TargetControllerConsole.cpp | 4 ++-- src/TargetController/TargetControllerConsole.hpp | 3 +-- 5 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/DebugServers/DebugServer.hpp b/src/DebugServers/DebugServer.hpp index ccf70005..9118dfa0 100644 --- a/src/DebugServers/DebugServer.hpp +++ b/src/DebugServers/DebugServer.hpp @@ -57,10 +57,7 @@ namespace Bloom::DebugServers EnvironmentConfig environmentConfig; DebugServerConfig debugServerConfig; - TargetControllerConsole targetControllerConsole = TargetControllerConsole( - this->eventManager, - *(this->eventListener) - ); + TargetControllerConsole targetControllerConsole = TargetControllerConsole(*(this->eventListener)); /** * Enables the interruption of any blocking file IO. diff --git a/src/Insight/Insight.hpp b/src/Insight/Insight.hpp index 705808f5..a0fad3c2 100644 --- a/src/Insight/Insight.hpp +++ b/src/Insight/Insight.hpp @@ -80,10 +80,7 @@ namespace Bloom this->insightProjectSettings ); - TargetControllerConsole targetControllerConsole = TargetControllerConsole( - this->eventManager, - this->eventListener - ); + TargetControllerConsole targetControllerConsole = TargetControllerConsole(this->eventListener); /** * Insight consists of two threads - the main thread where the main Qt event loop runs (for the GUI), and diff --git a/src/Insight/InsightWorker/InsightWorker.hpp b/src/Insight/InsightWorker/InsightWorker.hpp index 312047fb..cbebe857 100644 --- a/src/Insight/InsightWorker/InsightWorker.hpp +++ b/src/Insight/InsightWorker/InsightWorker.hpp @@ -48,10 +48,7 @@ namespace Bloom EventManager& eventManager; EventListenerPointer eventListener = std::make_shared("InsightWorkerEventListener"); - TargetControllerConsole targetControllerConsole = TargetControllerConsole( - this->eventManager, - *(this->eventListener) - ); + TargetControllerConsole targetControllerConsole = TargetControllerConsole(*(this->eventListener)); TargetControllerState lastTargetControllerState = TargetControllerState::ACTIVE; QTimer* eventDispatchTimer = nullptr; diff --git a/src/TargetController/TargetControllerConsole.cpp b/src/TargetController/TargetControllerConsole.cpp index a90d1151..a65f7f5f 100644 --- a/src/TargetController/TargetControllerConsole.cpp +++ b/src/TargetController/TargetControllerConsole.cpp @@ -9,8 +9,8 @@ namespace Bloom using namespace Bloom::Events; using namespace Bloom::Exceptions; - TargetControllerConsole::TargetControllerConsole(EventManager& eventManager, EventListener& eventListener) - :eventManager(eventManager), eventListener(eventListener) {} + TargetControllerConsole::TargetControllerConsole(EventListener& eventListener) + :eventListener(eventListener) {} TargetControllerState TargetControllerConsole::getTargetControllerState() { return this->triggerTargetControllerEventAndWaitForResponse( diff --git a/src/TargetController/TargetControllerConsole.hpp b/src/TargetController/TargetControllerConsole.hpp index aaaaf52d..60c1546b 100644 --- a/src/TargetController/TargetControllerConsole.hpp +++ b/src/TargetController/TargetControllerConsole.hpp @@ -23,7 +23,7 @@ namespace Bloom class TargetControllerConsole { public: - TargetControllerConsole(EventManager& eventManager, EventListener& eventListener); + TargetControllerConsole(EventListener& eventListener); void setDefaultTimeout(std::chrono::milliseconds timeout) { this->defaultTimeout = timeout; @@ -164,7 +164,6 @@ namespace Bloom std::uint32_t getStackPointer(); private: - EventManager& eventManager; EventListener& eventListener; std::chrono::milliseconds defaultTimeout = std::chrono::milliseconds(20000);