Removed unused EventManager class member from Insight and InsightWorker
This commit is contained in:
@@ -44,7 +44,6 @@ namespace Bloom
|
|||||||
if (this->insightConfig->insightEnabled) {
|
if (this->insightConfig->insightEnabled) {
|
||||||
this->insight = std::make_unique<Insight>(
|
this->insight = std::make_unique<Insight>(
|
||||||
*(this->applicationEventListener),
|
*(this->applicationEventListener),
|
||||||
this->eventManager,
|
|
||||||
this->projectConfig.value(),
|
this->projectConfig.value(),
|
||||||
this->environmentConfig.value(),
|
this->environmentConfig.value(),
|
||||||
this->insightConfig.value(),
|
this->insightConfig.value(),
|
||||||
|
|||||||
@@ -16,14 +16,12 @@ namespace Bloom
|
|||||||
|
|
||||||
Insight::Insight(
|
Insight::Insight(
|
||||||
EventListener& eventListener,
|
EventListener& eventListener,
|
||||||
EventManager& eventManager,
|
|
||||||
const ProjectConfig& projectConfig,
|
const ProjectConfig& projectConfig,
|
||||||
const EnvironmentConfig& environmentConfig,
|
const EnvironmentConfig& environmentConfig,
|
||||||
const InsightConfig& insightConfig,
|
const InsightConfig& insightConfig,
|
||||||
InsightProjectSettings& insightProjectSettings
|
InsightProjectSettings& insightProjectSettings
|
||||||
)
|
)
|
||||||
: eventListener(eventListener)
|
: eventListener(eventListener)
|
||||||
, eventManager(eventManager)
|
|
||||||
, projectConfig(projectConfig)
|
, projectConfig(projectConfig)
|
||||||
, environmentConfig(environmentConfig)
|
, environmentConfig(environmentConfig)
|
||||||
, insightConfig(insightConfig)
|
, insightConfig(insightConfig)
|
||||||
|
|||||||
@@ -40,7 +40,6 @@ namespace Bloom
|
|||||||
*/
|
*/
|
||||||
explicit Insight(
|
explicit Insight(
|
||||||
EventListener& eventListener,
|
EventListener& eventListener,
|
||||||
EventManager& eventManager,
|
|
||||||
const ProjectConfig& projectConfig,
|
const ProjectConfig& projectConfig,
|
||||||
const EnvironmentConfig& environmentConfig,
|
const EnvironmentConfig& environmentConfig,
|
||||||
const InsightConfig& insightConfig,
|
const InsightConfig& insightConfig,
|
||||||
@@ -68,11 +67,10 @@ namespace Bloom
|
|||||||
|
|
||||||
InsightProjectSettings& insightProjectSettings;
|
InsightProjectSettings& insightProjectSettings;
|
||||||
|
|
||||||
EventManager& eventManager;
|
|
||||||
EventListener& eventListener;
|
EventListener& eventListener;
|
||||||
|
|
||||||
QApplication application;
|
QApplication application;
|
||||||
InsightWorker* insightWorker = new InsightWorker(this->eventManager);
|
InsightWorker* insightWorker = new InsightWorker();
|
||||||
InsightWindow* mainWindow = new InsightWindow(
|
InsightWindow* mainWindow = new InsightWindow(
|
||||||
*(this->insightWorker),
|
*(this->insightWorker),
|
||||||
this->environmentConfig,
|
this->environmentConfig,
|
||||||
|
|||||||
@@ -12,8 +12,6 @@ namespace Bloom
|
|||||||
|
|
||||||
using Bloom::Targets::TargetState;
|
using Bloom::Targets::TargetState;
|
||||||
|
|
||||||
InsightWorker::InsightWorker(EventManager& eventManager): eventManager(eventManager) {}
|
|
||||||
|
|
||||||
void InsightWorker::queueTask(InsightWorkerTask* task) {
|
void InsightWorker::queueTask(InsightWorkerTask* task) {
|
||||||
auto taskQueueLock = this->queuedTasks.acquireLock();
|
auto taskQueueLock = this->queuedTasks.acquireLock();
|
||||||
task->moveToThread(this->thread());
|
task->moveToThread(this->thread());
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ namespace Bloom
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit InsightWorker(EventManager& eventManager);
|
InsightWorker() = default;
|
||||||
|
|
||||||
void queueTask(InsightWorkerTask* task);
|
void queueTask(InsightWorkerTask* task);
|
||||||
|
|
||||||
@@ -45,7 +45,6 @@ namespace Bloom
|
|||||||
void targetRegistersWritten(const Bloom::Targets::TargetRegisters& targetRegisters, const QDateTime& timestamp);
|
void targetRegistersWritten(const Bloom::Targets::TargetRegisters& targetRegisters, const QDateTime& timestamp);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
EventManager& eventManager;
|
|
||||||
EventListenerPointer eventListener = std::make_shared<EventListener>("InsightWorkerEventListener");
|
EventListenerPointer eventListener = std::make_shared<EventListener>("InsightWorkerEventListener");
|
||||||
|
|
||||||
TargetControllerConsole targetControllerConsole = TargetControllerConsole(*(this->eventListener));
|
TargetControllerConsole targetControllerConsole = TargetControllerConsole(*(this->eventListener));
|
||||||
|
|||||||
Reference in New Issue
Block a user