From a9793bc00656c517d29dec7236fe37b76da4e9ba Mon Sep 17 00:00:00 2001
From: DawnFire42 <justin.c.durocher@gmail.com>
Date: Tue, 16 Jun 2026 16:00:32 -0400
Subject: [PATCH] Prefix shadowed CounterState constructor args with
 underscores

---
 cockatrice/src/game/board/counter_state.cpp | 14 +++++++-------
 cockatrice/src/game/board/counter_state.h   | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/cockatrice/src/game/board/counter_state.cpp b/cockatrice/src/game/board/counter_state.cpp
index 116de4a8d..2ccdb49df 100644
--- a/cockatrice/src/game/board/counter_state.cpp
+++ b/cockatrice/src/game/board/counter_state.cpp
@@ -2,14 +2,14 @@
 
 #include <libcockatrice/utility/color.h>
 
-CounterState::CounterState(int id,
-                           const QString &name,
-                           const QColor &color,
-                           int radius,
-                           int value,
-                           bool active,
+CounterState::CounterState(int _id,
+                           const QString &_name,
+                           const QColor &_color,
+                           int _radius,
+                           int _value,
+                           bool _active,
                            QObject *parent)
-    : QObject(parent), id(id), name(name), color(color), radius(radius), value(value), active(active)
+    : QObject(parent), id(_id), name(_name), color(_color), radius(_radius), value(_value), active(_active)
 {
 }
 
diff --git a/cockatrice/src/game/board/counter_state.h b/cockatrice/src/game/board/counter_state.h
index 4a0f48203..c171dbb5a 100644
--- a/cockatrice/src/game/board/counter_state.h
+++ b/cockatrice/src/game/board/counter_state.h
@@ -10,12 +10,12 @@ class CounterState : public QObject
 {
     Q_OBJECT
 public:
-    CounterState(int id,
-                 const QString &name,
-                 const QColor &color,
-                 int radius,
-                 int value,
-                 bool active = true,
+    CounterState(int _id,
+                 const QString &_name,
+                 const QColor &_color,
+                 int _radius,
+                 int _value,
+                 bool _active = true,
                  QObject *parent = nullptr);
 
     static CounterState *fromProto(const ServerInfo_Counter &counter, QObject *parent = nullptr);