From faffb5a8370ef078a395c56e8f45bfab79214038 Mon Sep 17 00:00:00 2001
From: BruebachL <44814898+BruebachL@users.noreply.github.com>
Date: Sat, 19 Sep 2026 10:35:03 +0200
Subject: [PATCH] [DeckList] Extract sideboard-plan move parsing into a helper
 (#7318)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
---
 .../deck_list/sideboard_plan.cpp              | 44 ++++++++++++-------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp
index a76fed619..855062c18 100644
--- a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp
+++ b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp
@@ -2,6 +2,32 @@
 
 #include <QXmlStreamReader>
 
+namespace
+{
+
+void readMoveCardToZone(QXmlStreamReader *xml, QList<MoveCard_ToZone> &moveList)
+{
+    MoveCard_ToZone move;
+    while (!xml->atEnd()) {
+        xml->readNext();
+        const QString childName = xml->name().toString();
+        if (xml->isStartElement()) {
+            if (childName == "card_name") {
+                move.set_card_name(xml->readElementText().toStdString());
+            } else if (childName == "start_zone") {
+                move.set_start_zone(xml->readElementText().toStdString());
+            } else if (childName == "target_zone") {
+                move.set_target_zone(xml->readElementText().toStdString());
+            }
+        } else if (xml->isEndElement() && (childName == "move_card_to_zone")) {
+            moveList.append(move);
+            return;
+        }
+    }
+}
+
+} // namespace
+
 SideboardPlan::SideboardPlan(const QString &_name, const QList<MoveCard_ToZone> &_moveList)
     : name(_name), moveList(_moveList)
 {
@@ -21,23 +47,7 @@ bool SideboardPlan::readElement(QXmlStreamReader *xml)
             if (childName == "name") {
                 name = xml->readElementText();
             } else if (childName == "move_card_to_zone") {
-                MoveCard_ToZone m;
-                while (!xml->atEnd()) {
-                    xml->readNext();
-                    const QString childName2 = xml->name().toString();
-                    if (xml->isStartElement()) {
-                        if (childName2 == "card_name") {
-                            m.set_card_name(xml->readElementText().toStdString());
-                        } else if (childName2 == "start_zone") {
-                            m.set_start_zone(xml->readElementText().toStdString());
-                        } else if (childName2 == "target_zone") {
-                            m.set_target_zone(xml->readElementText().toStdString());
-                        }
-                    } else if (xml->isEndElement() && (childName2 == "move_card_to_zone")) {
-                        moveList.append(m);
-                        break;
-                    }
-                }
+                readMoveCardToZone(xml, moveList);
             }
         } else if (xml->isEndElement() && (childName == "sideboard_plan")) {
             return true;