From bc47b1546fdd84f988593238e83909858b8517bb Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Fri, 15 Apr 2022 14:32:26 +0100
Subject: [PATCH] These changes should have been in a previous commit, for
 tidying the SyncSafe class

---
 src/EventManager/EventListener.cpp          | 12 ++++++------
 src/Insight/InsightWorker/InsightWorker.cpp |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/EventManager/EventListener.cpp b/src/EventManager/EventListener.cpp
index 78650306..ead13ec3 100644
--- a/src/EventManager/EventListener.cpp
+++ b/src/EventManager/EventListener.cpp
@@ -8,14 +8,14 @@ namespace Bloom
 
     std::set<Events::EventType> EventListener::getRegisteredEventTypes() {
         auto lock = this->registeredEventTypes.acquireLock();
-        return this->registeredEventTypes.getReference();
+        return this->registeredEventTypes.getValue();
     }
 
     void EventListener::registerEvent(SharedGenericEventPointer event) {
         Logger::debug("Event \"" + event->getName() + "\" (" + std::to_string(event->id)
             + ") registered for listener " + this->name);
         auto queueLock = this->eventQueueByEventType.acquireLock();
-        auto& eventQueueByType = this->eventQueueByEventType.getReference();
+        auto& eventQueueByType = this->eventQueueByEventType.getValue();
 
         eventQueueByType[event->getType()].push(std::move(event));
         this->eventQueueByEventTypeCV.notify_all();
@@ -27,7 +27,7 @@ namespace Bloom
 
     void EventListener::waitAndDispatch(int msTimeout) {
         auto queueLock = this->eventQueueByEventType.acquireLock();
-        auto& eventQueueByType = this->eventQueueByEventType.getReference();
+        auto& eventQueueByType = this->eventQueueByEventType.getValue();
         auto registeredEventTypes = this->getRegisteredEventTypes();
         std::optional<SharedGenericEventPointer> event;
 
@@ -61,7 +61,7 @@ namespace Bloom
 
         // Dispatch the event to all registered handlers
         auto mappingLock = this->eventTypeToCallbacksMapping.acquireLock();
-        auto& callbacks = this->eventTypeToCallbacksMapping.getReference().find(event->getType())->second;
+        auto& callbacks = this->eventTypeToCallbacksMapping.getValue().find(event->getType())->second;
         mappingLock.unlock();
 
         for (auto& callback : callbacks) {
@@ -79,7 +79,7 @@ namespace Bloom
 
     std::vector<SharedGenericEventPointer> EventListener::getEvents() {
         auto queueLock = this->eventQueueByEventType.acquireLock();
-        auto& eventQueueByType = this->eventQueueByEventType.getReference();
+        auto& eventQueueByType = this->eventQueueByEventType.getValue();
         std::vector<SharedGenericEventPointer> output;
 
         for (auto& eventQueue: eventQueueByType) {
@@ -102,6 +102,6 @@ namespace Bloom
 
     void EventListener::clearAllCallbacks() {
         auto lock = this->eventTypeToCallbacksMapping.acquireLock();
-        this->eventTypeToCallbacksMapping.getReference().clear();
+        this->eventTypeToCallbacksMapping.getValue().clear();
     }
 }
diff --git a/src/Insight/InsightWorker/InsightWorker.cpp b/src/Insight/InsightWorker/InsightWorker.cpp
index 6d104fb6..e9e337d2 100644
--- a/src/Insight/InsightWorker/InsightWorker.cpp
+++ b/src/Insight/InsightWorker/InsightWorker.cpp
@@ -16,7 +16,7 @@ namespace Bloom
         auto taskQueueLock = this->queuedTasks.acquireLock();
         task->moveToThread(this->thread());
         task->setParent(this);
-        this->queuedTasks.getReference().push(task);
+        this->queuedTasks.getValue().push(task);
         emit this->taskQueued();
     }
 
@@ -60,7 +60,7 @@ namespace Bloom
     std::optional<InsightWorkerTask*> InsightWorker::getQueuedTask() {
         auto task = std::optional<InsightWorkerTask*>();
 
-        auto& queuedTasks = this->queuedTasks.getReference();
+        auto& queuedTasks = this->queuedTasks.getValue();
         auto taskQueueLock = this->queuedTasks.acquireLock();
 
         if (!queuedTasks.empty()) {