From c34502bd19f5e03e53adbe242799e8ac3f7c3061 Mon Sep 17 00:00:00 2001 From: elecpower Date: Fri, 7 Aug 2026 17:08:01 +1000 Subject: [PATCH 1/2] chore(cpn): move LabelsModel files to datamodels directory --- companion/src/CMakeLists.txt | 1 - companion/src/datamodels/CMakeLists.txt | 1 + companion/src/{ => datamodels}/labels.cpp | 0 companion/src/{ => datamodels}/labels.h | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename companion/src/{ => datamodels}/labels.cpp (100%) rename companion/src/{ => datamodels}/labels.h (100%) diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index 7225914a789..47b1b773fa5 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -221,7 +221,6 @@ include_directories(${maxLibQt_SOURCE_DIR}/widgets) set(companion_NAMES apppreferencesdialog helpers_html - labels logsdialog mainwindow mdichild diff --git a/companion/src/datamodels/CMakeLists.txt b/companion/src/datamodels/CMakeLists.txt index 9070de77fa3..538497c9b32 100644 --- a/companion/src/datamodels/CMakeLists.txt +++ b/companion/src/datamodels/CMakeLists.txt @@ -5,6 +5,7 @@ set(${PROJECT_NAME}_NAMES compounditemmodels filtereditemmodels itemmodeleventhandler + labels ) AddHeadersSources() diff --git a/companion/src/labels.cpp b/companion/src/datamodels/labels.cpp similarity index 100% rename from companion/src/labels.cpp rename to companion/src/datamodels/labels.cpp diff --git a/companion/src/labels.h b/companion/src/datamodels/labels.h similarity index 100% rename from companion/src/labels.h rename to companion/src/datamodels/labels.h From 9599287438011585012905c24ac7f77795bde19e Mon Sep 17 00:00:00 2001 From: elecpower Date: Fri, 7 Aug 2026 18:28:44 +1000 Subject: [PATCH 2/2] Add modellist to move --- companion/src/CMakeLists.txt | 1 - companion/src/datamodels/CMakeLists.txt | 1 + companion/src/{ => datamodels}/modelslist.cpp | 0 companion/src/{ => datamodels}/modelslist.h | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename companion/src/{ => datamodels}/modelslist.cpp (100%) rename companion/src/{ => datamodels}/modelslist.h (100%) diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index 47b1b773fa5..87bea740437 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -224,7 +224,6 @@ set(companion_NAMES logsdialog mainwindow mdichild - modelslist profilechooser dialogs/filesyncdialog ) diff --git a/companion/src/datamodels/CMakeLists.txt b/companion/src/datamodels/CMakeLists.txt index 538497c9b32..e4096522dd7 100644 --- a/companion/src/datamodels/CMakeLists.txt +++ b/companion/src/datamodels/CMakeLists.txt @@ -6,6 +6,7 @@ set(${PROJECT_NAME}_NAMES filtereditemmodels itemmodeleventhandler labels + modelslist ) AddHeadersSources() diff --git a/companion/src/modelslist.cpp b/companion/src/datamodels/modelslist.cpp similarity index 100% rename from companion/src/modelslist.cpp rename to companion/src/datamodels/modelslist.cpp diff --git a/companion/src/modelslist.h b/companion/src/datamodels/modelslist.h similarity index 100% rename from companion/src/modelslist.h rename to companion/src/datamodels/modelslist.h