From 7230b26dc3d541eaf768a3d6e4fd797b0bf55524 Mon Sep 17 00:00:00 2001
From: ikkemaniac <stuud1@hotmail.com>
Date: Mon, 1 Sep 2025 06:19:37 +0200
Subject: [PATCH] chore(cpn): move wizard to subdir (#6564)

---
 companion/src/CMakeLists.txt                |  4 +--
 companion/src/mdichild.cpp                  |  2 +-
 companion/src/wizard/CMakeLists.txt         | 37 +++++++++++++++++++++
 companion/src/{ => wizard}/wizarddata.cpp   |  0
 companion/src/{ => wizard}/wizarddata.h     |  0
 companion/src/{ => wizard}/wizarddialog.cpp |  0
 companion/src/{ => wizard}/wizarddialog.h   |  0
 7 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 companion/src/wizard/CMakeLists.txt
 rename companion/src/{ => wizard}/wizarddata.cpp (100%)
 rename companion/src/{ => wizard}/wizarddata.h (100%)
 rename companion/src/{ => wizard}/wizarddialog.cpp (100%)
 rename companion/src/{ => wizard}/wizarddialog.h (100%)

diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
index 918367a63..3ee7f3d0f 100644
--- a/companion/src/CMakeLists.txt
+++ b/companion/src/CMakeLists.txt
@@ -203,6 +203,7 @@ add_subdirectory(simulation)
 add_subdirectory(storage)
 add_subdirectory(thirdparty/qcustomplot)
 add_subdirectory(updates)
+add_subdirectory(wizard)
 
 ############# Companion ###############
 
@@ -233,8 +234,6 @@ set(companion_NAMES
   radionotfound
   splashlibrarydialog
   styleeditdialog
-  wizarddata
-  wizarddialog
   dialogs/filesyncdialog
   )
 
@@ -278,6 +277,7 @@ target_link_libraries(${COMPANION_NAME} PRIVATE
   qcustomplot
   miniz
   updates
+  wizard
 )
 
 PrintTargetReport("${COMPANION_NAME}")
diff --git a/companion/src/mdichild.cpp b/companion/src/mdichild.cpp
index 709e9ad08..b9fc2c89e 100644
--- a/companion/src/mdichild.cpp
+++ b/companion/src/mdichild.cpp
@@ -27,7 +27,7 @@
 #include "printdialog.h"
 #include "helpers.h"
 #include "appdata.h"
-#include "wizarddialog.h"
+#include "wizard/wizarddialog.h"
 #include "flashfirmwaredialog.h"
 #include "storage.h"
 #include "radiointerface.h"
diff --git a/companion/src/wizard/CMakeLists.txt b/companion/src/wizard/CMakeLists.txt
new file mode 100644
index 000000000..c00e3d5d8
--- /dev/null
+++ b/companion/src/wizard/CMakeLists.txt
@@ -0,0 +1,37 @@
+
+project(wizard)
+
+set(${PROJECT_NAME}_NAMES
+  wizarddata
+  wizarddialog
+)
+
+AddHeadersSources()
+
+# AUTOMOC does not detect so manually process
+set(${PROJECT_NAME}_MOC
+  wizarddata.h
+  wizarddialog.h
+)
+
+qt_wrap_cpp(${PROJECT_NAME}_SRCS
+  ${${PROJECT_NAME}_MOC}
+)
+
+add_library(${PROJECT_NAME}
+  ${${PROJECT_NAME}_HDRS}
+  ${${PROJECT_NAME}_SRCS}
+)
+
+target_link_libraries(${PROJECT_NAME}
+  PRIVATE
+    ${CPN_COMMON_LIB}
+)
+
+target_include_directories(${PROJECT_NAME}
+  PRIVATE
+    "${CMAKE_SOURCE_DIR}"
+    "${CMAKE_CURRENT_BINARY_DIR}"
+  PUBLIC
+    "${CMAKE_CURRENT_LIST_DIR}"
+)
diff --git a/companion/src/wizarddata.cpp b/companion/src/wizard/wizarddata.cpp
similarity index 100%
rename from companion/src/wizarddata.cpp
rename to companion/src/wizard/wizarddata.cpp
diff --git a/companion/src/wizarddata.h b/companion/src/wizard/wizarddata.h
similarity index 100%
rename from companion/src/wizarddata.h
rename to companion/src/wizard/wizarddata.h
diff --git a/companion/src/wizarddialog.cpp b/companion/src/wizard/wizarddialog.cpp
similarity index 100%
rename from companion/src/wizarddialog.cpp
rename to companion/src/wizard/wizarddialog.cpp
diff --git a/companion/src/wizarddialog.h b/companion/src/wizard/wizarddialog.h
similarity index 100%
rename from companion/src/wizarddialog.h
rename to companion/src/wizard/wizarddialog.h