From d79dc8ae637c55fd8c2a80ee1d3bc227e5f00231 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= <Bruebach.Lukas@bdosecurity.de>
Date: Tue, 6 Oct 2026 12:23:16 +0200
Subject: [PATCH] [Refactor] Move AnnotationDialog from game/ logic to
 game_graphics/

AnnotationDialog is a QInputDialog subclass that was declared at the
bottom of game/player/player_logic.h and implemented inside
game/player/player_actions.cpp, while its only consumer is the graphics
layer (PlayerDialogs::onSetAnnotationDialogRequested).

Adds game_graphics/dialogs/dlg_annotation.{h,cpp} and moves the class
there, letting player_logic.h drop its QInputDialog include and
player_actions.cpp drop its QKeyEvent include. game/ no longer declares
any widget type.

No behavior change.
---
 cockatrice/CMakeLists.txt                     |  1 +
 cockatrice/src/game/player/player_actions.cpp | 12 ----------
 cockatrice/src/game/player/player_logic.h     | 12 ----------
 .../game_graphics/dialogs/dlg_annotation.cpp  | 13 +++++++++++
 .../game_graphics/dialogs/dlg_annotation.h    | 22 +++++++++++++++++++
 .../game_graphics/player/player_dialogs.cpp   |  1 +
 6 files changed, 37 insertions(+), 24 deletions(-)
 create mode 100644 cockatrice/src/game_graphics/dialogs/dlg_annotation.cpp
 create mode 100644 cockatrice/src/game_graphics/dialogs/dlg_annotation.h

diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index 63ce7d1af..3ec3693a4 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -86,6 +86,7 @@ set(cockatrice_SOURCES
     src/game_graphics/deckview/deck_view.cpp
     src/game_graphics/deckview/deck_view_container.cpp
     src/game_graphics/deckview/tabbed_deck_view_container.cpp
+    src/game_graphics/dialogs/dlg_annotation.cpp
     src/game_graphics/dialogs/dlg_create_token.cpp
     src/game_graphics/dialogs/dlg_move_top_cards_until.cpp
     src/game_graphics/dialogs/dlg_roll_dice.cpp
diff --git a/cockatrice/src/game/player/player_actions.cpp b/cockatrice/src/game/player/player_actions.cpp
index 35682ede8..f9e219c84 100644
--- a/cockatrice/src/game/player/player_actions.cpp
+++ b/cockatrice/src/game/player/player_actions.cpp
@@ -31,8 +31,6 @@
 #include <QChar>
 #include <QColor>
 #include <QFlags>
-#include <QInputDialog>
-#include <QKeyEvent>
 #include <QList>
 #include <QMap>
 #include <QMapIterator>
@@ -1495,16 +1493,6 @@ void PlayerActions::actReduceLifeByPower(QList<CardItem *> selectedCards)
     sendGameCommand(prepareGameCommand(cmd));
 }
 
-void AnnotationDialog::keyPressEvent(QKeyEvent *event)
-{
-    if (event->key() == Qt::Key_Return && event->modifiers() & Qt::ControlModifier) {
-        event->accept();
-        accept();
-        return;
-    }
-    QInputDialog::keyPressEvent(event);
-}
-
 void PlayerActions::actRequestSetAnnotationDialog(QList<CardItem *> selectedCards)
 {
     QString oldAnnotation;
diff --git a/cockatrice/src/game/player/player_logic.h b/cockatrice/src/game/player/player_logic.h
index 59da7cc32..aa94dbb53 100644
--- a/cockatrice/src/game/player/player_logic.h
+++ b/cockatrice/src/game/player/player_logic.h
@@ -17,7 +17,6 @@
 #include "libcockatrice/utility/playmat_params.h"
 
 #include <QColor>
-#include <QInputDialog>
 #include <QList>
 #include <QLoggingCategory>
 #include <QMap>
@@ -258,15 +257,4 @@ private:
     bool hasRemotePlaymat = false;
 };
 
-class AnnotationDialog : public QInputDialog
-{
-    Q_OBJECT
-    void keyPressEvent(QKeyEvent *e) override;
-
-public:
-    explicit AnnotationDialog(QWidget *parent = nullptr) : QInputDialog(parent)
-    {
-    }
-};
-
 #endif
diff --git a/cockatrice/src/game_graphics/dialogs/dlg_annotation.cpp b/cockatrice/src/game_graphics/dialogs/dlg_annotation.cpp
new file mode 100644
index 000000000..c812f9c74
--- /dev/null
+++ b/cockatrice/src/game_graphics/dialogs/dlg_annotation.cpp
@@ -0,0 +1,13 @@
+#include "dlg_annotation.h"
+
+#include <QKeyEvent>
+
+void AnnotationDialog::keyPressEvent(QKeyEvent *event)
+{
+    if (event->key() == Qt::Key_Return && event->modifiers() & Qt::ControlModifier) {
+        event->accept();
+        accept();
+        return;
+    }
+    QInputDialog::keyPressEvent(event);
+}
diff --git a/cockatrice/src/game_graphics/dialogs/dlg_annotation.h b/cockatrice/src/game_graphics/dialogs/dlg_annotation.h
new file mode 100644
index 000000000..686377d3c
--- /dev/null
+++ b/cockatrice/src/game_graphics/dialogs/dlg_annotation.h
@@ -0,0 +1,22 @@
+/**
+ * @file dlg_annotation.h
+ * @ingroup GameDialogs
+ */
+
+#ifndef COCKATRICE_DLG_ANNOTATION_H
+#define COCKATRICE_DLG_ANNOTATION_H
+
+#include <QInputDialog>
+
+class AnnotationDialog : public QInputDialog
+{
+    Q_OBJECT
+    void keyPressEvent(QKeyEvent *e) override;
+
+public:
+    explicit AnnotationDialog(QWidget *parent = nullptr) : QInputDialog(parent)
+    {
+    }
+};
+
+#endif // COCKATRICE_DLG_ANNOTATION_H
diff --git a/cockatrice/src/game_graphics/player/player_dialogs.cpp b/cockatrice/src/game_graphics/player/player_dialogs.cpp
index 74f5de601..674b31ffa 100644
--- a/cockatrice/src/game_graphics/player/player_dialogs.cpp
+++ b/cockatrice/src/game_graphics/player/player_dialogs.cpp
@@ -7,6 +7,7 @@
 #include "../../interface/widgets/utility/get_text_with_max.h"
 #include "../board/abstract_counter.h"
 #include "../board/card_item.h"
+#include "../dialogs/dlg_annotation.h"
 #include "../dialogs/dlg_create_token.h"
 #include "../dialogs/dlg_move_top_cards_until.h"
 #include "../dialogs/dlg_roll_dice.h"