From 60df8c0d4924ce126ddaa9b8087fee74f34b0ee6 Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Sat, 11 Sep 2021 20:45:26 +0100
Subject: [PATCH] Tidying

---
 src/Insight/InsightWorker/InsightWorker.cpp   |  4 +--
 src/Insight/InsightWorker/InsightWorker.hpp   |  2 +-
 .../TargetRegistersPaneWidget.cpp             | 25 +++++++++----------
 .../TargetRegistersPaneWidget.hpp             |  2 +-
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/Insight/InsightWorker/InsightWorker.cpp b/src/Insight/InsightWorker/InsightWorker.cpp
index bf6ad97b..b2102a8e 100644
--- a/src/Insight/InsightWorker/InsightWorker.cpp
+++ b/src/Insight/InsightWorker/InsightWorker.cpp
@@ -17,7 +17,7 @@ void InsightWorker::startup() {
     this->eventManager.registerListener(this->eventListener);
 
     this->eventListener->registerCallbackForEventType<Events::TargetControllerStateReported>(
-        std::bind(&InsightWorker::onTargetControllerStateReported, this, std::placeholders::_1)
+        std::bind(&InsightWorker::onTargetControllerStateReportedEvent, this, std::placeholders::_1)
     );
 
     this->eventListener->registerCallbackForEventType<Events::TargetExecutionStopped>(
@@ -125,7 +125,7 @@ void InsightWorker::onTargetRegistersWrittenEvent(const Events::RegistersWritten
     emit this->targetRegistersWritten(event.descriptors);
 }
 
-void InsightWorker::onTargetControllerStateReported(const Events::TargetControllerStateReported& event) {
+void InsightWorker::onTargetControllerStateReportedEvent(const Events::TargetControllerStateReported& event) {
     if (this->lastTargetControllerState == TargetControllerState::ACTIVE
         && event.state == TargetControllerState::SUSPENDED
     ) {
diff --git a/src/Insight/InsightWorker/InsightWorker.hpp b/src/Insight/InsightWorker/InsightWorker.hpp
index 9eabbd27..6a01fb5d 100644
--- a/src/Insight/InsightWorker/InsightWorker.hpp
+++ b/src/Insight/InsightWorker/InsightWorker.hpp
@@ -40,8 +40,8 @@ namespace Bloom
         void onTargetStoppedEvent(const Events::TargetExecutionStopped& event);
         void onTargetResumedEvent(const Events::TargetExecutionResumed& event);
         void onTargetIoPortsUpdatedEvent(const Events::TargetIoPortsUpdated& event);
-        void onTargetControllerStateReported(const Events::TargetControllerStateReported& event);
         void onTargetRegistersWrittenEvent(const Events::RegistersWrittenToTarget& event);
+        void onTargetControllerStateReportedEvent(const Events::TargetControllerStateReported& event);
 
     private slots:
         void executeTasks();
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/TargetRegistersPaneWidget.cpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/TargetRegistersPaneWidget.cpp
index cb42487f..fb96bf15 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/TargetRegistersPaneWidget.cpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/TargetRegistersPaneWidget.cpp
@@ -149,6 +149,18 @@ void TargetRegistersPaneWidget::onTargetStateChanged(Targets::TargetState newSta
     }
 }
 
+void TargetRegistersPaneWidget::onRegistersRead(const Targets::TargetRegisters& registers) {
+    for (const auto& targetRegister : registers) {
+        auto& descriptor = targetRegister.descriptor;
+
+        for (const auto& registerGroupWidget : this->registerGroupWidgets) {
+            if (registerGroupWidget->registerWidgetsMappedByDescriptor.contains(descriptor)) {
+                registerGroupWidget->registerWidgetsMappedByDescriptor.at(descriptor)->setRegisterValue(targetRegister);
+                break;
+            }
+        }
+    }
+}
 
 void TargetRegistersPaneWidget::onRegistersWritten(const Bloom::Targets::TargetRegisterDescriptors& descriptors) {
     if (this->targetState != Targets::TargetState::STOPPED) {
@@ -265,16 +277,3 @@ void TargetRegistersPaneWidget::onItemSelectionChange(ItemWidget* newlySelectedW
         this->selectedItemWidget = newlySelectedWidget;
     }
 }
-
-void TargetRegistersPaneWidget::onRegistersRead(const Targets::TargetRegisters& registers) {
-    for (const auto& targetRegister : registers) {
-        auto& descriptor = targetRegister.descriptor;
-
-        for (const auto& registerGroupWidget : this->registerGroupWidgets) {
-            if (registerGroupWidget->registerWidgetsMappedByDescriptor.contains(descriptor)) {
-                registerGroupWidget->registerWidgetsMappedByDescriptor.at(descriptor)->setRegisterValue(targetRegister);
-                break;
-            }
-        }
-    }
-}
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/TargetRegistersPaneWidget.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/TargetRegistersPaneWidget.hpp
index 750931ab..c72eeea0 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/TargetRegistersPaneWidget.hpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegistersPane/TargetRegistersPaneWidget.hpp
@@ -44,6 +44,7 @@ namespace Bloom::Widgets
 
     private slots:
         void onTargetStateChanged(Targets::TargetState newState);
+        void onRegistersRead(const Targets::TargetRegisters& registers);
         void onRegistersWritten(const Bloom::Targets::TargetRegisterDescriptors& descriptors);
 
     protected:
@@ -81,6 +82,5 @@ namespace Bloom::Widgets
 
     public slots:
         void onItemSelectionChange(ItemWidget* newlySelectedWidget);
-        void onRegistersRead(const Targets::TargetRegisters& registers);
     };
 }