doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed unused EventManager class member from DebugServer and derived classes

Browse Source
This commit is contained in:
Nav
2022-03-20 17:55:15 +00:00
parent 3f70e84f68
commit 28396d9d80
4 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Application.hpp
View File

@@ -51,7 +51,6 @@ namespace Bloom
"avr-gdb-rsp", "avr-gdb-rsp",
[this] () -> std::unique_ptr<DebugServers::DebugServer> { [this] () -> std::unique_ptr<DebugServers::DebugServer> {
return std::make_unique<DebugServers::Gdb::AvrGdbRsp>( return std::make_unique<DebugServers::Gdb::AvrGdbRsp>(
this->eventManager,
this->projectConfig.value(), this->projectConfig.value(),
this->environmentConfig.value(), this->environmentConfig.value(),
this->debugServerConfig.value() this->debugServerConfig.value()

11
src/DebugServers/DebugServer.hpp
View File

@@ -29,15 +29,14 @@ namespace Bloom::DebugServers
{ {
public: public:
explicit DebugServer( explicit DebugServer(
EventManager& eventManager,
const ProjectConfig& projectConfig, const ProjectConfig& projectConfig,
const EnvironmentConfig& environmentConfig, const EnvironmentConfig& environmentConfig,
const DebugServerConfig& debugServerConfig const DebugServerConfig& debugServerConfig
) )
: eventManager(eventManager) : projectConfig(projectConfig)
, projectConfig(projectConfig)
, environmentConfig(environmentConfig) , environmentConfig(environmentConfig)
, debugServerConfig(debugServerConfig) {}; , debugServerConfig(debugServerConfig)
{};
/** /**
* Entry point for the DebugServer. This must called from a dedicated thread. * Entry point for the DebugServer. This must called from a dedicated thread.
@@ -47,10 +46,6 @@ namespace Bloom::DebugServers
virtual std::string getName() const = 0; virtual std::string getName() const = 0;
protected: protected:
/**
* Application-wide instance to EventManager
*/
EventManager& eventManager;
EventListenerPointer eventListener = std::make_shared<EventListener>("DebugServerEventListener"); EventListenerPointer eventListener = std::make_shared<EventListener>("DebugServerEventListener");
ProjectConfig projectConfig; ProjectConfig projectConfig;

3
src/DebugServers/GdbRsp/AvrGdbRsp/AvrGdbRsp.hpp
View File

@@ -27,11 +27,10 @@ namespace Bloom::DebugServers::Gdb
{ {
public: public:
explicit AvrGdbRsp( explicit AvrGdbRsp(
EventManager& eventManager,
const ProjectConfig& projectConfig, const ProjectConfig& projectConfig,
const EnvironmentConfig& environmentConfig, const EnvironmentConfig& environmentConfig,
const DebugServerConfig& debugServerConfig const DebugServerConfig& debugServerConfig
): GdbRspDebugServer(eventManager, projectConfig, environmentConfig, debugServerConfig) {}; ): GdbRspDebugServer(projectConfig, environmentConfig, debugServerConfig) {};
std::string getName() const override { std::string getName() const override {
return "AVR GDB Remote Serial Protocol Debug Server"; return "AVR GDB Remote Serial Protocol Debug Server";

3
src/DebugServers/GdbRsp/GdbRspDebugServer.hpp
View File

@@ -42,11 +42,10 @@ namespace Bloom::DebugServers::Gdb
{ {
public: public:
explicit GdbRspDebugServer( explicit GdbRspDebugServer(
EventManager& eventManager,
const ProjectConfig& projectConfig, const ProjectConfig& projectConfig,
const EnvironmentConfig& environmentConfig, const EnvironmentConfig& environmentConfig,
const DebugServerConfig& debugServerConfig const DebugServerConfig& debugServerConfig
): DebugServer(eventManager, projectConfig, environmentConfig, debugServerConfig) {}; ): DebugServer(projectConfig, environmentConfig, debugServerConfig) {};
std::string getName() const override { std::string getName() const override {
return "GDB Remote Serial Protocol DebugServer"; return "GDB Remote Serial Protocol DebugServer";