commit a82c55dff939b3fb6bb27761a01e7ca4b56b0432
author Andrew Jeffery <andrew@aj.id.au> Thu Mar 24 14:17:28 2022 +1030
committer Andrew Jeffery <andrew@aj.id.au> Tue Mar 29 13:52:05 2022 +1030
tree 620c2fb08cab968c2496b89361f4b8b70374ed0b
parent d38fc67a6a455640505c3a5df4c565d7f6d4d5a0

EntityManager: Exploit destructuring for device removed loop

This makes the code a bit nicer to read.

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Change-Id: Icea51f4841e316c0ba259cf6c104e3e449bb4dbe

src/EntityManager.cpp

diff --git a/src/EntityManager.cpp b/src/EntityManager.cpp
index 5ec5cfa..f8144b3 100644
--- a/src/EntityManager.cpp
+++ b/src/EntityManager.cpp
@@ -882,14 +882,14 @@
             }
 
             bool powerOff = !isPowerOn();
-            for (const auto& item : lastJson.items())
+            for (const auto& [name, device] : lastJson.items())
             {
-                if (systemConfiguration.contains(item.key()))
+                if (systemConfiguration.contains(name))
                 {
                     continue;
                 }
 
-                bool requirePowerOn = deviceRequiresPowerOn(item.value());
+                bool requirePowerOn = deviceRequiresPowerOn(device);
                 if (powerOff && requirePowerOn)
                 {
                     // power not on yet, don't know if it's there or not
@@ -901,7 +901,7 @@
                     continue;
                 }
 
-                logDeviceRemoved(item.value());
+                logDeviceRemoved(device);
             }
             scannedPowerOff = true;
             if (!powerOff)