Tidying

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
     ) {

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();

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;
-            }
-        }
-    }
-}

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);
     };
 }