switch to using own event system

src/balancing/BalancingWindow.cpp

@@ -48,14 +48,17 @@ BalancingWindow::BalancingWindow(const BalancingConfig& balancingConfig,
     m_pollTimer = new QTimer(this);
     connect(m_pollTimer, &QTimer::timeout, this, &BalancingWindow::pollStatuses);
     m_pollTimer->start(100);
+
+    registerForEvents();
 }
 
 BalancingWindow::~BalancingWindow()
 {
+    unregisterForEvents();
+
     m_pollTimer->stop();
     if (m_inspectWindow)
     {
-        m_inspectWindow->disconnect(this);
         delete m_inspectWindow;
         m_inspectWindow = nullptr;
     }
@@ -81,16 +84,11 @@ void BalancingWindow::populateArenas(const BalancingConfig& balancingConfig)
         entry.config = arenaConfig;
         entry.simulation = std::make_unique<ArenaSimulation>(
             m_gameConfig, arenaConfig, m_nextSeed++);
-        entry.widget = new ArenaWidget(arenaConfig.name, scrollContent);
+        entry.widget = new ArenaWidget(index, arenaConfig.name, scrollContent);
         contentLayout->addWidget(entry.widget);
 
         entry.widget->updateStatus(entry.simulation->status());
 
-        connect(entry.widget, &ArenaWidget::startRequested,
-                this, [this, index]() { startArena(index); });
-        connect(entry.widget, &ArenaWidget::inspectRequested,
-                this, [this, index]() { inspectArena(index); });
-
         m_arenas.push_back(std::move(entry));
     }
 
@@ -158,6 +156,21 @@ void BalancingWindow::startAll()
     }
 }
 
+void BalancingWindow::handleEvent(std::shared_ptr<const ArenaStartRequestedEvent> event)
+{
+    startArena(event->arenaIndex);
+}
+
+void BalancingWindow::handleEvent(std::shared_ptr<const ArenaInspectRequestedEvent> event)
+{
+    inspectArena(event->arenaIndex);
+}
+
+void BalancingWindow::handleEvent(std::shared_ptr<const InspectWindowClosedEvent> /*event*/)
+{
+    closeInspectWindow();
+}
+
 void BalancingWindow::startArena(int index)
 {
     ArenaEntry& entry = m_arenas[index];
@@ -179,7 +192,6 @@ void BalancingWindow::inspectArena(int index)
 {
     if (m_inspectWindow)
     {
-        m_inspectWindow->disconnect(this);
         delete m_inspectWindow;
         m_inspectWindow = nullptr;
 
@@ -210,8 +222,6 @@ void BalancingWindow::inspectArena(int index)
 
     m_inspectWindow = new InspectWindow(
         m_inspectedSim.get(), &m_gameConfig, &m_visuals, entry.config.name, nullptr);
-    connect(m_inspectWindow, &InspectWindow::closed,
-            this, &BalancingWindow::closeInspectWindow);
 
     setMainControlsEnabled(false);
     m_inspectWindow->show();
@@ -224,7 +234,6 @@ void BalancingWindow::closeInspectWindow()
         return;
     }
 
-    m_inspectWindow->disconnect(this);
     m_inspectWindow->deleteLater();
     m_inspectWindow = nullptr;