Fixed linting

dolphin-emu · Aug 13, 2023 · 25ab680 · 25ab680
1 parent 5d14ea8
commit 25ab680
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 14 deletions.
diff --git a/Source/Core/Core/IOS/USB/Emulated/Skylander.cpp b/Source/Core/Core/IOS/USB/Emulated/Skylander.cpp
@@ -253,32 +253,41 @@ const std::map<const std::pair<const u16, const u16>, SkyData> list_skylanders =
     {{543, 0x3000}, {"Eye-Small", Game::TrapTeam, Element::Undead, Type::Mini}},
     {{1000, 0x2000}, {"Boom Jet (Bottom)", Game::SwapForce, Element::Air, Type::Swapper}},
     {{1001, 0x2000}, {"Free Ranger (Bottom)", Game::SwapForce, Element::Air, Type::Swapper}},
-    {{1001, 0x2403}, {"Free Ranger (Legendary) (Bottom)", Game::SwapForce, Element::Air, Type::Swapper}},
+    {{1001, 0x2403},
+     {"Free Ranger (Legendary) (Bottom)", Game::SwapForce, Element::Air, Type::Swapper}},
     {{1002, 0x2000}, {"Rubble Rouser (Bottom)", Game::SwapForce, Element::Earth, Type::Swapper}},
     {{1003, 0x2000}, {"Doom Stone (Bottom)", Game::SwapForce, Element::Earth, Type::Swapper}},
     {{1004, 0x2000}, {"Blast Zone (Bottom)", Game::SwapForce, Element::Fire, Type::Swapper}},
     {{1004, 0x2402}, {"Blast Zone (Dark) (Bottom)", Game::SwapForce, Element::Fire, Type::Swapper}},
     {{1005, 0x2000}, {"Fire Kraken (Bottom)", Game::SwapForce, Element::Fire, Type::Swapper}},
-    {{1005, 0x2402}, {"Fire Kraken (Jade) (Bottom)", Game::SwapForce, Element::Fire, Type::Swapper}},
+    {{1005, 0x2402},
+     {"Fire Kraken (Jade) (Bottom)", Game::SwapForce, Element::Fire, Type::Swapper}},
     {{1006, 0x2000}, {"Stink Bomb (Bottom)", Game::SwapForce, Element::Life, Type::Swapper}},
     {{1007, 0x2000}, {"Grilla Drilla (Bottom)", Game::SwapForce, Element::Life, Type::Swapper}},
     {{1008, 0x2000}, {"Hoot Loop (Bottom)", Game::SwapForce, Element::Magic, Type::Swapper}},
-    {{1008, 0x2402}, {"Hoot Loop (Enchanted) (Bottom)", Game::SwapForce, Element::Magic, Type::Swapper}},
+    {{1008, 0x2402},
+     {"Hoot Loop (Enchanted) (Bottom)", Game::SwapForce, Element::Magic, Type::Swapper}},
     {{1009, 0x2000}, {"Trap Shadow (Bottom)", Game::SwapForce, Element::Magic, Type::Swapper}},
     {{1010, 0x2000}, {"Magna Charge (Bottom)", Game::SwapForce, Element::Tech, Type::Swapper}},
-    {{1010, 0x2402}, {"Magna Charge (Nitro) (Bottom)", Game::SwapForce, Element::Tech, Type::Swapper}},
+    {{1010, 0x2402},
+     {"Magna Charge (Nitro) (Bottom)", Game::SwapForce, Element::Tech, Type::Swapper}},
     {{1011, 0x2000}, {"Spy Rise (Bottom)", Game::SwapForce, Element::Tech, Type::Swapper}},
     {{1012, 0x2000}, {"Night Shift (Bottom)", Game::SwapForce, Element::Undead, Type::Swapper}},
-    {{1012, 0x2403}, {"Night Shift (Legendary) (Bottom)", Game::SwapForce, Element::Undead, Type::Swapper}},
+    {{1012, 0x2403},
+     {"Night Shift (Legendary) (Bottom)", Game::SwapForce, Element::Undead, Type::Swapper}},
     {{1013, 0x2000}, {"Rattle Shake (Bottom)", Game::SwapForce, Element::Undead, Type::Swapper}},
-    {{1013, 0x2402}, {"Rattle Shake (Quickdraw) (Bottom)", Game::SwapForce, Element::Undead, Type::Swapper}},
+    {{1013, 0x2402},
+     {"Rattle Shake (Quickdraw) (Bottom)", Game::SwapForce, Element::Undead, Type::Swapper}},
     {{1014, 0x2000}, {"Freeze Blade (Bottom)", Game::SwapForce, Element::Water, Type::Swapper}},
-    {{1014, 0x2402}, {"Freeze Blade (Nitro) (Bottom)", Game::SwapForce, Element::Water, Type::Swapper}},
+    {{1014, 0x2402},
+     {"Freeze Blade (Nitro) (Bottom)", Game::SwapForce, Element::Water, Type::Swapper}},
     {{1015, 0x2000}, {"Wash Buckler (Bottom)", Game::SwapForce, Element::Water, Type::Swapper}},
-    {{1015, 0x2402}, {"Wash Buckler (Dark) (Bottom)", Game::SwapForce, Element::Water, Type::Swapper}},
+    {{1015, 0x2402},
+     {"Wash Buckler (Dark) (Bottom)", Game::SwapForce, Element::Water, Type::Swapper}},
     {{2000, 0x2000}, {"Boom Jet (Top)", Game::SwapForce, Element::Air, Type::Swapper}},
     {{2001, 0x2000}, {"Free Ranger (Top)", Game::SwapForce, Element::Air, Type::Swapper}},
-    {{2001, 0x2403}, {"Free Ranger (Legendary) (Top)", Game::SwapForce, Element::Air, Type::Swapper}},
+    {{2001, 0x2403},
+     {"Free Ranger (Legendary) (Top)", Game::SwapForce, Element::Air, Type::Swapper}},
     {{2002, 0x2000}, {"Rubble Rouser (Top)", Game::SwapForce, Element::Earth, Type::Swapper}},
     {{2003, 0x2000}, {"Doom Stone (Top)", Game::SwapForce, Element::Earth, Type::Swapper}},
     {{2004, 0x2000}, {"Blast Zone (Top)", Game::SwapForce, Element::Fire, Type::Swapper}},
@@ -288,17 +297,21 @@ const std::map<const std::pair<const u16, const u16>, SkyData> list_skylanders =
     {{2006, 0x2000}, {"Stink Bomb (Top)", Game::SwapForce, Element::Life, Type::Swapper}},
     {{2007, 0x2000}, {"Grilla Drilla (Top)", Game::SwapForce, Element::Life, Type::Swapper}},
     {{2008, 0x2000}, {"Hoot Loop (Top)", Game::SwapForce, Element::Magic, Type::Swapper}},
-    {{2008, 0x2402}, {"Hoot Loop (Enchanted) (Top)", Game::SwapForce, Element::Magic, Type::Swapper}},
+    {{2008, 0x2402},
+     {"Hoot Loop (Enchanted) (Top)", Game::SwapForce, Element::Magic, Type::Swapper}},
     {{2009, 0x2000}, {"Trap Shadow (Top)", Game::SwapForce, Element::Magic, Type::Swapper}},
     {{2010, 0x2000}, {"Magna Charge (Top)", Game::SwapForce, Element::Tech, Type::Swapper}},
     {{2010, 0x2402}, {"Magna Charge (Nitro) (Top)", Game::SwapForce, Element::Tech, Type::Swapper}},
     {{2011, 0x2000}, {"Spy Rise (Top)", Game::SwapForce, Element::Tech, Type::Swapper}},
     {{2012, 0x2000}, {"Night Shift (Top)", Game::SwapForce, Element::Undead, Type::Swapper}},
-    {{2012, 0x2403}, {"Night Shift (Legendary) (Top)", Game::SwapForce, Element::Undead, Type::Swapper}},
+    {{2012, 0x2403},
+     {"Night Shift (Legendary) (Top)", Game::SwapForce, Element::Undead, Type::Swapper}},
     {{2013, 0x2000}, {"Rattle Shake (Top)", Game::SwapForce, Element::Undead, Type::Swapper}},
-    {{2013, 0x2402}, {"Rattle Shake (Quickdraw) (Top)", Game::SwapForce, Element::Undead, Type::Swapper}},
+    {{2013, 0x2402},
+     {"Rattle Shake (Quickdraw) (Top)", Game::SwapForce, Element::Undead, Type::Swapper}},
     {{2014, 0x2000}, {"Freeze Blade (Top)", Game::SwapForce, Element::Water, Type::Swapper}},
-    {{2014, 0x2402}, {"Freeze Blade (Nitro) (Top)", Game::SwapForce, Element::Water, Type::Swapper}},
+    {{2014, 0x2402},
+     {"Freeze Blade (Nitro) (Top)", Game::SwapForce, Element::Water, Type::Swapper}},
     {{2015, 0x2000}, {"Wash Buckler (Top)", Game::SwapForce, Element::Water, Type::Swapper}},
     {{2015, 0x2402}, {"Wash Buckler (Dark) (Top)", Game::SwapForce, Element::Water, Type::Swapper}},
     {{3000, 0x2000}, {"Scratch", Game::SwapForce, Element::Air, Type::Skylander}},

diff --git a/Source/Core/DolphinQt/SkylanderPortal/SkylanderPortalWindow.cpp b/Source/Core/DolphinQt/SkylanderPortal/SkylanderPortalWindow.cpp
@@ -375,7 +375,7 @@ QVBoxLayout* SkylanderPortalWindow::CreateFinderLayout()
 
   auto* radio_type_layout_left = new QVBoxLayout();
   auto* radio_type_layout_right = new QVBoxLayout();
-  for (int i = 0; i <NUM_SKYLANDER_TYPES; i++)
+  for (int i = 0; i < NUM_SKYLANDER_TYPES; i++)
   {
     QRadioButton* radio = new QRadioButton(this);
     radio->setProperty("id", i);