From e27c32c3d7ad2474c4501cf7fb53616c8732db72 Mon Sep 17 00:00:00 2001 From: Matt Young Date: Wed, 1 Jan 2025 19:12:54 +0100 Subject: [PATCH 1/4] Bump version number and move some source files around --- CHANGES.markdown | 12 + CMakeLists.txt | 2 +- meson.build | 206 ++++---- src/CMakeLists.txt | 102 ++-- src/MainWindow.cpp | 36 +- src/ScaleRecipeTool.cpp | 2 +- src/WaterDialog.cpp | 8 +- src/catalogs/EquipmentCatalog.cpp | 2 +- src/catalogs/EquipmentCatalog.h | 4 +- src/catalogs/FermentableCatalog.cpp | 2 +- src/catalogs/FermentableCatalog.h | 4 +- src/catalogs/HopCatalog.cpp | 2 +- src/catalogs/HopCatalog.h | 4 +- src/catalogs/MiscCatalog.cpp | 2 +- src/catalogs/MiscCatalog.h | 4 +- src/catalogs/StyleCatalog.cpp | 2 +- src/catalogs/StyleCatalog.h | 4 +- src/catalogs/YeastCatalog.cpp | 2 +- src/catalogs/YeastCatalog.h | 4 +- src/editors/NamedMashEditor.h | 6 +- src/editors/StyleEditor.cpp | 2 +- src/model/RecipeAdditionBase.h | 2 +- .../listModels/BoilListModel.cpp | 4 +- src/{ => qtModels}/listModels/BoilListModel.h | 4 +- .../listModels/EquipmentListModel.cpp | 4 +- .../listModels/EquipmentListModel.h | 4 +- .../listModels/FermentableListModel.cpp | 4 +- .../listModels/FermentableListModel.h | 4 +- .../listModels/FermentationListModel.cpp | 4 +- .../listModels/FermentationListModel.h | 4 +- .../listModels/HopListModel.cpp | 4 +- src/{ => qtModels}/listModels/HopListModel.h | 4 +- src/{ => qtModels}/listModels/ListModelBase.h | 2 +- .../listModels/MashListModel.cpp | 4 +- src/{ => qtModels}/listModels/MashListModel.h | 4 +- .../listModels/MashStepListModel.cpp | 4 +- .../listModels/MashStepListModel.h | 4 +- .../listModels/MiscListModel.cpp | 4 +- src/{ => qtModels}/listModels/MiscListModel.h | 4 +- .../RecipeAdditionFermentableListModel.cpp | 4 +- .../RecipeAdditionFermentableListModel.h | 4 +- .../listModels/RecipeAdditionHopListModel.cpp | 4 +- .../listModels/RecipeAdditionHopListModel.h | 4 +- .../RecipeAdditionMiscListModel.cpp | 4 +- .../listModels/RecipeAdditionMiscListModel.h | 4 +- .../RecipeAdditionYeastListModel.cpp | 4 +- .../listModels/RecipeAdditionYeastListModel.h | 4 +- .../RecipeAdjustmentSaltListModel.cpp | 4 +- .../RecipeAdjustmentSaltListModel.h | 4 +- .../listModels/SaltListModel.cpp | 4 +- src/{ => qtModels}/listModels/SaltListModel.h | 4 +- .../listModels/StyleListModel.cpp | 4 +- .../listModels/StyleListModel.h | 4 +- .../listModels/WaterListModel.cpp | 4 +- .../listModels/WaterListModel.h | 4 +- .../listModels/YeastListModel.cpp | 4 +- .../listModels/YeastListModel.h | 4 +- .../BoilSortFilterProxyModel.cpp | 4 +- .../BoilSortFilterProxyModel.h | 8 +- .../EquipmentSortFilterProxyModel.cpp | 4 +- .../EquipmentSortFilterProxyModel.h | 8 +- .../FermentableSortFilterProxyModel.cpp | 4 +- .../FermentableSortFilterProxyModel.h | 8 +- .../FermentationSortFilterProxyModel.cpp | 4 +- .../FermentationSortFilterProxyModel.h | 8 +- .../HopSortFilterProxyModel.cpp | 4 +- .../HopSortFilterProxyModel.h | 8 +- .../MashSortFilterProxyModel.cpp | 4 +- .../MashSortFilterProxyModel.h | 8 +- .../MiscSortFilterProxyModel.cpp | 4 +- .../MiscSortFilterProxyModel.h | 8 +- ...dditionFermentableSortFilterProxyModel.cpp | 4 +- ...eAdditionFermentableSortFilterProxyModel.h | 8 +- .../RecipeAdditionHopSortFilterProxyModel.cpp | 4 +- .../RecipeAdditionHopSortFilterProxyModel.h | 8 +- ...RecipeAdditionMiscSortFilterProxyModel.cpp | 4 +- .../RecipeAdditionMiscSortFilterProxyModel.h | 8 +- ...ecipeAdditionYeastSortFilterProxyModel.cpp | 4 +- .../RecipeAdditionYeastSortFilterProxyModel.h | 8 +- .../SortFilterProxyModelBase.h | 4 +- .../StyleSortFilterProxyModel.cpp | 4 +- .../StyleSortFilterProxyModel.h | 8 +- .../WaterSortFilterProxyModel.cpp | 4 +- .../WaterSortFilterProxyModel.h | 8 +- .../YeastSortFilterProxyModel.cpp | 4 +- .../YeastSortFilterProxyModel.h | 8 +- .../tableModels/BoilStepTableModel.cpp | 6 +- .../tableModels/BoilStepTableModel.h | 10 +- .../tableModels/BoilTableModel.cpp | 4 +- .../tableModels/BoilTableModel.h | 6 +- .../tableModels/BtTableModel.cpp | 4 +- src/{ => qtModels}/tableModels/BtTableModel.h | 2 +- .../tableModels/EquipmentTableModel.cpp | 4 +- .../tableModels/EquipmentTableModel.h | 6 +- .../tableModels/FermentableTableModel.cpp | 6 +- .../tableModels/FermentableTableModel.h | 6 +- .../FermentationStepTableModel.cpp | 4 +- .../tableModels/FermentationStepTableModel.h | 10 +- .../tableModels/FermentationTableModel.cpp | 4 +- .../tableModels/FermentationTableModel.h | 8 +- .../tableModels/HopTableModel.cpp | 4 +- .../tableModels/HopTableModel.h | 6 +- src/{ => qtModels}/tableModels/ItemDelegate.h | 4 +- .../tableModels/MashStepTableModel.cpp | 6 +- .../tableModels/MashStepTableModel.h | 10 +- .../tableModels/MashTableModel.cpp | 4 +- .../tableModels/MashTableModel.h | 8 +- .../tableModels/MiscTableModel.cpp | 4 +- .../tableModels/MiscTableModel.h | 6 +- .../RecipeAdditionFermentableTableModel.cpp | 4 +- .../RecipeAdditionFermentableTableModel.h | 8 +- .../RecipeAdditionHopTableModel.cpp | 4 +- .../tableModels/RecipeAdditionHopTableModel.h | 8 +- .../RecipeAdditionMiscTableModel.cpp | 4 +- .../RecipeAdditionMiscTableModel.h | 8 +- .../RecipeAdditionYeastTableModel.cpp | 4 +- .../RecipeAdditionYeastTableModel.h | 8 +- .../RecipeAdjustmentSaltTableModel.cpp | 4 +- .../RecipeAdjustmentSaltTableModel.h | 8 +- .../tableModels/SaltTableModel.cpp | 4 +- .../tableModels/SaltTableModel.h | 8 +- .../tableModels/StepTableModelBase.h | 2 +- .../tableModels/StyleTableModel.cpp | 4 +- .../tableModels/StyleTableModel.h | 6 +- .../tableModels/TableModelBase.h | 10 +- .../tableModels/WaterTableModel.cpp | 4 +- .../tableModels/WaterTableModel.h | 6 +- .../tableModels/YeastTableModel.cpp | 4 +- .../tableModels/YeastTableModel.h | 6 +- src/trees/TreeNode.h | 2 +- src/widgets/BtComboBoxNamedEntity.h | 28 +- translations/bt_ca.ts | 16 + translations/bt_cs.ts | 16 + translations/bt_da.ts | 466 +++++++++--------- translations/bt_de.ts | 16 + translations/bt_el.ts | 16 + translations/bt_en.ts | 16 + translations/bt_es.ts | 16 + translations/bt_et.ts | 16 + translations/bt_eu.ts | 16 + translations/bt_fr.ts | 16 + translations/bt_gl.ts | 16 + translations/bt_hu.ts | 16 + translations/bt_it.ts | 16 + translations/bt_lv.ts | 16 + translations/bt_nb.ts | 16 + translations/bt_nl.ts | 16 + translations/bt_pl.ts | 16 + translations/bt_pt.ts | 16 + translations/bt_ru.ts | 16 + translations/bt_sr.ts | 16 + translations/bt_sv.ts | 16 + translations/bt_tr.ts | 16 + translations/bt_zh.ts | 16 + 154 files changed, 1101 insertions(+), 717 deletions(-) rename src/{ => qtModels}/listModels/BoilListModel.cpp (90%) rename src/{ => qtModels}/listModels/BoilListModel.h (91%) rename src/{ => qtModels}/listModels/EquipmentListModel.cpp (90%) rename src/{ => qtModels}/listModels/EquipmentListModel.h (91%) rename src/{ => qtModels}/listModels/FermentableListModel.cpp (90%) rename src/{ => qtModels}/listModels/FermentableListModel.h (91%) rename src/{ => qtModels}/listModels/FermentationListModel.cpp (89%) rename src/{ => qtModels}/listModels/FermentationListModel.h (91%) rename src/{ => qtModels}/listModels/HopListModel.cpp (90%) rename src/{ => qtModels}/listModels/HopListModel.h (91%) rename src/{ => qtModels}/listModels/ListModelBase.h (99%) rename src/{ => qtModels}/listModels/MashListModel.cpp (91%) rename src/{ => qtModels}/listModels/MashListModel.h (92%) rename src/{ => qtModels}/listModels/MashStepListModel.cpp (90%) rename src/{ => qtModels}/listModels/MashStepListModel.h (91%) rename src/{ => qtModels}/listModels/MiscListModel.cpp (90%) rename src/{ => qtModels}/listModels/MiscListModel.h (91%) rename src/{ => qtModels}/listModels/RecipeAdditionFermentableListModel.cpp (88%) rename src/{ => qtModels}/listModels/RecipeAdditionFermentableListModel.h (91%) rename src/{ => qtModels}/listModels/RecipeAdditionHopListModel.cpp (89%) rename src/{ => qtModels}/listModels/RecipeAdditionHopListModel.h (91%) rename src/{ => qtModels}/listModels/RecipeAdditionMiscListModel.cpp (89%) rename src/{ => qtModels}/listModels/RecipeAdditionMiscListModel.h (91%) rename src/{ => qtModels}/listModels/RecipeAdditionYeastListModel.cpp (88%) rename src/{ => qtModels}/listModels/RecipeAdditionYeastListModel.h (91%) rename src/{ => qtModels}/listModels/RecipeAdjustmentSaltListModel.cpp (89%) rename src/{ => qtModels}/listModels/RecipeAdjustmentSaltListModel.h (91%) rename src/{ => qtModels}/listModels/SaltListModel.cpp (90%) rename src/{ => qtModels}/listModels/SaltListModel.h (91%) rename src/{ => qtModels}/listModels/StyleListModel.cpp (91%) rename src/{ => qtModels}/listModels/StyleListModel.h (91%) rename src/{ => qtModels}/listModels/WaterListModel.cpp (90%) rename src/{ => qtModels}/listModels/WaterListModel.h (92%) rename src/{ => qtModels}/listModels/YeastListModel.cpp (90%) rename src/{ => qtModels}/listModels/YeastListModel.h (91%) rename src/{ => qtModels}/sortFilterProxyModels/BoilSortFilterProxyModel.cpp (92%) rename src/{ => qtModels}/sortFilterProxyModels/BoilSortFilterProxyModel.h (87%) rename src/{ => qtModels}/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp (92%) rename src/{ => qtModels}/sortFilterProxyModels/EquipmentSortFilterProxyModel.h (87%) rename src/{ => qtModels}/sortFilterProxyModels/FermentableSortFilterProxyModel.cpp (94%) rename src/{ => qtModels}/sortFilterProxyModels/FermentableSortFilterProxyModel.h (87%) rename src/{ => qtModels}/sortFilterProxyModels/FermentationSortFilterProxyModel.cpp (91%) rename src/{ => qtModels}/sortFilterProxyModels/FermentationSortFilterProxyModel.h (86%) rename src/{ => qtModels}/sortFilterProxyModels/HopSortFilterProxyModel.cpp (93%) rename src/{ => qtModels}/sortFilterProxyModels/HopSortFilterProxyModel.h (87%) rename src/{ => qtModels}/sortFilterProxyModels/MashSortFilterProxyModel.cpp (93%) rename src/{ => qtModels}/sortFilterProxyModels/MashSortFilterProxyModel.h (87%) rename src/{ => qtModels}/sortFilterProxyModels/MiscSortFilterProxyModel.cpp (94%) rename src/{ => qtModels}/sortFilterProxyModels/MiscSortFilterProxyModel.h (88%) rename src/{ => qtModels}/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.cpp (94%) rename src/{ => qtModels}/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.h (86%) rename src/{ => qtModels}/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.cpp (94%) rename src/{ => qtModels}/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.h (87%) rename src/{ => qtModels}/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.cpp (93%) rename src/{ => qtModels}/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.h (87%) rename src/{ => qtModels}/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.cpp (95%) rename src/{ => qtModels}/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.h (87%) rename src/{ => qtModels}/sortFilterProxyModels/SortFilterProxyModelBase.h (97%) rename src/{ => qtModels}/sortFilterProxyModels/StyleSortFilterProxyModel.cpp (92%) rename src/{ => qtModels}/sortFilterProxyModels/StyleSortFilterProxyModel.h (88%) rename src/{ => qtModels}/sortFilterProxyModels/WaterSortFilterProxyModel.cpp (93%) rename src/{ => qtModels}/sortFilterProxyModels/WaterSortFilterProxyModel.h (88%) rename src/{ => qtModels}/sortFilterProxyModels/YeastSortFilterProxyModel.cpp (94%) rename src/{ => qtModels}/sortFilterProxyModels/YeastSortFilterProxyModel.h (88%) rename src/{ => qtModels}/tableModels/BoilStepTableModel.cpp (96%) rename src/{ => qtModels}/tableModels/BoilStepTableModel.h (90%) rename src/{ => qtModels}/tableModels/BoilTableModel.cpp (95%) rename src/{ => qtModels}/tableModels/BoilTableModel.h (91%) rename src/{ => qtModels}/tableModels/BtTableModel.cpp (98%) rename src/{ => qtModels}/tableModels/BtTableModel.h (99%) rename src/{ => qtModels}/tableModels/EquipmentTableModel.cpp (95%) rename src/{ => qtModels}/tableModels/EquipmentTableModel.h (92%) rename src/{ => qtModels}/tableModels/FermentableTableModel.cpp (96%) rename src/{ => qtModels}/tableModels/FermentableTableModel.h (93%) rename src/{ => qtModels}/tableModels/FermentationStepTableModel.cpp (97%) rename src/{ => qtModels}/tableModels/FermentationStepTableModel.h (91%) rename src/{ => qtModels}/tableModels/FermentationTableModel.cpp (95%) rename src/{ => qtModels}/tableModels/FermentationTableModel.h (89%) rename src/{ => qtModels}/tableModels/HopTableModel.cpp (96%) rename src/{ => qtModels}/tableModels/HopTableModel.h (93%) rename src/{ => qtModels}/tableModels/ItemDelegate.h (99%) rename src/{ => qtModels}/tableModels/MashStepTableModel.cpp (96%) rename src/{ => qtModels}/tableModels/MashStepTableModel.h (90%) rename src/{ => qtModels}/tableModels/MashTableModel.cpp (95%) rename src/{ => qtModels}/tableModels/MashTableModel.h (89%) rename src/{ => qtModels}/tableModels/MiscTableModel.cpp (96%) rename src/{ => qtModels}/tableModels/MiscTableModel.h (93%) rename src/{ => qtModels}/tableModels/RecipeAdditionFermentableTableModel.cpp (97%) rename src/{ => qtModels}/tableModels/RecipeAdditionFermentableTableModel.h (93%) rename src/{ => qtModels}/tableModels/RecipeAdditionHopTableModel.cpp (97%) rename src/{ => qtModels}/tableModels/RecipeAdditionHopTableModel.h (93%) rename src/{ => qtModels}/tableModels/RecipeAdditionMiscTableModel.cpp (97%) rename src/{ => qtModels}/tableModels/RecipeAdditionMiscTableModel.h (93%) rename src/{ => qtModels}/tableModels/RecipeAdditionYeastTableModel.cpp (97%) rename src/{ => qtModels}/tableModels/RecipeAdditionYeastTableModel.h (92%) rename src/{ => qtModels}/tableModels/RecipeAdjustmentSaltTableModel.cpp (98%) rename src/{ => qtModels}/tableModels/RecipeAdjustmentSaltTableModel.h (93%) rename src/{ => qtModels}/tableModels/SaltTableModel.cpp (97%) rename src/{ => qtModels}/tableModels/SaltTableModel.h (91%) rename src/{ => qtModels}/tableModels/StepTableModelBase.h (99%) rename src/{ => qtModels}/tableModels/StyleTableModel.cpp (95%) rename src/{ => qtModels}/tableModels/StyleTableModel.h (92%) rename src/{ => qtModels}/tableModels/TableModelBase.h (99%) rename src/{ => qtModels}/tableModels/WaterTableModel.cpp (97%) rename src/{ => qtModels}/tableModels/WaterTableModel.h (95%) rename src/{ => qtModels}/tableModels/YeastTableModel.cpp (96%) rename src/{ => qtModels}/tableModels/YeastTableModel.h (93%) diff --git a/CHANGES.markdown b/CHANGES.markdown index fccc939fa..c43842d12 100644 --- a/CHANGES.markdown +++ b/CHANGES.markdown @@ -13,6 +13,18 @@ happens, so I'm now setting it to a slightly arbitrary time early in the morning * Additional methods for calculating IBU * We'll list other new features here... +## v4.0.16 +Bug fixes and minor enhancements. + +### New Features +* None + +### Bug Fixes +* None yet! + +### Release Timestamp +Wed, 1 Jan 2025 04:00:16 +0100 + ## v4.0.15 Bug fixes and minor enhancements. diff --git a/CMakeLists.txt b/CMakeLists.txt index 2118753dc..d5d613db3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -115,7 +115,7 @@ endif() #======================================================================================================================= # It's simplest to keep the project name all lower-case as it means we can use a lot more of the default settings for # Linux packaging (where directory names etc are expected to be all lower-case). -project(brewtarget VERSION 4.0.15 LANGUAGES CXX) +project(brewtarget VERSION 4.0.16 LANGUAGES CXX) message(STATUS "Building ${PROJECT_NAME} version ${PROJECT_VERSION}") message(STATUS "PROJECT_SOURCE_DIR is ${PROJECT_SOURCE_DIR}") # Sometimes we do need the capitalised version of the project name diff --git a/meson.build b/meson.build index a06e58c18..5b095334c 100644 --- a/meson.build +++ b/meson.build @@ -189,7 +189,7 @@ # # project('brewtarget', 'cpp', - version: '4.0.15', + version: '4.0.16', license: 'GPL-3.0-or-later', meson_version: '>=0.63.0', default_options : ['cpp_std=c++23', @@ -690,23 +690,23 @@ commonSourceFiles = files([ 'src/editors/StyleEditor.cpp', 'src/editors/WaterEditor.cpp', 'src/editors/YeastEditor.cpp', - 'src/listModels/BoilListModel.cpp', - 'src/listModels/EquipmentListModel.cpp', - 'src/listModels/FermentableListModel.cpp', - 'src/listModels/FermentationListModel.cpp', - 'src/listModels/HopListModel.cpp', - 'src/listModels/MashListModel.cpp', - 'src/listModels/MashStepListModel.cpp', - 'src/listModels/MiscListModel.cpp', - 'src/listModels/RecipeAdditionFermentableListModel.cpp', - 'src/listModels/RecipeAdditionHopListModel.cpp', - 'src/listModels/RecipeAdditionMiscListModel.cpp', - 'src/listModels/RecipeAdditionYeastListModel.cpp', - 'src/listModels/RecipeAdjustmentSaltListModel.cpp', - 'src/listModels/SaltListModel.cpp', - 'src/listModels/StyleListModel.cpp', - 'src/listModels/WaterListModel.cpp', - 'src/listModels/YeastListModel.cpp', + 'src/qtModels/listModels/BoilListModel.cpp', + 'src/qtModels/listModels/EquipmentListModel.cpp', + 'src/qtModels/listModels/FermentableListModel.cpp', + 'src/qtModels/listModels/FermentationListModel.cpp', + 'src/qtModels/listModels/HopListModel.cpp', + 'src/qtModels/listModels/MashListModel.cpp', + 'src/qtModels/listModels/MashStepListModel.cpp', + 'src/qtModels/listModels/MiscListModel.cpp', + 'src/qtModels/listModels/RecipeAdditionFermentableListModel.cpp', + 'src/qtModels/listModels/RecipeAdditionHopListModel.cpp', + 'src/qtModels/listModels/RecipeAdditionMiscListModel.cpp', + 'src/qtModels/listModels/RecipeAdditionYeastListModel.cpp', + 'src/qtModels/listModels/RecipeAdjustmentSaltListModel.cpp', + 'src/qtModels/listModels/SaltListModel.cpp', + 'src/qtModels/listModels/StyleListModel.cpp', + 'src/qtModels/listModels/WaterListModel.cpp', + 'src/qtModels/listModels/YeastListModel.cpp', 'src/measurement/Amount.cpp', 'src/measurement/ColorMethods.cpp', 'src/measurement/IbuMethods.cpp', @@ -768,40 +768,40 @@ commonSourceFiles = files([ 'src/serialization/xml/XmlRecipeRecord.cpp', 'src/serialization/xml/XmlRecord.cpp', 'src/serialization/xml/XmlRecordDefinition.cpp', - 'src/sortFilterProxyModels/BoilSortFilterProxyModel.cpp', - 'src/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp', - 'src/sortFilterProxyModels/FermentationSortFilterProxyModel.cpp', - 'src/sortFilterProxyModels/FermentableSortFilterProxyModel.cpp', - 'src/sortFilterProxyModels/HopSortFilterProxyModel.cpp', - 'src/sortFilterProxyModels/MashSortFilterProxyModel.cpp', - 'src/sortFilterProxyModels/MiscSortFilterProxyModel.cpp', - 'src/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.cpp', - 'src/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.cpp', - 'src/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.cpp', - 'src/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.cpp', - 'src/sortFilterProxyModels/StyleSortFilterProxyModel.cpp', - 'src/sortFilterProxyModels/WaterSortFilterProxyModel.cpp', - 'src/sortFilterProxyModels/YeastSortFilterProxyModel.cpp', - 'src/tableModels/BoilStepTableModel.cpp', - 'src/tableModels/BoilTableModel.cpp', - 'src/tableModels/BtTableModel.cpp', - 'src/tableModels/EquipmentTableModel.cpp', - 'src/tableModels/FermentableTableModel.cpp', - 'src/tableModels/FermentationStepTableModel.cpp', - 'src/tableModels/FermentationTableModel.cpp', - 'src/tableModels/HopTableModel.cpp', - 'src/tableModels/MashStepTableModel.cpp', - 'src/tableModels/MashTableModel.cpp', - 'src/tableModels/MiscTableModel.cpp', - 'src/tableModels/RecipeAdditionFermentableTableModel.cpp', - 'src/tableModels/RecipeAdditionHopTableModel.cpp', - 'src/tableModels/RecipeAdditionMiscTableModel.cpp', - 'src/tableModels/RecipeAdditionYeastTableModel.cpp', - 'src/tableModels/RecipeAdjustmentSaltTableModel.cpp', - 'src/tableModels/SaltTableModel.cpp', - 'src/tableModels/StyleTableModel.cpp', - 'src/tableModels/WaterTableModel.cpp', - 'src/tableModels/YeastTableModel.cpp', + 'src/qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.cpp', + 'src/qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp', + 'src/qtModels/sortFilterProxyModels/FermentationSortFilterProxyModel.cpp', + 'src/qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.cpp', + 'src/qtModels/sortFilterProxyModels/HopSortFilterProxyModel.cpp', + 'src/qtModels/sortFilterProxyModels/MashSortFilterProxyModel.cpp', + 'src/qtModels/sortFilterProxyModels/MiscSortFilterProxyModel.cpp', + 'src/qtModels/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.cpp', + 'src/qtModels/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.cpp', + 'src/qtModels/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.cpp', + 'src/qtModels/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.cpp', + 'src/qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.cpp', + 'src/qtModels/sortFilterProxyModels/WaterSortFilterProxyModel.cpp', + 'src/qtModels/sortFilterProxyModels/YeastSortFilterProxyModel.cpp', + 'src/qtModels/tableModels/BoilStepTableModel.cpp', + 'src/qtModels/tableModels/BoilTableModel.cpp', + 'src/qtModels/tableModels/BtTableModel.cpp', + 'src/qtModels/tableModels/EquipmentTableModel.cpp', + 'src/qtModels/tableModels/FermentableTableModel.cpp', + 'src/qtModels/tableModels/FermentationStepTableModel.cpp', + 'src/qtModels/tableModels/FermentationTableModel.cpp', + 'src/qtModels/tableModels/HopTableModel.cpp', + 'src/qtModels/tableModels/MashStepTableModel.cpp', + 'src/qtModels/tableModels/MashTableModel.cpp', + 'src/qtModels/tableModels/MiscTableModel.cpp', + 'src/qtModels/tableModels/RecipeAdditionFermentableTableModel.cpp', + 'src/qtModels/tableModels/RecipeAdditionHopTableModel.cpp', + 'src/qtModels/tableModels/RecipeAdditionMiscTableModel.cpp', + 'src/qtModels/tableModels/RecipeAdditionYeastTableModel.cpp', + 'src/qtModels/tableModels/RecipeAdjustmentSaltTableModel.cpp', + 'src/qtModels/tableModels/SaltTableModel.cpp', + 'src/qtModels/tableModels/StyleTableModel.cpp', + 'src/qtModels/tableModels/WaterTableModel.cpp', + 'src/qtModels/tableModels/YeastTableModel.cpp', 'src/trees/TreeFilterProxyModel.cpp', 'src/trees/TreeModel.cpp', 'src/trees/TreeNode.cpp', @@ -923,23 +923,23 @@ mocHeaders = files([ 'src/editors/StyleEditor.h', 'src/editors/WaterEditor.h', 'src/editors/YeastEditor.h', - 'src/listModels/BoilListModel.h', - 'src/listModels/EquipmentListModel.h', - 'src/listModels/FermentableListModel.h', - 'src/listModels/FermentationListModel.h', - 'src/listModels/HopListModel.h', - 'src/listModels/MashListModel.h', - 'src/listModels/MashStepListModel.h', - 'src/listModels/MiscListModel.h', - 'src/listModels/RecipeAdditionFermentableListModel.h', - 'src/listModels/RecipeAdditionHopListModel.h', - 'src/listModels/RecipeAdditionMiscListModel.h', - 'src/listModels/RecipeAdditionYeastListModel.h', - 'src/listModels/RecipeAdjustmentSaltListModel.h', - 'src/listModels/SaltListModel.h', - 'src/listModels/StyleListModel.h', - 'src/listModels/WaterListModel.h', - 'src/listModels/YeastListModel.h', + 'src/qtModels/listModels/BoilListModel.h', + 'src/qtModels/listModels/EquipmentListModel.h', + 'src/qtModels/listModels/FermentableListModel.h', + 'src/qtModels/listModels/FermentationListModel.h', + 'src/qtModels/listModels/HopListModel.h', + 'src/qtModels/listModels/MashListModel.h', + 'src/qtModels/listModels/MashStepListModel.h', + 'src/qtModels/listModels/MiscListModel.h', + 'src/qtModels/listModels/RecipeAdditionFermentableListModel.h', + 'src/qtModels/listModels/RecipeAdditionHopListModel.h', + 'src/qtModels/listModels/RecipeAdditionMiscListModel.h', + 'src/qtModels/listModels/RecipeAdditionYeastListModel.h', + 'src/qtModels/listModels/RecipeAdjustmentSaltListModel.h', + 'src/qtModels/listModels/SaltListModel.h', + 'src/qtModels/listModels/StyleListModel.h', + 'src/qtModels/listModels/WaterListModel.h', + 'src/qtModels/listModels/YeastListModel.h', 'src/model/Boil.h', 'src/model/BoilStep.h', 'src/model/BrewNote.h', @@ -978,40 +978,40 @@ mocHeaders = files([ 'src/model/Style.h', 'src/model/Water.h', 'src/model/Yeast.h', - 'src/sortFilterProxyModels/BoilSortFilterProxyModel.h', - 'src/sortFilterProxyModels/EquipmentSortFilterProxyModel.h', - 'src/sortFilterProxyModels/FermentableSortFilterProxyModel.h', - 'src/sortFilterProxyModels/FermentationSortFilterProxyModel.h', - 'src/sortFilterProxyModels/HopSortFilterProxyModel.h', - 'src/sortFilterProxyModels/MashSortFilterProxyModel.h', - 'src/sortFilterProxyModels/MiscSortFilterProxyModel.h', - 'src/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.h', - 'src/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.h', - 'src/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.h', - 'src/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.h', - 'src/sortFilterProxyModels/StyleSortFilterProxyModel.h', - 'src/sortFilterProxyModels/WaterSortFilterProxyModel.h', - 'src/sortFilterProxyModels/YeastSortFilterProxyModel.h', - 'src/tableModels/BoilStepTableModel.h', - 'src/tableModels/BoilTableModel.h', - 'src/tableModels/BtTableModel.h', - 'src/tableModels/EquipmentTableModel.h', - 'src/tableModels/FermentableTableModel.h', - 'src/tableModels/FermentationStepTableModel.h', - 'src/tableModels/FermentationTableModel.h', - 'src/tableModels/HopTableModel.h', - 'src/tableModels/MashStepTableModel.h', - 'src/tableModels/MashTableModel.h', - 'src/tableModels/MiscTableModel.h', - 'src/tableModels/RecipeAdditionFermentableTableModel.h', - 'src/tableModels/RecipeAdditionHopTableModel.h', - 'src/tableModels/RecipeAdditionMiscTableModel.h', - 'src/tableModels/RecipeAdditionYeastTableModel.h', - 'src/tableModels/RecipeAdjustmentSaltTableModel.h', - 'src/tableModels/SaltTableModel.h', - 'src/tableModels/StyleTableModel.h', - 'src/tableModels/WaterTableModel.h', - 'src/tableModels/YeastTableModel.h', + 'src/qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.h', + 'src/qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.h', + 'src/qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.h', + 'src/qtModels/sortFilterProxyModels/FermentationSortFilterProxyModel.h', + 'src/qtModels/sortFilterProxyModels/HopSortFilterProxyModel.h', + 'src/qtModels/sortFilterProxyModels/MashSortFilterProxyModel.h', + 'src/qtModels/sortFilterProxyModels/MiscSortFilterProxyModel.h', + 'src/qtModels/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.h', + 'src/qtModels/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.h', + 'src/qtModels/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.h', + 'src/qtModels/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.h', + 'src/qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.h', + 'src/qtModels/sortFilterProxyModels/WaterSortFilterProxyModel.h', + 'src/qtModels/sortFilterProxyModels/YeastSortFilterProxyModel.h', + 'src/qtModels/tableModels/BoilStepTableModel.h', + 'src/qtModels/tableModels/BoilTableModel.h', + 'src/qtModels/tableModels/BtTableModel.h', + 'src/qtModels/tableModels/EquipmentTableModel.h', + 'src/qtModels/tableModels/FermentableTableModel.h', + 'src/qtModels/tableModels/FermentationStepTableModel.h', + 'src/qtModels/tableModels/FermentationTableModel.h', + 'src/qtModels/tableModels/HopTableModel.h', + 'src/qtModels/tableModels/MashStepTableModel.h', + 'src/qtModels/tableModels/MashTableModel.h', + 'src/qtModels/tableModels/MiscTableModel.h', + 'src/qtModels/tableModels/RecipeAdditionFermentableTableModel.h', + 'src/qtModels/tableModels/RecipeAdditionHopTableModel.h', + 'src/qtModels/tableModels/RecipeAdditionMiscTableModel.h', + 'src/qtModels/tableModels/RecipeAdditionYeastTableModel.h', + 'src/qtModels/tableModels/RecipeAdjustmentSaltTableModel.h', + 'src/qtModels/tableModels/SaltTableModel.h', + 'src/qtModels/tableModels/StyleTableModel.h', + 'src/qtModels/tableModels/WaterTableModel.h', + 'src/qtModels/tableModels/YeastTableModel.h', 'src/trees/TreeFilterProxyModel.h', 'src/trees/TreeModel.h', 'src/trees/TreeView.h', diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e722e66ce..2620b8ae5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -121,23 +121,23 @@ set(filesToCompile_cpp ${repoDir}/src/editors/StyleEditor.cpp ${repoDir}/src/editors/WaterEditor.cpp ${repoDir}/src/editors/YeastEditor.cpp - ${repoDir}/src/listModels/BoilListModel.cpp - ${repoDir}/src/listModels/EquipmentListModel.cpp - ${repoDir}/src/listModels/FermentableListModel.cpp - ${repoDir}/src/listModels/FermentationListModel.cpp - ${repoDir}/src/listModels/HopListModel.cpp - ${repoDir}/src/listModels/MashListModel.cpp - ${repoDir}/src/listModels/MashStepListModel.cpp - ${repoDir}/src/listModels/MiscListModel.cpp - ${repoDir}/src/listModels/RecipeAdditionFermentableListModel.cpp - ${repoDir}/src/listModels/RecipeAdditionHopListModel.cpp - ${repoDir}/src/listModels/RecipeAdditionMiscListModel.cpp - ${repoDir}/src/listModels/RecipeAdditionYeastListModel.cpp - ${repoDir}/src/listModels/RecipeAdjustmentSaltListModel.cpp - ${repoDir}/src/listModels/SaltListModel.cpp - ${repoDir}/src/listModels/StyleListModel.cpp - ${repoDir}/src/listModels/WaterListModel.cpp - ${repoDir}/src/listModels/YeastListModel.cpp + ${repoDir}/src/qtModels/listModels/BoilListModel.cpp + ${repoDir}/src/qtModels/listModels/EquipmentListModel.cpp + ${repoDir}/src/qtModels/listModels/FermentableListModel.cpp + ${repoDir}/src/qtModels/listModels/FermentationListModel.cpp + ${repoDir}/src/qtModels/listModels/HopListModel.cpp + ${repoDir}/src/qtModels/listModels/MashListModel.cpp + ${repoDir}/src/qtModels/listModels/MashStepListModel.cpp + ${repoDir}/src/qtModels/listModels/MiscListModel.cpp + ${repoDir}/src/qtModels/listModels/RecipeAdditionFermentableListModel.cpp + ${repoDir}/src/qtModels/listModels/RecipeAdditionHopListModel.cpp + ${repoDir}/src/qtModels/listModels/RecipeAdditionMiscListModel.cpp + ${repoDir}/src/qtModels/listModels/RecipeAdditionYeastListModel.cpp + ${repoDir}/src/qtModels/listModels/RecipeAdjustmentSaltListModel.cpp + ${repoDir}/src/qtModels/listModels/SaltListModel.cpp + ${repoDir}/src/qtModels/listModels/StyleListModel.cpp + ${repoDir}/src/qtModels/listModels/WaterListModel.cpp + ${repoDir}/src/qtModels/listModels/YeastListModel.cpp ${repoDir}/src/measurement/Amount.cpp ${repoDir}/src/measurement/ColorMethods.cpp ${repoDir}/src/measurement/IbuMethods.cpp @@ -199,40 +199,40 @@ set(filesToCompile_cpp ${repoDir}/src/serialization/xml/XmlRecipeRecord.cpp ${repoDir}/src/serialization/xml/XmlRecord.cpp ${repoDir}/src/serialization/xml/XmlRecordDefinition.cpp - ${repoDir}/src/sortFilterProxyModels/BoilSortFilterProxyModel.cpp - ${repoDir}/src/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp - ${repoDir}/src/sortFilterProxyModels/FermentableSortFilterProxyModel.cpp - ${repoDir}/src/sortFilterProxyModels/FermentationSortFilterProxyModel.cpp - ${repoDir}/src/sortFilterProxyModels/HopSortFilterProxyModel.cpp - ${repoDir}/src/sortFilterProxyModels/MashSortFilterProxyModel.cpp - ${repoDir}/src/sortFilterProxyModels/MiscSortFilterProxyModel.cpp - ${repoDir}/src/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.cpp - ${repoDir}/src/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.cpp - ${repoDir}/src/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.cpp - ${repoDir}/src/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.cpp - ${repoDir}/src/sortFilterProxyModels/StyleSortFilterProxyModel.cpp - ${repoDir}/src/sortFilterProxyModels/WaterSortFilterProxyModel.cpp - ${repoDir}/src/sortFilterProxyModels/YeastSortFilterProxyModel.cpp - ${repoDir}/src/tableModels/BoilStepTableModel.cpp - ${repoDir}/src/tableModels/BoilTableModel.cpp - ${repoDir}/src/tableModels/BtTableModel.cpp - ${repoDir}/src/tableModels/EquipmentTableModel.cpp - ${repoDir}/src/tableModels/FermentableTableModel.cpp - ${repoDir}/src/tableModels/FermentationStepTableModel.cpp - ${repoDir}/src/tableModels/FermentationTableModel.cpp - ${repoDir}/src/tableModels/HopTableModel.cpp - ${repoDir}/src/tableModels/MashStepTableModel.cpp - ${repoDir}/src/tableModels/MashTableModel.cpp - ${repoDir}/src/tableModels/MiscTableModel.cpp - ${repoDir}/src/tableModels/RecipeAdditionFermentableTableModel.cpp - ${repoDir}/src/tableModels/RecipeAdditionHopTableModel.cpp - ${repoDir}/src/tableModels/RecipeAdditionMiscTableModel.cpp - ${repoDir}/src/tableModels/RecipeAdditionYeastTableModel.cpp - ${repoDir}/src/tableModels/RecipeAdjustmentSaltTableModel.cpp - ${repoDir}/src/tableModels/SaltTableModel.cpp - ${repoDir}/src/tableModels/StyleTableModel.cpp - ${repoDir}/src/tableModels/WaterTableModel.cpp - ${repoDir}/src/tableModels/YeastTableModel.cpp + ${repoDir}/src/qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.cpp + ${repoDir}/src/qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp + ${repoDir}/src/qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.cpp + ${repoDir}/src/qtModels/sortFilterProxyModels/FermentationSortFilterProxyModel.cpp + ${repoDir}/src/qtModels/sortFilterProxyModels/HopSortFilterProxyModel.cpp + ${repoDir}/src/qtModels/sortFilterProxyModels/MashSortFilterProxyModel.cpp + ${repoDir}/src/qtModels/sortFilterProxyModels/MiscSortFilterProxyModel.cpp + ${repoDir}/src/qtModels/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.cpp + ${repoDir}/src/qtModels/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.cpp + ${repoDir}/src/qtModels/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.cpp + ${repoDir}/src/qtModels/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.cpp + ${repoDir}/src/qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.cpp + ${repoDir}/src/qtModels/sortFilterProxyModels/WaterSortFilterProxyModel.cpp + ${repoDir}/src/qtModels/sortFilterProxyModels/YeastSortFilterProxyModel.cpp + ${repoDir}/src/qtModels/tableModels/BoilStepTableModel.cpp + ${repoDir}/src/qtModels/tableModels/BoilTableModel.cpp + ${repoDir}/src/qtModels/tableModels/BtTableModel.cpp + ${repoDir}/src/qtModels/tableModels/EquipmentTableModel.cpp + ${repoDir}/src/qtModels/tableModels/FermentableTableModel.cpp + ${repoDir}/src/qtModels/tableModels/FermentationStepTableModel.cpp + ${repoDir}/src/qtModels/tableModels/FermentationTableModel.cpp + ${repoDir}/src/qtModels/tableModels/HopTableModel.cpp + ${repoDir}/src/qtModels/tableModels/MashStepTableModel.cpp + ${repoDir}/src/qtModels/tableModels/MashTableModel.cpp + ${repoDir}/src/qtModels/tableModels/MiscTableModel.cpp + ${repoDir}/src/qtModels/tableModels/RecipeAdditionFermentableTableModel.cpp + ${repoDir}/src/qtModels/tableModels/RecipeAdditionHopTableModel.cpp + ${repoDir}/src/qtModels/tableModels/RecipeAdditionMiscTableModel.cpp + ${repoDir}/src/qtModels/tableModels/RecipeAdditionYeastTableModel.cpp + ${repoDir}/src/qtModels/tableModels/RecipeAdjustmentSaltTableModel.cpp + ${repoDir}/src/qtModels/tableModels/SaltTableModel.cpp + ${repoDir}/src/qtModels/tableModels/StyleTableModel.cpp + ${repoDir}/src/qtModels/tableModels/WaterTableModel.cpp + ${repoDir}/src/qtModels/tableModels/YeastTableModel.cpp ${repoDir}/src/trees/TreeFilterProxyModel.cpp ${repoDir}/src/trees/TreeModel.cpp ${repoDir}/src/trees/TreeNode.cpp diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 4fff3b3de..087c7d532 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -121,10 +121,10 @@ #include "editors/StyleEditor.h" #include "editors/WaterEditor.h" #include "editors/YeastEditor.h" -#include "listModels/EquipmentListModel.h" -#include "listModels/MashListModel.h" -#include "listModels/StyleListModel.h" -#include "listModels/WaterListModel.h" +#include "qtModels/listModels/EquipmentListModel.h" +#include "qtModels/listModels/MashListModel.h" +#include "qtModels/listModels/StyleListModel.h" +#include "qtModels/listModels/WaterListModel.h" #include "measurement/Measurement.h" #include "measurement/Unit.h" #include "model/Boil.h" @@ -138,20 +138,20 @@ #include "model/Style.h" #include "model/Yeast.h" #include "serialization/ImportExport.h" -#include "sortFilterProxyModels/FermentableSortFilterProxyModel.h" -#include "sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.h" -#include "sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.h" -#include "sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.h" -#include "sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.h" -#include "sortFilterProxyModels/StyleSortFilterProxyModel.h" -#include "tableModels/BoilStepTableModel.h" -#include "tableModels/FermentableTableModel.h" -#include "tableModels/FermentationStepTableModel.h" -#include "tableModels/MashStepTableModel.h" -#include "tableModels/RecipeAdditionFermentableTableModel.h" -#include "tableModels/RecipeAdditionHopTableModel.h" -#include "tableModels/RecipeAdditionMiscTableModel.h" -#include "tableModels/RecipeAdditionYeastTableModel.h" +#include "qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.h" +#include "qtModels/tableModels/BoilStepTableModel.h" +#include "qtModels/tableModels/FermentableTableModel.h" +#include "qtModels/tableModels/FermentationStepTableModel.h" +#include "qtModels/tableModels/MashStepTableModel.h" +#include "qtModels/tableModels/RecipeAdditionFermentableTableModel.h" +#include "qtModels/tableModels/RecipeAdditionHopTableModel.h" +#include "qtModels/tableModels/RecipeAdditionMiscTableModel.h" +#include "qtModels/tableModels/RecipeAdditionYeastTableModel.h" #include "undoRedo/RelationalUndoableUpdate.h" #include "undoRedo/Undoable.h" #include "undoRedo/UndoableAddOrRemove.h" diff --git a/src/ScaleRecipeTool.cpp b/src/ScaleRecipeTool.cpp index b1c0e4d88..0dfdfcd5d 100644 --- a/src/ScaleRecipeTool.cpp +++ b/src/ScaleRecipeTool.cpp @@ -23,7 +23,7 @@ #include "config.h" #include "database/ObjectStoreWrapper.h" -#include "listModels/EquipmentListModel.h" +#include "qtModels/listModels/EquipmentListModel.h" #include "model/Boil.h" #include "model/Equipment.h" #include "model/Fermentable.h" diff --git a/src/WaterDialog.cpp b/src/WaterDialog.cpp index d75eab043..d78a837bc 100644 --- a/src/WaterDialog.cpp +++ b/src/WaterDialog.cpp @@ -36,11 +36,11 @@ #include "model/RecipeAdditionFermentable.h" #include "model/RecipeUseOfWater.h" #include "model/Salt.h" -#include "tableModels/RecipeAdjustmentSaltTableModel.h" -#include "tableModels/WaterTableModel.h" +#include "qtModels/tableModels/RecipeAdjustmentSaltTableModel.h" +#include "qtModels/tableModels/WaterTableModel.h" #include "editors/WaterEditor.h" -#include "listModels/WaterListModel.h" -#include "sortFilterProxyModels/WaterSortFilterProxyModel.h" +#include "qtModels/listModels/WaterListModel.h" +#include "qtModels/sortFilterProxyModels/WaterSortFilterProxyModel.h" #include "widgets/SmartDigitWidget.h" diff --git a/src/catalogs/EquipmentCatalog.cpp b/src/catalogs/EquipmentCatalog.cpp index f3a606a7e..d0d45477c 100755 --- a/src/catalogs/EquipmentCatalog.cpp +++ b/src/catalogs/EquipmentCatalog.cpp @@ -15,7 +15,7 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "catalogs/EquipmentCatalog.h" -#include "sortFilterProxyModels/EquipmentSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.h" // Insert the boiler-plate stuff that we cannot do in CatalogBase CATALOG_COMMON_CODE(Equipment) diff --git a/src/catalogs/EquipmentCatalog.h b/src/catalogs/EquipmentCatalog.h index 2062823f1..5d3e28c8b 100755 --- a/src/catalogs/EquipmentCatalog.h +++ b/src/catalogs/EquipmentCatalog.h @@ -22,8 +22,8 @@ #include "editors/EquipmentEditor.h" #include "model/Equipment.h" -#include "sortFilterProxyModels/EquipmentSortFilterProxyModel.h" -#include "tableModels/EquipmentTableModel.h" +#include "qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.h" +#include "qtModels/tableModels/EquipmentTableModel.h" // This needs to be the last include. (I know, I know...) #include "catalogs/CatalogBase.h" diff --git a/src/catalogs/FermentableCatalog.cpp b/src/catalogs/FermentableCatalog.cpp index 981bf76e4..e516d414f 100755 --- a/src/catalogs/FermentableCatalog.cpp +++ b/src/catalogs/FermentableCatalog.cpp @@ -19,7 +19,7 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "catalogs/FermentableCatalog.h" -#include "sortFilterProxyModels/FermentableSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.h" // Insert the boiler-plate stuff that we cannot do in CatalogBase CATALOG_COMMON_CODE(Fermentable) diff --git a/src/catalogs/FermentableCatalog.h b/src/catalogs/FermentableCatalog.h index 3415c54db..1df26675f 100755 --- a/src/catalogs/FermentableCatalog.h +++ b/src/catalogs/FermentableCatalog.h @@ -26,8 +26,8 @@ #include "editors/FermentableEditor.h" #include "model/Fermentable.h" -#include "tableModels/FermentableTableModel.h" -#include "sortFilterProxyModels/FermentableSortFilterProxyModel.h" +#include "qtModels/tableModels/FermentableTableModel.h" +#include "qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.h" // This needs to be the last include. (I know, I know...) #include "catalogs/CatalogBase.h" diff --git a/src/catalogs/HopCatalog.cpp b/src/catalogs/HopCatalog.cpp index 868283405..6181b8615 100755 --- a/src/catalogs/HopCatalog.cpp +++ b/src/catalogs/HopCatalog.cpp @@ -21,7 +21,7 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "catalogs/HopCatalog.h" -#include "sortFilterProxyModels/HopSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/HopSortFilterProxyModel.h" // Insert the boiler-plate stuff that we cannot do in CatalogBase CATALOG_COMMON_CODE(Hop) diff --git a/src/catalogs/HopCatalog.h b/src/catalogs/HopCatalog.h index 97fa25877..93e4adb07 100755 --- a/src/catalogs/HopCatalog.h +++ b/src/catalogs/HopCatalog.h @@ -26,8 +26,8 @@ #include "editors/HopEditor.h" #include "model/Hop.h" -#include "sortFilterProxyModels/HopSortFilterProxyModel.h" -#include "tableModels/HopTableModel.h" +#include "qtModels/sortFilterProxyModels/HopSortFilterProxyModel.h" +#include "qtModels/tableModels/HopTableModel.h" // This needs to be the last include. (I know, I know...) #include "catalogs/CatalogBase.h" diff --git a/src/catalogs/MiscCatalog.cpp b/src/catalogs/MiscCatalog.cpp index 73867aee8..cc26f6762 100755 --- a/src/catalogs/MiscCatalog.cpp +++ b/src/catalogs/MiscCatalog.cpp @@ -19,7 +19,7 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "catalogs/MiscCatalog.h" -#include "sortFilterProxyModels/MiscSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/MiscSortFilterProxyModel.h" // Insert the boiler-plate stuff that we cannot do in CatalogBase CATALOG_COMMON_CODE(Misc) diff --git a/src/catalogs/MiscCatalog.h b/src/catalogs/MiscCatalog.h index cd2f49f3c..54a0652a8 100755 --- a/src/catalogs/MiscCatalog.h +++ b/src/catalogs/MiscCatalog.h @@ -26,8 +26,8 @@ #include "editors/MiscEditor.h" #include "model/Misc.h" -#include "sortFilterProxyModels/MiscSortFilterProxyModel.h" -#include "tableModels/MiscTableModel.h" +#include "qtModels/sortFilterProxyModels/MiscSortFilterProxyModel.h" +#include "qtModels/tableModels/MiscTableModel.h" // This needs to be the last include. (I know, I know...) #include "catalogs/CatalogBase.h" diff --git a/src/catalogs/StyleCatalog.cpp b/src/catalogs/StyleCatalog.cpp index 37f08750f..a2a8a96b0 100755 --- a/src/catalogs/StyleCatalog.cpp +++ b/src/catalogs/StyleCatalog.cpp @@ -15,7 +15,7 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "catalogs/StyleCatalog.h" -#include "sortFilterProxyModels/StyleSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.h" // Insert the boiler-plate stuff that we cannot do in CatalogBase CATALOG_COMMON_CODE(Style) diff --git a/src/catalogs/StyleCatalog.h b/src/catalogs/StyleCatalog.h index 73b7acd2d..fccb63d85 100755 --- a/src/catalogs/StyleCatalog.h +++ b/src/catalogs/StyleCatalog.h @@ -22,8 +22,8 @@ #include "editors/StyleEditor.h" #include "model/Style.h" -#include "sortFilterProxyModels/StyleSortFilterProxyModel.h" -#include "tableModels/StyleTableModel.h" +#include "qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.h" +#include "qtModels/tableModels/StyleTableModel.h" // This needs to be the last include. (I know, I know...) #include "catalogs/CatalogBase.h" diff --git a/src/catalogs/YeastCatalog.cpp b/src/catalogs/YeastCatalog.cpp index 83601041c..deaf7064b 100755 --- a/src/catalogs/YeastCatalog.cpp +++ b/src/catalogs/YeastCatalog.cpp @@ -19,7 +19,7 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "catalogs/YeastCatalog.h" -#include "sortFilterProxyModels/YeastSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/YeastSortFilterProxyModel.h" // Insert the boiler-plate stuff that we cannot do in CatalogBase CATALOG_COMMON_CODE(Yeast) diff --git a/src/catalogs/YeastCatalog.h b/src/catalogs/YeastCatalog.h index 622e751c2..0edf2a5c5 100755 --- a/src/catalogs/YeastCatalog.h +++ b/src/catalogs/YeastCatalog.h @@ -26,8 +26,8 @@ #include "editors/YeastEditor.h" #include "model/Yeast.h" -#include "sortFilterProxyModels/YeastSortFilterProxyModel.h" -#include "tableModels/YeastTableModel.h" +#include "qtModels/sortFilterProxyModels/YeastSortFilterProxyModel.h" +#include "qtModels/tableModels/YeastTableModel.h" // This needs to be the last include. (I know, I know...) #include "catalogs/CatalogBase.h" diff --git a/src/editors/NamedMashEditor.h b/src/editors/NamedMashEditor.h index 531b12036..4ba7029e1 100755 --- a/src/editors/NamedMashEditor.h +++ b/src/editors/NamedMashEditor.h @@ -27,10 +27,10 @@ #include "ui_namedMashEditor.h" #include "editors/MashStepEditor.h" -#include "listModels/MashListModel.h" -#include "listModels/EquipmentListModel.h" +#include "qtModels/listModels/MashListModel.h" +#include "qtModels/listModels/EquipmentListModel.h" #include "NamedEntitySortProxyModel.h" -#include "tableModels/MashStepTableModel.h" +#include "qtModels/tableModels/MashStepTableModel.h" // Forward declarations. diff --git a/src/editors/StyleEditor.cpp b/src/editors/StyleEditor.cpp index ede476672..6a3d32736 100755 --- a/src/editors/StyleEditor.cpp +++ b/src/editors/StyleEditor.cpp @@ -23,7 +23,7 @@ #include "BtHorizontalTabs.h" #include "database/ObjectStoreWrapper.h" #include "measurement/Unit.h" -#include "sortFilterProxyModels/StyleSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.h" StyleEditor::StyleEditor(QWidget* parent, QString const editorName) : QDialog{parent}, diff --git a/src/model/RecipeAdditionBase.h b/src/model/RecipeAdditionBase.h index 6c647baa5..84cd323a6 100755 --- a/src/model/RecipeAdditionBase.h +++ b/src/model/RecipeAdditionBase.h @@ -25,7 +25,7 @@ class RecipeAddition; // -// See comment in tableModels/TableModelBase.h about benefits (and limitations) of using concepts. +// See comment in qtModels/tableModels/TableModelBase.h about benefits (and limitations) of using concepts. // // See comment in utils/TypeTraits.h for definition of CONCEPT_FIX_UP (and why, for now, we need it) template concept CONCEPT_FIX_UP IsRegularAddition = std::is_base_of_v; diff --git a/src/listModels/BoilListModel.cpp b/src/qtModels/listModels/BoilListModel.cpp similarity index 90% rename from src/listModels/BoilListModel.cpp rename to src/qtModels/listModels/BoilListModel.cpp index 9768005a6..b3596bd63 100644 --- a/src/listModels/BoilListModel.cpp +++ b/src/qtModels/listModels/BoilListModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/BoilListModel.cpp is part of Brewtarget, and is copyright the following authors 2024: + * qtModels/listModels/BoilListModel.cpp is part of Brewtarget, and is copyright the following authors 2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "listModels/BoilListModel.h" +#include "qtModels/listModels/BoilListModel.h" // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Boil, PropertyNames::Recipe::boil) diff --git a/src/listModels/BoilListModel.h b/src/qtModels/listModels/BoilListModel.h similarity index 91% rename from src/listModels/BoilListModel.h rename to src/qtModels/listModels/BoilListModel.h index 96bf130ff..d103e9662 100644 --- a/src/listModels/BoilListModel.h +++ b/src/qtModels/listModels/BoilListModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/BoilListModel.h is part of Brewtarget, and is copyright the following authors 2024: + * qtModels/listModels/BoilListModel.h is part of Brewtarget, and is copyright the following authors 2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -19,7 +19,7 @@ #include -#include "listModels/ListModelBase.h" +#include "qtModels/listModels/ListModelBase.h" #include "model/Boil.h" /*! diff --git a/src/listModels/EquipmentListModel.cpp b/src/qtModels/listModels/EquipmentListModel.cpp similarity index 90% rename from src/listModels/EquipmentListModel.cpp rename to src/qtModels/listModels/EquipmentListModel.cpp index 62e7b914d..13d40c8b6 100755 --- a/src/listModels/EquipmentListModel.cpp +++ b/src/qtModels/listModels/EquipmentListModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/EquipmentListModel.cpp is part of Brewtarget, and is copyright the following authors 2009-2023: + * qtModels/listModels/EquipmentListModel.cpp is part of Brewtarget, and is copyright the following authors 2009-2023: * • Brian Rower * • Matt Young * • Mik Firestone @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "listModels/EquipmentListModel.h" +#include "qtModels/listModels/EquipmentListModel.h" // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Equipment, PropertyNames::Recipe::equipment) diff --git a/src/listModels/EquipmentListModel.h b/src/qtModels/listModels/EquipmentListModel.h similarity index 91% rename from src/listModels/EquipmentListModel.h rename to src/qtModels/listModels/EquipmentListModel.h index e65c68847..3d1f86044 100755 --- a/src/listModels/EquipmentListModel.h +++ b/src/qtModels/listModels/EquipmentListModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/EquipmentListModel.h is part of Brewtarget, and is copyright the following authors 2009-2023: + * qtModels/listModels/EquipmentListModel.h is part of Brewtarget, and is copyright the following authors 2009-2023: * • Matt Young * • Philip Greggory Lee * @@ -20,7 +20,7 @@ #include -#include "listModels/ListModelBase.h" +#include "qtModels/listModels/ListModelBase.h" #include "model/Equipment.h" /*! diff --git a/src/listModels/FermentableListModel.cpp b/src/qtModels/listModels/FermentableListModel.cpp similarity index 90% rename from src/listModels/FermentableListModel.cpp rename to src/qtModels/listModels/FermentableListModel.cpp index 8bcc56f29..070778eeb 100755 --- a/src/listModels/FermentableListModel.cpp +++ b/src/qtModels/listModels/FermentableListModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/FermentableListModel.cpp is part of Brewtarget, and is copyright the following authors 2023: + * qtModels/listModels/FermentableListModel.cpp is part of Brewtarget, and is copyright the following authors 2023: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "listModels/FermentableListModel.h" +#include "qtModels/listModels/FermentableListModel.h" // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Fermentable, PropertyNames::Recipe::fermentableAdditions) diff --git a/src/listModels/FermentableListModel.h b/src/qtModels/listModels/FermentableListModel.h similarity index 91% rename from src/listModels/FermentableListModel.h rename to src/qtModels/listModels/FermentableListModel.h index 241a0e749..89c4055aa 100755 --- a/src/listModels/FermentableListModel.h +++ b/src/qtModels/listModels/FermentableListModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/FermentableListModel.h is part of Brewtarget, and is copyright the following authors 2023: + * qtModels/listModels/FermentableListModel.h is part of Brewtarget, and is copyright the following authors 2023: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -19,7 +19,7 @@ #include -#include "listModels/ListModelBase.h" +#include "qtModels/listModels/ListModelBase.h" #include "model/Fermentable.h" /*! diff --git a/src/listModels/FermentationListModel.cpp b/src/qtModels/listModels/FermentationListModel.cpp similarity index 89% rename from src/listModels/FermentationListModel.cpp rename to src/qtModels/listModels/FermentationListModel.cpp index 9805a3218..924293388 100644 --- a/src/listModels/FermentationListModel.cpp +++ b/src/qtModels/listModels/FermentationListModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/FermentationListModel.cpp is part of Brewtarget, and is copyright the following authors 2024: + * qtModels/listModels/FermentationListModel.cpp is part of Brewtarget, and is copyright the following authors 2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "listModels/FermentationListModel.h" +#include "qtModels/listModels/FermentationListModel.h" // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Fermentation, PropertyNames::Recipe::fermentation) diff --git a/src/listModels/FermentationListModel.h b/src/qtModels/listModels/FermentationListModel.h similarity index 91% rename from src/listModels/FermentationListModel.h rename to src/qtModels/listModels/FermentationListModel.h index 6efd6d1a5..09ddbef5d 100644 --- a/src/listModels/FermentationListModel.h +++ b/src/qtModels/listModels/FermentationListModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/FermentationListModel.h is part of Brewtarget, and is copyright the following authors 2024: + * qtModels/listModels/FermentationListModel.h is part of Brewtarget, and is copyright the following authors 2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -19,7 +19,7 @@ #include -#include "listModels/ListModelBase.h" +#include "qtModels/listModels/ListModelBase.h" #include "model/Fermentation.h" /*! diff --git a/src/listModels/HopListModel.cpp b/src/qtModels/listModels/HopListModel.cpp similarity index 90% rename from src/listModels/HopListModel.cpp rename to src/qtModels/listModels/HopListModel.cpp index e471bae00..0f6be8116 100755 --- a/src/listModels/HopListModel.cpp +++ b/src/qtModels/listModels/HopListModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/HopListModel.cpp is part of Brewtarget, and is copyright the following authors 2023: + * qtModels/listModels/HopListModel.cpp is part of Brewtarget, and is copyright the following authors 2023: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "listModels/HopListModel.h" +#include "qtModels/listModels/HopListModel.h" // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Hop, PropertyNames::Recipe::hopAdditions) diff --git a/src/listModels/HopListModel.h b/src/qtModels/listModels/HopListModel.h similarity index 91% rename from src/listModels/HopListModel.h rename to src/qtModels/listModels/HopListModel.h index 0cf9fc3ba..5bd5897e7 100755 --- a/src/listModels/HopListModel.h +++ b/src/qtModels/listModels/HopListModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/HopListModel.h is part of Brewtarget, and is copyright the following authors 2023: + * qtModels/listModels/HopListModel.h is part of Brewtarget, and is copyright the following authors 2023: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -19,7 +19,7 @@ #include -#include "listModels/ListModelBase.h" +#include "qtModels/listModels/ListModelBase.h" #include "model/Hop.h" /*! diff --git a/src/listModels/ListModelBase.h b/src/qtModels/listModels/ListModelBase.h similarity index 99% rename from src/listModels/ListModelBase.h rename to src/qtModels/listModels/ListModelBase.h index 93e585f0c..05b88d681 100755 --- a/src/listModels/ListModelBase.h +++ b/src/qtModels/listModels/ListModelBase.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/ListModelBase.h is part of Brewtarget, and is copyright the following authors 2023-2024: + * qtModels/listModels/ListModelBase.h is part of Brewtarget, and is copyright the following authors 2023-2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/src/listModels/MashListModel.cpp b/src/qtModels/listModels/MashListModel.cpp similarity index 91% rename from src/listModels/MashListModel.cpp rename to src/qtModels/listModels/MashListModel.cpp index 031fd9ce3..6deb8a32d 100755 --- a/src/listModels/MashListModel.cpp +++ b/src/qtModels/listModels/MashListModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/MashListModel.cpp is part of Brewtarget, and is copyright the following authors 2009-2023: + * qtModels/listModels/MashListModel.cpp is part of Brewtarget, and is copyright the following authors 2009-2023: * • Brian Rower * • Matt Young * • Mik Firestone @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "listModels/MashListModel.h" +#include "qtModels/listModels/MashListModel.h" // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Mash, PropertyNames::Recipe::mash) diff --git a/src/listModels/MashListModel.h b/src/qtModels/listModels/MashListModel.h similarity index 92% rename from src/listModels/MashListModel.h rename to src/qtModels/listModels/MashListModel.h index 0350e9055..020e8d5f6 100755 --- a/src/listModels/MashListModel.h +++ b/src/qtModels/listModels/MashListModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/MashListModel.h is part of Brewtarget, and is copyright the following authors 2009-2023: + * qtModels/listModels/MashListModel.h is part of Brewtarget, and is copyright the following authors 2009-2023: * • Matt Young * • Mik Firestone * • Philip Greggory Lee @@ -21,7 +21,7 @@ #include -#include "listModels/ListModelBase.h" +#include "qtModels/listModels/ListModelBase.h" #include "model/Mash.h" /*! diff --git a/src/listModels/MashStepListModel.cpp b/src/qtModels/listModels/MashStepListModel.cpp similarity index 90% rename from src/listModels/MashStepListModel.cpp rename to src/qtModels/listModels/MashStepListModel.cpp index de18c832e..b492262b5 100755 --- a/src/listModels/MashStepListModel.cpp +++ b/src/qtModels/listModels/MashStepListModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/MashStepListModel.cpp is part of Brewtarget, and is copyright the following authors 2023: + * qtModels/listModels/MashStepListModel.cpp is part of Brewtarget, and is copyright the following authors 2023: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "listModels/MashStepListModel.h" +#include "qtModels/listModels/MashStepListModel.h" // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(MashStep, PropertyNames::Recipe::mash) diff --git a/src/listModels/MashStepListModel.h b/src/qtModels/listModels/MashStepListModel.h similarity index 91% rename from src/listModels/MashStepListModel.h rename to src/qtModels/listModels/MashStepListModel.h index 19e3ac338..bc4f48875 100755 --- a/src/listModels/MashStepListModel.h +++ b/src/qtModels/listModels/MashStepListModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/MashStepListModel.h is part of Brewtarget, and is copyright the following authors 2023: + * qtModels/listModels/MashStepListModel.h is part of Brewtarget, and is copyright the following authors 2023: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -19,7 +19,7 @@ #include -#include "listModels/ListModelBase.h" +#include "qtModels/listModels/ListModelBase.h" #include "model/MashStep.h" /*! diff --git a/src/listModels/MiscListModel.cpp b/src/qtModels/listModels/MiscListModel.cpp similarity index 90% rename from src/listModels/MiscListModel.cpp rename to src/qtModels/listModels/MiscListModel.cpp index 018ef3984..4da6297f5 100755 --- a/src/listModels/MiscListModel.cpp +++ b/src/qtModels/listModels/MiscListModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/MiscListModel.cpp is part of Brewtarget, and is copyright the following authors 2023-2024: + * qtModels/listModels/MiscListModel.cpp is part of Brewtarget, and is copyright the following authors 2023-2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "listModels/MiscListModel.h" +#include "qtModels/listModels/MiscListModel.h" // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Misc, PropertyNames::Recipe::miscAdditions) diff --git a/src/listModels/MiscListModel.h b/src/qtModels/listModels/MiscListModel.h similarity index 91% rename from src/listModels/MiscListModel.h rename to src/qtModels/listModels/MiscListModel.h index 89fb9767f..7795bca83 100755 --- a/src/listModels/MiscListModel.h +++ b/src/qtModels/listModels/MiscListModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/MiscListModel.h is part of Brewtarget, and is copyright the following authors 2023: + * qtModels/listModels/MiscListModel.h is part of Brewtarget, and is copyright the following authors 2023: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -19,7 +19,7 @@ #include -#include "listModels/ListModelBase.h" +#include "qtModels/listModels/ListModelBase.h" #include "model/Misc.h" /*! diff --git a/src/listModels/RecipeAdditionFermentableListModel.cpp b/src/qtModels/listModels/RecipeAdditionFermentableListModel.cpp similarity index 88% rename from src/listModels/RecipeAdditionFermentableListModel.cpp rename to src/qtModels/listModels/RecipeAdditionFermentableListModel.cpp index fea84279d..805f32b05 100755 --- a/src/listModels/RecipeAdditionFermentableListModel.cpp +++ b/src/qtModels/listModels/RecipeAdditionFermentableListModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/RecipeAdditionFermentableListModel.cpp is part of Brewtarget, and is copyright the following authors 2023: + * qtModels/listModels/RecipeAdditionFermentableListModel.cpp is part of Brewtarget, and is copyright the following authors 2023: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "listModels/RecipeAdditionFermentableListModel.h" +#include "qtModels/listModels/RecipeAdditionFermentableListModel.h" // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(RecipeAdditionFermentable, PropertyNames::Recipe::fermentableAdditions) diff --git a/src/listModels/RecipeAdditionFermentableListModel.h b/src/qtModels/listModels/RecipeAdditionFermentableListModel.h similarity index 91% rename from src/listModels/RecipeAdditionFermentableListModel.h rename to src/qtModels/listModels/RecipeAdditionFermentableListModel.h index f2fa4f5fd..78cb93af0 100755 --- a/src/listModels/RecipeAdditionFermentableListModel.h +++ b/src/qtModels/listModels/RecipeAdditionFermentableListModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/RecipeAdditionFermentableListModel.h is part of Brewtarget, and is copyright the following authors 2023: + * qtModels/listModels/RecipeAdditionFermentableListModel.h is part of Brewtarget, and is copyright the following authors 2023: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -19,7 +19,7 @@ #include -#include "listModels/ListModelBase.h" +#include "qtModels/listModels/ListModelBase.h" #include "model/RecipeAdditionFermentable.h" /*! diff --git a/src/listModels/RecipeAdditionHopListModel.cpp b/src/qtModels/listModels/RecipeAdditionHopListModel.cpp similarity index 89% rename from src/listModels/RecipeAdditionHopListModel.cpp rename to src/qtModels/listModels/RecipeAdditionHopListModel.cpp index e92b0171f..54eb90b19 100755 --- a/src/listModels/RecipeAdditionHopListModel.cpp +++ b/src/qtModels/listModels/RecipeAdditionHopListModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/RecipeAdditionHopListModel.cpp is part of Brewtarget, and is copyright the following authors 2023: + * qtModels/listModels/RecipeAdditionHopListModel.cpp is part of Brewtarget, and is copyright the following authors 2023: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "listModels/RecipeAdditionHopListModel.h" +#include "qtModels/listModels/RecipeAdditionHopListModel.h" // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(RecipeAdditionHop, PropertyNames::Recipe::hopAdditions) diff --git a/src/listModels/RecipeAdditionHopListModel.h b/src/qtModels/listModels/RecipeAdditionHopListModel.h similarity index 91% rename from src/listModels/RecipeAdditionHopListModel.h rename to src/qtModels/listModels/RecipeAdditionHopListModel.h index 5e778dc2b..e8c49f4c1 100755 --- a/src/listModels/RecipeAdditionHopListModel.h +++ b/src/qtModels/listModels/RecipeAdditionHopListModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/RecipeAdditionHopListModel.h is part of Brewtarget, and is copyright the following authors 2023: + * qtModels/listModels/RecipeAdditionHopListModel.h is part of Brewtarget, and is copyright the following authors 2023: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -19,7 +19,7 @@ #include -#include "listModels/ListModelBase.h" +#include "qtModels/listModels/ListModelBase.h" #include "model/RecipeAdditionHop.h" /*! diff --git a/src/listModels/RecipeAdditionMiscListModel.cpp b/src/qtModels/listModels/RecipeAdditionMiscListModel.cpp similarity index 89% rename from src/listModels/RecipeAdditionMiscListModel.cpp rename to src/qtModels/listModels/RecipeAdditionMiscListModel.cpp index 73230fa5c..143bde13e 100755 --- a/src/listModels/RecipeAdditionMiscListModel.cpp +++ b/src/qtModels/listModels/RecipeAdditionMiscListModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/RecipeAdditionMiscListModel.cpp is part of Brewtarget, and is copyright the following authors 2023-2024: + * qtModels/listModels/RecipeAdditionMiscListModel.cpp is part of Brewtarget, and is copyright the following authors 2023-2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "listModels/RecipeAdditionMiscListModel.h" +#include "qtModels/listModels/RecipeAdditionMiscListModel.h" // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(RecipeAdditionMisc, PropertyNames::Recipe::miscAdditions) diff --git a/src/listModels/RecipeAdditionMiscListModel.h b/src/qtModels/listModels/RecipeAdditionMiscListModel.h similarity index 91% rename from src/listModels/RecipeAdditionMiscListModel.h rename to src/qtModels/listModels/RecipeAdditionMiscListModel.h index 98b642b26..dde1ea755 100755 --- a/src/listModels/RecipeAdditionMiscListModel.h +++ b/src/qtModels/listModels/RecipeAdditionMiscListModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/RecipeAdditionMiscListModel.h is part of Brewtarget, and is copyright the following authors 2023-2024: + * qtModels/listModels/RecipeAdditionMiscListModel.h is part of Brewtarget, and is copyright the following authors 2023-2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -19,7 +19,7 @@ #include -#include "listModels/ListModelBase.h" +#include "qtModels/listModels/ListModelBase.h" #include "model/RecipeAdditionMisc.h" /*! diff --git a/src/listModels/RecipeAdditionYeastListModel.cpp b/src/qtModels/listModels/RecipeAdditionYeastListModel.cpp similarity index 88% rename from src/listModels/RecipeAdditionYeastListModel.cpp rename to src/qtModels/listModels/RecipeAdditionYeastListModel.cpp index 046c85fec..458d103c6 100755 --- a/src/listModels/RecipeAdditionYeastListModel.cpp +++ b/src/qtModels/listModels/RecipeAdditionYeastListModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/RecipeAdditionYeastListModel.cpp is part of Brewtarget, and is copyright the following authors 2023-2024: + * qtModels/listModels/RecipeAdditionYeastListModel.cpp is part of Brewtarget, and is copyright the following authors 2023-2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "listModels/RecipeAdditionYeastListModel.h" +#include "qtModels/listModels/RecipeAdditionYeastListModel.h" // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(RecipeAdditionYeast, PropertyNames::Recipe::yeastAdditions) diff --git a/src/listModels/RecipeAdditionYeastListModel.h b/src/qtModels/listModels/RecipeAdditionYeastListModel.h similarity index 91% rename from src/listModels/RecipeAdditionYeastListModel.h rename to src/qtModels/listModels/RecipeAdditionYeastListModel.h index dcfb88f22..8870c29ad 100755 --- a/src/listModels/RecipeAdditionYeastListModel.h +++ b/src/qtModels/listModels/RecipeAdditionYeastListModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/RecipeAdditionYeastListModel.h is part of Brewtarget, and is copyright the following authors 2023-2024: + * qtModels/listModels/RecipeAdditionYeastListModel.h is part of Brewtarget, and is copyright the following authors 2023-2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -19,7 +19,7 @@ #include -#include "listModels/ListModelBase.h" +#include "qtModels/listModels/ListModelBase.h" #include "model/RecipeAdditionYeast.h" /*! diff --git a/src/listModels/RecipeAdjustmentSaltListModel.cpp b/src/qtModels/listModels/RecipeAdjustmentSaltListModel.cpp similarity index 89% rename from src/listModels/RecipeAdjustmentSaltListModel.cpp rename to src/qtModels/listModels/RecipeAdjustmentSaltListModel.cpp index 45bbe827a..7642c424f 100755 --- a/src/listModels/RecipeAdjustmentSaltListModel.cpp +++ b/src/qtModels/listModels/RecipeAdjustmentSaltListModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/RecipeAdjustmentSaltListModel.cpp is part of Brewtarget, and is copyright the following authors 2024: + * qtModels/listModels/RecipeAdjustmentSaltListModel.cpp is part of Brewtarget, and is copyright the following authors 2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "listModels/RecipeAdjustmentSaltListModel.h" +#include "qtModels/listModels/RecipeAdjustmentSaltListModel.h" // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(RecipeAdjustmentSalt, PropertyNames::Recipe::saltAdjustments) diff --git a/src/listModels/RecipeAdjustmentSaltListModel.h b/src/qtModels/listModels/RecipeAdjustmentSaltListModel.h similarity index 91% rename from src/listModels/RecipeAdjustmentSaltListModel.h rename to src/qtModels/listModels/RecipeAdjustmentSaltListModel.h index e0a49629b..fa234d091 100755 --- a/src/listModels/RecipeAdjustmentSaltListModel.h +++ b/src/qtModels/listModels/RecipeAdjustmentSaltListModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/RecipeAdjustmentSaltListModel.h is part of Brewtarget, and is copyright the following authors 2024: + * qtModels/listModels/RecipeAdjustmentSaltListModel.h is part of Brewtarget, and is copyright the following authors 2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -19,7 +19,7 @@ #include -#include "listModels/ListModelBase.h" +#include "qtModels/listModels/ListModelBase.h" #include "model/RecipeAdjustmentSalt.h" /*! diff --git a/src/listModels/SaltListModel.cpp b/src/qtModels/listModels/SaltListModel.cpp similarity index 90% rename from src/listModels/SaltListModel.cpp rename to src/qtModels/listModels/SaltListModel.cpp index c917b1f22..78f18ef52 100755 --- a/src/listModels/SaltListModel.cpp +++ b/src/qtModels/listModels/SaltListModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/SaltListModel.cpp is part of Brewtarget, and is copyright the following authors 2023-2024: + * qtModels/listModels/SaltListModel.cpp is part of Brewtarget, and is copyright the following authors 2023-2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "listModels/SaltListModel.h" +#include "qtModels/listModels/SaltListModel.h" // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Salt, PropertyNames::Recipe::saltAdjustments) diff --git a/src/listModels/SaltListModel.h b/src/qtModels/listModels/SaltListModel.h similarity index 91% rename from src/listModels/SaltListModel.h rename to src/qtModels/listModels/SaltListModel.h index 4bd2deb31..21326142b 100755 --- a/src/listModels/SaltListModel.h +++ b/src/qtModels/listModels/SaltListModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/SaltListModel.h is part of Brewtarget, and is copyright the following authors 2023: + * qtModels/listModels/SaltListModel.h is part of Brewtarget, and is copyright the following authors 2023: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -19,7 +19,7 @@ #include -#include "listModels/ListModelBase.h" +#include "qtModels/listModels/ListModelBase.h" #include "model/Salt.h" /*! diff --git a/src/listModels/StyleListModel.cpp b/src/qtModels/listModels/StyleListModel.cpp similarity index 91% rename from src/listModels/StyleListModel.cpp rename to src/qtModels/listModels/StyleListModel.cpp index f8b2f6c25..a723baa66 100755 --- a/src/listModels/StyleListModel.cpp +++ b/src/qtModels/listModels/StyleListModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/StyleListModel.cpp is part of Brewtarget, and is copyright the following authors 2009-2023: + * qtModels/listModels/StyleListModel.cpp is part of Brewtarget, and is copyright the following authors 2009-2023: * • Brian Rower * • Matt Young * • Mik Firestone @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "listModels/StyleListModel.h" +#include "qtModels/listModels/StyleListModel.h" // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Style, PropertyNames::Recipe::style) diff --git a/src/listModels/StyleListModel.h b/src/qtModels/listModels/StyleListModel.h similarity index 91% rename from src/listModels/StyleListModel.h rename to src/qtModels/listModels/StyleListModel.h index a4539574a..69492f482 100755 --- a/src/listModels/StyleListModel.h +++ b/src/qtModels/listModels/StyleListModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/StyleListModel.h is part of Brewtarget, and is copyright the following authors 2009-2023: + * qtModels/listModels/StyleListModel.h is part of Brewtarget, and is copyright the following authors 2009-2023: * • Matt Young * • Philip Greggory Lee * @@ -20,7 +20,7 @@ #include -#include "listModels/ListModelBase.h" +#include "qtModels/listModels/ListModelBase.h" #include "model/Style.h" /*! diff --git a/src/listModels/WaterListModel.cpp b/src/qtModels/listModels/WaterListModel.cpp similarity index 90% rename from src/listModels/WaterListModel.cpp rename to src/qtModels/listModels/WaterListModel.cpp index d681e12fa..19ed276db 100755 --- a/src/listModels/WaterListModel.cpp +++ b/src/qtModels/listModels/WaterListModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/WaterListModel.cpp is part of Brewtarget, and is copyright the following authors 2020-2024: + * qtModels/listModels/WaterListModel.cpp is part of Brewtarget, and is copyright the following authors 2020-2024: * • Matt Young * • Mik Firestone * @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "listModels/WaterListModel.h" +#include "qtModels/listModels/WaterListModel.h" // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Water, PropertyNames::Recipe::waterUses) diff --git a/src/listModels/WaterListModel.h b/src/qtModels/listModels/WaterListModel.h similarity index 92% rename from src/listModels/WaterListModel.h rename to src/qtModels/listModels/WaterListModel.h index 2d06649e7..acc4f37f6 100755 --- a/src/listModels/WaterListModel.h +++ b/src/qtModels/listModels/WaterListModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/WaterListModel.h is part of Brewtarget, and is copyright the following authors 2009-2023: + * qtModels/listModels/WaterListModel.h is part of Brewtarget, and is copyright the following authors 2009-2023: * • Matt Young * • Mik Firestone * • Philip Greggory Lee @@ -21,7 +21,7 @@ #include -#include "listModels/ListModelBase.h" +#include "qtModels/listModels/ListModelBase.h" #include "model/Water.h" /*! diff --git a/src/listModels/YeastListModel.cpp b/src/qtModels/listModels/YeastListModel.cpp similarity index 90% rename from src/listModels/YeastListModel.cpp rename to src/qtModels/listModels/YeastListModel.cpp index ffabf4855..7049f71eb 100755 --- a/src/listModels/YeastListModel.cpp +++ b/src/qtModels/listModels/YeastListModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/YeastListModel.cpp is part of Brewtarget, and is copyright the following authors 2023-2024: + * qtModels/listModels/YeastListModel.cpp is part of Brewtarget, and is copyright the following authors 2023-2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "listModels/YeastListModel.h" +#include "qtModels/listModels/YeastListModel.h" // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Yeast, PropertyNames::Recipe::yeastAdditions) diff --git a/src/listModels/YeastListModel.h b/src/qtModels/listModels/YeastListModel.h similarity index 91% rename from src/listModels/YeastListModel.h rename to src/qtModels/listModels/YeastListModel.h index 7631d039f..b90052198 100755 --- a/src/listModels/YeastListModel.h +++ b/src/qtModels/listModels/YeastListModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * listModels/YeastListModel.h is part of Brewtarget, and is copyright the following authors 2023: + * qtModels/listModels/YeastListModel.h is part of Brewtarget, and is copyright the following authors 2023: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -19,7 +19,7 @@ #include -#include "listModels/ListModelBase.h" +#include "qtModels/listModels/ListModelBase.h" #include "model/Yeast.h" /*! diff --git a/src/sortFilterProxyModels/BoilSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.cpp similarity index 92% rename from src/sortFilterProxyModels/BoilSortFilterProxyModel.cpp rename to src/qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.cpp index 61f20f73e..2cf3615f8 100644 --- a/src/sortFilterProxyModels/BoilSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/BoilSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following authors 2024: + * qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following authors 2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "sortFilterProxyModels/BoilSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.h" #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" diff --git a/src/sortFilterProxyModels/BoilSortFilterProxyModel.h b/src/qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.h similarity index 87% rename from src/sortFilterProxyModels/BoilSortFilterProxyModel.h rename to src/qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.h index c2c9332b4..8b15e912a 100644 --- a/src/sortFilterProxyModels/BoilSortFilterProxyModel.h +++ b/src/qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/BoilSortFilterProxyModel.h is part of Brewtarget, and is copyright the following authors 2024: + * qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.h is part of Brewtarget, and is copyright the following authors 2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -19,9 +19,9 @@ #include -#include "sortFilterProxyModels/SortFilterProxyModelBase.h" -#include "tableModels/BoilTableModel.h" -#include "listModels/BoilListModel.h" +#include "qtModels/sortFilterProxyModels/SortFilterProxyModelBase.h" +#include "qtModels/tableModels/BoilTableModel.h" +#include "qtModels/listModels/BoilListModel.h" /*! * \class BoilSortFilterProxyModel diff --git a/src/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp similarity index 92% rename from src/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp rename to src/qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp index 49d088883..b5426f191 100755 --- a/src/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following authors + * qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following authors * 2023: * • Matt Young * @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "sortFilterProxyModels/EquipmentSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.h" #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" diff --git a/src/sortFilterProxyModels/EquipmentSortFilterProxyModel.h b/src/qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.h similarity index 87% rename from src/sortFilterProxyModels/EquipmentSortFilterProxyModel.h rename to src/qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.h index 7867e7c99..b6c109a5a 100755 --- a/src/sortFilterProxyModels/EquipmentSortFilterProxyModel.h +++ b/src/qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/EquipmentSortFilterProxyModel.h is part of Brewtarget, and is copyright the following authors + * qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.h is part of Brewtarget, and is copyright the following authors * 2023: * • Matt Young * @@ -20,9 +20,9 @@ #include -#include "sortFilterProxyModels/SortFilterProxyModelBase.h" -#include "tableModels/EquipmentTableModel.h" -#include "listModels/EquipmentListModel.h" +#include "qtModels/sortFilterProxyModels/SortFilterProxyModelBase.h" +#include "qtModels/tableModels/EquipmentTableModel.h" +#include "qtModels/listModels/EquipmentListModel.h" /*! * \class EquipmentSortFilterProxyModel diff --git a/src/sortFilterProxyModels/FermentableSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.cpp similarity index 94% rename from src/sortFilterProxyModels/FermentableSortFilterProxyModel.cpp rename to src/qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.cpp index 9bfe5e7bc..616804344 100755 --- a/src/sortFilterProxyModels/FermentableSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/FermentableSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following authors + * qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following authors * 2009-2023: * • Daniel Pettersson * • Jamie Daws @@ -20,7 +20,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "sortFilterProxyModels/FermentableSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.h" #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" diff --git a/src/sortFilterProxyModels/FermentableSortFilterProxyModel.h b/src/qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.h similarity index 87% rename from src/sortFilterProxyModels/FermentableSortFilterProxyModel.h rename to src/qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.h index 0104879da..f5c246442 100755 --- a/src/sortFilterProxyModels/FermentableSortFilterProxyModel.h +++ b/src/qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/FermentableSortFilterProxyModel.h is part of Brewtarget, and is copyright the following authors + * qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.h is part of Brewtarget, and is copyright the following authors * 2009-2023: * • Matt Young * • Mik Firestone @@ -23,9 +23,9 @@ #include -#include "sortFilterProxyModels/SortFilterProxyModelBase.h" -#include "tableModels/FermentableTableModel.h" -#include "listModels/FermentableListModel.h" +#include "qtModels/sortFilterProxyModels/SortFilterProxyModelBase.h" +#include "qtModels/tableModels/FermentableTableModel.h" +#include "qtModels/listModels/FermentableListModel.h" /*! * \class FermentableSortFilterProxyModel diff --git a/src/sortFilterProxyModels/FermentationSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/FermentationSortFilterProxyModel.cpp similarity index 91% rename from src/sortFilterProxyModels/FermentationSortFilterProxyModel.cpp rename to src/qtModels/sortFilterProxyModels/FermentationSortFilterProxyModel.cpp index 0486ed921..2c9d6fd5d 100644 --- a/src/sortFilterProxyModels/FermentationSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/FermentationSortFilterProxyModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/FermentationSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following authors + * qtModels/sortFilterProxyModels/FermentationSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following authors * 2024: * • Matt Young * @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "sortFilterProxyModels/FermentationSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/FermentationSortFilterProxyModel.h" #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" diff --git a/src/sortFilterProxyModels/FermentationSortFilterProxyModel.h b/src/qtModels/sortFilterProxyModels/FermentationSortFilterProxyModel.h similarity index 86% rename from src/sortFilterProxyModels/FermentationSortFilterProxyModel.h rename to src/qtModels/sortFilterProxyModels/FermentationSortFilterProxyModel.h index 2ca1dca21..b814c9fc9 100644 --- a/src/sortFilterProxyModels/FermentationSortFilterProxyModel.h +++ b/src/qtModels/sortFilterProxyModels/FermentationSortFilterProxyModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/FermentationSortFilterProxyModel.h is part of Brewtarget, and is copyright the following authors 2024: + * qtModels/sortFilterProxyModels/FermentationSortFilterProxyModel.h is part of Brewtarget, and is copyright the following authors 2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -19,9 +19,9 @@ #include -#include "sortFilterProxyModels/SortFilterProxyModelBase.h" -#include "tableModels/FermentationTableModel.h" -#include "listModels/FermentationListModel.h" +#include "qtModels/sortFilterProxyModels/SortFilterProxyModelBase.h" +#include "qtModels/tableModels/FermentationTableModel.h" +#include "qtModels/listModels/FermentationListModel.h" /*! * \class FermentationSortFilterProxyModel diff --git a/src/sortFilterProxyModels/HopSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/HopSortFilterProxyModel.cpp similarity index 93% rename from src/sortFilterProxyModels/HopSortFilterProxyModel.cpp rename to src/qtModels/sortFilterProxyModels/HopSortFilterProxyModel.cpp index 90529b6ea..1b55cc8fb 100755 --- a/src/sortFilterProxyModels/HopSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/HopSortFilterProxyModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/HopSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following authors + * qtModels/sortFilterProxyModels/HopSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following authors * 2009-2023: * • Daniel Pettersson * • Mattias Måhl @@ -19,7 +19,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "sortFilterProxyModels/HopSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/HopSortFilterProxyModel.h" #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" diff --git a/src/sortFilterProxyModels/HopSortFilterProxyModel.h b/src/qtModels/sortFilterProxyModels/HopSortFilterProxyModel.h similarity index 87% rename from src/sortFilterProxyModels/HopSortFilterProxyModel.h rename to src/qtModels/sortFilterProxyModels/HopSortFilterProxyModel.h index 3aa2ef883..d1cea835d 100755 --- a/src/sortFilterProxyModels/HopSortFilterProxyModel.h +++ b/src/qtModels/sortFilterProxyModels/HopSortFilterProxyModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/HopSortFilterProxyModel.h is part of Brewtarget, and is copyright the following authors 2009-2023: + * qtModels/sortFilterProxyModels/HopSortFilterProxyModel.h is part of Brewtarget, and is copyright the following authors 2009-2023: * • Matt Young * • Mik Firestone * • Philip Greggory Lee @@ -21,9 +21,9 @@ #include -#include "sortFilterProxyModels/SortFilterProxyModelBase.h" -#include "tableModels/HopTableModel.h" -#include "listModels/HopListModel.h" +#include "qtModels/sortFilterProxyModels/SortFilterProxyModelBase.h" +#include "qtModels/tableModels/HopTableModel.h" +#include "qtModels/listModels/HopListModel.h" /*! * \class HopSortFilterProxyModel diff --git a/src/sortFilterProxyModels/MashSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/MashSortFilterProxyModel.cpp similarity index 93% rename from src/sortFilterProxyModels/MashSortFilterProxyModel.cpp rename to src/qtModels/sortFilterProxyModels/MashSortFilterProxyModel.cpp index cdf83c5c4..55d3771aa 100644 --- a/src/sortFilterProxyModels/MashSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/MashSortFilterProxyModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/MashSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following authors 2024: + * qtModels/sortFilterProxyModels/MashSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following authors 2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "sortFilterProxyModels/MashSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/MashSortFilterProxyModel.h" #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" diff --git a/src/sortFilterProxyModels/MashSortFilterProxyModel.h b/src/qtModels/sortFilterProxyModels/MashSortFilterProxyModel.h similarity index 87% rename from src/sortFilterProxyModels/MashSortFilterProxyModel.h rename to src/qtModels/sortFilterProxyModels/MashSortFilterProxyModel.h index 63b0291fe..53b464cf4 100644 --- a/src/sortFilterProxyModels/MashSortFilterProxyModel.h +++ b/src/qtModels/sortFilterProxyModels/MashSortFilterProxyModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/MashSortFilterProxyModel.h is part of Brewtarget, and is copyright the following authors 2024: + * qtModels/sortFilterProxyModels/MashSortFilterProxyModel.h is part of Brewtarget, and is copyright the following authors 2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -19,9 +19,9 @@ #include -#include "sortFilterProxyModels/SortFilterProxyModelBase.h" -#include "tableModels/MashTableModel.h" -#include "listModels/MashListModel.h" +#include "qtModels/sortFilterProxyModels/SortFilterProxyModelBase.h" +#include "qtModels/tableModels/MashTableModel.h" +#include "qtModels/listModels/MashListModel.h" /*! * \class MashSortFilterProxyModel diff --git a/src/sortFilterProxyModels/MiscSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/MiscSortFilterProxyModel.cpp similarity index 94% rename from src/sortFilterProxyModels/MiscSortFilterProxyModel.cpp rename to src/qtModels/sortFilterProxyModels/MiscSortFilterProxyModel.cpp index b678dc644..f1894e97f 100755 --- a/src/sortFilterProxyModels/MiscSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/MiscSortFilterProxyModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/MiscSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following authors + * qtModels/sortFilterProxyModels/MiscSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following authors * 2009-2024: * • Daniel Pettersson * • Matt Young @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "sortFilterProxyModels/MiscSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/MiscSortFilterProxyModel.h" #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" diff --git a/src/sortFilterProxyModels/MiscSortFilterProxyModel.h b/src/qtModels/sortFilterProxyModels/MiscSortFilterProxyModel.h similarity index 88% rename from src/sortFilterProxyModels/MiscSortFilterProxyModel.h rename to src/qtModels/sortFilterProxyModels/MiscSortFilterProxyModel.h index 47622108d..b2a24321d 100755 --- a/src/sortFilterProxyModels/MiscSortFilterProxyModel.h +++ b/src/qtModels/sortFilterProxyModels/MiscSortFilterProxyModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/MiscSortFilterProxyModel.h is part of Brewtarget, and is copyright the following authors + * qtModels/sortFilterProxyModels/MiscSortFilterProxyModel.h is part of Brewtarget, and is copyright the following authors * 2009-2023: * • Matt Young * • Mik Firestone @@ -22,9 +22,9 @@ #include -#include "sortFilterProxyModels/SortFilterProxyModelBase.h" -#include "tableModels/MiscTableModel.h" -#include "listModels/MiscListModel.h" +#include "qtModels/sortFilterProxyModels/SortFilterProxyModelBase.h" +#include "qtModels/tableModels/MiscTableModel.h" +#include "qtModels/listModels/MiscListModel.h" /*! * \class MiscSortFilterProxyModel diff --git a/src/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.cpp similarity index 94% rename from src/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.cpp rename to src/qtModels/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.cpp index 7db8b19d6..dea684377 100755 --- a/src/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following + * qtModels/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following * authors 2009-2023: * • Daniel Pettersson * • Mattias Måhl @@ -19,7 +19,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.h" #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" diff --git a/src/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.h b/src/qtModels/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.h similarity index 86% rename from src/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.h rename to src/qtModels/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.h index 5f77b0445..6fffd0ffc 100755 --- a/src/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.h +++ b/src/qtModels/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.h is part of Brewtarget, and is copyright the following + * qtModels/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.h is part of Brewtarget, and is copyright the following * authors 2009-2023: * • Matt Young * @@ -20,9 +20,9 @@ #include -#include "sortFilterProxyModels/SortFilterProxyModelBase.h" -#include "tableModels/RecipeAdditionFermentableTableModel.h" -#include "listModels/RecipeAdditionFermentableListModel.h" +#include "qtModels/sortFilterProxyModels/SortFilterProxyModelBase.h" +#include "qtModels/tableModels/RecipeAdditionFermentableTableModel.h" +#include "qtModels/listModels/RecipeAdditionFermentableListModel.h" /*! * \class RecipeAdditionFermentableSortFilterProxyModel diff --git a/src/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.cpp similarity index 94% rename from src/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.cpp rename to src/qtModels/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.cpp index 198f6d055..14020ffa0 100755 --- a/src/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following + * qtModels/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following * authors 2009-2023: * • Daniel Pettersson * • Mattias Måhl @@ -19,7 +19,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.h" #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" diff --git a/src/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.h b/src/qtModels/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.h similarity index 87% rename from src/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.h rename to src/qtModels/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.h index e2eb69c33..2d860ccf5 100755 --- a/src/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.h +++ b/src/qtModels/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.h is part of Brewtarget, and is copyright the following + * qtModels/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.h is part of Brewtarget, and is copyright the following * authors 2009-2023: * • Matt Young * @@ -20,9 +20,9 @@ #include -#include "sortFilterProxyModels/SortFilterProxyModelBase.h" -#include "tableModels/RecipeAdditionHopTableModel.h" -#include "listModels/RecipeAdditionHopListModel.h" +#include "qtModels/sortFilterProxyModels/SortFilterProxyModelBase.h" +#include "qtModels/tableModels/RecipeAdditionHopTableModel.h" +#include "qtModels/listModels/RecipeAdditionHopListModel.h" /*! * \class RecipeAdditionHopSortFilterProxyModel diff --git a/src/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.cpp similarity index 93% rename from src/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.cpp rename to src/qtModels/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.cpp index 5ffad009d..d825ef21b 100755 --- a/src/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following + * qtModels/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following * authors 2009-2024: * • Daniel Pettersson * • Mattias Måhl @@ -19,7 +19,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.h" #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" diff --git a/src/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.h b/src/qtModels/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.h similarity index 87% rename from src/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.h rename to src/qtModels/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.h index e107be327..e2839eef8 100755 --- a/src/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.h +++ b/src/qtModels/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.h is part of Brewtarget, and is copyright the following + * qtModels/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.h is part of Brewtarget, and is copyright the following * authors 2009-2024: * • Matt Young * @@ -20,9 +20,9 @@ #include -#include "sortFilterProxyModels/SortFilterProxyModelBase.h" -#include "tableModels/RecipeAdditionMiscTableModel.h" -#include "listModels/RecipeAdditionMiscListModel.h" +#include "qtModels/sortFilterProxyModels/SortFilterProxyModelBase.h" +#include "qtModels/tableModels/RecipeAdditionMiscTableModel.h" +#include "qtModels/listModels/RecipeAdditionMiscListModel.h" /*! * \class RecipeAdditionMiscSortFilterProxyModel diff --git a/src/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.cpp similarity index 95% rename from src/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.cpp rename to src/qtModels/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.cpp index b85120ba9..d0a21bd5a 100755 --- a/src/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following + * qtModels/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following * authors 2009-2024: * • Daniel Pettersson * • Mattias Måhl @@ -19,7 +19,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.h" #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" diff --git a/src/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.h b/src/qtModels/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.h similarity index 87% rename from src/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.h rename to src/qtModels/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.h index 96f0c9dd2..5c9b8b4a4 100755 --- a/src/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.h +++ b/src/qtModels/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.h is part of Brewtarget, and is copyright the following + * qtModels/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.h is part of Brewtarget, and is copyright the following * authors 2009-2024: * • Matt Young * @@ -20,9 +20,9 @@ #include -#include "sortFilterProxyModels/SortFilterProxyModelBase.h" -#include "tableModels/RecipeAdditionYeastTableModel.h" -#include "listModels/RecipeAdditionYeastListModel.h" +#include "qtModels/sortFilterProxyModels/SortFilterProxyModelBase.h" +#include "qtModels/tableModels/RecipeAdditionYeastTableModel.h" +#include "qtModels/listModels/RecipeAdditionYeastListModel.h" /*! * \class RecipeAdditionYeastSortFilterProxyModel diff --git a/src/sortFilterProxyModels/SortFilterProxyModelBase.h b/src/qtModels/sortFilterProxyModels/SortFilterProxyModelBase.h similarity index 97% rename from src/sortFilterProxyModels/SortFilterProxyModelBase.h rename to src/qtModels/sortFilterProxyModels/SortFilterProxyModelBase.h index 1e25af3d6..310030ed4 100755 --- a/src/sortFilterProxyModels/SortFilterProxyModelBase.h +++ b/src/qtModels/sortFilterProxyModels/SortFilterProxyModelBase.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/SortFilterProxyModelBase.h is part of Brewtarget, and is copyright the following authors + * qtModels/sortFilterProxyModels/SortFilterProxyModelBase.h is part of Brewtarget, and is copyright the following authors * 2023-2024: * • Matt Young * @@ -116,7 +116,7 @@ class SortFilterProxyModelBase : public CuriouslyRecurringTemplateBasedata(right); } - // As per more detailed comment in tableModels/ItemDelegate.h, we need "typename" here only until Apple ship Clang + // As per more detailed comment in qtModels/tableModels/ItemDelegate.h, we need "typename" here only until Apple ship Clang // 16 or later as their standard C++ compiler. auto const columnIndex = static_cast(left.column()); return this->derived().isLessThan(columnIndex, leftItem, rightItem); diff --git a/src/sortFilterProxyModels/StyleSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.cpp similarity index 92% rename from src/sortFilterProxyModels/StyleSortFilterProxyModel.cpp rename to src/qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.cpp index dc5c4319b..70123b859 100755 --- a/src/sortFilterProxyModels/StyleSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/StyleSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following authors + * qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following authors * 2009-2023: * • Matt Young * • Philip Greggory Lee @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "sortFilterProxyModels/StyleSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.h" #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" diff --git a/src/sortFilterProxyModels/StyleSortFilterProxyModel.h b/src/qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.h similarity index 88% rename from src/sortFilterProxyModels/StyleSortFilterProxyModel.h rename to src/qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.h index 2b49db6ff..1e484d7fc 100755 --- a/src/sortFilterProxyModels/StyleSortFilterProxyModel.h +++ b/src/qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/StyleSortFilterProxyModel.h is part of Brewtarget, and is copyright the following authors + * qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.h is part of Brewtarget, and is copyright the following authors * 2009-2023: * • Matt Young * • Mik Firestone @@ -22,9 +22,9 @@ #include -#include "sortFilterProxyModels/SortFilterProxyModelBase.h" -#include "tableModels/StyleTableModel.h" -#include "listModels/StyleListModel.h" +#include "qtModels/sortFilterProxyModels/SortFilterProxyModelBase.h" +#include "qtModels/tableModels/StyleTableModel.h" +#include "qtModels/listModels/StyleListModel.h" /*! * \class StyleSortFilterProxyModel diff --git a/src/sortFilterProxyModels/WaterSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/WaterSortFilterProxyModel.cpp similarity index 93% rename from src/sortFilterProxyModels/WaterSortFilterProxyModel.cpp rename to src/qtModels/sortFilterProxyModels/WaterSortFilterProxyModel.cpp index b717e5147..e1444d96a 100755 --- a/src/sortFilterProxyModels/WaterSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/WaterSortFilterProxyModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/WaterSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following authors + * qtModels/sortFilterProxyModels/WaterSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following authors * 2009-2024: * • Matt Young * • Mik Firestone @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "sortFilterProxyModels/WaterSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/WaterSortFilterProxyModel.h" #include diff --git a/src/sortFilterProxyModels/WaterSortFilterProxyModel.h b/src/qtModels/sortFilterProxyModels/WaterSortFilterProxyModel.h similarity index 88% rename from src/sortFilterProxyModels/WaterSortFilterProxyModel.h rename to src/qtModels/sortFilterProxyModels/WaterSortFilterProxyModel.h index c4b6e831f..97845a3ba 100755 --- a/src/sortFilterProxyModels/WaterSortFilterProxyModel.h +++ b/src/qtModels/sortFilterProxyModels/WaterSortFilterProxyModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/WaterSortFilterProxyModel.h is part of Brewtarget, and is copyright the following authors + * qtModels/sortFilterProxyModels/WaterSortFilterProxyModel.h is part of Brewtarget, and is copyright the following authors * 2009-2023: * • Matt Young * • Mik Firestone @@ -22,9 +22,9 @@ #include -#include "sortFilterProxyModels/SortFilterProxyModelBase.h" -#include "tableModels/WaterTableModel.h" -#include "listModels/WaterListModel.h" +#include "qtModels/sortFilterProxyModels/SortFilterProxyModelBase.h" +#include "qtModels/tableModels/WaterTableModel.h" +#include "qtModels/listModels/WaterListModel.h" /*! * \class WaterSortFilterProxyModel diff --git a/src/sortFilterProxyModels/YeastSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/YeastSortFilterProxyModel.cpp similarity index 94% rename from src/sortFilterProxyModels/YeastSortFilterProxyModel.cpp rename to src/qtModels/sortFilterProxyModels/YeastSortFilterProxyModel.cpp index 6516d1f0e..2c1ec2084 100755 --- a/src/sortFilterProxyModels/YeastSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/YeastSortFilterProxyModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/YeastSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following authors + * qtModels/sortFilterProxyModels/YeastSortFilterProxyModel.cpp is part of Brewtarget, and is copyright the following authors * 2009-2024: * • Daniel Pettersson * • Matt Young @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "sortFilterProxyModels/YeastSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/YeastSortFilterProxyModel.h" #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" diff --git a/src/sortFilterProxyModels/YeastSortFilterProxyModel.h b/src/qtModels/sortFilterProxyModels/YeastSortFilterProxyModel.h similarity index 88% rename from src/sortFilterProxyModels/YeastSortFilterProxyModel.h rename to src/qtModels/sortFilterProxyModels/YeastSortFilterProxyModel.h index 4f264ee52..6b47503ba 100755 --- a/src/sortFilterProxyModels/YeastSortFilterProxyModel.h +++ b/src/qtModels/sortFilterProxyModels/YeastSortFilterProxyModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * sortFilterProxyModels/YeastSortFilterProxyModel.h is part of Brewtarget, and is copyright the following authors + * qtModels/sortFilterProxyModels/YeastSortFilterProxyModel.h is part of Brewtarget, and is copyright the following authors * 2009-2023: * • Matt Young * • Mik Firestone @@ -22,9 +22,9 @@ #include -#include "sortFilterProxyModels/SortFilterProxyModelBase.h" -#include "tableModels/YeastTableModel.h" -#include "listModels/YeastListModel.h" +#include "qtModels/sortFilterProxyModels/SortFilterProxyModelBase.h" +#include "qtModels/tableModels/YeastTableModel.h" +#include "qtModels/listModels/YeastListModel.h" /*! * \class YeastSortFilterProxyModel diff --git a/src/tableModels/BoilStepTableModel.cpp b/src/qtModels/tableModels/BoilStepTableModel.cpp similarity index 96% rename from src/tableModels/BoilStepTableModel.cpp rename to src/qtModels/tableModels/BoilStepTableModel.cpp index d65d4e806..6f0c723b8 100755 --- a/src/tableModels/BoilStepTableModel.cpp +++ b/src/qtModels/tableModels/BoilStepTableModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/BoilStepTableModel.cpp is part of Brewtarget, and is copyright the following authors 2024: + * qtModels/tableModels/BoilStepTableModel.cpp is part of Brewtarget, and is copyright the following authors 2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "tableModels/BoilStepTableModel.h" +#include "qtModels/tableModels/BoilStepTableModel.h" #include #include @@ -22,7 +22,7 @@ #include #include "model/BoilStep.h" -#include "tableModels/BtTableModel.h" +#include "qtModels/tableModels/BtTableModel.h" BoilStepTableModel::BoilStepTableModel(QTableView * parent, bool editable) : BtTableModel{ diff --git a/src/tableModels/BoilStepTableModel.h b/src/qtModels/tableModels/BoilStepTableModel.h similarity index 90% rename from src/tableModels/BoilStepTableModel.h rename to src/qtModels/tableModels/BoilStepTableModel.h index 5ff874b9f..647fe2a14 100755 --- a/src/tableModels/BoilStepTableModel.h +++ b/src/qtModels/tableModels/BoilStepTableModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/BoilStepTableModel.h is part of Brewtarget, and is copyright the following authors 2024: + * qtModels/tableModels/BoilStepTableModel.h is part of Brewtarget, and is copyright the following authors 2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -20,10 +20,10 @@ #include #include "model/BoilStep.h" -#include "tableModels/BtTableModel.h" -#include "tableModels/ItemDelegate.h" -#include "tableModels/StepTableModelBase.h" -#include "tableModels/TableModelBase.h" +#include "qtModels/tableModels/BtTableModel.h" +#include "qtModels/tableModels/ItemDelegate.h" +#include "qtModels/tableModels/StepTableModelBase.h" +#include "qtModels/tableModels/TableModelBase.h" TABLE_MODEL_TRAITS(BoilStep, Name , StepTime , diff --git a/src/tableModels/BoilTableModel.cpp b/src/qtModels/tableModels/BoilTableModel.cpp similarity index 95% rename from src/tableModels/BoilTableModel.cpp rename to src/qtModels/tableModels/BoilTableModel.cpp index 1fd90646a..be4020c60 100644 --- a/src/tableModels/BoilTableModel.cpp +++ b/src/qtModels/tableModels/BoilTableModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/BoilTableModel.cpp is part of Brewtarget, and is copyright the following authors 2024: + * qtModels/tableModels/BoilTableModel.cpp is part of Brewtarget, and is copyright the following authors 2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "tableModels/BoilTableModel.h" +#include "qtModels/tableModels/BoilTableModel.h" #include #include diff --git a/src/tableModels/BoilTableModel.h b/src/qtModels/tableModels/BoilTableModel.h similarity index 91% rename from src/tableModels/BoilTableModel.h rename to src/qtModels/tableModels/BoilTableModel.h index 794a35cf9..9a52d6b02 100644 --- a/src/tableModels/BoilTableModel.h +++ b/src/qtModels/tableModels/BoilTableModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/BoilTableModel.h is part of Brewtarget, and is copyright the following authors 2024: + * qtModels/tableModels/BoilTableModel.h is part of Brewtarget, and is copyright the following authors 2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -20,8 +20,8 @@ #include #include "model/Boil.h" -#include "tableModels/ItemDelegate.h" -#include "tableModels/TableModelBase.h" +#include "qtModels/tableModels/ItemDelegate.h" +#include "qtModels/tableModels/TableModelBase.h" TABLE_MODEL_TRAITS(Boil, Name, PreBoilSize) diff --git a/src/tableModels/BtTableModel.cpp b/src/qtModels/tableModels/BtTableModel.cpp similarity index 98% rename from src/tableModels/BtTableModel.cpp rename to src/qtModels/tableModels/BtTableModel.cpp index 0add739a4..482fc3f90 100644 --- a/src/tableModels/BtTableModel.cpp +++ b/src/qtModels/tableModels/BtTableModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/BtTableModel.cpp is part of Brewtarget, and is copyright the following authors 2021-2024: + * qtModels/tableModels/BtTableModel.cpp is part of Brewtarget, and is copyright the following authors 2021-2024: * • Matt Young * • Mik Firestone * @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "tableModels/BtTableModel.h" +#include "qtModels/tableModels/BtTableModel.h" #include #include diff --git a/src/tableModels/BtTableModel.h b/src/qtModels/tableModels/BtTableModel.h similarity index 99% rename from src/tableModels/BtTableModel.h rename to src/qtModels/tableModels/BtTableModel.h index 406e2a097..420e665b0 100644 --- a/src/tableModels/BtTableModel.h +++ b/src/qtModels/tableModels/BtTableModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/BtTableModel.h is part of Brewtarget, and is copyright the following authors 2021-2023: + * qtModels/tableModels/BtTableModel.h is part of Brewtarget, and is copyright the following authors 2021-2023: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/src/tableModels/EquipmentTableModel.cpp b/src/qtModels/tableModels/EquipmentTableModel.cpp similarity index 95% rename from src/tableModels/EquipmentTableModel.cpp rename to src/qtModels/tableModels/EquipmentTableModel.cpp index 1e89f0e05..75eac31e6 100755 --- a/src/tableModels/EquipmentTableModel.cpp +++ b/src/qtModels/tableModels/EquipmentTableModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/EquipmentTableModel.cpp is part of Brewtarget, and is copyright the following authors 2023-2024: + * qtModels/tableModels/EquipmentTableModel.cpp is part of Brewtarget, and is copyright the following authors 2023-2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "tableModels/EquipmentTableModel.h" +#include "qtModels/tableModels/EquipmentTableModel.h" #include #include diff --git a/src/tableModels/EquipmentTableModel.h b/src/qtModels/tableModels/EquipmentTableModel.h similarity index 92% rename from src/tableModels/EquipmentTableModel.h rename to src/qtModels/tableModels/EquipmentTableModel.h index 2a5b18def..c801ccb4f 100755 --- a/src/tableModels/EquipmentTableModel.h +++ b/src/qtModels/tableModels/EquipmentTableModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/EquipmentTableModel.h is part of Brewtarget, and is copyright the following authors 2023: + * qtModels/tableModels/EquipmentTableModel.h is part of Brewtarget, and is copyright the following authors 2023: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -24,8 +24,8 @@ #include #include "model/Equipment.h" -#include "tableModels/ItemDelegate.h" -#include "tableModels/TableModelBase.h" +#include "qtModels/tableModels/ItemDelegate.h" +#include "qtModels/tableModels/TableModelBase.h" class BtStringConst; class Recipe; diff --git a/src/tableModels/FermentableTableModel.cpp b/src/qtModels/tableModels/FermentableTableModel.cpp similarity index 96% rename from src/tableModels/FermentableTableModel.cpp rename to src/qtModels/tableModels/FermentableTableModel.cpp index ebd2e1c8f..f4c7986ae 100644 --- a/src/tableModels/FermentableTableModel.cpp +++ b/src/qtModels/tableModels/FermentableTableModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/FermentableTableModel.cpp is part of Brewtarget, and is copyright the following authors 2009-2024: + * qtModels/tableModels/FermentableTableModel.cpp is part of Brewtarget, and is copyright the following authors 2009-2024: * • Brian Rower * • Daniel Pettersson * • Mattias Måhl @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "tableModels/FermentableTableModel.h" +#include "qtModels/tableModels/FermentableTableModel.h" #include @@ -39,7 +39,7 @@ #include "measurement/Unit.h" #include "model/Inventory.h" #include "model/Recipe.h" -#include "tableModels/ItemDelegate.h" +#include "qtModels/tableModels/ItemDelegate.h" #include "utils/BtStringConst.h" #include "widgets/BtComboBoxEnum.h" diff --git a/src/tableModels/FermentableTableModel.h b/src/qtModels/tableModels/FermentableTableModel.h similarity index 93% rename from src/tableModels/FermentableTableModel.h rename to src/qtModels/tableModels/FermentableTableModel.h index 2fb0f32af..47811f0b3 100644 --- a/src/tableModels/FermentableTableModel.h +++ b/src/qtModels/tableModels/FermentableTableModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/FermentableTableModel.h is part of Brewtarget, and is copyright the following authors 2009-2024: + * qtModels/tableModels/FermentableTableModel.h is part of Brewtarget, and is copyright the following authors 2009-2024: * • Jeff Bailey * • Matt Young * • Mik Firestone @@ -34,8 +34,8 @@ #include "measurement/Unit.h" #include "model/Fermentable.h" #include "model/InventoryFermentable.h" -#include "tableModels/ItemDelegate.h" -#include "tableModels/TableModelBase.h" +#include "qtModels/tableModels/ItemDelegate.h" +#include "qtModels/tableModels/TableModelBase.h" // Forward declarations. class BtStringConst; diff --git a/src/tableModels/FermentationStepTableModel.cpp b/src/qtModels/tableModels/FermentationStepTableModel.cpp similarity index 97% rename from src/tableModels/FermentationStepTableModel.cpp rename to src/qtModels/tableModels/FermentationStepTableModel.cpp index ee96ae1a9..07de286de 100755 --- a/src/tableModels/FermentationStepTableModel.cpp +++ b/src/qtModels/tableModels/FermentationStepTableModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/FermentationStepTableModel.cpp is part of Brewtarget, and is copyright the following authors 2024: + * qtModels/tableModels/FermentationStepTableModel.cpp is part of Brewtarget, and is copyright the following authors 2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "tableModels/FermentationStepTableModel.h" +#include "qtModels/tableModels/FermentationStepTableModel.h" #include #include diff --git a/src/tableModels/FermentationStepTableModel.h b/src/qtModels/tableModels/FermentationStepTableModel.h similarity index 91% rename from src/tableModels/FermentationStepTableModel.h rename to src/qtModels/tableModels/FermentationStepTableModel.h index 43c7ab94d..2e39f15c1 100755 --- a/src/tableModels/FermentationStepTableModel.h +++ b/src/qtModels/tableModels/FermentationStepTableModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/FermentationStepTableModel.h is part of Brewtarget, and is copyright the following authors 2024: + * qtModels/tableModels/FermentationStepTableModel.h is part of Brewtarget, and is copyright the following authors 2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -28,10 +28,10 @@ #include "measurement/Unit.h" #include "model/FermentationStep.h" #include "model/Fermentation.h" -#include "tableModels/BtTableModel.h" -#include "tableModels/ItemDelegate.h" -#include "tableModels/StepTableModelBase.h" -#include "tableModels/TableModelBase.h" +#include "qtModels/tableModels/BtTableModel.h" +#include "qtModels/tableModels/ItemDelegate.h" +#include "qtModels/tableModels/StepTableModelBase.h" +#include "qtModels/tableModels/TableModelBase.h" // You have to get the order of everything right with traits classes, but the end result is that we can refer to // HopTableModel::ColumnIndex::Alpha etc. diff --git a/src/tableModels/FermentationTableModel.cpp b/src/qtModels/tableModels/FermentationTableModel.cpp similarity index 95% rename from src/tableModels/FermentationTableModel.cpp rename to src/qtModels/tableModels/FermentationTableModel.cpp index 241a9f492..a2149ad79 100644 --- a/src/tableModels/FermentationTableModel.cpp +++ b/src/qtModels/tableModels/FermentationTableModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/FermentationTableModel.cpp is part of Brewtarget, and is copyright the following authors 2024: + * qtModels/tableModels/FermentationTableModel.cpp is part of Brewtarget, and is copyright the following authors 2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "tableModels/FermentationTableModel.h" +#include "qtModels/tableModels/FermentationTableModel.h" #include #include diff --git a/src/tableModels/FermentationTableModel.h b/src/qtModels/tableModels/FermentationTableModel.h similarity index 89% rename from src/tableModels/FermentationTableModel.h rename to src/qtModels/tableModels/FermentationTableModel.h index fddd58491..711c64278 100644 --- a/src/tableModels/FermentationTableModel.h +++ b/src/qtModels/tableModels/FermentationTableModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/FermentationTableModel.h is part of Brewtarget, and is copyright the following authors 2024: + * qtModels/tableModels/FermentationTableModel.h is part of Brewtarget, and is copyright the following authors 2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -20,9 +20,9 @@ #include #include "model/Fermentation.h" -#include "tableModels/BtTableModel.h" -#include "tableModels/ItemDelegate.h" -#include "tableModels/TableModelBase.h" +#include "qtModels/tableModels/BtTableModel.h" +#include "qtModels/tableModels/ItemDelegate.h" +#include "qtModels/tableModels/TableModelBase.h" TABLE_MODEL_TRAITS(Fermentation, Name, NumSteps) diff --git a/src/tableModels/HopTableModel.cpp b/src/qtModels/tableModels/HopTableModel.cpp similarity index 96% rename from src/tableModels/HopTableModel.cpp rename to src/qtModels/tableModels/HopTableModel.cpp index d18876930..adb17ebbe 100644 --- a/src/tableModels/HopTableModel.cpp +++ b/src/qtModels/tableModels/HopTableModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/HopTableModel.cpp is part of Brewtarget, and is copyright the following authors 2009-2023: + * qtModels/tableModels/HopTableModel.cpp is part of Brewtarget, and is copyright the following authors 2009-2023: * • Brian Rower * • Daniel Pettersson * • Luke Vincent @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "tableModels/HopTableModel.h" +#include "qtModels/tableModels/HopTableModel.h" #include #include diff --git a/src/tableModels/HopTableModel.h b/src/qtModels/tableModels/HopTableModel.h similarity index 93% rename from src/tableModels/HopTableModel.h rename to src/qtModels/tableModels/HopTableModel.h index ac3fcf478..e4a75110b 100644 --- a/src/tableModels/HopTableModel.h +++ b/src/qtModels/tableModels/HopTableModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/HopTableModel.h is part of Brewtarget, and is copyright the following authors 2009-2024: + * qtModels/tableModels/HopTableModel.h is part of Brewtarget, and is copyright the following authors 2009-2024: * • Jeff Bailey * • Matt Young * • Markus Mårtensson @@ -30,8 +30,8 @@ #include "model/Hop.h" #include "model/InventoryHop.h" -#include "tableModels/ItemDelegate.h" -#include "tableModels/TableModelBase.h" +#include "qtModels/tableModels/ItemDelegate.h" +#include "qtModels/tableModels/TableModelBase.h" class BtStringConst; class Recipe; diff --git a/src/tableModels/ItemDelegate.h b/src/qtModels/tableModels/ItemDelegate.h similarity index 99% rename from src/tableModels/ItemDelegate.h rename to src/qtModels/tableModels/ItemDelegate.h index fb34b4d8b..4374262e5 100755 --- a/src/tableModels/ItemDelegate.h +++ b/src/qtModels/tableModels/ItemDelegate.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/ItemDelegate.h is part of Brewtarget, and is copyright the following authors 2023-2024: + * qtModels/tableModels/ItemDelegate.h is part of Brewtarget, and is copyright the following authors 2023-2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -23,7 +23,7 @@ #include "utils/NoCopy.h" #include "widgets/BtComboBoxBool.h" #include "widgets/BtComboBoxEnum.h" -#include "tableModels/BtTableModel.h" +#include "qtModels/tableModels/BtTableModel.h" namespace { /** diff --git a/src/tableModels/MashStepTableModel.cpp b/src/qtModels/tableModels/MashStepTableModel.cpp similarity index 96% rename from src/tableModels/MashStepTableModel.cpp rename to src/qtModels/tableModels/MashStepTableModel.cpp index d88c9fe4b..a607f1522 100644 --- a/src/tableModels/MashStepTableModel.cpp +++ b/src/qtModels/tableModels/MashStepTableModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/MashStepTableModel.cpp is part of Brewtarget, and is copyright the following authors 2009-2024: + * qtModels/tableModels/MashStepTableModel.cpp is part of Brewtarget, and is copyright the following authors 2009-2024: * • Brian Rower * • Mattias Måhl * • Matt Young @@ -19,7 +19,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "tableModels/MashStepTableModel.h" +#include "qtModels/tableModels/MashStepTableModel.h" #include #include @@ -28,7 +28,7 @@ #include #include "model/MashStep.h" -#include "tableModels/BtTableModel.h" +#include "qtModels/tableModels/BtTableModel.h" MashStepTableModel::MashStepTableModel(QTableView * parent, bool editable) : BtTableModel{ diff --git a/src/tableModels/MashStepTableModel.h b/src/qtModels/tableModels/MashStepTableModel.h similarity index 90% rename from src/tableModels/MashStepTableModel.h rename to src/qtModels/tableModels/MashStepTableModel.h index 640438837..54fb0d7da 100644 --- a/src/tableModels/MashStepTableModel.h +++ b/src/qtModels/tableModels/MashStepTableModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/MashStepTableModel.h is part of Brewtarget, and is copyright the following authors 2009-2024: + * qtModels/tableModels/MashStepTableModel.h is part of Brewtarget, and is copyright the following authors 2009-2024: * • Jeff Bailey * • Matt Young * • Mik Firestone @@ -24,10 +24,10 @@ #include "model/MashStep.h" #include "model/Mash.h" -#include "tableModels/BtTableModel.h" -#include "tableModels/ItemDelegate.h" -#include "tableModels/StepTableModelBase.h" -#include "tableModels/TableModelBase.h" +#include "qtModels/tableModels/BtTableModel.h" +#include "qtModels/tableModels/ItemDelegate.h" +#include "qtModels/tableModels/StepTableModelBase.h" +#include "qtModels/tableModels/TableModelBase.h" // You have to get the order of everything right with traits classes, but the end result is that we can refer to // HopTableModel::ColumnIndex::Alpha etc. diff --git a/src/tableModels/MashTableModel.cpp b/src/qtModels/tableModels/MashTableModel.cpp similarity index 95% rename from src/tableModels/MashTableModel.cpp rename to src/qtModels/tableModels/MashTableModel.cpp index 27b003377..9b4819170 100644 --- a/src/tableModels/MashTableModel.cpp +++ b/src/qtModels/tableModels/MashTableModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/MashTableModel.cpp is part of Brewtarget, and is copyright the following authors 2024: + * qtModels/tableModels/MashTableModel.cpp is part of Brewtarget, and is copyright the following authors 2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "tableModels/MashTableModel.h" +#include "qtModels/tableModels/MashTableModel.h" #include #include diff --git a/src/tableModels/MashTableModel.h b/src/qtModels/tableModels/MashTableModel.h similarity index 89% rename from src/tableModels/MashTableModel.h rename to src/qtModels/tableModels/MashTableModel.h index df91b3dd8..227e6a3bb 100644 --- a/src/tableModels/MashTableModel.h +++ b/src/qtModels/tableModels/MashTableModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/MashTableModel.h is part of Brewtarget, and is copyright the following authors 2024: + * qtModels/tableModels/MashTableModel.h is part of Brewtarget, and is copyright the following authors 2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -20,9 +20,9 @@ #include #include "model/Mash.h" -#include "tableModels/BtTableModel.h" -#include "tableModels/ItemDelegate.h" -#include "tableModels/TableModelBase.h" +#include "qtModels/tableModels/BtTableModel.h" +#include "qtModels/tableModels/ItemDelegate.h" +#include "qtModels/tableModels/TableModelBase.h" TABLE_MODEL_TRAITS(Mash, Name, InitialGrainTemp, diff --git a/src/tableModels/MiscTableModel.cpp b/src/qtModels/tableModels/MiscTableModel.cpp similarity index 96% rename from src/tableModels/MiscTableModel.cpp rename to src/qtModels/tableModels/MiscTableModel.cpp index c38aca4f6..fb3fb9782 100644 --- a/src/tableModels/MiscTableModel.cpp +++ b/src/qtModels/tableModels/MiscTableModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/MiscTableModel.cpp is part of Brewtarget, and is copyright the following authors 2009-2024: + * qtModels/tableModels/MiscTableModel.cpp is part of Brewtarget, and is copyright the following authors 2009-2024: * • Brian Rower * • Daniel Pettersson * • Mattias Måhl @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "tableModels/MiscTableModel.h" +#include "qtModels/tableModels/MiscTableModel.h" #include #include diff --git a/src/tableModels/MiscTableModel.h b/src/qtModels/tableModels/MiscTableModel.h similarity index 93% rename from src/tableModels/MiscTableModel.h rename to src/qtModels/tableModels/MiscTableModel.h index 7b38f2a48..4d9be3629 100644 --- a/src/tableModels/MiscTableModel.h +++ b/src/qtModels/tableModels/MiscTableModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/MiscTableModel.h is part of Brewtarget, and is copyright the following authors 2009-2024: + * qtModels/tableModels/MiscTableModel.h is part of Brewtarget, and is copyright the following authors 2009-2024: * • Jeff Bailey * • Matt Young * • Mik Firestone @@ -29,8 +29,8 @@ #include "model/InventoryMisc.h" #include "model/Misc.h" -#include "tableModels/ItemDelegate.h" -#include "tableModels/TableModelBase.h" +#include "qtModels/tableModels/ItemDelegate.h" +#include "qtModels/tableModels/TableModelBase.h" class BtStringConst; class Recipe; diff --git a/src/tableModels/RecipeAdditionFermentableTableModel.cpp b/src/qtModels/tableModels/RecipeAdditionFermentableTableModel.cpp similarity index 97% rename from src/tableModels/RecipeAdditionFermentableTableModel.cpp rename to src/qtModels/tableModels/RecipeAdditionFermentableTableModel.cpp index 0ef2ed23f..c09f87e2a 100755 --- a/src/tableModels/RecipeAdditionFermentableTableModel.cpp +++ b/src/qtModels/tableModels/RecipeAdditionFermentableTableModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/RecipeAdditionFermentableTableModel.cpp is part of Brewtarget, and is copyright the following authors + * qtModels/tableModels/RecipeAdditionFermentableTableModel.cpp is part of Brewtarget, and is copyright the following authors * 2009-2024: * • Brian Rower * • Daniel Pettersson @@ -24,7 +24,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "tableModels/RecipeAdditionFermentableTableModel.h" +#include "qtModels/tableModels/RecipeAdditionFermentableTableModel.h" #include #include diff --git a/src/tableModels/RecipeAdditionFermentableTableModel.h b/src/qtModels/tableModels/RecipeAdditionFermentableTableModel.h similarity index 93% rename from src/tableModels/RecipeAdditionFermentableTableModel.h rename to src/qtModels/tableModels/RecipeAdditionFermentableTableModel.h index f346f9ae2..c7e0d1640 100755 --- a/src/tableModels/RecipeAdditionFermentableTableModel.h +++ b/src/qtModels/tableModels/RecipeAdditionFermentableTableModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/RecipeAdditionFermentableTableModel.h is part of Brewtarget, and is copyright the following authors 2009-2023: + * qtModels/tableModels/RecipeAdditionFermentableTableModel.h is part of Brewtarget, and is copyright the following authors 2009-2023: * • Jeff Bailey * • Matt Young * • Markus Mårtensson @@ -29,9 +29,9 @@ #include #include "model/RecipeAdditionFermentable.h" -#include "tableModels/BtTableModel.h" -#include "tableModels/ItemDelegate.h" -#include "tableModels/TableModelBase.h" +#include "qtModels/tableModels/BtTableModel.h" +#include "qtModels/tableModels/ItemDelegate.h" +#include "qtModels/tableModels/TableModelBase.h" class BtStringConst; class Recipe; diff --git a/src/tableModels/RecipeAdditionHopTableModel.cpp b/src/qtModels/tableModels/RecipeAdditionHopTableModel.cpp similarity index 97% rename from src/tableModels/RecipeAdditionHopTableModel.cpp rename to src/qtModels/tableModels/RecipeAdditionHopTableModel.cpp index 99213b436..341d826da 100755 --- a/src/tableModels/RecipeAdditionHopTableModel.cpp +++ b/src/qtModels/tableModels/RecipeAdditionHopTableModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/RecipeAdditionHopTableModel.cpp is part of Brewtarget, and is copyright the following authors 2009-2024: + * qtModels/tableModels/RecipeAdditionHopTableModel.cpp is part of Brewtarget, and is copyright the following authors 2009-2024: * • Brian Rower * • Daniel Pettersson * • Luke Vincent @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "tableModels/RecipeAdditionHopTableModel.h" +#include "qtModels/tableModels/RecipeAdditionHopTableModel.h" #include #include diff --git a/src/tableModels/RecipeAdditionHopTableModel.h b/src/qtModels/tableModels/RecipeAdditionHopTableModel.h similarity index 93% rename from src/tableModels/RecipeAdditionHopTableModel.h rename to src/qtModels/tableModels/RecipeAdditionHopTableModel.h index 10d354fe0..ff741eaba 100755 --- a/src/tableModels/RecipeAdditionHopTableModel.h +++ b/src/qtModels/tableModels/RecipeAdditionHopTableModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/RecipeAdditionHopTableModel.h is part of Brewtarget, and is copyright the following authors 2009-2023: + * qtModels/tableModels/RecipeAdditionHopTableModel.h is part of Brewtarget, and is copyright the following authors 2009-2023: * • Jeff Bailey * • Matt Young * • Markus Mårtensson @@ -29,9 +29,9 @@ #include #include "model/RecipeAdditionHop.h" -#include "tableModels/BtTableModel.h" -#include "tableModels/ItemDelegate.h" -#include "tableModels/TableModelBase.h" +#include "qtModels/tableModels/BtTableModel.h" +#include "qtModels/tableModels/ItemDelegate.h" +#include "qtModels/tableModels/TableModelBase.h" class BtStringConst; class Recipe; diff --git a/src/tableModels/RecipeAdditionMiscTableModel.cpp b/src/qtModels/tableModels/RecipeAdditionMiscTableModel.cpp similarity index 97% rename from src/tableModels/RecipeAdditionMiscTableModel.cpp rename to src/qtModels/tableModels/RecipeAdditionMiscTableModel.cpp index 21690f4de..16e24b31d 100755 --- a/src/tableModels/RecipeAdditionMiscTableModel.cpp +++ b/src/qtModels/tableModels/RecipeAdditionMiscTableModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/RecipeAdditionMiscTableModel.cpp is part of Brewtarget, and is copyright the following authors 2009-2024: + * qtModels/tableModels/RecipeAdditionMiscTableModel.cpp is part of Brewtarget, and is copyright the following authors 2009-2024: * • Brian Rower * • Daniel Pettersson * • Luke Vincent @@ -23,7 +23,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "tableModels/RecipeAdditionMiscTableModel.h" +#include "qtModels/tableModels/RecipeAdditionMiscTableModel.h" #include #include diff --git a/src/tableModels/RecipeAdditionMiscTableModel.h b/src/qtModels/tableModels/RecipeAdditionMiscTableModel.h similarity index 93% rename from src/tableModels/RecipeAdditionMiscTableModel.h rename to src/qtModels/tableModels/RecipeAdditionMiscTableModel.h index 8340e9b92..69e9e53d5 100755 --- a/src/tableModels/RecipeAdditionMiscTableModel.h +++ b/src/qtModels/tableModels/RecipeAdditionMiscTableModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/RecipeAdditionMiscTableModel.h is part of Brewtarget, and is copyright the following authors 2009-2024: + * qtModels/tableModels/RecipeAdditionMiscTableModel.h is part of Brewtarget, and is copyright the following authors 2009-2024: * • Jeff Bailey * • Matt Young * • Markus Mårtensson @@ -29,9 +29,9 @@ #include #include "model/RecipeAdditionMisc.h" -#include "tableModels/BtTableModel.h" -#include "tableModels/ItemDelegate.h" -#include "tableModels/TableModelBase.h" +#include "qtModels/tableModels/BtTableModel.h" +#include "qtModels/tableModels/ItemDelegate.h" +#include "qtModels/tableModels/TableModelBase.h" class BtStringConst; class Recipe; diff --git a/src/tableModels/RecipeAdditionYeastTableModel.cpp b/src/qtModels/tableModels/RecipeAdditionYeastTableModel.cpp similarity index 97% rename from src/tableModels/RecipeAdditionYeastTableModel.cpp rename to src/qtModels/tableModels/RecipeAdditionYeastTableModel.cpp index e5e85e1e6..834eafbfd 100755 --- a/src/tableModels/RecipeAdditionYeastTableModel.cpp +++ b/src/qtModels/tableModels/RecipeAdditionYeastTableModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/RecipeAdditionYeastTableModel.cpp is part of Brewtarget, and is copyright the following authors + * qtModels/tableModels/RecipeAdditionYeastTableModel.cpp is part of Brewtarget, and is copyright the following authors * 2009-2024: * • Brian Rower * • Daniel Pettersson @@ -24,7 +24,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "tableModels/RecipeAdditionYeastTableModel.h" +#include "qtModels/tableModels/RecipeAdditionYeastTableModel.h" #include #include diff --git a/src/tableModels/RecipeAdditionYeastTableModel.h b/src/qtModels/tableModels/RecipeAdditionYeastTableModel.h similarity index 92% rename from src/tableModels/RecipeAdditionYeastTableModel.h rename to src/qtModels/tableModels/RecipeAdditionYeastTableModel.h index 31ce583e1..fab383c6b 100755 --- a/src/tableModels/RecipeAdditionYeastTableModel.h +++ b/src/qtModels/tableModels/RecipeAdditionYeastTableModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/RecipeAdditionYeastTableModel.h is part of Brewtarget, and is copyright the following authors 2009-2024: + * qtModels/tableModels/RecipeAdditionYeastTableModel.h is part of Brewtarget, and is copyright the following authors 2009-2024: * • Jeff Bailey * • Matt Young * • Markus Mårtensson @@ -29,9 +29,9 @@ #include #include "model/RecipeAdditionYeast.h" -#include "tableModels/BtTableModel.h" -#include "tableModels/ItemDelegate.h" -#include "tableModels/TableModelBase.h" +#include "qtModels/tableModels/BtTableModel.h" +#include "qtModels/tableModels/ItemDelegate.h" +#include "qtModels/tableModels/TableModelBase.h" class BtStringConst; class Recipe; diff --git a/src/tableModels/RecipeAdjustmentSaltTableModel.cpp b/src/qtModels/tableModels/RecipeAdjustmentSaltTableModel.cpp similarity index 98% rename from src/tableModels/RecipeAdjustmentSaltTableModel.cpp rename to src/qtModels/tableModels/RecipeAdjustmentSaltTableModel.cpp index 03bb8e441..b20a0498d 100755 --- a/src/tableModels/RecipeAdjustmentSaltTableModel.cpp +++ b/src/qtModels/tableModels/RecipeAdjustmentSaltTableModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/RecipeAdjustmentSaltTableModel.cpp is part of Brewtarget, and is copyright the following authors + * qtModels/tableModels/RecipeAdjustmentSaltTableModel.cpp is part of Brewtarget, and is copyright the following authors * 2009-2024: * • Mattias Måhl * • Matt Young @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "tableModels/RecipeAdjustmentSaltTableModel.h" +#include "qtModels/tableModels/RecipeAdjustmentSaltTableModel.h" #include #include diff --git a/src/tableModels/RecipeAdjustmentSaltTableModel.h b/src/qtModels/tableModels/RecipeAdjustmentSaltTableModel.h similarity index 93% rename from src/tableModels/RecipeAdjustmentSaltTableModel.h rename to src/qtModels/tableModels/RecipeAdjustmentSaltTableModel.h index 9f30697bc..f2bf1cc29 100755 --- a/src/tableModels/RecipeAdjustmentSaltTableModel.h +++ b/src/qtModels/tableModels/RecipeAdjustmentSaltTableModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/RecipeAdjustmentSaltTableModel.h is part of Brewtarget, and is copyright the following authors 2009-2024: + * qtModels/tableModels/RecipeAdjustmentSaltTableModel.h is part of Brewtarget, and is copyright the following authors 2009-2024: * • Jeff Bailey * • Matt Young * • Mik Firestone @@ -31,9 +31,9 @@ #include "measurement/Unit.h" #include "model/RecipeAdjustmentSalt.h" #include "model/Water.h" -#include "tableModels/BtTableModel.h" -#include "tableModels/ItemDelegate.h" -#include "tableModels/TableModelBase.h" +#include "qtModels/tableModels/BtTableModel.h" +#include "qtModels/tableModels/ItemDelegate.h" +#include "qtModels/tableModels/TableModelBase.h" // Forward declarations. class Mash; diff --git a/src/tableModels/SaltTableModel.cpp b/src/qtModels/tableModels/SaltTableModel.cpp similarity index 97% rename from src/tableModels/SaltTableModel.cpp rename to src/qtModels/tableModels/SaltTableModel.cpp index 2e3b90366..cb8c1c9df 100644 --- a/src/tableModels/SaltTableModel.cpp +++ b/src/qtModels/tableModels/SaltTableModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/SaltTableModel.cpp is part of Brewtarget, and is copyright the following authors 2009-2024: + * qtModels/tableModels/SaltTableModel.cpp is part of Brewtarget, and is copyright the following authors 2009-2024: * • Mattias Måhl * • Matt Young * • Mik Firestone @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "tableModels/SaltTableModel.h" +#include "qtModels/tableModels/SaltTableModel.h" #include #include diff --git a/src/tableModels/SaltTableModel.h b/src/qtModels/tableModels/SaltTableModel.h similarity index 91% rename from src/tableModels/SaltTableModel.h rename to src/qtModels/tableModels/SaltTableModel.h index ce627ca65..527095766 100644 --- a/src/tableModels/SaltTableModel.h +++ b/src/qtModels/tableModels/SaltTableModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/SaltTableModel.h is part of Brewtarget, and is copyright the following authors 2009-2024: + * qtModels/tableModels/SaltTableModel.h is part of Brewtarget, and is copyright the following authors 2009-2024: * • Jeff Bailey * • Matt Young * • Mik Firestone @@ -32,9 +32,9 @@ #include "model/InventorySalt.h" #include "model/Salt.h" #include "model/Water.h" -#include "tableModels/BtTableModel.h" -#include "tableModels/ItemDelegate.h" -#include "tableModels/TableModelBase.h" +#include "qtModels/tableModels/BtTableModel.h" +#include "qtModels/tableModels/ItemDelegate.h" +#include "qtModels/tableModels/TableModelBase.h" // Forward declarations. class Mash; diff --git a/src/tableModels/StepTableModelBase.h b/src/qtModels/tableModels/StepTableModelBase.h similarity index 99% rename from src/tableModels/StepTableModelBase.h rename to src/qtModels/tableModels/StepTableModelBase.h index 70f1c53f8..04e89d28e 100755 --- a/src/tableModels/StepTableModelBase.h +++ b/src/qtModels/tableModels/StepTableModelBase.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/StepTableModelBase.h is part of Brewtarget, and is copyright the following authors 2024: + * qtModels/tableModels/StepTableModelBase.h is part of Brewtarget, and is copyright the following authors 2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/src/tableModels/StyleTableModel.cpp b/src/qtModels/tableModels/StyleTableModel.cpp similarity index 95% rename from src/tableModels/StyleTableModel.cpp rename to src/qtModels/tableModels/StyleTableModel.cpp index 9829b312d..2350d3881 100755 --- a/src/tableModels/StyleTableModel.cpp +++ b/src/qtModels/tableModels/StyleTableModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/StyleTableModel.cpp is part of Brewtarget, and is copyright the following authors 2023: + * qtModels/tableModels/StyleTableModel.cpp is part of Brewtarget, and is copyright the following authors 2023: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "tableModels/StyleTableModel.h" +#include "qtModels/tableModels/StyleTableModel.h" #include #include diff --git a/src/tableModels/StyleTableModel.h b/src/qtModels/tableModels/StyleTableModel.h similarity index 92% rename from src/tableModels/StyleTableModel.h rename to src/qtModels/tableModels/StyleTableModel.h index 6e965093d..b93d2120c 100755 --- a/src/tableModels/StyleTableModel.h +++ b/src/qtModels/tableModels/StyleTableModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/StyleTableModel.h is part of Brewtarget, and is copyright the following authors 2023: + * qtModels/tableModels/StyleTableModel.h is part of Brewtarget, and is copyright the following authors 2023: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -24,8 +24,8 @@ #include #include "model/Style.h" -#include "tableModels/ItemDelegate.h" -#include "tableModels/TableModelBase.h" +#include "qtModels/tableModels/ItemDelegate.h" +#include "qtModels/tableModels/TableModelBase.h" class BtStringConst; class Recipe; diff --git a/src/tableModels/TableModelBase.h b/src/qtModels/tableModels/TableModelBase.h similarity index 99% rename from src/tableModels/TableModelBase.h rename to src/qtModels/tableModels/TableModelBase.h index 1aa61ce44..e53ff1fd4 100755 --- a/src/tableModels/TableModelBase.h +++ b/src/qtModels/tableModels/TableModelBase.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/TableModelBase.h is part of Brewtarget, and is copyright the following authors 2023-2024: + * qtModels/tableModels/TableModelBase.h is part of Brewtarget, and is copyright the following authors 2023-2024: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -31,7 +31,7 @@ #include "model/IngredientAmount.h" #include "model/Inventory.h" #include "model/Recipe.h" -#include "tableModels/BtTableModel.h" +#include "qtModels/tableModels/BtTableModel.h" #include "utils/CuriouslyRecurringTemplateBase.h" #include "utils/MetaTypes.h" @@ -111,7 +111,7 @@ template struct TableModelTraits; /** - * \brief See comment in tableModels/BtTableModel.h for more info on inheritance structure + * \brief See comment in qtModels/tableModels/BtTableModel.h for more info on inheritance structure * * Classes inheriting from this one need to include the TABLE_MODEL_COMMON_DECL macro in their header file and * the TABLE_MODEL_COMMON_CODE macro in their .cpp file. @@ -517,7 +517,7 @@ class TableModelBase : public CuriouslyRecurringTemplateBase(*typeInfo.fieldType) || typeInfo.typeIndex == typeid(Measurement::Amount)) { // - // Per the comments in tableModels/ItemDelegate.h, depending on the value of extras, this is either the + // Per the comments in qtModels/tableModels/ItemDelegate.h, depending on the value of extras, this is either the // amount itself or a drop-down for the PhysicalQuantity of the amount. // // In both cases, we start by getting the amount from the model. diff --git a/src/tableModels/WaterTableModel.cpp b/src/qtModels/tableModels/WaterTableModel.cpp similarity index 97% rename from src/tableModels/WaterTableModel.cpp rename to src/qtModels/tableModels/WaterTableModel.cpp index fbd1543dc..3b7390096 100644 --- a/src/tableModels/WaterTableModel.cpp +++ b/src/qtModels/tableModels/WaterTableModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/WaterTableModel.cpp is part of Brewtarget, and is copyright the following authors 2009-2024: + * qtModels/tableModels/WaterTableModel.cpp is part of Brewtarget, and is copyright the following authors 2009-2024: * • Brian Rower * • Mattias Måhl * • Matt Young @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "tableModels/WaterTableModel.h" +#include "qtModels/tableModels/WaterTableModel.h" #include #include diff --git a/src/tableModels/WaterTableModel.h b/src/qtModels/tableModels/WaterTableModel.h similarity index 95% rename from src/tableModels/WaterTableModel.h rename to src/qtModels/tableModels/WaterTableModel.h index fc5b94941..b5cb58bba 100644 --- a/src/tableModels/WaterTableModel.h +++ b/src/qtModels/tableModels/WaterTableModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/WaterTableModel.h is part of Brewtarget, and is copyright the following authors 2009-2024: + * qtModels/tableModels/WaterTableModel.h is part of Brewtarget, and is copyright the following authors 2009-2024: * • Jeff Bailey * • Matt Young * • Mik Firestone @@ -31,8 +31,8 @@ #include "measurement/Unit.h" #include "model/Water.h" -#include "tableModels/ItemDelegate.h" -#include "tableModels/TableModelBase.h" +#include "qtModels/tableModels/ItemDelegate.h" +#include "qtModels/tableModels/TableModelBase.h" // Forward declarations. class Water; diff --git a/src/tableModels/YeastTableModel.cpp b/src/qtModels/tableModels/YeastTableModel.cpp similarity index 96% rename from src/tableModels/YeastTableModel.cpp rename to src/qtModels/tableModels/YeastTableModel.cpp index 519343263..8824dd14d 100644 --- a/src/tableModels/YeastTableModel.cpp +++ b/src/qtModels/tableModels/YeastTableModel.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/YeastTableModel.cpp is part of Brewtarget, and is copyright the following authors 2009-2024: + * qtModels/tableModels/YeastTableModel.cpp is part of Brewtarget, and is copyright the following authors 2009-2024: * • Brian Rower * • Daniel Pettersson * • Mattias Måhl @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License along with this program. If not, see * . ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ -#include "tableModels/YeastTableModel.h" +#include "qtModels/tableModels/YeastTableModel.h" #include #include diff --git a/src/tableModels/YeastTableModel.h b/src/qtModels/tableModels/YeastTableModel.h similarity index 93% rename from src/tableModels/YeastTableModel.h rename to src/qtModels/tableModels/YeastTableModel.h index 59c8a3692..a245b088b 100644 --- a/src/tableModels/YeastTableModel.h +++ b/src/qtModels/tableModels/YeastTableModel.h @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * tableModels/YeastTableModel.h is part of Brewtarget, and is copyright the following authors 2009-2024: + * qtModels/tableModels/YeastTableModel.h is part of Brewtarget, and is copyright the following authors 2009-2024: * • Jeff Bailey * • Matt Young * • Mik Firestone @@ -31,8 +31,8 @@ #include "model/InventoryYeast.h" #include "model/Yeast.h" -#include "tableModels/ItemDelegate.h" -#include "tableModels/TableModelBase.h" +#include "qtModels/tableModels/ItemDelegate.h" +#include "qtModels/tableModels/TableModelBase.h" // Forward declarations. class BtStringConst; diff --git a/src/trees/TreeNode.h b/src/trees/TreeNode.h index dc930aa24..140bbda8c 100644 --- a/src/trees/TreeNode.h +++ b/src/trees/TreeNode.h @@ -43,7 +43,7 @@ class TreeModel; template class TreeFolderNode; /** - * \brief See comment in tableModels/TableModelBase.h for why we use a traits class to allow the following attributes + * \brief See comment in qtModels/tableModels/TableModelBase.h for why we use a traits class to allow the following attributes * from each \c Derived class to be accessible in \c TreeNodeBase: * - \c ColumnIndex = class enum for the columns of this node type * - \c Info = class enum holding just NumberOfColumns = number of entries in the above diff --git a/src/widgets/BtComboBoxNamedEntity.h b/src/widgets/BtComboBoxNamedEntity.h index fe517dd44..bc7a08a08 100755 --- a/src/widgets/BtComboBoxNamedEntity.h +++ b/src/widgets/BtComboBoxNamedEntity.h @@ -26,7 +26,7 @@ * \brief Extends \c QComboBox to show a list of a particular \c NamedEntity - eg \c Style for a \c Recipe. Used in * conjunction with \c BtComboBoxNamedEntityBase to make \c BtComboBoxNamedStyle etc, because classes inheriting * from QObject can't be templated, as the Qt MOC won't be able to process them. (See comment in - * tableModels/BtTableModel.h for more info.) + * qtModels/tableModels/BtTableModel.h for more info.) */ class BtComboBoxNamedEntity : public QComboBox { Q_OBJECT @@ -226,19 +226,19 @@ class BtComboBox##NeName : public BtComboBoxNamedEntity, \ #include "model/Style.h" #include "model/Water.h" -#include "listModels/BoilListModel.h" -#include "listModels/EquipmentListModel.h" -#include "listModels/MashListModel.h" -#include "listModels/FermentationListModel.h" -#include "listModels/StyleListModel.h" -#include "listModels/WaterListModel.h" - -#include "sortFilterProxyModels/BoilSortFilterProxyModel.h" -#include "sortFilterProxyModels/EquipmentSortFilterProxyModel.h" -#include "sortFilterProxyModels/MashSortFilterProxyModel.h" -#include "sortFilterProxyModels/FermentationSortFilterProxyModel.h" -#include "sortFilterProxyModels/StyleSortFilterProxyModel.h" -#include "sortFilterProxyModels/WaterSortFilterProxyModel.h" +#include "qtModels/listModels/BoilListModel.h" +#include "qtModels/listModels/EquipmentListModel.h" +#include "qtModels/listModels/MashListModel.h" +#include "qtModels/listModels/FermentationListModel.h" +#include "qtModels/listModels/StyleListModel.h" +#include "qtModels/listModels/WaterListModel.h" + +#include "qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/MashSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/FermentationSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.h" +#include "qtModels/sortFilterProxyModels/WaterSortFilterProxyModel.h" BT_COMBO_BOX_NAMED_ENTITY_DECL(Boil ) BT_COMBO_BOX_NAMED_ENTITY_DECL(Equipment ) diff --git a/translations/bt_ca.ts b/translations/bt_ca.ts index ae37e938e..8a1cad068 100644 --- a/translations/bt_ca.ts +++ b/translations/bt_ca.ts @@ -7074,6 +7074,14 @@ El volum final al primari és de %1. Opening Diameter + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + fermentableEditor @@ -10172,6 +10180,14 @@ El volum final al primari és de %1. Overall Impression + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + timerListDialog diff --git a/translations/bt_cs.ts b/translations/bt_cs.ts index 092a76d3a..781160c7e 100644 --- a/translations/bt_cs.ts +++ b/translations/bt_cs.ts @@ -6924,6 +6924,14 @@ Celkový objem pro hlavní kvašení je %1. Opening Diameter + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + fermentableEditor @@ -10008,6 +10016,14 @@ Celkový objem pro hlavní kvašení je %1. Overall Impression + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + timerListDialog diff --git a/translations/bt_da.ts b/translations/bt_da.ts index 8c557f10b..021db601d 100644 --- a/translations/bt_da.ts +++ b/translations/bt_da.ts @@ -140,52 +140,52 @@ BoilStepTableModel - + Name Navn - + Step Time Trin varighed - + Start Temp Starttemperatur - + Ramp Time Varighed niveau - + End Temp Sluttemperatur - + Start Acidity Startsurhedsgrad - + End Acidity Slutsurhedsgrad - + Start Gravity Startmassefylde - + End Gravity Slutmassefylde - + Chilling Type Afkølingstype @@ -193,12 +193,12 @@ BoilTableModel - + Name Navn - + Pre-Boil Size Volumen før kogning @@ -1319,22 +1319,22 @@ Logfil indeholder måske flere detaljer. EquipmentTableModel - + Name Navn - + Mash Tun Volume Mæskebeholder Volumen - + Kettle Volume Kogekar Volumen - + Fermenter Volume Gæringskar Volumen @@ -1498,12 +1498,12 @@ Logfil indeholder måske flere detaljer. Forkert kolonne: %1 - + Name Navn - + Type Type @@ -1516,22 +1516,22 @@ Logfil indeholder måske flere detaljer. Udbyttegrad % - + Inventory Lager - + Color Farve - + Yield (DBFG) % Udbytte af ekstrakt med fint kværnet malt (DBFG) % - + Amount Type Mængdeangivelse @@ -1555,62 +1555,62 @@ Logfil indeholder måske flere detaljer. FermentationStepTableModel - + Name Navn - + Step Time Trin varighed - + Start Temp Start-temp. - + End Temp Slut-temp. - + Start Acidity Startsurhedsgrad - + End Acidity Slutsurhedsgrad - + Start Gravity Startmassefylde - + End Gravity Slutmassefylde - + Free Rise Frivillig temp.stigning - + No Nej - + Yes Ja - + Vessel Beholder @@ -1618,12 +1618,12 @@ Logfil indeholder måske flere detaljer. FermentationTableModel - + Name Navn - + Number of Steps Antal trin @@ -1872,12 +1872,12 @@ Logfil indeholder måske flere detaljer. HopTableModel - + Name Navn - + Alpha % Alfa % @@ -1894,22 +1894,22 @@ Logfil indeholder måske flere detaljer. Titel: - + Form Form - + Inventory Lager - + Year År - + Amount Type Mængdeangivelse @@ -2571,32 +2571,32 @@ Hvis du har brug for hjælp, bedes du åbne en sag (issue) på %1 Forkert kolonne: %1 - + Name Navn - + Type Type - + Amount Mængde - + Infusion Temp Infusions-temp. - + Target Temp Tlsigtet temperatur - + Time Varighed @@ -2604,22 +2604,22 @@ Hvis du har brug for hjælp, bedes du åbne en sag (issue) på %1 MashTableModel - + Name Navn - + Initial Grain Temperature Malttemperatur ved start - + Total Mash Water Samlet volumen vand til mæskning - + Total Time Samlet varighed @@ -2902,12 +2902,12 @@ Hvis du har brug for hjælp, bedes du åbne en sag (issue) på %1 MiscTableModel - + Name Navn - + Type Type @@ -2924,12 +2924,12 @@ Hvis du har brug for hjælp, bedes du åbne en sag (issue) på %1 Mængde - + Amount Type Mængdeangivelse - + Inventory Lager @@ -2937,7 +2937,7 @@ Hvis du har brug for hjælp, bedes du åbne en sag (issue) på %1 NE - + Change %1 %2 Skift %1 %2 @@ -4867,47 +4867,47 @@ The final volume in the primary is %1. RecipeAdditionFermentableTableModel - + Name Navn - + Type Type - + Yield Udbytte - + Color FarveFarve - + Amount Mængde - + Amount Type Mængdeangivelse - + Inventory Lager - + Stage Trin - + Time Tid @@ -4958,47 +4958,47 @@ The final volume in the primary is %1. RecipeAdditionHopTableModel - + Name Navn - + Form Tilstand - + Alpha % Alfa % - + Year År - + Amount Mængde - + Amount Type Mængdeangivelse - + Inventory Lager - + Stage Trin - + Time Tid @@ -5049,37 +5049,37 @@ The final volume in the primary is %1. RecipeAdditionMiscTableModel - + Name Navn - + Type Type - + Amount Mængde - + Amount Type Mængdeangivelse - + Inventory Lager - + Stage Trin - + Time Tid @@ -5105,62 +5105,62 @@ The final volume in the primary is %1. RecipeAdditionYeastTableModel - + Name Navn - + Laboratory Producent - + Product ID Produkt ID - + Type Type - + Form Tilstand - + Amount Mængde - + Amount Type Mængde enhed - + Inventory Lager - + Stage Trin - + Step Trin - + Attenuation Forgæring - + Times Cultured Antal gange genhøstet @@ -5206,37 +5206,37 @@ The final volume in the primary is %1. RecipeAdjustmentSaltTableModel - + Name Navn - + Type Type - + Amount Mængde - + Amount Type Mængdeangivelse - + Inventory Lager - + Added To Føjet til - + % Acid % syre @@ -5881,22 +5881,22 @@ The final volume in the primary is %1. SaltTableModel - + Name Navn - + % Acid % syre - + Inventory Lager - + Amount Type Mængdeangivelse @@ -6063,32 +6063,32 @@ The final volume in the primary is %1. StyleTableModel - + Name Navn - + Type Type - + Category Kategori - + Category Number Kategorinummer - + Style Letter Stilart bogstav - + Style Guide Stilart guide @@ -6710,12 +6710,12 @@ The final volume in the primary is %1. Forkert model index. række = %1 - + Bad column: %1 Forkert kolonne: %1 - + Name Navn @@ -6724,32 +6724,32 @@ The final volume in the primary is %1. Mængde - + Calcium (ppm) Calcium (ppm) - + Bicarbonate (ppm) Hydrogencarbonat (ppm) - + Sulfate (ppm) Sulfat (ppm) - + Chloride (ppm) Chlorid (ppm) - + Sodium (ppm) Natrium (ppm) - + Magnesium (ppm) Magnesium (ppm) @@ -6941,17 +6941,17 @@ The final volume in the primary is %1. Forkert kolonne: %1 - + Name Navn - + Type Type - + Form Type @@ -6960,22 +6960,22 @@ The final volume in the primary is %1. Mængde - + Laboratory Producent - + Product ID Produkt ID - + Inventory Lager - + Amount Type Mængdeangivelse @@ -7469,8 +7469,8 @@ The final volume in the primary is %1. equipmentEditor - - + + Losses Tab @@ -7511,25 +7511,25 @@ The final volume in the primary is %1. - + Hot Liquor Tank Varm væske beholder - + Lauter Tun Urtfiltreringsbeholder - + Aging Vessel Lagertank - + Packaging Vessel Opbevaringstank @@ -7574,254 +7574,264 @@ The final volume in the primary is %1. Standardværdi er 100°C (212°F), men aktuel værdi varierer med højde over havet. - + + ID in database + ID i database + + + + You can normally ignore this, but it's sometimes useful for debugging. + Du kan normalt ignorere dette, men det er nogle gange nyttigt til fejlfinding. + + + Hot Liquor Tank Type Varm væske beholdertype - - - - - + + + + + Volume Volumen - + Evaporation Loss Fordampningstab - - - - + + + + Weight Masse - - - - + + + + Specific Heat Capacity Specifik varmekapacitet - + HLT Notes Varm væskebeholder notater - - - - - - - + + + + + + + Notes Notater - + Mash Tun Mæskekar - - - + + + Mash Tun Type Type af mæskekar - + Volume of mash tun Volumen af mæskekar - + This is equal to the vessel's Heat Capacity divided by its weight. Typical values are • Aluminum - 0.215 c/g·C • Copper - 0.092 c/g·C • Iron/Steel - 0.108 c/g·C • Plastic - 0.359 c/g·C. Dette er lig med beholderens varmekapacitet divideret med dens masse. Typiske værdier er • Aluminum - 0.900 J/g·°C • Kobber - 0.385 J/g·°C • Jern/stål- 0.444 J/g·°C • Plastik - 0.92 J/g·°C. - + Grain absorption Absorption i malt - + Default Absorption Standardabsorption - + How much water is permanently lost to each unit of weight of grain during mashing. The default value is 1.0875 liters per kilogram. This can fluctuate due to the fine-ness of your grind, humidity, brand, and other factors. Pressing the "Default Absorption" button will reset the value to this default. Hvor meget vand mistes pr. masseenhed af malt under mæskningen. Standardværdien er 1.0875 L/kg. Dette kan variere afhængigt af formalingsgraden, leverandør og andre faktorer. Ved klik på "Standardabsorption" vil værdien blive sat til denne standard. - + Other Mashing losses Andre tab under mæskning - + Mashing losses not included in grain absorption Tab under mæskning, som ikke er indregnet i absorption - + If you do not have a separate lauter tun, then this should include the lautering deadspace. Hvis du ikke har en særskilt urtfiltrerinsbeholder, skal denne inkludere dødvolumen ved urtfiltreringen. - + Mash Tun Notes Mæskekar notater - + Lauter Tun Type Urtfiltreringsbeholder type - + Lauter Tun Volume Urtfiltreringsbeholder volumen - - + + Deadspace Losses Dødvolumentab - + Lauter Tun Notes Urtfiltreringsbeholder notater - + Boil Kettle Kogekar - - - + + + Boil Kettle Type Kogekar type - + Pre-boil Volume Voumen før kogning - + Calculate pre-boil volume Beregn volumen før kogning - + Evaporation rate per hour Fordampningshastighed pr. time - + Kettle to Fermenter Loss Tab ved overførsel kogekar til gærkar - + Outflow per minute Aftapningshastighed pr. min - + Brew Kettle Notes Bryggekar notater - + Fermenter Gærkar - + Fermenter Type Gærkar type - + This is also known as the batch size. Dette er det samme som volumen af portion. - + Fermenter Notes Gærkar notater - + Aging Vessel Type Lagringsbeholder type - - + + Packaging Vessel Notes Opbevaringsbeholder notater - + Packaging Vessel Type Opbevaringsbeholder type - + Set as Default Vælg som standard - + New equipment Nyt udstyr - + Save and close Gem og luk - + Discard and close Annuller og luk - + Internal Diameter Indre diameter - + Opening Diameter Diameter af åbning - + New Ny - + Save Gem - + Cancel Annuller @@ -11040,62 +11050,72 @@ The final volume in the primary is %1. Type af bryg - + Max Maks - + Min Min - + + ID in database + ID i database + + + + You can normally ignore this, but it's sometimes useful for debugging. + Du kan normalt ignorere dette, men det er nogle gange nyttigt til fejlfinding. + + + OG Startmassefylde (OG) - + FG Slutmassefylde (FG) - + IBUs IBU - + Color (SRM) Farve (SRM) - + Carb (vols) Carbondioxidindhold (volumen) - + ABV (pct) Alkoholvolumenprocent (ABV) - + Ingredients Ingredienser - + Examples Eksempler - + Notes Notater - + Save Gem @@ -11115,57 +11135,57 @@ The final volume in the primary is %1. Krævet - + Ranges Intervaller - + Aroma Aroma - + Appearance Udseende - + Flavor Duft - + Mouthfeel Mundfølelse - + Overall Impression Helhedsindtryk - + New style Ny stilart - + Save and close Gem og luk - + Discard and close Annuller og luk - + New Ny - + Cancel Annuller diff --git a/translations/bt_de.ts b/translations/bt_de.ts index fd1545e60..3787b2c1f 100644 --- a/translations/bt_de.ts +++ b/translations/bt_de.ts @@ -6963,6 +6963,14 @@ Das endgültige Volumen in der Hauptgärung beträgt %1. Opening Diameter + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + fermentableEditor @@ -10045,6 +10053,14 @@ Das endgültige Volumen in der Hauptgärung beträgt %1. Overall Impression + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + timerListDialog diff --git a/translations/bt_el.ts b/translations/bt_el.ts index ff6e3cf92..c5b139a33 100644 --- a/translations/bt_el.ts +++ b/translations/bt_el.ts @@ -6956,6 +6956,14 @@ The final volume in the primary is %1. Opening Diameter + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + fermentableEditor @@ -10042,6 +10050,14 @@ The final volume in the primary is %1. Overall Impression + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + timerListDialog diff --git a/translations/bt_en.ts b/translations/bt_en.ts index 072a693b9..49bac1bff 100644 --- a/translations/bt_en.ts +++ b/translations/bt_en.ts @@ -5344,6 +5344,14 @@ The final volume in the primary is %1. Opening Diameter + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + fermentableEditor @@ -7823,6 +7831,14 @@ The final volume in the primary is %1. Cancel + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + timerListDialog diff --git a/translations/bt_es.ts b/translations/bt_es.ts index c54bf497a..38bdae3a9 100644 --- a/translations/bt_es.ts +++ b/translations/bt_es.ts @@ -7026,6 +7026,14 @@ El volumen final en el primario es %1. Opening Diameter + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + fermentableEditor @@ -10108,6 +10116,14 @@ El volumen final en el primario es %1. Overall Impression + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + timerListDialog diff --git a/translations/bt_et.ts b/translations/bt_et.ts index ac4059342..42b301a85 100644 --- a/translations/bt_et.ts +++ b/translations/bt_et.ts @@ -5440,6 +5440,14 @@ The final volume in the primary is %1. Opening Diameter + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + fermentableEditor @@ -7935,6 +7943,14 @@ The final volume in the primary is %1. Cancel + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + timerListDialog diff --git a/translations/bt_eu.ts b/translations/bt_eu.ts index f6824f228..23e3dd8c6 100644 --- a/translations/bt_eu.ts +++ b/translations/bt_eu.ts @@ -5452,6 +5452,14 @@ The final volume in the primary is %1. Opening Diameter + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + fermentableEditor @@ -7947,6 +7955,14 @@ The final volume in the primary is %1. Cancel + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + timerListDialog diff --git a/translations/bt_fr.ts b/translations/bt_fr.ts index eafa8f661..9d1d7bd6b 100644 --- a/translations/bt_fr.ts +++ b/translations/bt_fr.ts @@ -7080,6 +7080,14 @@ Le volume final dans la cuve de fermentation est de %1. Opening Diameter + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + fermentableEditor @@ -10190,6 +10198,14 @@ Le volume final dans la cuve de fermentation est de %1. Overall Impression + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + timerListDialog diff --git a/translations/bt_gl.ts b/translations/bt_gl.ts index c67180c47..26acddc99 100644 --- a/translations/bt_gl.ts +++ b/translations/bt_gl.ts @@ -5794,6 +5794,14 @@ The final volume in the primary is %1. Opening Diameter + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + fermentableEditor @@ -8328,6 +8336,14 @@ The final volume in the primary is %1. Cancel + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + timerListDialog diff --git a/translations/bt_hu.ts b/translations/bt_hu.ts index b46bc9593..bd09b9bb7 100644 --- a/translations/bt_hu.ts +++ b/translations/bt_hu.ts @@ -7002,6 +7002,14 @@ Végleges mennyiség az elsődleges erjesztőben: %1 Opening Diameter + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + fermentableEditor @@ -9912,6 +9920,14 @@ Végleges mennyiség az elsődleges erjesztőben: %1 Overall Impression + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + timerListDialog diff --git a/translations/bt_it.ts b/translations/bt_it.ts index b48436d7e..b5febc8e6 100644 --- a/translations/bt_it.ts +++ b/translations/bt_it.ts @@ -7055,6 +7055,14 @@ Il Volume finale del primo è %1. Opening Diameter + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + fermentableEditor @@ -10163,6 +10171,14 @@ Il Volume finale del primo è %1. Overall Impression + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + timerListDialog diff --git a/translations/bt_lv.ts b/translations/bt_lv.ts index f7543647d..99748d6d2 100644 --- a/translations/bt_lv.ts +++ b/translations/bt_lv.ts @@ -5627,6 +5627,14 @@ The final volume in the primary is %1. Opening Diameter + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + fermentableEditor @@ -8166,6 +8174,14 @@ The final volume in the primary is %1. Cancel + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + timerListDialog diff --git a/translations/bt_nb.ts b/translations/bt_nb.ts index 9bd750599..1ac0170aa 100644 --- a/translations/bt_nb.ts +++ b/translations/bt_nb.ts @@ -6967,6 +6967,14 @@ Sluttvolumet i primærgjæringskaret er %1. Opening Diameter + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + fermentableEditor @@ -10052,6 +10060,14 @@ Sluttvolumet i primærgjæringskaret er %1. Overall Impression + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + timerListDialog diff --git a/translations/bt_nl.ts b/translations/bt_nl.ts index e50d6c336..583a38c78 100644 --- a/translations/bt_nl.ts +++ b/translations/bt_nl.ts @@ -7088,6 +7088,14 @@ Het uiteindelijke volume in de hoofdvergisting is %1. Opening Diameter + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + fermentableEditor @@ -10046,6 +10054,14 @@ Het uiteindelijke volume in de hoofdvergisting is %1. Overall Impression + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + timerListDialog diff --git a/translations/bt_pl.ts b/translations/bt_pl.ts index 23bcc3ec3..81484cb16 100644 --- a/translations/bt_pl.ts +++ b/translations/bt_pl.ts @@ -6868,6 +6868,14 @@ Końcowa pojemność w fermentorze wyniesie %1. Opening Diameter + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + fermentableEditor @@ -9958,6 +9966,14 @@ Końcowa pojemność w fermentorze wyniesie %1. Overall Impression + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + timerListDialog diff --git a/translations/bt_pt.ts b/translations/bt_pt.ts index 9f0ba4ad0..7bd5cf972 100644 --- a/translations/bt_pt.ts +++ b/translations/bt_pt.ts @@ -6994,6 +6994,14 @@ O volume final do fermentador primário é %1. Opening Diameter + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + fermentableEditor @@ -10092,6 +10100,14 @@ O volume final do fermentador primário é %1. Overall Impression + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + timerListDialog diff --git a/translations/bt_ru.ts b/translations/bt_ru.ts index e643731a6..5fd71b546 100644 --- a/translations/bt_ru.ts +++ b/translations/bt_ru.ts @@ -7026,6 +7026,14 @@ The final volume in the primary is %1. Opening Diameter + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + fermentableEditor @@ -10100,6 +10108,14 @@ The final volume in the primary is %1. Overall Impression + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + timerListDialog diff --git a/translations/bt_sr.ts b/translations/bt_sr.ts index 54b73710d..1ad6b7aae 100644 --- a/translations/bt_sr.ts +++ b/translations/bt_sr.ts @@ -6550,6 +6550,14 @@ The final volume in the primary is %1. Opening Diameter + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + fermentableEditor @@ -9232,6 +9240,14 @@ The final volume in the primary is %1. Cancel + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + timerListDialog diff --git a/translations/bt_sv.ts b/translations/bt_sv.ts index 14a1bdb02..5f18e8450 100644 --- a/translations/bt_sv.ts +++ b/translations/bt_sv.ts @@ -7079,6 +7079,14 @@ Primärens slutgiltiga volym är %1. Opening Diameter + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + fermentableEditor @@ -10085,6 +10093,14 @@ Primärens slutgiltiga volym är %1. Overall Impression + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + timerListDialog diff --git a/translations/bt_tr.ts b/translations/bt_tr.ts index cc286e5ca..ce6051dd4 100644 --- a/translations/bt_tr.ts +++ b/translations/bt_tr.ts @@ -7064,6 +7064,14 @@ The final volume in the primary is %1. Opening Diameter + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + fermentableEditor @@ -9886,6 +9894,14 @@ The final volume in the primary is %1. Cancel İptal + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + timerListDialog diff --git a/translations/bt_zh.ts b/translations/bt_zh.ts index 5321c1e5f..0a9540250 100644 --- a/translations/bt_zh.ts +++ b/translations/bt_zh.ts @@ -6744,6 +6744,14 @@ The final volume in the primary is %1. Opening Diameter + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + fermentableEditor @@ -9814,6 +9822,14 @@ The final volume in the primary is %1. Overall Impression + + ID in database + + + + You can normally ignore this, but it's sometimes useful for debugging. + + timerListDialog From f6ceb5b1f0a45895c96918c5bcb70fee7e00896f Mon Sep 17 00:00:00 2001 From: Matt Young Date: Wed, 1 Jan 2025 19:44:40 +0100 Subject: [PATCH 2/4] Build fix --- meson.build | 104 ++++++++++++++++++++++----------------------- src/CMakeLists.txt | 72 +++++++++++++++---------------- 2 files changed, 88 insertions(+), 88 deletions(-) diff --git a/meson.build b/meson.build index 5b095334c..69c8ee086 100644 --- a/meson.build +++ b/meson.build @@ -690,23 +690,6 @@ commonSourceFiles = files([ 'src/editors/StyleEditor.cpp', 'src/editors/WaterEditor.cpp', 'src/editors/YeastEditor.cpp', - 'src/qtModels/listModels/BoilListModel.cpp', - 'src/qtModels/listModels/EquipmentListModel.cpp', - 'src/qtModels/listModels/FermentableListModel.cpp', - 'src/qtModels/listModels/FermentationListModel.cpp', - 'src/qtModels/listModels/HopListModel.cpp', - 'src/qtModels/listModels/MashListModel.cpp', - 'src/qtModels/listModels/MashStepListModel.cpp', - 'src/qtModels/listModels/MiscListModel.cpp', - 'src/qtModels/listModels/RecipeAdditionFermentableListModel.cpp', - 'src/qtModels/listModels/RecipeAdditionHopListModel.cpp', - 'src/qtModels/listModels/RecipeAdditionMiscListModel.cpp', - 'src/qtModels/listModels/RecipeAdditionYeastListModel.cpp', - 'src/qtModels/listModels/RecipeAdjustmentSaltListModel.cpp', - 'src/qtModels/listModels/SaltListModel.cpp', - 'src/qtModels/listModels/StyleListModel.cpp', - 'src/qtModels/listModels/WaterListModel.cpp', - 'src/qtModels/listModels/YeastListModel.cpp', 'src/measurement/Amount.cpp', 'src/measurement/ColorMethods.cpp', 'src/measurement/IbuMethods.cpp', @@ -750,24 +733,23 @@ commonSourceFiles = files([ 'src/model/Style.cpp', 'src/model/Water.cpp', 'src/model/Yeast.cpp', - 'src/serialization/ImportExport.cpp', - 'src/serialization/SerializationRecord.cpp', - 'src/serialization/json/BeerJson.cpp', - 'src/serialization/json/JsonCoding.cpp', - 'src/serialization/json/JsonMeasureableUnitsMapping.cpp', - 'src/serialization/json/JsonRecord.cpp', - 'src/serialization/json/JsonRecordDefinition.cpp', - 'src/serialization/json/JsonSchema.cpp', - 'src/serialization/json/JsonUtils.cpp', - 'src/serialization/json/JsonXPath.cpp', - 'src/serialization/xml/BeerXml.cpp', - 'src/serialization/xml/BtDomErrorHandler.cpp', - 'src/serialization/xml/XercesHelpers.cpp', - 'src/serialization/xml/XmlCoding.cpp', - 'src/serialization/xml/XmlMashRecord.cpp', - 'src/serialization/xml/XmlRecipeRecord.cpp', - 'src/serialization/xml/XmlRecord.cpp', - 'src/serialization/xml/XmlRecordDefinition.cpp', + 'src/qtModels/listModels/BoilListModel.cpp', + 'src/qtModels/listModels/EquipmentListModel.cpp', + 'src/qtModels/listModels/FermentableListModel.cpp', + 'src/qtModels/listModels/FermentationListModel.cpp', + 'src/qtModels/listModels/HopListModel.cpp', + 'src/qtModels/listModels/MashListModel.cpp', + 'src/qtModels/listModels/MashStepListModel.cpp', + 'src/qtModels/listModels/MiscListModel.cpp', + 'src/qtModels/listModels/RecipeAdditionFermentableListModel.cpp', + 'src/qtModels/listModels/RecipeAdditionHopListModel.cpp', + 'src/qtModels/listModels/RecipeAdditionMiscListModel.cpp', + 'src/qtModels/listModels/RecipeAdditionYeastListModel.cpp', + 'src/qtModels/listModels/RecipeAdjustmentSaltListModel.cpp', + 'src/qtModels/listModels/SaltListModel.cpp', + 'src/qtModels/listModels/StyleListModel.cpp', + 'src/qtModels/listModels/WaterListModel.cpp', + 'src/qtModels/listModels/YeastListModel.cpp', 'src/qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.cpp', 'src/qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp', 'src/qtModels/sortFilterProxyModels/FermentationSortFilterProxyModel.cpp', @@ -802,6 +784,24 @@ commonSourceFiles = files([ 'src/qtModels/tableModels/StyleTableModel.cpp', 'src/qtModels/tableModels/WaterTableModel.cpp', 'src/qtModels/tableModels/YeastTableModel.cpp', + 'src/serialization/ImportExport.cpp', + 'src/serialization/SerializationRecord.cpp', + 'src/serialization/json/BeerJson.cpp', + 'src/serialization/json/JsonCoding.cpp', + 'src/serialization/json/JsonMeasureableUnitsMapping.cpp', + 'src/serialization/json/JsonRecord.cpp', + 'src/serialization/json/JsonRecordDefinition.cpp', + 'src/serialization/json/JsonSchema.cpp', + 'src/serialization/json/JsonUtils.cpp', + 'src/serialization/json/JsonXPath.cpp', + 'src/serialization/xml/BeerXml.cpp', + 'src/serialization/xml/BtDomErrorHandler.cpp', + 'src/serialization/xml/XercesHelpers.cpp', + 'src/serialization/xml/XmlCoding.cpp', + 'src/serialization/xml/XmlMashRecord.cpp', + 'src/serialization/xml/XmlRecipeRecord.cpp', + 'src/serialization/xml/XmlRecord.cpp', + 'src/serialization/xml/XmlRecordDefinition.cpp', 'src/trees/TreeFilterProxyModel.cpp', 'src/trees/TreeModel.cpp', 'src/trees/TreeNode.cpp', @@ -923,23 +923,6 @@ mocHeaders = files([ 'src/editors/StyleEditor.h', 'src/editors/WaterEditor.h', 'src/editors/YeastEditor.h', - 'src/qtModels/listModels/BoilListModel.h', - 'src/qtModels/listModels/EquipmentListModel.h', - 'src/qtModels/listModels/FermentableListModel.h', - 'src/qtModels/listModels/FermentationListModel.h', - 'src/qtModels/listModels/HopListModel.h', - 'src/qtModels/listModels/MashListModel.h', - 'src/qtModels/listModels/MashStepListModel.h', - 'src/qtModels/listModels/MiscListModel.h', - 'src/qtModels/listModels/RecipeAdditionFermentableListModel.h', - 'src/qtModels/listModels/RecipeAdditionHopListModel.h', - 'src/qtModels/listModels/RecipeAdditionMiscListModel.h', - 'src/qtModels/listModels/RecipeAdditionYeastListModel.h', - 'src/qtModels/listModels/RecipeAdjustmentSaltListModel.h', - 'src/qtModels/listModels/SaltListModel.h', - 'src/qtModels/listModels/StyleListModel.h', - 'src/qtModels/listModels/WaterListModel.h', - 'src/qtModels/listModels/YeastListModel.h', 'src/model/Boil.h', 'src/model/BoilStep.h', 'src/model/BrewNote.h', @@ -978,6 +961,23 @@ mocHeaders = files([ 'src/model/Style.h', 'src/model/Water.h', 'src/model/Yeast.h', + 'src/qtModels/listModels/BoilListModel.h', + 'src/qtModels/listModels/EquipmentListModel.h', + 'src/qtModels/listModels/FermentableListModel.h', + 'src/qtModels/listModels/FermentationListModel.h', + 'src/qtModels/listModels/HopListModel.h', + 'src/qtModels/listModels/MashListModel.h', + 'src/qtModels/listModels/MashStepListModel.h', + 'src/qtModels/listModels/MiscListModel.h', + 'src/qtModels/listModels/RecipeAdditionFermentableListModel.h', + 'src/qtModels/listModels/RecipeAdditionHopListModel.h', + 'src/qtModels/listModels/RecipeAdditionMiscListModel.h', + 'src/qtModels/listModels/RecipeAdditionYeastListModel.h', + 'src/qtModels/listModels/RecipeAdjustmentSaltListModel.h', + 'src/qtModels/listModels/SaltListModel.h', + 'src/qtModels/listModels/StyleListModel.h', + 'src/qtModels/listModels/WaterListModel.h', + 'src/qtModels/listModels/YeastListModel.h', 'src/qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.h', 'src/qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.h', 'src/qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.h', diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2620b8ae5..11207bb45 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -61,7 +61,7 @@ set(filesToCompile_cpp ${repoDir}/src/HydrometerTool.cpp ${repoDir}/src/IbuGuSlider.cpp ${repoDir}/src/InventoryFormatter.cpp - ${repoDir}/src/LatestReleaseFinder + ${repoDir}/src/LatestReleaseFinder.cpp ${repoDir}/src/Localization.cpp ${repoDir}/src/Logging.cpp ${repoDir}/src/MainWindow.cpp @@ -121,23 +121,6 @@ set(filesToCompile_cpp ${repoDir}/src/editors/StyleEditor.cpp ${repoDir}/src/editors/WaterEditor.cpp ${repoDir}/src/editors/YeastEditor.cpp - ${repoDir}/src/qtModels/listModels/BoilListModel.cpp - ${repoDir}/src/qtModels/listModels/EquipmentListModel.cpp - ${repoDir}/src/qtModels/listModels/FermentableListModel.cpp - ${repoDir}/src/qtModels/listModels/FermentationListModel.cpp - ${repoDir}/src/qtModels/listModels/HopListModel.cpp - ${repoDir}/src/qtModels/listModels/MashListModel.cpp - ${repoDir}/src/qtModels/listModels/MashStepListModel.cpp - ${repoDir}/src/qtModels/listModels/MiscListModel.cpp - ${repoDir}/src/qtModels/listModels/RecipeAdditionFermentableListModel.cpp - ${repoDir}/src/qtModels/listModels/RecipeAdditionHopListModel.cpp - ${repoDir}/src/qtModels/listModels/RecipeAdditionMiscListModel.cpp - ${repoDir}/src/qtModels/listModels/RecipeAdditionYeastListModel.cpp - ${repoDir}/src/qtModels/listModels/RecipeAdjustmentSaltListModel.cpp - ${repoDir}/src/qtModels/listModels/SaltListModel.cpp - ${repoDir}/src/qtModels/listModels/StyleListModel.cpp - ${repoDir}/src/qtModels/listModels/WaterListModel.cpp - ${repoDir}/src/qtModels/listModels/YeastListModel.cpp ${repoDir}/src/measurement/Amount.cpp ${repoDir}/src/measurement/ColorMethods.cpp ${repoDir}/src/measurement/IbuMethods.cpp @@ -181,24 +164,23 @@ set(filesToCompile_cpp ${repoDir}/src/model/Style.cpp ${repoDir}/src/model/Water.cpp ${repoDir}/src/model/Yeast.cpp - ${repoDir}/src/serialization/ImportExport.cpp - ${repoDir}/src/serialization/SerializationRecord.cpp - ${repoDir}/src/serialization/json/BeerJson.cpp - ${repoDir}/src/serialization/json/JsonCoding.cpp - ${repoDir}/src/serialization/json/JsonMeasureableUnitsMapping.cpp - ${repoDir}/src/serialization/json/JsonRecord.cpp - ${repoDir}/src/serialization/json/JsonRecordDefinition.cpp - ${repoDir}/src/serialization/json/JsonSchema.cpp - ${repoDir}/src/serialization/json/JsonUtils.cpp - ${repoDir}/src/serialization/json/JsonXPath.cpp - ${repoDir}/src/serialization/xml/BeerXml.cpp - ${repoDir}/src/serialization/xml/BtDomErrorHandler.cpp - ${repoDir}/src/serialization/xml/XercesHelpers.cpp - ${repoDir}/src/serialization/xml/XmlCoding.cpp - ${repoDir}/src/serialization/xml/XmlMashRecord.cpp - ${repoDir}/src/serialization/xml/XmlRecipeRecord.cpp - ${repoDir}/src/serialization/xml/XmlRecord.cpp - ${repoDir}/src/serialization/xml/XmlRecordDefinition.cpp + ${repoDir}/src/qtModels/listModels/BoilListModel.cpp + ${repoDir}/src/qtModels/listModels/EquipmentListModel.cpp + ${repoDir}/src/qtModels/listModels/FermentableListModel.cpp + ${repoDir}/src/qtModels/listModels/FermentationListModel.cpp + ${repoDir}/src/qtModels/listModels/HopListModel.cpp + ${repoDir}/src/qtModels/listModels/MashListModel.cpp + ${repoDir}/src/qtModels/listModels/MashStepListModel.cpp + ${repoDir}/src/qtModels/listModels/MiscListModel.cpp + ${repoDir}/src/qtModels/listModels/RecipeAdditionFermentableListModel.cpp + ${repoDir}/src/qtModels/listModels/RecipeAdditionHopListModel.cpp + ${repoDir}/src/qtModels/listModels/RecipeAdditionMiscListModel.cpp + ${repoDir}/src/qtModels/listModels/RecipeAdditionYeastListModel.cpp + ${repoDir}/src/qtModels/listModels/RecipeAdjustmentSaltListModel.cpp + ${repoDir}/src/qtModels/listModels/SaltListModel.cpp + ${repoDir}/src/qtModels/listModels/StyleListModel.cpp + ${repoDir}/src/qtModels/listModels/WaterListModel.cpp + ${repoDir}/src/qtModels/listModels/YeastListModel.cpp ${repoDir}/src/qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.cpp ${repoDir}/src/qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp ${repoDir}/src/qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.cpp @@ -233,6 +215,24 @@ set(filesToCompile_cpp ${repoDir}/src/qtModels/tableModels/StyleTableModel.cpp ${repoDir}/src/qtModels/tableModels/WaterTableModel.cpp ${repoDir}/src/qtModels/tableModels/YeastTableModel.cpp + ${repoDir}/src/serialization/ImportExport.cpp + ${repoDir}/src/serialization/SerializationRecord.cpp + ${repoDir}/src/serialization/json/BeerJson.cpp + ${repoDir}/src/serialization/json/JsonCoding.cpp + ${repoDir}/src/serialization/json/JsonMeasureableUnitsMapping.cpp + ${repoDir}/src/serialization/json/JsonRecord.cpp + ${repoDir}/src/serialization/json/JsonRecordDefinition.cpp + ${repoDir}/src/serialization/json/JsonSchema.cpp + ${repoDir}/src/serialization/json/JsonUtils.cpp + ${repoDir}/src/serialization/json/JsonXPath.cpp + ${repoDir}/src/serialization/xml/BeerXml.cpp + ${repoDir}/src/serialization/xml/BtDomErrorHandler.cpp + ${repoDir}/src/serialization/xml/XercesHelpers.cpp + ${repoDir}/src/serialization/xml/XmlCoding.cpp + ${repoDir}/src/serialization/xml/XmlMashRecord.cpp + ${repoDir}/src/serialization/xml/XmlRecipeRecord.cpp + ${repoDir}/src/serialization/xml/XmlRecord.cpp + ${repoDir}/src/serialization/xml/XmlRecordDefinition.cpp ${repoDir}/src/trees/TreeFilterProxyModel.cpp ${repoDir}/src/trees/TreeModel.cpp ${repoDir}/src/trees/TreeNode.cpp From de9fff63b4abe141316fe7883aa1144a0d0e88f1 Mon Sep 17 00:00:00 2001 From: Matt Young Date: Thu, 2 Jan 2025 08:16:50 +0100 Subject: [PATCH 3/4] Build fixes 2 --- src/AboutDialog.cpp | 7 +++++-- src/AlcoholTool.cpp | 3 +++ src/AncestorDialog.cpp | 3 +++ src/BeerColorWidget.cpp | 3 +++ src/BrewDayFormatter.cpp | 3 +++ src/BrewDayScrollWidget.cpp | 3 +++ src/BrewNoteWidget.cpp | 3 +++ src/BtDatePopup.cpp | 3 +++ src/BtSplashScreen.cpp | 3 +++ src/BtTabWidget.cpp | 3 +++ src/BtTextEdit.cpp | 3 +++ src/ConverterTool.cpp | 3 +++ src/HelpDialog.cpp | 3 +++ src/HydrometerTool.cpp | 3 +++ src/IbuGuSlider.cpp | 3 +++ src/LatestReleaseFinder.cpp | 3 +++ src/MainWindow.cpp | 3 +++ src/MashDesigner.cpp | 3 +++ src/MashWizard.cpp | 3 +++ src/NamedEntitySortProxyModel.cpp | 3 +++ src/OgAdjuster.cpp | 3 +++ src/OptionDialog.cpp | 3 +++ src/PitchDialog.cpp | 3 +++ src/PrimingDialog.cpp | 3 +++ src/PrintAndPreviewDialog.cpp | 3 +++ src/RangedSlider.cpp | 3 +++ src/RecipeExtrasWidget.cpp | 3 +++ src/RecipeFormatter.cpp | 3 +++ src/RefractoDialog.cpp | 3 +++ src/ScaleRecipeTool.cpp | 3 +++ src/StrikeWaterDialog.cpp | 3 +++ src/StyleRangeWidget.cpp | 3 +++ src/TimerListDialog.cpp | 3 +++ src/TimerMainDialog.cpp | 3 +++ src/TimerWidget.cpp | 3 +++ src/WaterDialog.cpp | 3 +++ src/boiltime.cpp | 3 +++ src/buttons/BoilButton.cpp | 3 +++ src/buttons/EquipmentButton.cpp | 3 +++ src/buttons/FermentationButton.cpp | 3 +++ src/buttons/MashButton.cpp | 3 +++ src/buttons/RecipeAttributeButton.cpp | 3 +++ src/buttons/StyleButton.cpp | 3 +++ src/buttons/WaterButton.cpp | 3 +++ src/catalogs/EquipmentCatalog.cpp | 3 +++ src/catalogs/FermentableCatalog.cpp | 3 +++ src/catalogs/HopCatalog.cpp | 3 +++ src/catalogs/MiscCatalog.cpp | 3 +++ src/catalogs/StyleCatalog.cpp | 3 +++ src/catalogs/YeastCatalog.cpp | 3 +++ src/database/ObjectStore.cpp | 3 +++ src/editors/BoilEditor.cpp | 3 +++ src/editors/BoilStepEditor.cpp | 3 +++ src/editors/EquipmentEditor.cpp | 3 +++ src/editors/FermentableEditor.cpp | 3 +++ src/editors/FermentationEditor.cpp | 3 +++ src/editors/FermentationStepEditor.cpp | 3 +++ src/editors/HopEditor.cpp | 3 +++ src/editors/MashEditor.cpp | 3 +++ src/editors/MashStepEditor.cpp | 3 +++ src/editors/MiscEditor.cpp | 3 +++ src/editors/NamedMashEditor.cpp | 3 +++ src/editors/StyleEditor.cpp | 3 +++ src/editors/WaterEditor.cpp | 3 +++ src/editors/YeastEditor.cpp | 3 +++ src/model/Boil.cpp | 3 +++ src/model/BoilStep.cpp | 3 +++ src/model/BrewNote.cpp | 3 +++ src/model/Equipment.cpp | 3 +++ src/model/Fermentable.cpp | 3 +++ src/model/Fermentation.cpp | 3 +++ src/model/FermentationStep.cpp | 3 +++ src/model/Folder.cpp | 3 +++ src/model/Hop.cpp | 3 +++ src/model/Ingredient.cpp | 3 +++ src/model/IngredientInRecipe.cpp | 3 +++ src/model/Instruction.cpp | 3 +++ src/model/Inventory.cpp | 3 +++ src/model/Mash.cpp | 3 +++ src/model/MashStep.cpp | 3 +++ src/model/Misc.cpp | 3 +++ src/model/NamedEntity.cpp | 3 +++ src/model/OutlineableNamedEntity.cpp | 3 +++ src/model/OwnedByRecipe.cpp | 3 +++ src/model/Recipe.cpp | 3 +++ src/model/RecipeAddition.cpp | 3 +++ src/model/RecipeAdditionFermentable.cpp | 5 ++++- src/model/RecipeAdditionFermentable.h | 2 -- src/model/RecipeAdditionHop.cpp | 5 ++++- src/model/RecipeAdditionHop.h | 2 -- src/model/RecipeAdditionMisc.cpp | 5 ++++- src/model/RecipeAdditionMisc.h | 2 -- src/model/RecipeAdditionYeast.cpp | 5 ++++- src/model/RecipeAdditionYeast.h | 2 -- src/model/RecipeAdjustmentSalt.cpp | 5 ++++- src/model/RecipeAdjustmentSalt.h | 4 ---- src/model/RecipeUseOfWater.cpp | 5 ++++- src/model/RecipeUseOfWater.h | 2 -- src/model/Salt.cpp | 3 +++ src/model/Step.cpp | 3 +++ src/model/StepExtended.cpp | 3 +++ src/model/Style.cpp | 3 +++ src/model/Water.cpp | 3 +++ src/model/Yeast.cpp | 3 +++ src/qtModels/listModels/BoilListModel.cpp | 3 +++ src/qtModels/listModels/EquipmentListModel.cpp | 3 +++ src/qtModels/listModels/FermentableListModel.cpp | 3 +++ src/qtModels/listModels/FermentationListModel.cpp | 3 +++ src/qtModels/listModels/HopListModel.cpp | 3 +++ src/qtModels/listModels/MashListModel.cpp | 3 +++ src/qtModels/listModels/MashStepListModel.cpp | 3 +++ src/qtModels/listModels/MiscListModel.cpp | 3 +++ .../listModels/RecipeAdditionFermentableListModel.cpp | 3 +++ src/qtModels/listModels/RecipeAdditionHopListModel.cpp | 3 +++ src/qtModels/listModels/RecipeAdditionMiscListModel.cpp | 3 +++ src/qtModels/listModels/RecipeAdditionYeastListModel.cpp | 3 +++ src/qtModels/listModels/RecipeAdjustmentSaltListModel.cpp | 3 +++ src/qtModels/listModels/SaltListModel.cpp | 3 +++ src/qtModels/listModels/StyleListModel.cpp | 3 +++ src/qtModels/listModels/WaterListModel.cpp | 3 +++ src/qtModels/listModels/YeastListModel.cpp | 3 +++ .../sortFilterProxyModels/BoilSortFilterProxyModel.cpp | 3 +++ .../EquipmentSortFilterProxyModel.cpp | 3 +++ .../FermentableSortFilterProxyModel.cpp | 3 +++ .../FermentationSortFilterProxyModel.cpp | 3 +++ .../sortFilterProxyModels/HopSortFilterProxyModel.cpp | 3 +++ .../sortFilterProxyModels/MashSortFilterProxyModel.cpp | 3 +++ .../sortFilterProxyModels/MiscSortFilterProxyModel.cpp | 3 +++ .../RecipeAdditionFermentableSortFilterProxyModel.cpp | 3 +++ .../RecipeAdditionHopSortFilterProxyModel.cpp | 3 +++ .../RecipeAdditionMiscSortFilterProxyModel.cpp | 3 +++ .../RecipeAdditionYeastSortFilterProxyModel.cpp | 3 +++ .../sortFilterProxyModels/StyleSortFilterProxyModel.cpp | 3 +++ .../sortFilterProxyModels/WaterSortFilterProxyModel.cpp | 3 +++ .../sortFilterProxyModels/YeastSortFilterProxyModel.cpp | 3 +++ src/qtModels/tableModels/BoilStepTableModel.cpp | 3 +++ src/qtModels/tableModels/BoilTableModel.cpp | 3 +++ src/qtModels/tableModels/BtTableModel.cpp | 3 +++ src/qtModels/tableModels/EquipmentTableModel.cpp | 3 +++ src/qtModels/tableModels/FermentableTableModel.cpp | 3 +++ src/qtModels/tableModels/FermentationStepTableModel.cpp | 3 +++ src/qtModels/tableModels/FermentationTableModel.cpp | 3 +++ src/qtModels/tableModels/HopTableModel.cpp | 3 +++ src/qtModels/tableModels/MashStepTableModel.cpp | 3 +++ src/qtModels/tableModels/MashTableModel.cpp | 3 +++ src/qtModels/tableModels/MiscTableModel.cpp | 3 +++ .../tableModels/RecipeAdditionFermentableTableModel.cpp | 3 +++ src/qtModels/tableModels/RecipeAdditionHopTableModel.cpp | 3 +++ src/qtModels/tableModels/RecipeAdditionMiscTableModel.cpp | 3 +++ src/qtModels/tableModels/RecipeAdditionYeastTableModel.cpp | 3 +++ .../tableModels/RecipeAdjustmentSaltTableModel.cpp | 3 +++ src/qtModels/tableModels/SaltTableModel.cpp | 3 +++ src/qtModels/tableModels/StyleTableModel.cpp | 3 +++ src/qtModels/tableModels/WaterTableModel.cpp | 3 +++ src/qtModels/tableModels/YeastTableModel.cpp | 3 +++ src/trees/TreeFilterProxyModel.cpp | 3 +++ src/trees/TreeModel.cpp | 3 +++ src/trees/TreeView.cpp | 3 +++ src/widgets/Animator.cpp | 3 +++ src/widgets/BtComboBoxBool.cpp | 3 +++ src/widgets/BtComboBoxEnum.cpp | 3 +++ src/widgets/BtComboBoxNamedEntity.cpp | 3 +++ src/widgets/BtOptionalDateEdit.cpp | 3 +++ src/widgets/InfoButton.cpp | 3 +++ src/widgets/InfoText.cpp | 3 +++ src/widgets/SelectionControl.cpp | 3 +++ src/widgets/SmartCheckBox.cpp | 3 +++ src/widgets/SmartDigitWidget.cpp | 3 +++ src/widgets/SmartLabel.cpp | 3 +++ src/widgets/SmartLineEdit.cpp | 3 +++ src/widgets/ToggleSwitch.cpp | 3 +++ 171 files changed, 503 insertions(+), 22 deletions(-) mode change 100755 => 100644 src/AboutDialog.cpp mode change 100755 => 100644 src/HelpDialog.cpp mode change 100755 => 100644 src/buttons/BoilButton.cpp mode change 100755 => 100644 src/buttons/EquipmentButton.cpp mode change 100755 => 100644 src/buttons/FermentationButton.cpp mode change 100755 => 100644 src/buttons/MashButton.cpp mode change 100755 => 100644 src/buttons/RecipeAttributeButton.cpp mode change 100755 => 100644 src/buttons/StyleButton.cpp mode change 100755 => 100644 src/buttons/WaterButton.cpp mode change 100755 => 100644 src/catalogs/EquipmentCatalog.cpp mode change 100755 => 100644 src/catalogs/FermentableCatalog.cpp mode change 100755 => 100644 src/catalogs/HopCatalog.cpp mode change 100755 => 100644 src/catalogs/MiscCatalog.cpp mode change 100755 => 100644 src/catalogs/StyleCatalog.cpp mode change 100755 => 100644 src/catalogs/YeastCatalog.cpp mode change 100755 => 100644 src/editors/BoilEditor.cpp mode change 100755 => 100644 src/editors/BoilStepEditor.cpp mode change 100755 => 100644 src/editors/EquipmentEditor.cpp mode change 100755 => 100644 src/editors/FermentableEditor.cpp mode change 100755 => 100644 src/editors/FermentationEditor.cpp mode change 100755 => 100644 src/editors/FermentationStepEditor.cpp mode change 100755 => 100644 src/editors/HopEditor.cpp mode change 100755 => 100644 src/editors/MashEditor.cpp mode change 100755 => 100644 src/editors/MashStepEditor.cpp mode change 100755 => 100644 src/editors/MiscEditor.cpp mode change 100755 => 100644 src/editors/NamedMashEditor.cpp mode change 100755 => 100644 src/editors/StyleEditor.cpp mode change 100755 => 100644 src/editors/WaterEditor.cpp mode change 100755 => 100644 src/editors/YeastEditor.cpp mode change 100755 => 100644 src/model/Boil.cpp mode change 100755 => 100644 src/model/BoilStep.cpp mode change 100755 => 100644 src/model/Fermentation.cpp mode change 100755 => 100644 src/model/FermentationStep.cpp mode change 100755 => 100644 src/model/Ingredient.cpp mode change 100755 => 100644 src/model/IngredientInRecipe.cpp mode change 100755 => 100644 src/model/OutlineableNamedEntity.cpp mode change 100755 => 100644 src/model/OwnedByRecipe.cpp mode change 100755 => 100644 src/model/RecipeAddition.cpp mode change 100755 => 100644 src/model/RecipeAdditionFermentable.cpp mode change 100755 => 100644 src/model/RecipeAdditionHop.cpp mode change 100755 => 100644 src/model/RecipeAdditionMisc.cpp mode change 100755 => 100644 src/model/RecipeAdditionYeast.cpp mode change 100755 => 100644 src/model/RecipeAdjustmentSalt.cpp mode change 100755 => 100644 src/model/RecipeUseOfWater.cpp mode change 100755 => 100644 src/model/Step.cpp mode change 100755 => 100644 src/model/StepExtended.cpp mode change 100755 => 100644 src/qtModels/listModels/EquipmentListModel.cpp mode change 100755 => 100644 src/qtModels/listModels/FermentableListModel.cpp mode change 100755 => 100644 src/qtModels/listModels/HopListModel.cpp mode change 100755 => 100644 src/qtModels/listModels/MashListModel.cpp mode change 100755 => 100644 src/qtModels/listModels/MashStepListModel.cpp mode change 100755 => 100644 src/qtModels/listModels/MiscListModel.cpp mode change 100755 => 100644 src/qtModels/listModels/RecipeAdditionFermentableListModel.cpp mode change 100755 => 100644 src/qtModels/listModels/RecipeAdditionHopListModel.cpp mode change 100755 => 100644 src/qtModels/listModels/RecipeAdditionMiscListModel.cpp mode change 100755 => 100644 src/qtModels/listModels/RecipeAdditionYeastListModel.cpp mode change 100755 => 100644 src/qtModels/listModels/RecipeAdjustmentSaltListModel.cpp mode change 100755 => 100644 src/qtModels/listModels/SaltListModel.cpp mode change 100755 => 100644 src/qtModels/listModels/StyleListModel.cpp mode change 100755 => 100644 src/qtModels/listModels/WaterListModel.cpp mode change 100755 => 100644 src/qtModels/listModels/YeastListModel.cpp mode change 100755 => 100644 src/qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp mode change 100755 => 100644 src/qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.cpp mode change 100755 => 100644 src/qtModels/sortFilterProxyModels/HopSortFilterProxyModel.cpp mode change 100755 => 100644 src/qtModels/sortFilterProxyModels/MiscSortFilterProxyModel.cpp mode change 100755 => 100644 src/qtModels/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.cpp mode change 100755 => 100644 src/qtModels/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.cpp mode change 100755 => 100644 src/qtModels/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.cpp mode change 100755 => 100644 src/qtModels/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.cpp mode change 100755 => 100644 src/qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.cpp mode change 100755 => 100644 src/qtModels/sortFilterProxyModels/WaterSortFilterProxyModel.cpp mode change 100755 => 100644 src/qtModels/sortFilterProxyModels/YeastSortFilterProxyModel.cpp mode change 100755 => 100644 src/qtModels/tableModels/BoilStepTableModel.cpp mode change 100755 => 100644 src/qtModels/tableModels/EquipmentTableModel.cpp mode change 100755 => 100644 src/qtModels/tableModels/FermentationStepTableModel.cpp mode change 100755 => 100644 src/qtModels/tableModels/RecipeAdditionFermentableTableModel.cpp mode change 100755 => 100644 src/qtModels/tableModels/RecipeAdditionHopTableModel.cpp mode change 100755 => 100644 src/qtModels/tableModels/RecipeAdditionMiscTableModel.cpp mode change 100755 => 100644 src/qtModels/tableModels/RecipeAdditionYeastTableModel.cpp mode change 100755 => 100644 src/qtModels/tableModels/RecipeAdjustmentSaltTableModel.cpp mode change 100755 => 100644 src/qtModels/tableModels/StyleTableModel.cpp mode change 100755 => 100644 src/trees/TreeFilterProxyModel.cpp mode change 100755 => 100644 src/widgets/BtComboBoxBool.cpp mode change 100755 => 100644 src/widgets/BtComboBoxEnum.cpp mode change 100755 => 100644 src/widgets/BtComboBoxNamedEntity.cpp mode change 100755 => 100644 src/widgets/BtOptionalDateEdit.cpp mode change 100755 => 100644 src/widgets/InfoButton.cpp mode change 100755 => 100644 src/widgets/InfoText.cpp mode change 100755 => 100644 src/widgets/SmartCheckBox.cpp diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp old mode 100755 new mode 100644 index bfde683cb..7cc3599d6 --- a/src/AboutDialog.cpp +++ b/src/AboutDialog.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * AboutDialog.cpp is part of Brewtarget, and is copyright the following authors 2009-2022: + * AboutDialog.cpp is part of Brewtarget, and is copyright the following authors 2009-2025: * • Matt Young * • Philip Greggory Lee * @@ -27,6 +27,9 @@ #include "config.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_AboutDialog.cpp" + AboutDialog::AboutDialog(QWidget * parent) : QDialog(parent), label(0) { @@ -139,7 +142,7 @@ AboutDialog::AboutDialog(QWidget * parent) : "
  • 2015 Markus Mårtensson <mackan.90@gmail.com>
    • " "
  • 2017 Matt Anderson <matt.anderson@is4s.com>
    • " // Commit is "andersonm ", but second name clear from email "
  • 2020-2022 Mattias Måhl <mattias@kejsarsten.com>
    • " - "
  • 2020-2024 Matt Young <mfsy@yahoo.com>
    • " + "
  • 2020-2025 Matt Young <mfsy@yahoo.com>
    • " "
  • 2014-2017 Maxime Lavigne <duguigne@gmail.com>
    • " "
  • 2018 Medic Momcilo <medicmomcilo@gmail.com>
    • " "
  • 2016 Mike Evans <mikee@saxicola.co.uk>
    • " diff --git a/src/AlcoholTool.cpp b/src/AlcoholTool.cpp index 9e58197e5..1aa9925e8 100644 --- a/src/AlcoholTool.cpp +++ b/src/AlcoholTool.cpp @@ -34,6 +34,9 @@ #include "measurement/SystemOfMeasurement.h" #include "widgets/ToggleSwitch.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_AlcoholTool.cpp" + // Settings we only use in this file under the PersistentSettings::Sections::alcoholTool section #define AddSettingName(name) namespace { BtStringConst const name{#name}; } AddSettingName(advancedInputsEnabled) diff --git a/src/AncestorDialog.cpp b/src/AncestorDialog.cpp index db1035542..6f5b6a009 100644 --- a/src/AncestorDialog.cpp +++ b/src/AncestorDialog.cpp @@ -37,6 +37,9 @@ #include "model/NamedEntity.h" #include "model/Recipe.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_AncestorDialog.cpp" + AncestorDialog::AncestorDialog(QWidget * parent) : QDialog(parent) { setupUi(this); diff --git a/src/BeerColorWidget.cpp b/src/BeerColorWidget.cpp index 7f64861a1..93b9d6ebf 100644 --- a/src/BeerColorWidget.cpp +++ b/src/BeerColorWidget.cpp @@ -26,6 +26,9 @@ #include "config.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_BeerColorWidget.cpp" + // TODO: make the size adjust inside the container. BeerColorWidget::BeerColorWidget(QWidget* parent) : QWidget(parent) { //setFixedSize(QSize(90,130)); diff --git a/src/BrewDayFormatter.cpp b/src/BrewDayFormatter.cpp index e2b4b5290..567a07ced 100644 --- a/src/BrewDayFormatter.cpp +++ b/src/BrewDayFormatter.cpp @@ -30,6 +30,9 @@ #include "model/Style.h" #include "PersistentSettings.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_BrewDayFormatter.cpp" + BrewDayFormatter::BrewDayFormatter(QObject * parent) : QObject(parent) { recObs = nullptr; diff --git a/src/BrewDayScrollWidget.cpp b/src/BrewDayScrollWidget.cpp index 20067348e..6a1e0b403 100644 --- a/src/BrewDayScrollWidget.cpp +++ b/src/BrewDayScrollWidget.cpp @@ -41,6 +41,9 @@ #include "PersistentSettings.h" #include "TimerWidget.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_BrewDayScrollWidget.cpp" + namespace { QString styleName(Style const * style) { if (!style) { diff --git a/src/BrewNoteWidget.cpp b/src/BrewNoteWidget.cpp index 7e888eced..554ebc93d 100644 --- a/src/BrewNoteWidget.cpp +++ b/src/BrewNoteWidget.cpp @@ -29,6 +29,9 @@ #include "model/BrewNote.h" #include "PersistentSettings.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_BrewNoteWidget.cpp" + namespace { double const lowLimitPct = 0.95; double const highLimitPct = 1.05; diff --git a/src/BtDatePopup.cpp b/src/BtDatePopup.cpp index a772b44a6..716f1c953 100644 --- a/src/BtDatePopup.cpp +++ b/src/BtDatePopup.cpp @@ -20,6 +20,9 @@ #include #include "BtDatePopup.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_BtDatePopup.cpp" + //! \brief set up the popup window. BtDatePopup::BtDatePopup(QWidget* parent) : QDialog(parent, Qt::Popup) { diff --git a/src/BtSplashScreen.cpp b/src/BtSplashScreen.cpp index 222d12afc..ef73aeba3 100644 --- a/src/BtSplashScreen.cpp +++ b/src/BtSplashScreen.cpp @@ -21,6 +21,9 @@ #include "config.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_BtSplashScreen.cpp" + namespace { static QString const logoFile = QString{":images/%1.svg"}.arg(CONFIG_APPLICATION_NAME_LC); } diff --git a/src/BtTabWidget.cpp b/src/BtTabWidget.cpp index 4eaf9cbc7..1786ed1bf 100644 --- a/src/BtTabWidget.cpp +++ b/src/BtTabWidget.cpp @@ -26,6 +26,9 @@ #include "model/Recipe.h" #include "model/Style.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_BtTabWidget.cpp" + //! \brief set up the popup window. BtTabWidget::BtTabWidget(QWidget* parent) : diff --git a/src/BtTextEdit.cpp b/src/BtTextEdit.cpp index e5dded85f..c16d37995 100644 --- a/src/BtTextEdit.cpp +++ b/src/BtTextEdit.cpp @@ -22,6 +22,9 @@ #include #include +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_BtTextEdit.cpp" + BtTextEdit::BtTextEdit([[maybe_unused]] QWidget * parent) : wasModified{false} { // We will see if this works... diff --git a/src/ConverterTool.cpp b/src/ConverterTool.cpp index fe4841b46..7eeceb194 100644 --- a/src/ConverterTool.cpp +++ b/src/ConverterTool.cpp @@ -24,6 +24,9 @@ #include "measurement/Unit.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_ConverterTool.cpp" + ConverterTool::ConverterTool(QWidget* parent) : QDialog(parent) { this->doLayout(); diff --git a/src/HelpDialog.cpp b/src/HelpDialog.cpp old mode 100755 new mode 100644 index 06b9b3f45..664987e00 --- a/src/HelpDialog.cpp +++ b/src/HelpDialog.cpp @@ -25,6 +25,9 @@ #include "Logging.h" #include "PersistentSettings.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_HelpDialog.cpp" + // This private implementation class holds all private non-virtual members of HelpDialog class HelpDialog::impl { diff --git a/src/HydrometerTool.cpp b/src/HydrometerTool.cpp index ead974d7a..d3ce9a4de 100644 --- a/src/HydrometerTool.cpp +++ b/src/HydrometerTool.cpp @@ -32,6 +32,9 @@ #include "Algorithms.h" #include "measurement/Unit.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_HydrometerTool.cpp" + HydrometerTool::HydrometerTool(QWidget* parent) : QDialog(parent) { this->doLayout(); diff --git a/src/IbuGuSlider.cpp b/src/IbuGuSlider.cpp index 421f67d0c..7f3b67026 100644 --- a/src/IbuGuSlider.cpp +++ b/src/IbuGuSlider.cpp @@ -16,6 +16,9 @@ #include "IbuGuSlider.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_IbuGuSlider.cpp" + IbuGuSlider::IbuGuSlider(QWidget* parent) : RangedSlider(parent) { diff --git a/src/LatestReleaseFinder.cpp b/src/LatestReleaseFinder.cpp index 6d20cac8c..e7246b7fa 100644 --- a/src/LatestReleaseFinder.cpp +++ b/src/LatestReleaseFinder.cpp @@ -28,6 +28,9 @@ #include "config.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_LatestReleaseFinder.cpp" + void LatestReleaseFinder::checkMainRespository() { // diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 087c7d532..2d4483fdf 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -159,6 +159,9 @@ #include "utils/BtStringConst.h" #include "utils/OptionalHelpers.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_MainWindow.cpp" + namespace { /** diff --git a/src/MashDesigner.cpp b/src/MashDesigner.cpp index 91d192d75..3fddbdb84 100644 --- a/src/MashDesigner.cpp +++ b/src/MashDesigner.cpp @@ -32,6 +32,9 @@ #include "model/Fermentable.h" #include "PhysicalConstants.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_MashDesigner.cpp" + MashDesigner::MashDesigner(QWidget * parent) : QDialog {parent}, m_recObs {nullptr}, m_mash {nullptr}, diff --git a/src/MashWizard.cpp b/src/MashWizard.cpp index 61458fd4a..0a66ccf2f 100644 --- a/src/MashWizard.cpp +++ b/src/MashWizard.cpp @@ -37,6 +37,9 @@ #include "model/MashStep.h" #include "PhysicalConstants.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_MashWizard.cpp" + MashWizard::MashWizard(QWidget* parent) : QDialog(parent), m_recObs{nullptr}, diff --git a/src/NamedEntitySortProxyModel.cpp b/src/NamedEntitySortProxyModel.cpp index b047dd365..8cb5ac3cf 100644 --- a/src/NamedEntitySortProxyModel.cpp +++ b/src/NamedEntitySortProxyModel.cpp @@ -19,6 +19,9 @@ #include #include +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_NamedEntitySortProxyModel.cpp" + NamedEntitySortProxyModel::NamedEntitySortProxyModel(QAbstractItemModel* sourceModel) : QSortFilterProxyModel(sourceModel) { diff --git a/src/OgAdjuster.cpp b/src/OgAdjuster.cpp index b4a9dcf27..62c6fd2f5 100644 --- a/src/OgAdjuster.cpp +++ b/src/OgAdjuster.cpp @@ -26,6 +26,9 @@ #include "model/Equipment.h" #include "model/Recipe.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_OgAdjuster.cpp" + OgAdjuster::OgAdjuster( QWidget* parent ) : QDialog{parent}, recObs {nullptr} { diff --git a/src/OptionDialog.cpp b/src/OptionDialog.cpp index d845efe74..b106ec489 100644 --- a/src/OptionDialog.cpp +++ b/src/OptionDialog.cpp @@ -52,6 +52,9 @@ #include "measurement/UnitSystem.h" #include "PersistentSettings.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_OptionDialog.cpp" + // // Anonymous namespace for constants, global variables and functions used only in this file // diff --git a/src/PitchDialog.cpp b/src/PitchDialog.cpp index eeaa1e317..a906648b7 100644 --- a/src/PitchDialog.cpp +++ b/src/PitchDialog.cpp @@ -29,6 +29,9 @@ #include "measurement/Unit.h" #include "PersistentSettings.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_PitchDialog.cpp" + PitchDialog::PitchDialog(QWidget* parent) : QDialog(parent) { setupUi(this); diff --git a/src/PrimingDialog.cpp b/src/PrimingDialog.cpp index 591687d68..f250df392 100644 --- a/src/PrimingDialog.cpp +++ b/src/PrimingDialog.cpp @@ -27,6 +27,9 @@ #include "measurement/Unit.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_PrimingDialog.cpp" + PrimingDialog::PrimingDialog(QWidget* parent) : QDialog(parent) { this->setupUi(this); diff --git a/src/PrintAndPreviewDialog.cpp b/src/PrintAndPreviewDialog.cpp index a5c702aeb..b1cfcd0af 100644 --- a/src/PrintAndPreviewDialog.cpp +++ b/src/PrintAndPreviewDialog.cpp @@ -29,6 +29,9 @@ #include "InventoryFormatter.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_PrintAndPreviewDialog.cpp" + /** * @brief Construct a new Print And Preview Dialog:: Print And Preview Dialog object * diff --git a/src/RangedSlider.cpp b/src/RangedSlider.cpp index df220a3d5..6260fe729 100644 --- a/src/RangedSlider.cpp +++ b/src/RangedSlider.cpp @@ -34,6 +34,9 @@ #include #include +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RangedSlider.cpp" + RangedSlider::RangedSlider(QWidget* parent) : QWidget(parent), m_min(0.0), diff --git a/src/RecipeExtrasWidget.cpp b/src/RecipeExtrasWidget.cpp index 858fe5668..203cb0764 100644 --- a/src/RecipeExtrasWidget.cpp +++ b/src/RecipeExtrasWidget.cpp @@ -28,6 +28,9 @@ #include "undoRedo/Undoable.h" #include "utils/OptionalHelpers.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RecipeExtrasWidget.cpp" + RecipeExtrasWidget::RecipeExtrasWidget(QWidget* parent) : QWidget(parent), recipe(nullptr), diff --git a/src/RecipeFormatter.cpp b/src/RecipeFormatter.cpp index f06fe4034..3be7aef61 100644 --- a/src/RecipeFormatter.cpp +++ b/src/RecipeFormatter.cpp @@ -58,6 +58,9 @@ #include "model/Yeast.h" #include "PersistentSettings.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RecipeFormatter.cpp" + namespace { //! Get the maximum number of characters in a list of strings. unsigned int getMaxLength(QStringList & list) { diff --git a/src/RefractoDialog.cpp b/src/RefractoDialog.cpp index 349fdcd62..cfc946692 100644 --- a/src/RefractoDialog.cpp +++ b/src/RefractoDialog.cpp @@ -29,6 +29,9 @@ #include "Algorithms.h" #include "measurement/Measurement.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RefractoDialog.cpp" + RefractoDialog::RefractoDialog(QWidget* parent) : QDialog(parent) { setupUi(this); diff --git a/src/ScaleRecipeTool.cpp b/src/ScaleRecipeTool.cpp index 0dfdfcd5d..5504a047e 100644 --- a/src/ScaleRecipeTool.cpp +++ b/src/ScaleRecipeTool.cpp @@ -41,6 +41,9 @@ #include "model/Yeast.h" #include "NamedEntitySortProxyModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_ScaleRecipeTool.cpp" + ScaleRecipeTool::ScaleRecipeTool(QWidget* parent) : QWizard(parent), equipListModel(new EquipmentListModel(this)), diff --git a/src/StrikeWaterDialog.cpp b/src/StrikeWaterDialog.cpp index ce766cb45..285d04154 100644 --- a/src/StrikeWaterDialog.cpp +++ b/src/StrikeWaterDialog.cpp @@ -22,6 +22,9 @@ #include +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_StrikeWaterDialog.cpp" + namespace { // From Northern Brewer ~0.38 but Jon Palmer suggest 0.41 // to compensate for the lost to the tun even if the tun is pre-heated diff --git a/src/StyleRangeWidget.cpp b/src/StyleRangeWidget.cpp index 24de90b9d..176854390 100644 --- a/src/StyleRangeWidget.cpp +++ b/src/StyleRangeWidget.cpp @@ -19,6 +19,9 @@ #include #include +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_StyleRangeWidget.cpp" + StyleRangeWidget::StyleRangeWidget(QWidget* parent) : RangedSlider(parent) { setBackgroundBrush(QColor(121,201,121)); setPreferredRangeBrush(QColor(0,127,0)); diff --git a/src/TimerListDialog.cpp b/src/TimerListDialog.cpp index 2fa38ef08..c64913af9 100644 --- a/src/TimerListDialog.cpp +++ b/src/TimerListDialog.cpp @@ -21,6 +21,9 @@ #include "TimerWidget.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_TimerListDialog.cpp" + TimerListDialog::TimerListDialog(QWidget* parent, QList* timers) : QDialog(parent) { this->setWindowTitle(tr("Addition Timers")); diff --git a/src/TimerMainDialog.cpp b/src/TimerMainDialog.cpp index 72e3930d2..1e66df26e 100644 --- a/src/TimerMainDialog.cpp +++ b/src/TimerMainDialog.cpp @@ -29,6 +29,9 @@ #include "TimerListDialog.h" #include "TimerWidget.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_TimerMainDialog.cpp" + TimerMainDialog::TimerMainDialog(MainWindow* parent) : QDialog{parent}, mainWindow{parent}, diff --git a/src/TimerWidget.cpp b/src/TimerWidget.cpp index edb357f57..1d5963f06 100644 --- a/src/TimerWidget.cpp +++ b/src/TimerWidget.cpp @@ -36,6 +36,9 @@ #include "TimerMainDialog.h" #include "utils/TimerUtils.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_TimerWidget.cpp" + TimerWidget::TimerWidget(TimerMainDialog *parent, BoilTime* bt) : QDialog{parent}, // ui{new Ui::timerWidget}, diff --git a/src/WaterDialog.cpp b/src/WaterDialog.cpp index d78a837bc..642eefcb7 100644 --- a/src/WaterDialog.cpp +++ b/src/WaterDialog.cpp @@ -43,6 +43,9 @@ #include "qtModels/sortFilterProxyModels/WaterSortFilterProxyModel.h" #include "widgets/SmartDigitWidget.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_WaterDialog.cpp" + // // All of the pH calculations are taken from the work done by Kai Troester and published at diff --git a/src/boiltime.cpp b/src/boiltime.cpp index a41dd25e4..d095999d0 100644 --- a/src/boiltime.cpp +++ b/src/boiltime.cpp @@ -17,6 +17,9 @@ #include "boiltime.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_boiltime.cpp" + BoilTime::BoilTime(QObject* parent): QObject(parent), time(0), started(false), diff --git a/src/buttons/BoilButton.cpp b/src/buttons/BoilButton.cpp old mode 100755 new mode 100644 index 088a9319c..7c39a70d0 --- a/src/buttons/BoilButton.cpp +++ b/src/buttons/BoilButton.cpp @@ -15,4 +15,7 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "buttons/BoilButton.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_BoilButton.cpp" + RECIPE_ATTRIBUTE_BUTTON_BASE_COMMON_CODE(Boil) diff --git a/src/buttons/EquipmentButton.cpp b/src/buttons/EquipmentButton.cpp old mode 100755 new mode 100644 index 43a1e2244..34dbd7614 --- a/src/buttons/EquipmentButton.cpp +++ b/src/buttons/EquipmentButton.cpp @@ -18,4 +18,7 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "buttons/EquipmentButton.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_EquipmentButton.cpp" + RECIPE_ATTRIBUTE_BUTTON_BASE_COMMON_CODE(Equipment) diff --git a/src/buttons/FermentationButton.cpp b/src/buttons/FermentationButton.cpp old mode 100755 new mode 100644 index d67f56f75..e1782ac53 --- a/src/buttons/FermentationButton.cpp +++ b/src/buttons/FermentationButton.cpp @@ -15,4 +15,7 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "buttons/FermentationButton.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_FermentationButton.cpp" + RECIPE_ATTRIBUTE_BUTTON_BASE_COMMON_CODE(Fermentation) diff --git a/src/buttons/MashButton.cpp b/src/buttons/MashButton.cpp old mode 100755 new mode 100644 index 97efab510..fa9dcfe94 --- a/src/buttons/MashButton.cpp +++ b/src/buttons/MashButton.cpp @@ -18,4 +18,7 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "buttons/MashButton.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_MashButton.cpp" + RECIPE_ATTRIBUTE_BUTTON_BASE_COMMON_CODE(Mash) diff --git a/src/buttons/RecipeAttributeButton.cpp b/src/buttons/RecipeAttributeButton.cpp old mode 100755 new mode 100644 index d1ce28549..b82154ccb --- a/src/buttons/RecipeAttributeButton.cpp +++ b/src/buttons/RecipeAttributeButton.cpp @@ -15,6 +15,9 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "buttons/RecipeAttributeButton.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RecipeAttributeButton.cpp" + RecipeAttributeButton::RecipeAttributeButton(QWidget * parent) : QPushButton(parent) { return; diff --git a/src/buttons/StyleButton.cpp b/src/buttons/StyleButton.cpp old mode 100755 new mode 100644 index 2c16c9a4d..e4b6da9c8 --- a/src/buttons/StyleButton.cpp +++ b/src/buttons/StyleButton.cpp @@ -18,4 +18,7 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "buttons/StyleButton.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_StyleButton.cpp" + RECIPE_ATTRIBUTE_BUTTON_BASE_COMMON_CODE(Style) diff --git a/src/buttons/WaterButton.cpp b/src/buttons/WaterButton.cpp old mode 100755 new mode 100644 index 24c327968..e1d625ad5 --- a/src/buttons/WaterButton.cpp +++ b/src/buttons/WaterButton.cpp @@ -16,4 +16,7 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "buttons/WaterButton.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_WaterButton.cpp" + RECIPE_ATTRIBUTE_BUTTON_BASE_COMMON_CODE(Water) diff --git a/src/catalogs/EquipmentCatalog.cpp b/src/catalogs/EquipmentCatalog.cpp old mode 100755 new mode 100644 index d0d45477c..0b866d251 --- a/src/catalogs/EquipmentCatalog.cpp +++ b/src/catalogs/EquipmentCatalog.cpp @@ -17,5 +17,8 @@ #include "qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_EquipmentCatalog.cpp" + // Insert the boiler-plate stuff that we cannot do in CatalogBase CATALOG_COMMON_CODE(Equipment) diff --git a/src/catalogs/FermentableCatalog.cpp b/src/catalogs/FermentableCatalog.cpp old mode 100755 new mode 100644 index e516d414f..3ca1ff7b2 --- a/src/catalogs/FermentableCatalog.cpp +++ b/src/catalogs/FermentableCatalog.cpp @@ -21,5 +21,8 @@ #include "qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_FermentableCatalog.cpp" + // Insert the boiler-plate stuff that we cannot do in CatalogBase CATALOG_COMMON_CODE(Fermentable) diff --git a/src/catalogs/HopCatalog.cpp b/src/catalogs/HopCatalog.cpp old mode 100755 new mode 100644 index 6181b8615..bd705c30a --- a/src/catalogs/HopCatalog.cpp +++ b/src/catalogs/HopCatalog.cpp @@ -23,5 +23,8 @@ #include "qtModels/sortFilterProxyModels/HopSortFilterProxyModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_HopCatalog.cpp" + // Insert the boiler-plate stuff that we cannot do in CatalogBase CATALOG_COMMON_CODE(Hop) diff --git a/src/catalogs/MiscCatalog.cpp b/src/catalogs/MiscCatalog.cpp old mode 100755 new mode 100644 index cc26f6762..6622d7af3 --- a/src/catalogs/MiscCatalog.cpp +++ b/src/catalogs/MiscCatalog.cpp @@ -21,5 +21,8 @@ #include "qtModels/sortFilterProxyModels/MiscSortFilterProxyModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_MiscCatalog.cpp" + // Insert the boiler-plate stuff that we cannot do in CatalogBase CATALOG_COMMON_CODE(Misc) diff --git a/src/catalogs/StyleCatalog.cpp b/src/catalogs/StyleCatalog.cpp old mode 100755 new mode 100644 index a2a8a96b0..6f063a36b --- a/src/catalogs/StyleCatalog.cpp +++ b/src/catalogs/StyleCatalog.cpp @@ -17,5 +17,8 @@ #include "qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_StyleCatalog.cpp" + // Insert the boiler-plate stuff that we cannot do in CatalogBase CATALOG_COMMON_CODE(Style) diff --git a/src/catalogs/YeastCatalog.cpp b/src/catalogs/YeastCatalog.cpp old mode 100755 new mode 100644 index deaf7064b..6bdb756ec --- a/src/catalogs/YeastCatalog.cpp +++ b/src/catalogs/YeastCatalog.cpp @@ -21,5 +21,8 @@ #include "qtModels/sortFilterProxyModels/YeastSortFilterProxyModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_YeastCatalog.cpp" + // Insert the boiler-plate stuff that we cannot do in CatalogBase CATALOG_COMMON_CODE(Yeast) diff --git a/src/database/ObjectStore.cpp b/src/database/ObjectStore.cpp index baa14e71f..cdcc6a0eb 100644 --- a/src/database/ObjectStore.cpp +++ b/src/database/ObjectStore.cpp @@ -36,6 +36,9 @@ #include "utils/MetaTypes.h" #include "utils/OptionalHelpers.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_ObjectStore.cpp" + // Private implementation details that don't need access to class member variables namespace { diff --git a/src/editors/BoilEditor.cpp b/src/editors/BoilEditor.cpp old mode 100755 new mode 100644 index ec2b92169..2d52c9bc6 --- a/src/editors/BoilEditor.cpp +++ b/src/editors/BoilEditor.cpp @@ -22,6 +22,9 @@ #include "model/Boil.h" #include "model/Recipe.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_BoilEditor.cpp" + BoilEditor::BoilEditor(QWidget* parent, QString const editorName) : QDialog(parent), EditorBase(editorName) { diff --git a/src/editors/BoilStepEditor.cpp b/src/editors/BoilStepEditor.cpp old mode 100755 new mode 100644 index 8b4f5960a..61d0a0a28 --- a/src/editors/BoilStepEditor.cpp +++ b/src/editors/BoilStepEditor.cpp @@ -18,6 +18,9 @@ #include "MainWindow.h" #include "measurement/Unit.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_BoilStepEditor.cpp" + BoilStepEditor::BoilStepEditor(QWidget* parent, QString const editorName) : QDialog{parent}, StepEditorBase{}, diff --git a/src/editors/EquipmentEditor.cpp b/src/editors/EquipmentEditor.cpp old mode 100755 new mode 100644 index cfc8cf4ca..a847ac258 --- a/src/editors/EquipmentEditor.cpp +++ b/src/editors/EquipmentEditor.cpp @@ -41,6 +41,9 @@ #include "PersistentSettings.h" #include "PhysicalConstants.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_EquipmentEditor.cpp" + // // TODO: According to https://www.engineersedge.com/materials/specific_heat_capacity_of_metals_13259.htm, the specific // heat capacity of 304 grade stainless steel is 502.416 J/kg·K = 0.120080 c/g·C. Would be nice to have a way for the diff --git a/src/editors/FermentableEditor.cpp b/src/editors/FermentableEditor.cpp old mode 100755 new mode 100644 index a15a4a833..c08b0618a --- a/src/editors/FermentableEditor.cpp +++ b/src/editors/FermentableEditor.cpp @@ -27,6 +27,9 @@ #include "database/ObjectStoreWrapper.h" #include "measurement/Unit.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_FermentableEditor.cpp" + // TODO: Need a separate editor for inventory FermentableEditor::FermentableEditor(QWidget* parent, QString const editorName) : diff --git a/src/editors/FermentationEditor.cpp b/src/editors/FermentationEditor.cpp old mode 100755 new mode 100644 index 52b7dc185..bc262b044 --- a/src/editors/FermentationEditor.cpp +++ b/src/editors/FermentationEditor.cpp @@ -22,6 +22,9 @@ #include "model/Fermentation.h" #include "model/Recipe.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_FermentationEditor.cpp" + FermentationEditor::FermentationEditor(QWidget* parent, QString const editorName) : QDialog(parent), EditorBase(editorName) { diff --git a/src/editors/FermentationStepEditor.cpp b/src/editors/FermentationStepEditor.cpp old mode 100755 new mode 100644 index ce8279107..610fe1790 --- a/src/editors/FermentationStepEditor.cpp +++ b/src/editors/FermentationStepEditor.cpp @@ -18,6 +18,9 @@ #include "MainWindow.h" #include "measurement/Unit.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_FermentationStepEditor.cpp" + FermentationStepEditor::FermentationStepEditor(QWidget* parent, QString const editorName) : QDialog{parent}, StepEditorBase{}, diff --git a/src/editors/HopEditor.cpp b/src/editors/HopEditor.cpp old mode 100755 new mode 100644 index f16a02217..4070fd07a --- a/src/editors/HopEditor.cpp +++ b/src/editors/HopEditor.cpp @@ -29,6 +29,9 @@ #include "database/ObjectStoreWrapper.h" #include "measurement/Unit.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_HopEditor.cpp" + // TODO: Need a separate editor for inventory HopEditor::HopEditor(QWidget * parent, QString const editorName) : diff --git a/src/editors/MashEditor.cpp b/src/editors/MashEditor.cpp old mode 100755 new mode 100644 index 48b8fc960..7b4b55b9a --- a/src/editors/MashEditor.cpp +++ b/src/editors/MashEditor.cpp @@ -28,6 +28,9 @@ #include "model/Mash.h" #include "model/Recipe.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_MashEditor.cpp" + MashEditor::MashEditor(QWidget* parent) : QDialog(parent), m_recipe{nullptr}, diff --git a/src/editors/MashStepEditor.cpp b/src/editors/MashStepEditor.cpp old mode 100755 new mode 100644 index b85c9ccdc..da8327ed1 --- a/src/editors/MashStepEditor.cpp +++ b/src/editors/MashStepEditor.cpp @@ -21,6 +21,9 @@ #include "MainWindow.h" #include "measurement/Unit.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_MashStepEditor.cpp" + MashStepEditor::MashStepEditor(QWidget* parent, QString const editorName) : QDialog{parent}, StepEditorBase{}, diff --git a/src/editors/MiscEditor.cpp b/src/editors/MiscEditor.cpp old mode 100755 new mode 100644 index 6295ace65..26db1db6e --- a/src/editors/MiscEditor.cpp +++ b/src/editors/MiscEditor.cpp @@ -28,6 +28,9 @@ #include "database/ObjectStoreWrapper.h" #include "measurement/Unit.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_MiscEditor.cpp" + MiscEditor::MiscEditor(QWidget * parent, QString const editorName) : QDialog(parent), EditorBase(editorName) { diff --git a/src/editors/NamedMashEditor.cpp b/src/editors/NamedMashEditor.cpp old mode 100755 new mode 100644 index 2e44d00c5..5e3976b24 --- a/src/editors/NamedMashEditor.cpp +++ b/src/editors/NamedMashEditor.cpp @@ -28,6 +28,9 @@ #include "model/Mash.h" #include "model/Recipe.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_NamedMashEditor.cpp" + NamedMashEditor::NamedMashEditor(QWidget* parent, MashStepEditor* editor, bool singleMashEditor) : QDialog{parent}, diff --git a/src/editors/StyleEditor.cpp b/src/editors/StyleEditor.cpp old mode 100755 new mode 100644 index 6a3d32736..b18739184 --- a/src/editors/StyleEditor.cpp +++ b/src/editors/StyleEditor.cpp @@ -25,6 +25,9 @@ #include "measurement/Unit.h" #include "qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_StyleEditor.cpp" + StyleEditor::StyleEditor(QWidget* parent, QString const editorName) : QDialog{parent}, EditorBase(editorName) { diff --git a/src/editors/WaterEditor.cpp b/src/editors/WaterEditor.cpp old mode 100755 new mode 100644 index 86c0713e2..e0df0e965 --- a/src/editors/WaterEditor.cpp +++ b/src/editors/WaterEditor.cpp @@ -25,6 +25,9 @@ #include "database/ObjectStoreWrapper.h" #include "model/Water.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_WaterEditor.cpp" + namespace { auto const seriesNameCurrent {WaterEditor::tr("Current" )}; auto const seriesNameModified{WaterEditor::tr("Modified")}; diff --git a/src/editors/YeastEditor.cpp b/src/editors/YeastEditor.cpp old mode 100755 new mode 100644 index 611564410..b9b094198 --- a/src/editors/YeastEditor.cpp +++ b/src/editors/YeastEditor.cpp @@ -29,6 +29,9 @@ #include "database/ObjectStoreWrapper.h" #include "measurement/Unit.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_YeastEditor.cpp" + YeastEditor::YeastEditor(QWidget * parent, QString const editorName) : QDialog(parent), EditorBase(editorName) { diff --git a/src/model/Boil.cpp b/src/model/Boil.cpp old mode 100755 new mode 100644 index 616a9aa1d..b470fb6e2 --- a/src/model/Boil.cpp +++ b/src/model/Boil.cpp @@ -25,6 +25,9 @@ #include "model/NamedParameterBundle.h" #include "utils/AutoCompare.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_Boil.cpp" + QString Boil::localisedName() { return tr("Boil"); } bool Boil::isEqualTo(NamedEntity const & other) const { diff --git a/src/model/BoilStep.cpp b/src/model/BoilStep.cpp old mode 100755 new mode 100644 index 0c2883fb4..63c69309e --- a/src/model/BoilStep.cpp +++ b/src/model/BoilStep.cpp @@ -20,6 +20,9 @@ #include "utils/OptionalHelpers.h" #include "utils/AutoCompare.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_BoilStep.cpp" + QString BoilStep::localisedName() { return tr("Boil Step"); } EnumStringMapping const BoilStep::chillingTypeStringMapping { diff --git a/src/model/BrewNote.cpp b/src/model/BrewNote.cpp index a3d316988..df3fd924d 100644 --- a/src/model/BrewNote.cpp +++ b/src/model/BrewNote.cpp @@ -38,6 +38,9 @@ #include "model/Recipe.h" #include "model/RecipeAdditionYeast.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_BrewNote.cpp" + QString BrewNote::localisedName() { return tr("Brew Note"); } // BrewNote doesn't use its name field, so we sort by brew date diff --git a/src/model/Equipment.cpp b/src/model/Equipment.cpp index a58445bec..b41146792 100644 --- a/src/model/Equipment.cpp +++ b/src/model/Equipment.cpp @@ -25,6 +25,9 @@ #include "model/Recipe.h" #include "utils/AutoCompare.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_Equipment.cpp" + QString Equipment::localisedName() { return tr("Equipment"); } bool Equipment::isEqualTo(NamedEntity const & other) const { diff --git a/src/model/Fermentable.cpp b/src/model/Fermentable.cpp index efbf7bfb2..3cc0741dc 100644 --- a/src/model/Fermentable.cpp +++ b/src/model/Fermentable.cpp @@ -35,6 +35,9 @@ #include "utils/AutoCompare.h" #include "utils/OptionalHelpers.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_Fermentable.cpp" + QString Fermentable::localisedName() { return tr("Fermentable"); } // Note that Fermentable::typeStringMapping and Fermentable::grainGroupStringMapping are as defined by BeerJSON, but we diff --git a/src/model/Fermentation.cpp b/src/model/Fermentation.cpp old mode 100755 new mode 100644 index 838012113..d94ce7b96 --- a/src/model/Fermentation.cpp +++ b/src/model/Fermentation.cpp @@ -17,6 +17,9 @@ #include "model/NamedParameterBundle.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_Fermentation.cpp" + QString Fermentation::localisedName() { return tr("Fermentation"); } bool Fermentation::isEqualTo(NamedEntity const & other) const { diff --git a/src/model/FermentationStep.cpp b/src/model/FermentationStep.cpp old mode 100755 new mode 100644 index 595cd5d48..f5579a983 --- a/src/model/FermentationStep.cpp +++ b/src/model/FermentationStep.cpp @@ -19,6 +19,9 @@ #include "model/NamedParameterBundle.h" #include "utils/AutoCompare.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_FermentationStep.cpp" + QString FermentationStep::localisedName() { return tr("Fermentation Step"); } bool FermentationStep::isEqualTo(NamedEntity const & other) const { diff --git a/src/model/Folder.cpp b/src/model/Folder.cpp index fb132e901..2bc221833 100644 --- a/src/model/Folder.cpp +++ b/src/model/Folder.cpp @@ -20,6 +20,9 @@ #include #include +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_Folder.cpp" + Folder::Folder() : QObject() { setObjectName("Folder"); return; diff --git a/src/model/Hop.cpp b/src/model/Hop.cpp index 91169a9f2..92864a98f 100644 --- a/src/model/Hop.cpp +++ b/src/model/Hop.cpp @@ -30,6 +30,9 @@ #include "model/Recipe.h" #include "utils/AutoCompare.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_Hop.cpp" + QString Hop::localisedName() { return tr("Hop"); } // Note that Hop::typeStringMapping and Hop::formStringMapping are as defined by BeerJSON, but we also use them for the diff --git a/src/model/Ingredient.cpp b/src/model/Ingredient.cpp old mode 100755 new mode 100644 index fb56b412b..c480274ea --- a/src/model/Ingredient.cpp +++ b/src/model/Ingredient.cpp @@ -17,6 +17,9 @@ #include "model/NamedParameterBundle.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_Ingredient.cpp" + QString Ingredient::localisedName() { return tr("Ingredient"); } TypeLookup const Ingredient::typeLookup { diff --git a/src/model/IngredientInRecipe.cpp b/src/model/IngredientInRecipe.cpp old mode 100755 new mode 100644 index a25c3ce06..a96c2972b --- a/src/model/IngredientInRecipe.cpp +++ b/src/model/IngredientInRecipe.cpp @@ -17,6 +17,9 @@ #include "model/Recipe.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_IngredientInRecipe.cpp" + QString IngredientInRecipe::localisedName() { return tr("Ingredient In Recipe"); } bool IngredientInRecipe::isEqualTo(NamedEntity const & other) const { diff --git a/src/model/Instruction.cpp b/src/model/Instruction.cpp index a7ec68786..f530942ed 100644 --- a/src/model/Instruction.cpp +++ b/src/model/Instruction.cpp @@ -22,6 +22,9 @@ #include "model/NamedParameterBundle.h" #include "model/Recipe.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_Instruction.cpp" + QString Instruction::localisedName() { return tr("Instruction"); } bool Instruction::isEqualTo(NamedEntity const & other) const { diff --git a/src/model/Inventory.cpp b/src/model/Inventory.cpp index a3df18865..21680b721 100644 --- a/src/model/Inventory.cpp +++ b/src/model/Inventory.cpp @@ -35,6 +35,9 @@ #include "moc_InventorySalt.cpp" #include "moc_InventoryYeast.cpp" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_Inventory.cpp" + QString Inventory::localisedName() { return tr("Inventory"); } bool Inventory::isEqualTo(NamedEntity const & other) const { diff --git a/src/model/Mash.cpp b/src/model/Mash.cpp index 85751fd4d..22a53d171 100644 --- a/src/model/Mash.cpp +++ b/src/model/Mash.cpp @@ -30,6 +30,9 @@ #include "model/Recipe.h" #include "utils/AutoCompare.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_Mash.cpp" + QString Mash::localisedName() { return tr("Mash"); } bool Mash::isEqualTo(NamedEntity const & other) const { diff --git a/src/model/MashStep.cpp b/src/model/MashStep.cpp index 32861337d..b9077a246 100644 --- a/src/model/MashStep.cpp +++ b/src/model/MashStep.cpp @@ -27,6 +27,9 @@ #include "PhysicalConstants.h" #include "utils/AutoCompare.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_MashStep.cpp" + QString MashStep::localisedName() { return tr("Mash Step"); } EnumStringMapping const MashStep::typeStringMapping { diff --git a/src/model/Misc.cpp b/src/model/Misc.cpp index d99e9bf1e..d8fa6f2fd 100644 --- a/src/model/Misc.cpp +++ b/src/model/Misc.cpp @@ -33,6 +33,9 @@ #include "model/Recipe.h" #include "utils/AutoCompare.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_Misc.cpp" + QString Misc::localisedName() { return tr("Miscellaneous"); } EnumStringMapping const Misc::typeStringMapping { diff --git a/src/model/NamedEntity.cpp b/src/model/NamedEntity.cpp index 1aa66b05c..50d6c3a42 100644 --- a/src/model/NamedEntity.cpp +++ b/src/model/NamedEntity.cpp @@ -57,6 +57,9 @@ #include "model/Water.h" #include "model/Yeast.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_NamedEntity.cpp" + namespace { /** * \brief This is a regexp that will match the " (n)" (for n some positive integer) added on the end of a name to diff --git a/src/model/OutlineableNamedEntity.cpp b/src/model/OutlineableNamedEntity.cpp old mode 100755 new mode 100644 index 8877b3cfd..3ec7c2a2b --- a/src/model/OutlineableNamedEntity.cpp +++ b/src/model/OutlineableNamedEntity.cpp @@ -18,6 +18,9 @@ #include "BtFieldType.h" #include "model/NamedParameterBundle.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_OutlineableNamedEntity.cpp" + QString OutlineableNamedEntity::localisedName() { return tr("Outlineable Named Entity"); } TypeLookup const OutlineableNamedEntity::typeLookup { diff --git a/src/model/OwnedByRecipe.cpp b/src/model/OwnedByRecipe.cpp old mode 100755 new mode 100644 index dd5576dfd..1dd84f517 --- a/src/model/OwnedByRecipe.cpp +++ b/src/model/OwnedByRecipe.cpp @@ -17,6 +17,9 @@ #include "model/Recipe.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_OwnedByRecipe.cpp" + QString OwnedByRecipe::localisedName() { return tr("Owned By Recipe"); } bool OwnedByRecipe::isEqualTo(NamedEntity const & other) const { diff --git a/src/model/Recipe.cpp b/src/model/Recipe.cpp index 253fcacd9..ea4dc2c8b 100644 --- a/src/model/Recipe.cpp +++ b/src/model/Recipe.cpp @@ -70,6 +70,9 @@ #include "PhysicalConstants.h" #include "utils/AutoCompare.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_Recipe.cpp" + namespace { /** diff --git a/src/model/RecipeAddition.cpp b/src/model/RecipeAddition.cpp old mode 100755 new mode 100644 index 9d21bbbfd..8714a8aaa --- a/src/model/RecipeAddition.cpp +++ b/src/model/RecipeAddition.cpp @@ -23,6 +23,9 @@ #include "model/Recipe.h" #include "utils/AutoCompare.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RecipeAddition.cpp" + QString RecipeAddition::localisedName() { return tr("Recipe Addition"); } // Note that RecipeAddition::stageStringMapping is as defined by BeerJSON, but we also use them for the DB and for diff --git a/src/model/RecipeAdditionFermentable.cpp b/src/model/RecipeAdditionFermentable.cpp old mode 100755 new mode 100644 index bddc7c4e6..a2bb011e2 --- a/src/model/RecipeAdditionFermentable.cpp +++ b/src/model/RecipeAdditionFermentable.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * model/RecipeAdditionFermentable.cpp is part of Brewtarget, and is copyright the following authors 2023-2024: + * model/RecipeAdditionFermentable.cpp is part of Brewtarget, and is copyright the following authors 2023-2025: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -21,6 +21,9 @@ #include "model/Boil.h" #include "model/BoilStep.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RecipeAdditionFermentable.cpp" + QString RecipeAdditionFermentable::localisedName() { return tr("Fermentable Addition"); } ObjectStore & RecipeAdditionFermentable::getObjectStoreTypedInstance() const { diff --git a/src/model/RecipeAdditionFermentable.h b/src/model/RecipeAdditionFermentable.h index 4bcae0d2b..3dc3a71f3 100755 --- a/src/model/RecipeAdditionFermentable.h +++ b/src/model/RecipeAdditionFermentable.h @@ -99,8 +99,6 @@ class RecipeAdditionFermentable : public RecipeAddition, }; -Q_DECLARE_METATYPE(Fermentable) -Q_DECLARE_METATYPE(Fermentable *) BT_DECLARE_METATYPES(RecipeAdditionFermentable) #endif diff --git a/src/model/RecipeAdditionHop.cpp b/src/model/RecipeAdditionHop.cpp old mode 100755 new mode 100644 index 5c07b70ca..85a1f6780 --- a/src/model/RecipeAdditionHop.cpp +++ b/src/model/RecipeAdditionHop.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * model/RecipeAdditionHop.cpp is part of Brewtarget, and is copyright the following authors 2023-2024: + * model/RecipeAdditionHop.cpp is part of Brewtarget, and is copyright the following authors 2023-2025: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -21,6 +21,9 @@ #include "model/Boil.h" #include "model/BoilStep.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RecipeAdditionHop.cpp" + QString RecipeAdditionHop::localisedName() { return tr("Hop Addition"); } EnumStringMapping const RecipeAdditionHop::useStringMapping { diff --git a/src/model/RecipeAdditionHop.h b/src/model/RecipeAdditionHop.h index 63204fbf9..c7bd12021 100755 --- a/src/model/RecipeAdditionHop.h +++ b/src/model/RecipeAdditionHop.h @@ -140,8 +140,6 @@ class RecipeAdditionHop : public RecipeAddition, }; -Q_DECLARE_METATYPE(Hop) -Q_DECLARE_METATYPE(Hop *) BT_DECLARE_METATYPES(RecipeAdditionHop) #endif diff --git a/src/model/RecipeAdditionMisc.cpp b/src/model/RecipeAdditionMisc.cpp old mode 100755 new mode 100644 index 8b67e3615..76a03157b --- a/src/model/RecipeAdditionMisc.cpp +++ b/src/model/RecipeAdditionMisc.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * model/RecipeAdditionMisc.cpp is part of Brewtarget, and is copyright the following authors 2023-2024: + * model/RecipeAdditionMisc.cpp is part of Brewtarget, and is copyright the following authors 2023-2025: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -21,6 +21,9 @@ #include "model/Boil.h" #include "model/BoilStep.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RecipeAdditionMisc.cpp" + QString RecipeAdditionMisc::localisedName() { return tr("Misc Addition"); } EnumStringMapping const RecipeAdditionMisc::useStringMapping { diff --git a/src/model/RecipeAdditionMisc.h b/src/model/RecipeAdditionMisc.h index d6b9e9c39..0539a1690 100755 --- a/src/model/RecipeAdditionMisc.h +++ b/src/model/RecipeAdditionMisc.h @@ -128,8 +128,6 @@ class RecipeAdditionMisc : public RecipeAddition, }; -Q_DECLARE_METATYPE(Misc) -Q_DECLARE_METATYPE(Misc *) BT_DECLARE_METATYPES(RecipeAdditionMisc) #endif diff --git a/src/model/RecipeAdditionYeast.cpp b/src/model/RecipeAdditionYeast.cpp old mode 100755 new mode 100644 index 6a52c1cd9..747f64db2 --- a/src/model/RecipeAdditionYeast.cpp +++ b/src/model/RecipeAdditionYeast.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * model/RecipeAdditionYeast.cpp is part of Brewtarget, and is copyright the following authors 2023-2024: + * model/RecipeAdditionYeast.cpp is part of Brewtarget, and is copyright the following authors 2023-2025: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -19,6 +19,9 @@ #include "database/ObjectStoreWrapper.h" #include "model/NamedParameterBundle.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RecipeAdditionYeast.cpp" + QString RecipeAdditionYeast::localisedName() { return tr("Yeast Addition"); } ObjectStore & RecipeAdditionYeast::getObjectStoreTypedInstance() const { diff --git a/src/model/RecipeAdditionYeast.h b/src/model/RecipeAdditionYeast.h index 15341a051..e5731d224 100755 --- a/src/model/RecipeAdditionYeast.h +++ b/src/model/RecipeAdditionYeast.h @@ -116,8 +116,6 @@ class RecipeAdditionYeast : public RecipeAddition, std::optional m_cellCountBillions; }; -Q_DECLARE_METATYPE(Yeast) -Q_DECLARE_METATYPE(Yeast *) BT_DECLARE_METATYPES(RecipeAdditionYeast) #endif diff --git a/src/model/RecipeAdjustmentSalt.cpp b/src/model/RecipeAdjustmentSalt.cpp old mode 100755 new mode 100644 index 2ed4da525..a5f7f3031 --- a/src/model/RecipeAdjustmentSalt.cpp +++ b/src/model/RecipeAdjustmentSalt.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * model/RecipeAdjustmentSalt.cpp is part of Brewtarget, and is copyright the following authors 2024: + * model/RecipeAdjustmentSalt.cpp is part of Brewtarget, and is copyright the following authors 2024-2025: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -21,6 +21,9 @@ #include "model/Boil.h" #include "model/BoilStep.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RecipeAdjustmentSalt.cpp" + QString RecipeAdjustmentSalt::localisedName() { return tr("Salt Addition"); } EnumStringMapping const RecipeAdjustmentSalt::whenToAddStringMapping { diff --git a/src/model/RecipeAdjustmentSalt.h b/src/model/RecipeAdjustmentSalt.h index 1a7974c93..196d43341 100755 --- a/src/model/RecipeAdjustmentSalt.h +++ b/src/model/RecipeAdjustmentSalt.h @@ -124,10 +124,6 @@ class RecipeAdjustmentSalt : public IngredientInRecipe, WhenToAdd m_whenToAdd; }; -Q_DECLARE_METATYPE(Salt) -// As of Qt6, we get compiler errors if we uncomment the following, but, so far, everything seems to work fine with it -// commented out! -//Q_DECLARE_METATYPE(Salt *) BT_DECLARE_METATYPES(RecipeAdjustmentSalt) #endif diff --git a/src/model/RecipeUseOfWater.cpp b/src/model/RecipeUseOfWater.cpp old mode 100755 new mode 100644 index 6401c2cd2..14147afa9 --- a/src/model/RecipeUseOfWater.cpp +++ b/src/model/RecipeUseOfWater.cpp @@ -1,5 +1,5 @@ /*╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ - * model/RecipeUseOfWater.cpp is part of Brewtarget, and is copyright the following authors 2024: + * model/RecipeUseOfWater.cpp is part of Brewtarget, and is copyright the following authors 2024-2025: * • Matt Young * * Brewtarget is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -17,6 +17,9 @@ #include "model/NamedParameterBundle.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RecipeUseOfWater.cpp" + QString RecipeUseOfWater::localisedName() { return tr("Recipe Use Of Water"); } ObjectStore & RecipeUseOfWater::getObjectStoreTypedInstance() const { diff --git a/src/model/RecipeUseOfWater.h b/src/model/RecipeUseOfWater.h index 94627e92c..d13c349c4 100755 --- a/src/model/RecipeUseOfWater.h +++ b/src/model/RecipeUseOfWater.h @@ -97,8 +97,6 @@ class RecipeUseOfWater : public IngredientInRecipe, }; -Q_DECLARE_METATYPE(Water) -Q_DECLARE_METATYPE(Water *) BT_DECLARE_METATYPES(RecipeUseOfWater) #endif diff --git a/src/model/Salt.cpp b/src/model/Salt.cpp index d363327cf..cfa5230ae 100644 --- a/src/model/Salt.cpp +++ b/src/model/Salt.cpp @@ -24,6 +24,9 @@ #include "model/Recipe.h" #include "utils/AutoCompare.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_Salt.cpp" + namespace { // Constants used in our mass concentration calculations below double constexpr molarMass_Ca = 40.078 ; // https://en.wikipedia.org/wiki/Calcium diff --git a/src/model/Step.cpp b/src/model/Step.cpp old mode 100755 new mode 100644 index 22519485c..b088e2fb3 --- a/src/model/Step.cpp +++ b/src/model/Step.cpp @@ -19,6 +19,9 @@ #include "PhysicalConstants.h" #include "utils/AutoCompare.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_Step.cpp" + QString Step::localisedName() { return tr("Step"); } bool Step::isEqualTo(NamedEntity const & other) const { diff --git a/src/model/StepExtended.cpp b/src/model/StepExtended.cpp old mode 100755 new mode 100644 index 1c9ef9662..1ab873449 --- a/src/model/StepExtended.cpp +++ b/src/model/StepExtended.cpp @@ -19,6 +19,9 @@ #include "PhysicalConstants.h" #include "utils/AutoCompare.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_StepExtended.cpp" + QString StepExtended::localisedName() { return tr("Extended Step"); } bool StepExtended::isEqualTo(NamedEntity const & other) const { diff --git a/src/model/Style.cpp b/src/model/Style.cpp index 1b300fde0..97b8c0639 100644 --- a/src/model/Style.cpp +++ b/src/model/Style.cpp @@ -25,6 +25,9 @@ #include "model/Recipe.h" #include "utils/AutoCompare.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_Style.cpp" + QString Style::localisedName() { return tr("Style"); } EnumStringMapping const Style::typeStringMapping { diff --git a/src/model/Water.cpp b/src/model/Water.cpp index 3abae77a2..8da9e2ab0 100644 --- a/src/model/Water.cpp +++ b/src/model/Water.cpp @@ -23,6 +23,9 @@ #include "model/Recipe.h" #include "utils/AutoCompare.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_Water.cpp" + QString Water::localisedName() { return tr("Water"); } EnumStringMapping const Water::typeStringMapping { diff --git a/src/model/Yeast.cpp b/src/model/Yeast.cpp index 670aea04b..c7c21fd5c 100644 --- a/src/model/Yeast.cpp +++ b/src/model/Yeast.cpp @@ -29,6 +29,9 @@ #include "PhysicalConstants.h" #include "utils/AutoCompare.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_Yeast.cpp" + QString Yeast::localisedName() { return tr("Yeast"); } EnumStringMapping const Yeast::typeStringMapping { diff --git a/src/qtModels/listModels/BoilListModel.cpp b/src/qtModels/listModels/BoilListModel.cpp index b3596bd63..1b8c6d2af 100644 --- a/src/qtModels/listModels/BoilListModel.cpp +++ b/src/qtModels/listModels/BoilListModel.cpp @@ -15,5 +15,8 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/BoilListModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_BoilListModel.cpp" + // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Boil, PropertyNames::Recipe::boil) diff --git a/src/qtModels/listModels/EquipmentListModel.cpp b/src/qtModels/listModels/EquipmentListModel.cpp old mode 100755 new mode 100644 index 13d40c8b6..6d089f5fc --- a/src/qtModels/listModels/EquipmentListModel.cpp +++ b/src/qtModels/listModels/EquipmentListModel.cpp @@ -19,5 +19,8 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/EquipmentListModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_EquipmentListModel.cpp" + // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Equipment, PropertyNames::Recipe::equipment) diff --git a/src/qtModels/listModels/FermentableListModel.cpp b/src/qtModels/listModels/FermentableListModel.cpp old mode 100755 new mode 100644 index 070778eeb..ee76aa26f --- a/src/qtModels/listModels/FermentableListModel.cpp +++ b/src/qtModels/listModels/FermentableListModel.cpp @@ -15,5 +15,8 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/FermentableListModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_FermentableListModel.cpp" + // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Fermentable, PropertyNames::Recipe::fermentableAdditions) diff --git a/src/qtModels/listModels/FermentationListModel.cpp b/src/qtModels/listModels/FermentationListModel.cpp index 924293388..c40d1a1af 100644 --- a/src/qtModels/listModels/FermentationListModel.cpp +++ b/src/qtModels/listModels/FermentationListModel.cpp @@ -15,5 +15,8 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/FermentationListModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_FermentationListModel.cpp" + // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Fermentation, PropertyNames::Recipe::fermentation) diff --git a/src/qtModels/listModels/HopListModel.cpp b/src/qtModels/listModels/HopListModel.cpp old mode 100755 new mode 100644 index 0f6be8116..40bdec9bf --- a/src/qtModels/listModels/HopListModel.cpp +++ b/src/qtModels/listModels/HopListModel.cpp @@ -15,5 +15,8 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/HopListModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_HopListModel.cpp" + // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Hop, PropertyNames::Recipe::hopAdditions) diff --git a/src/qtModels/listModels/MashListModel.cpp b/src/qtModels/listModels/MashListModel.cpp old mode 100755 new mode 100644 index 6deb8a32d..da84bff1f --- a/src/qtModels/listModels/MashListModel.cpp +++ b/src/qtModels/listModels/MashListModel.cpp @@ -19,5 +19,8 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/MashListModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_MashListModel.cpp" + // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Mash, PropertyNames::Recipe::mash) diff --git a/src/qtModels/listModels/MashStepListModel.cpp b/src/qtModels/listModels/MashStepListModel.cpp old mode 100755 new mode 100644 index b492262b5..fb4c52e72 --- a/src/qtModels/listModels/MashStepListModel.cpp +++ b/src/qtModels/listModels/MashStepListModel.cpp @@ -15,5 +15,8 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/MashStepListModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_MashStepListModel.cpp" + // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(MashStep, PropertyNames::Recipe::mash) diff --git a/src/qtModels/listModels/MiscListModel.cpp b/src/qtModels/listModels/MiscListModel.cpp old mode 100755 new mode 100644 index 4da6297f5..e52436376 --- a/src/qtModels/listModels/MiscListModel.cpp +++ b/src/qtModels/listModels/MiscListModel.cpp @@ -15,5 +15,8 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/MiscListModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_MiscListModel.cpp" + // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Misc, PropertyNames::Recipe::miscAdditions) diff --git a/src/qtModels/listModels/RecipeAdditionFermentableListModel.cpp b/src/qtModels/listModels/RecipeAdditionFermentableListModel.cpp old mode 100755 new mode 100644 index 805f32b05..4347526c1 --- a/src/qtModels/listModels/RecipeAdditionFermentableListModel.cpp +++ b/src/qtModels/listModels/RecipeAdditionFermentableListModel.cpp @@ -15,5 +15,8 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/RecipeAdditionFermentableListModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RecipeAdditionFermentableListModel.cpp" + // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(RecipeAdditionFermentable, PropertyNames::Recipe::fermentableAdditions) diff --git a/src/qtModels/listModels/RecipeAdditionHopListModel.cpp b/src/qtModels/listModels/RecipeAdditionHopListModel.cpp old mode 100755 new mode 100644 index 54eb90b19..d42a21a13 --- a/src/qtModels/listModels/RecipeAdditionHopListModel.cpp +++ b/src/qtModels/listModels/RecipeAdditionHopListModel.cpp @@ -15,5 +15,8 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/RecipeAdditionHopListModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RecipeAdditionHopListModel.cpp" + // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(RecipeAdditionHop, PropertyNames::Recipe::hopAdditions) diff --git a/src/qtModels/listModels/RecipeAdditionMiscListModel.cpp b/src/qtModels/listModels/RecipeAdditionMiscListModel.cpp old mode 100755 new mode 100644 index 143bde13e..3addc72c9 --- a/src/qtModels/listModels/RecipeAdditionMiscListModel.cpp +++ b/src/qtModels/listModels/RecipeAdditionMiscListModel.cpp @@ -15,5 +15,8 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/RecipeAdditionMiscListModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RecipeAdditionMiscListModel.cpp" + // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(RecipeAdditionMisc, PropertyNames::Recipe::miscAdditions) diff --git a/src/qtModels/listModels/RecipeAdditionYeastListModel.cpp b/src/qtModels/listModels/RecipeAdditionYeastListModel.cpp old mode 100755 new mode 100644 index 458d103c6..452288851 --- a/src/qtModels/listModels/RecipeAdditionYeastListModel.cpp +++ b/src/qtModels/listModels/RecipeAdditionYeastListModel.cpp @@ -15,5 +15,8 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/RecipeAdditionYeastListModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RecipeAdditionYeastListModel.cpp" + // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(RecipeAdditionYeast, PropertyNames::Recipe::yeastAdditions) diff --git a/src/qtModels/listModels/RecipeAdjustmentSaltListModel.cpp b/src/qtModels/listModels/RecipeAdjustmentSaltListModel.cpp old mode 100755 new mode 100644 index 7642c424f..a1d72815d --- a/src/qtModels/listModels/RecipeAdjustmentSaltListModel.cpp +++ b/src/qtModels/listModels/RecipeAdjustmentSaltListModel.cpp @@ -15,5 +15,8 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/RecipeAdjustmentSaltListModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RecipeAdjustmentSaltListModel.cpp" + // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(RecipeAdjustmentSalt, PropertyNames::Recipe::saltAdjustments) diff --git a/src/qtModels/listModels/SaltListModel.cpp b/src/qtModels/listModels/SaltListModel.cpp old mode 100755 new mode 100644 index 78f18ef52..4a6f8a5a5 --- a/src/qtModels/listModels/SaltListModel.cpp +++ b/src/qtModels/listModels/SaltListModel.cpp @@ -15,5 +15,8 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/SaltListModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_SaltListModel.cpp" + // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Salt, PropertyNames::Recipe::saltAdjustments) diff --git a/src/qtModels/listModels/StyleListModel.cpp b/src/qtModels/listModels/StyleListModel.cpp old mode 100755 new mode 100644 index a723baa66..63cb62a7f --- a/src/qtModels/listModels/StyleListModel.cpp +++ b/src/qtModels/listModels/StyleListModel.cpp @@ -19,5 +19,8 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/StyleListModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_StyleListModel.cpp" + // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Style, PropertyNames::Recipe::style) diff --git a/src/qtModels/listModels/WaterListModel.cpp b/src/qtModels/listModels/WaterListModel.cpp old mode 100755 new mode 100644 index 19ed276db..d5eda53ae --- a/src/qtModels/listModels/WaterListModel.cpp +++ b/src/qtModels/listModels/WaterListModel.cpp @@ -16,5 +16,8 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/WaterListModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_WaterListModel.cpp" + // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Water, PropertyNames::Recipe::waterUses) diff --git a/src/qtModels/listModels/YeastListModel.cpp b/src/qtModels/listModels/YeastListModel.cpp old mode 100755 new mode 100644 index 7049f71eb..570b81433 --- a/src/qtModels/listModels/YeastListModel.cpp +++ b/src/qtModels/listModels/YeastListModel.cpp @@ -15,5 +15,8 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/YeastListModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_YeastListModel.cpp" + // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Yeast, PropertyNames::Recipe::yeastAdditions) diff --git a/src/qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.cpp index 2cf3615f8..8e2bfc4e4 100644 --- a/src/qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.cpp @@ -18,6 +18,9 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_BoilSortFilterProxyModel.cpp" + bool BoilSortFilterProxyModel::isLessThan(BoilTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, QVariant const & rightItem) const { diff --git a/src/qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp old mode 100755 new mode 100644 index b5426f191..05eabe942 --- a/src/qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp @@ -19,6 +19,9 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_EquipmentSortFilterProxyModel.cpp" + bool EquipmentSortFilterProxyModel::isLessThan(EquipmentTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, QVariant const & rightItem) const { diff --git a/src/qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.cpp old mode 100755 new mode 100644 index 616804344..0fde827ae --- a/src/qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.cpp @@ -25,6 +25,9 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_FermentableSortFilterProxyModel.cpp" + bool FermentableSortFilterProxyModel::isLessThan(FermentableTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, QVariant const & rightItem) const { diff --git a/src/qtModels/sortFilterProxyModels/FermentationSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/FermentationSortFilterProxyModel.cpp index 2c9d6fd5d..0cbacc85b 100644 --- a/src/qtModels/sortFilterProxyModels/FermentationSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/FermentationSortFilterProxyModel.cpp @@ -19,6 +19,9 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_FermentationSortFilterProxyModel.cpp" + bool FermentationSortFilterProxyModel::isLessThan(FermentationTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, QVariant const & rightItem) const { diff --git a/src/qtModels/sortFilterProxyModels/HopSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/HopSortFilterProxyModel.cpp old mode 100755 new mode 100644 index 1b55cc8fb..7e1fd4133 --- a/src/qtModels/sortFilterProxyModels/HopSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/HopSortFilterProxyModel.cpp @@ -24,6 +24,9 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_HopSortFilterProxyModel.cpp" + bool HopSortFilterProxyModel::isLessThan(HopTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, QVariant const & rightItem) const { diff --git a/src/qtModels/sortFilterProxyModels/MashSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/MashSortFilterProxyModel.cpp index 55d3771aa..ec7f0f8aa 100644 --- a/src/qtModels/sortFilterProxyModels/MashSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/MashSortFilterProxyModel.cpp @@ -18,6 +18,9 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_MashSortFilterProxyModel.cpp" + bool MashSortFilterProxyModel::isLessThan(MashTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, QVariant const & rightItem) const { diff --git a/src/qtModels/sortFilterProxyModels/MiscSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/MiscSortFilterProxyModel.cpp old mode 100755 new mode 100644 index f1894e97f..b5f123938 --- a/src/qtModels/sortFilterProxyModels/MiscSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/MiscSortFilterProxyModel.cpp @@ -23,6 +23,9 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_MiscSortFilterProxyModel.cpp" + bool MiscSortFilterProxyModel::isLessThan(MiscTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, QVariant const & rightItem) const { diff --git a/src/qtModels/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.cpp old mode 100755 new mode 100644 index dea684377..af33940c0 --- a/src/qtModels/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.cpp @@ -24,6 +24,9 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RecipeAdditionFermentableSortFilterProxyModel.cpp" + bool RecipeAdditionFermentableSortFilterProxyModel::isLessThan(RecipeAdditionFermentableTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, QVariant const & rightItem) const { diff --git a/src/qtModels/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.cpp old mode 100755 new mode 100644 index 14020ffa0..4f3dd1c24 --- a/src/qtModels/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.cpp @@ -24,6 +24,9 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RecipeAdditionHopSortFilterProxyModel.cpp" + bool RecipeAdditionHopSortFilterProxyModel::isLessThan(RecipeAdditionHopTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, QVariant const & rightItem) const { diff --git a/src/qtModels/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.cpp old mode 100755 new mode 100644 index d825ef21b..568333bb3 --- a/src/qtModels/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.cpp @@ -24,6 +24,9 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RecipeAdditionMiscSortFilterProxyModel.cpp" + bool RecipeAdditionMiscSortFilterProxyModel::isLessThan(RecipeAdditionMiscTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, QVariant const & rightItem) const { diff --git a/src/qtModels/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.cpp old mode 100755 new mode 100644 index d0a21bd5a..8e1d24432 --- a/src/qtModels/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.cpp @@ -24,6 +24,9 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RecipeAdditionYeastSortFilterProxyModel.cpp" + bool RecipeAdditionYeastSortFilterProxyModel::isLessThan(RecipeAdditionYeastTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, QVariant const & rightItem) const { diff --git a/src/qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.cpp old mode 100755 new mode 100644 index 70123b859..d4df84112 --- a/src/qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.cpp @@ -20,6 +20,9 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_StyleSortFilterProxyModel.cpp" + bool StyleSortFilterProxyModel::isLessThan(StyleTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, QVariant const & rightItem) const { diff --git a/src/qtModels/sortFilterProxyModels/WaterSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/WaterSortFilterProxyModel.cpp old mode 100755 new mode 100644 index e1444d96a..b090694de --- a/src/qtModels/sortFilterProxyModels/WaterSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/WaterSortFilterProxyModel.cpp @@ -22,6 +22,9 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_WaterSortFilterProxyModel.cpp" + bool WaterSortFilterProxyModel::isLessThan(WaterTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, QVariant const & rightItem) const { diff --git a/src/qtModels/sortFilterProxyModels/YeastSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/YeastSortFilterProxyModel.cpp old mode 100755 new mode 100644 index 2c1ec2084..4b8dbdba3 --- a/src/qtModels/sortFilterProxyModels/YeastSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/YeastSortFilterProxyModel.cpp @@ -23,6 +23,9 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_YeastSortFilterProxyModel.cpp" + bool YeastSortFilterProxyModel::isLessThan(YeastTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, QVariant const & rightItem) const { diff --git a/src/qtModels/tableModels/BoilStepTableModel.cpp b/src/qtModels/tableModels/BoilStepTableModel.cpp old mode 100755 new mode 100644 index 6f0c723b8..b241a95ab --- a/src/qtModels/tableModels/BoilStepTableModel.cpp +++ b/src/qtModels/tableModels/BoilStepTableModel.cpp @@ -24,6 +24,9 @@ #include "model/BoilStep.h" #include "qtModels/tableModels/BtTableModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_BoilStepTableModel.cpp" + BoilStepTableModel::BoilStepTableModel(QTableView * parent, bool editable) : BtTableModel{ parent, diff --git a/src/qtModels/tableModels/BoilTableModel.cpp b/src/qtModels/tableModels/BoilTableModel.cpp index be4020c60..fc5e94818 100644 --- a/src/qtModels/tableModels/BoilTableModel.cpp +++ b/src/qtModels/tableModels/BoilTableModel.cpp @@ -23,6 +23,9 @@ #include "model/Boil.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_BoilTableModel.cpp" + BoilTableModel::BoilTableModel(QTableView * parent, bool editable) : BtTableModel{ parent, diff --git a/src/qtModels/tableModels/BtTableModel.cpp b/src/qtModels/tableModels/BtTableModel.cpp index 482fc3f90..8fd7f5c37 100644 --- a/src/qtModels/tableModels/BtTableModel.cpp +++ b/src/qtModels/tableModels/BtTableModel.cpp @@ -28,6 +28,9 @@ #include "widgets/SmartAmounts.h" #include "widgets/UnitAndScalePopUpMenu.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_BtTableModel.cpp" + BtTableModelRecipeObserver::BtTableModelRecipeObserver(QTableView * parent, bool editable, std::initializer_list columnInfos) : diff --git a/src/qtModels/tableModels/EquipmentTableModel.cpp b/src/qtModels/tableModels/EquipmentTableModel.cpp old mode 100755 new mode 100644 index 75eac31e6..405b96e3d --- a/src/qtModels/tableModels/EquipmentTableModel.cpp +++ b/src/qtModels/tableModels/EquipmentTableModel.cpp @@ -20,6 +20,9 @@ #include #include +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_EquipmentTableModel.cpp" + EquipmentTableModel::EquipmentTableModel(QTableView* parent, bool editable) : BtTableModel{ parent, diff --git a/src/qtModels/tableModels/FermentableTableModel.cpp b/src/qtModels/tableModels/FermentableTableModel.cpp index f4c7986ae..17a013927 100644 --- a/src/qtModels/tableModels/FermentableTableModel.cpp +++ b/src/qtModels/tableModels/FermentableTableModel.cpp @@ -43,6 +43,9 @@ #include "utils/BtStringConst.h" #include "widgets/BtComboBoxEnum.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_FermentableTableModel.cpp" + //=====================CLASS FermentableTableModel============================== FermentableTableModel::FermentableTableModel(QTableView* parent, bool editable) : BtTableModel{ diff --git a/src/qtModels/tableModels/FermentationStepTableModel.cpp b/src/qtModels/tableModels/FermentationStepTableModel.cpp old mode 100755 new mode 100644 index 07de286de..139d4360b --- a/src/qtModels/tableModels/FermentationStepTableModel.cpp +++ b/src/qtModels/tableModels/FermentationStepTableModel.cpp @@ -34,6 +34,9 @@ #include "model/FermentationStep.h" #include "PersistentSettings.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_FermentationStepTableModel.cpp" + FermentationStepTableModel::FermentationStepTableModel(QTableView * parent, bool editable) : BtTableModel{ parent, diff --git a/src/qtModels/tableModels/FermentationTableModel.cpp b/src/qtModels/tableModels/FermentationTableModel.cpp index a2149ad79..503fc1292 100644 --- a/src/qtModels/tableModels/FermentationTableModel.cpp +++ b/src/qtModels/tableModels/FermentationTableModel.cpp @@ -23,6 +23,9 @@ #include "model/Fermentation.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_FermentationTableModel.cpp" + FermentationTableModel::FermentationTableModel(QTableView * parent, bool editable) : BtTableModel{ parent, diff --git a/src/qtModels/tableModels/HopTableModel.cpp b/src/qtModels/tableModels/HopTableModel.cpp index adb17ebbe..62bfa4b46 100644 --- a/src/qtModels/tableModels/HopTableModel.cpp +++ b/src/qtModels/tableModels/HopTableModel.cpp @@ -30,6 +30,9 @@ #include #include +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_HopTableModel.cpp" + HopTableModel::HopTableModel(QTableView * parent, bool editable) : BtTableModel{ parent, diff --git a/src/qtModels/tableModels/MashStepTableModel.cpp b/src/qtModels/tableModels/MashStepTableModel.cpp index a607f1522..005bee8ab 100644 --- a/src/qtModels/tableModels/MashStepTableModel.cpp +++ b/src/qtModels/tableModels/MashStepTableModel.cpp @@ -30,6 +30,9 @@ #include "model/MashStep.h" #include "qtModels/tableModels/BtTableModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_MashStepTableModel.cpp" + MashStepTableModel::MashStepTableModel(QTableView * parent, bool editable) : BtTableModel{ parent, diff --git a/src/qtModels/tableModels/MashTableModel.cpp b/src/qtModels/tableModels/MashTableModel.cpp index 9b4819170..71bbe0b9d 100644 --- a/src/qtModels/tableModels/MashTableModel.cpp +++ b/src/qtModels/tableModels/MashTableModel.cpp @@ -23,6 +23,9 @@ #include "model/Mash.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_MashTableModel.cpp" + MashTableModel::MashTableModel(QTableView * parent, bool editable) : BtTableModel{ parent, diff --git a/src/qtModels/tableModels/MiscTableModel.cpp b/src/qtModels/tableModels/MiscTableModel.cpp index fb3fb9782..cf47aecde 100644 --- a/src/qtModels/tableModels/MiscTableModel.cpp +++ b/src/qtModels/tableModels/MiscTableModel.cpp @@ -28,6 +28,9 @@ #include #include +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_MiscTableModel.cpp" + MiscTableModel::MiscTableModel(QTableView* parent, bool editable) : BtTableModel{ parent, diff --git a/src/qtModels/tableModels/RecipeAdditionFermentableTableModel.cpp b/src/qtModels/tableModels/RecipeAdditionFermentableTableModel.cpp old mode 100755 new mode 100644 index c09f87e2a..9a8b4a90f --- a/src/qtModels/tableModels/RecipeAdditionFermentableTableModel.cpp +++ b/src/qtModels/tableModels/RecipeAdditionFermentableTableModel.cpp @@ -37,6 +37,9 @@ #include "model/Inventory.h" #include "model/Recipe.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RecipeAdditionFermentableTableModel.cpp" + RecipeAdditionFermentableTableModel::RecipeAdditionFermentableTableModel(QTableView * parent, bool editable) : BtTableModelRecipeObserver{ parent, diff --git a/src/qtModels/tableModels/RecipeAdditionHopTableModel.cpp b/src/qtModels/tableModels/RecipeAdditionHopTableModel.cpp old mode 100755 new mode 100644 index 341d826da..d0cda5b8d --- a/src/qtModels/tableModels/RecipeAdditionHopTableModel.cpp +++ b/src/qtModels/tableModels/RecipeAdditionHopTableModel.cpp @@ -36,6 +36,9 @@ #include "model/Inventory.h" #include "model/Recipe.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RecipeAdditionHopTableModel.cpp" + RecipeAdditionHopTableModel::RecipeAdditionHopTableModel(QTableView * parent, bool editable) : BtTableModelRecipeObserver{ parent, diff --git a/src/qtModels/tableModels/RecipeAdditionMiscTableModel.cpp b/src/qtModels/tableModels/RecipeAdditionMiscTableModel.cpp old mode 100755 new mode 100644 index 16e24b31d..a1380fd50 --- a/src/qtModels/tableModels/RecipeAdditionMiscTableModel.cpp +++ b/src/qtModels/tableModels/RecipeAdditionMiscTableModel.cpp @@ -36,6 +36,9 @@ #include "model/Inventory.h" #include "model/Recipe.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RecipeAdditionMiscTableModel.cpp" + RecipeAdditionMiscTableModel::RecipeAdditionMiscTableModel(QTableView * parent, bool editable) : BtTableModelRecipeObserver{ parent, diff --git a/src/qtModels/tableModels/RecipeAdditionYeastTableModel.cpp b/src/qtModels/tableModels/RecipeAdditionYeastTableModel.cpp old mode 100755 new mode 100644 index 834eafbfd..0b8a916fe --- a/src/qtModels/tableModels/RecipeAdditionYeastTableModel.cpp +++ b/src/qtModels/tableModels/RecipeAdditionYeastTableModel.cpp @@ -37,6 +37,9 @@ #include "model/Inventory.h" #include "model/Recipe.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RecipeAdditionYeastTableModel.cpp" + RecipeAdditionYeastTableModel::RecipeAdditionYeastTableModel(QTableView * parent, bool editable) : BtTableModelRecipeObserver{ parent, diff --git a/src/qtModels/tableModels/RecipeAdjustmentSaltTableModel.cpp b/src/qtModels/tableModels/RecipeAdjustmentSaltTableModel.cpp old mode 100755 new mode 100644 index b20a0498d..8c49d4619 --- a/src/qtModels/tableModels/RecipeAdjustmentSaltTableModel.cpp +++ b/src/qtModels/tableModels/RecipeAdjustmentSaltTableModel.cpp @@ -32,6 +32,9 @@ #include "model/Mash.h" #include "model/Recipe.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_RecipeAdjustmentSaltTableModel.cpp" + RecipeAdjustmentSaltTableModel::RecipeAdjustmentSaltTableModel(QTableView* parent, bool editable) : BtTableModelRecipeObserver{ parent, diff --git a/src/qtModels/tableModels/SaltTableModel.cpp b/src/qtModels/tableModels/SaltTableModel.cpp index cb8c1c9df..9f1b47d43 100644 --- a/src/qtModels/tableModels/SaltTableModel.cpp +++ b/src/qtModels/tableModels/SaltTableModel.cpp @@ -24,6 +24,9 @@ #include #include +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_SaltTableModel.cpp" + SaltTableModel::SaltTableModel(QTableView* parent, bool editable) : BtTableModel{ parent, diff --git a/src/qtModels/tableModels/StyleTableModel.cpp b/src/qtModels/tableModels/StyleTableModel.cpp old mode 100755 new mode 100644 index 2350d3881..c11c4647d --- a/src/qtModels/tableModels/StyleTableModel.cpp +++ b/src/qtModels/tableModels/StyleTableModel.cpp @@ -20,6 +20,9 @@ #include #include +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_StyleTableModel.cpp" + StyleTableModel::StyleTableModel(QTableView* parent, bool editable) : BtTableModel{ parent, diff --git a/src/qtModels/tableModels/WaterTableModel.cpp b/src/qtModels/tableModels/WaterTableModel.cpp index 3b7390096..5b4803abb 100644 --- a/src/qtModels/tableModels/WaterTableModel.cpp +++ b/src/qtModels/tableModels/WaterTableModel.cpp @@ -27,6 +27,9 @@ #include "Localization.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_WaterTableModel.cpp" + WaterTableModel::WaterTableModel(QTableView * parent, bool editable) : BtTableModel{ parent, diff --git a/src/qtModels/tableModels/YeastTableModel.cpp b/src/qtModels/tableModels/YeastTableModel.cpp index 8824dd14d..21845e64d 100644 --- a/src/qtModels/tableModels/YeastTableModel.cpp +++ b/src/qtModels/tableModels/YeastTableModel.cpp @@ -28,6 +28,9 @@ #include #include +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_YeastTableModel.cpp" + YeastTableModel::YeastTableModel(QTableView * parent, bool editable) : BtTableModel{ parent, diff --git a/src/trees/TreeFilterProxyModel.cpp b/src/trees/TreeFilterProxyModel.cpp old mode 100755 new mode 100644 index d84a231df..90f3e0963 --- a/src/trees/TreeFilterProxyModel.cpp +++ b/src/trees/TreeFilterProxyModel.cpp @@ -32,6 +32,9 @@ #include "model/Water.h" #include "model/Yeast.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_TreeFilterProxyModel.cpp" + namespace { template bool lessThan(TreeModel * model, diff --git a/src/trees/TreeModel.cpp b/src/trees/TreeModel.cpp index e5bf3e3d5..27043bb22 100644 --- a/src/trees/TreeModel.cpp +++ b/src/trees/TreeModel.cpp @@ -49,6 +49,9 @@ #include "utils/BtStringConst.h" #include "PersistentSettings.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_TreeModel.cpp" + namespace { NamedEntity * getElement(TreeNode::Type oType, int id) { switch (oType) { diff --git a/src/trees/TreeView.cpp b/src/trees/TreeView.cpp index 9c918c562..2fefa29f8 100644 --- a/src/trees/TreeView.cpp +++ b/src/trees/TreeView.cpp @@ -48,6 +48,9 @@ #include "model/Yeast.h" #include "trees/TreeModel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_TreeView.cpp" + TreeView::TreeView(QWidget * parent, TreeModel::TypeMasks type) : QTreeView{parent}, m_type{type} { diff --git a/src/widgets/Animator.cpp b/src/widgets/Animator.cpp index f0102376d..df8e64463 100644 --- a/src/widgets/Animator.cpp +++ b/src/widgets/Animator.cpp @@ -21,6 +21,9 @@ #include #include +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_Animator.cpp" + Animator::Animator(QObject * target, QObject * parent) : QVariantAnimation(parent) { setTargetObject(target); return; diff --git a/src/widgets/BtComboBoxBool.cpp b/src/widgets/BtComboBoxBool.cpp old mode 100755 new mode 100644 index 683ad2674..42e5d6558 --- a/src/widgets/BtComboBoxBool.cpp +++ b/src/widgets/BtComboBoxBool.cpp @@ -20,6 +20,9 @@ #include "utils/MetaTypes.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_BtComboBoxBool.cpp" + namespace { // We store string values inside the combo box as it's less confusing when the value is optional QString const falseValue = QStringLiteral("false"); diff --git a/src/widgets/BtComboBoxEnum.cpp b/src/widgets/BtComboBoxEnum.cpp old mode 100755 new mode 100644 index 8b974fc89..3fc29df94 --- a/src/widgets/BtComboBoxEnum.cpp +++ b/src/widgets/BtComboBoxEnum.cpp @@ -17,6 +17,9 @@ #include "widgets/SmartLineEdit.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_BtComboBoxEnum.cpp" + // This private implementation class holds all private non-virtual members of BtComboBoxEnum class BtComboBoxEnum::impl { public: diff --git a/src/widgets/BtComboBoxNamedEntity.cpp b/src/widgets/BtComboBoxNamedEntity.cpp old mode 100755 new mode 100644 index 67205ffa3..3e635d1a3 --- a/src/widgets/BtComboBoxNamedEntity.cpp +++ b/src/widgets/BtComboBoxNamedEntity.cpp @@ -21,6 +21,9 @@ #include #include +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_BtComboBoxNamedEntity.cpp" + BtComboBoxNamedEntity::BtComboBoxNamedEntity(char const * const name, QWidget* parent) : QComboBox{parent}, m_name{name} { diff --git a/src/widgets/BtOptionalDateEdit.cpp b/src/widgets/BtOptionalDateEdit.cpp old mode 100755 new mode 100644 index b573a7733..7f968da39 --- a/src/widgets/BtOptionalDateEdit.cpp +++ b/src/widgets/BtOptionalDateEdit.cpp @@ -23,6 +23,9 @@ #include #include +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_BtOptionalDateEdit.cpp" + // // This private implementation class holds all private non-virtual members of BtOptionalDateEdit // diff --git a/src/widgets/InfoButton.cpp b/src/widgets/InfoButton.cpp old mode 100755 new mode 100644 index ab39c01d6..069558ea0 --- a/src/widgets/InfoButton.cpp +++ b/src/widgets/InfoButton.cpp @@ -25,6 +25,9 @@ #include "utils/Fonts.h" #include "widgets/InfoText.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_InfoButton.cpp" + namespace { QColor const backgroundColorInfoShown {0x14, 0x82, 0x63}; QColor const backgroundColorPressed {0x63, 0x14, 0x82}; diff --git a/src/widgets/InfoText.cpp b/src/widgets/InfoText.cpp old mode 100755 new mode 100644 index 8994af23d..c1048620c --- a/src/widgets/InfoText.cpp +++ b/src/widgets/InfoText.cpp @@ -19,6 +19,9 @@ #include "widgets/InfoButton.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_InfoText.cpp" + InfoText::InfoText(QWidget * parent, Qt::WindowFlags flags) : QLabel(parent, flags), m_infoButton{nullptr} { this->setWordWrap(true); // diff --git a/src/widgets/SelectionControl.cpp b/src/widgets/SelectionControl.cpp index 44a832440..0f5973697 100644 --- a/src/widgets/SelectionControl.cpp +++ b/src/widgets/SelectionControl.cpp @@ -16,6 +16,9 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "widgets/SelectionControl.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_SelectionControl.cpp" + SelectionControl::SelectionControl(QWidget * parent) : QAbstractButton(parent) { setObjectName("SelectionControl"); setCheckable(true); diff --git a/src/widgets/SmartCheckBox.cpp b/src/widgets/SmartCheckBox.cpp old mode 100755 new mode 100644 index 3d67b2be4..12d0139f4 --- a/src/widgets/SmartCheckBox.cpp +++ b/src/widgets/SmartCheckBox.cpp @@ -21,6 +21,9 @@ #include "widgets/SmartLineEdit.h" #include "utils/TypeLookup.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_SmartCheckBox.cpp" + // This private implementation class holds all private non-virtual members of SmartCheckBox class SmartCheckBox::impl { public: diff --git a/src/widgets/SmartDigitWidget.cpp b/src/widgets/SmartDigitWidget.cpp index f8dda9fba..8dad6fa95 100644 --- a/src/widgets/SmartDigitWidget.cpp +++ b/src/widgets/SmartDigitWidget.cpp @@ -31,6 +31,9 @@ #include "PersistentSettings.h" #include "widgets/SmartLabel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_SmartDigitWidget.cpp" + // This private implementation class holds all private non-virtual members of SmartDigitWidget class SmartDigitWidget::impl { public: diff --git a/src/widgets/SmartLabel.cpp b/src/widgets/SmartLabel.cpp index 21c0098b9..d14cf8de5 100644 --- a/src/widgets/SmartLabel.cpp +++ b/src/widgets/SmartLabel.cpp @@ -33,6 +33,9 @@ #include "widgets/SmartField.h" #include "widgets/UnitAndScalePopUpMenu.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_SmartLabel.cpp" + // This private implementation class holds all private non-virtual members of SmartLabel class SmartLabel::impl { public: diff --git a/src/widgets/SmartLineEdit.cpp b/src/widgets/SmartLineEdit.cpp index 4be2db451..1a982cc01 100644 --- a/src/widgets/SmartLineEdit.cpp +++ b/src/widgets/SmartLineEdit.cpp @@ -34,6 +34,9 @@ #include "utils/TypeLookup.h" #include "widgets/SmartLabel.h" +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_SmartLineEdit.cpp" + namespace { // // There is a bit of trial-and-error involved in setting these values diff --git a/src/widgets/ToggleSwitch.cpp b/src/widgets/ToggleSwitch.cpp index 24385c0e2..995c3bb77 100644 --- a/src/widgets/ToggleSwitch.cpp +++ b/src/widgets/ToggleSwitch.cpp @@ -18,6 +18,9 @@ #include +// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake +#include "moc_ToggleSwitch.cpp" + Q_DECL_IMPORT void qt_blurImage(QPainter * p, QImage & blurImage, qreal radius, bool quality, bool alphaOnly, int transposed = 0); // src/widgets/effects/qpixmapfilter.cpp From 866fd37fb1cee656077925b2162d9627f287d19a Mon Sep 17 00:00:00 2001 From: Matt Young Date: Thu, 2 Jan 2025 09:51:00 +0100 Subject: [PATCH 4/4] Build fixes 3 --- CMakeLists.txt | 10 ++++++++++ src/AboutDialog.cpp | 6 ++++-- src/AlcoholTool.cpp | 6 ++++-- src/AncestorDialog.cpp | 6 ++++-- src/BeerColorWidget.cpp | 6 ++++-- src/BrewDayFormatter.cpp | 6 ++++-- src/BrewDayScrollWidget.cpp | 6 ++++-- src/BrewNoteWidget.cpp | 6 ++++-- src/BtDatePopup.cpp | 6 ++++-- src/BtSplashScreen.cpp | 6 ++++-- src/BtTabWidget.cpp | 6 ++++-- src/BtTextEdit.cpp | 6 ++++-- src/ConverterTool.cpp | 6 ++++-- src/HelpDialog.cpp | 6 ++++-- src/HydrometerTool.cpp | 6 ++++-- src/IbuGuSlider.cpp | 6 ++++-- src/LatestReleaseFinder.cpp | 6 ++++-- src/MainWindow.cpp | 6 ++++-- src/MashDesigner.cpp | 6 ++++-- src/MashWizard.cpp | 6 ++++-- src/NamedEntitySortProxyModel.cpp | 6 ++++-- src/OgAdjuster.cpp | 6 ++++-- src/OptionDialog.cpp | 6 ++++-- src/PitchDialog.cpp | 6 ++++-- src/PrimingDialog.cpp | 6 ++++-- src/PrintAndPreviewDialog.cpp | 6 ++++-- src/RangedSlider.cpp | 6 ++++-- src/RecipeExtrasWidget.cpp | 6 ++++-- src/RecipeFormatter.cpp | 6 ++++-- src/RefractoDialog.cpp | 6 ++++-- src/ScaleRecipeTool.cpp | 6 ++++-- src/StrikeWaterDialog.cpp | 6 ++++-- src/StyleRangeWidget.cpp | 6 ++++-- src/TimerListDialog.cpp | 6 ++++-- src/TimerMainDialog.cpp | 6 ++++-- src/TimerWidget.cpp | 6 ++++-- src/WaterDialog.cpp | 6 ++++-- src/boiltime.cpp | 6 ++++-- src/buttons/BoilButton.cpp | 6 ++++-- src/buttons/EquipmentButton.cpp | 6 ++++-- src/buttons/FermentationButton.cpp | 6 ++++-- src/buttons/MashButton.cpp | 6 ++++-- src/buttons/RecipeAttributeButton.cpp | 6 ++++-- src/buttons/StyleButton.cpp | 6 ++++-- src/buttons/WaterButton.cpp | 6 ++++-- src/catalogs/EquipmentCatalog.cpp | 6 ++++-- src/catalogs/FermentableCatalog.cpp | 6 ++++-- src/catalogs/HopCatalog.cpp | 6 ++++-- src/catalogs/MiscCatalog.cpp | 6 ++++-- src/catalogs/StyleCatalog.cpp | 6 ++++-- src/catalogs/YeastCatalog.cpp | 6 ++++-- src/database/ObjectStore.cpp | 6 ++++-- src/editors/BoilEditor.cpp | 6 ++++-- src/editors/BoilStepEditor.cpp | 6 ++++-- src/editors/EquipmentEditor.cpp | 6 ++++-- src/editors/FermentableEditor.cpp | 6 ++++-- src/editors/FermentationEditor.cpp | 6 ++++-- src/editors/FermentationStepEditor.cpp | 6 ++++-- src/editors/HopEditor.cpp | 6 ++++-- src/editors/MashEditor.cpp | 6 ++++-- src/editors/MashStepEditor.cpp | 6 ++++-- src/editors/MiscEditor.cpp | 6 ++++-- src/editors/NamedMashEditor.cpp | 6 ++++-- src/editors/StyleEditor.cpp | 6 ++++-- src/editors/WaterEditor.cpp | 6 ++++-- src/editors/YeastEditor.cpp | 6 ++++-- src/model/Boil.cpp | 6 ++++-- src/model/BoilStep.cpp | 6 ++++-- src/model/BrewNote.cpp | 6 ++++-- src/model/Equipment.cpp | 6 ++++-- src/model/Fermentable.cpp | 6 ++++-- src/model/Fermentation.cpp | 6 ++++-- src/model/FermentationStep.cpp | 6 ++++-- src/model/Folder.cpp | 6 ++++-- src/model/Hop.cpp | 6 ++++-- src/model/Ingredient.cpp | 6 ++++-- src/model/IngredientInRecipe.cpp | 6 ++++-- src/model/Instruction.cpp | 6 ++++-- src/model/Inventory.cpp | 18 ++++++++++-------- src/model/Mash.cpp | 6 ++++-- src/model/MashStep.cpp | 6 ++++-- src/model/Misc.cpp | 6 ++++-- src/model/NamedEntity.cpp | 6 ++++-- src/model/OutlineableNamedEntity.cpp | 6 ++++-- src/model/OwnedByRecipe.cpp | 6 ++++-- src/model/Recipe.cpp | 6 ++++-- src/model/RecipeAddition.cpp | 6 ++++-- src/model/RecipeAdditionFermentable.cpp | 6 ++++-- src/model/RecipeAdditionHop.cpp | 6 ++++-- src/model/RecipeAdditionMisc.cpp | 6 ++++-- src/model/RecipeAdditionYeast.cpp | 6 ++++-- src/model/RecipeAdjustmentSalt.cpp | 6 ++++-- src/model/RecipeUseOfWater.cpp | 6 ++++-- src/model/Salt.cpp | 6 ++++-- src/model/Step.cpp | 6 ++++-- src/model/StepExtended.cpp | 6 ++++-- src/model/Style.cpp | 6 ++++-- src/model/Water.cpp | 6 ++++-- src/model/Yeast.cpp | 6 ++++-- src/qtModels/listModels/BoilListModel.cpp | 6 ++++-- src/qtModels/listModels/EquipmentListModel.cpp | 6 ++++-- .../listModels/FermentableListModel.cpp | 6 ++++-- .../listModels/FermentationListModel.cpp | 6 ++++-- src/qtModels/listModels/HopListModel.cpp | 6 ++++-- src/qtModels/listModels/MashListModel.cpp | 6 ++++-- src/qtModels/listModels/MashStepListModel.cpp | 6 ++++-- src/qtModels/listModels/MiscListModel.cpp | 6 ++++-- .../RecipeAdditionFermentableListModel.cpp | 6 ++++-- .../listModels/RecipeAdditionHopListModel.cpp | 6 ++++-- .../listModels/RecipeAdditionMiscListModel.cpp | 6 ++++-- .../RecipeAdditionYeastListModel.cpp | 6 ++++-- .../RecipeAdjustmentSaltListModel.cpp | 6 ++++-- src/qtModels/listModels/SaltListModel.cpp | 6 ++++-- src/qtModels/listModels/StyleListModel.cpp | 6 ++++-- src/qtModels/listModels/WaterListModel.cpp | 6 ++++-- src/qtModels/listModels/YeastListModel.cpp | 6 ++++-- .../BoilSortFilterProxyModel.cpp | 6 ++++-- .../EquipmentSortFilterProxyModel.cpp | 6 ++++-- .../FermentableSortFilterProxyModel.cpp | 6 ++++-- .../FermentationSortFilterProxyModel.cpp | 6 ++++-- .../HopSortFilterProxyModel.cpp | 6 ++++-- .../MashSortFilterProxyModel.cpp | 6 ++++-- .../MiscSortFilterProxyModel.cpp | 6 ++++-- ...AdditionFermentableSortFilterProxyModel.cpp | 6 ++++-- .../RecipeAdditionHopSortFilterProxyModel.cpp | 6 ++++-- .../RecipeAdditionMiscSortFilterProxyModel.cpp | 6 ++++-- ...RecipeAdditionYeastSortFilterProxyModel.cpp | 6 ++++-- .../StyleSortFilterProxyModel.cpp | 6 ++++-- .../WaterSortFilterProxyModel.cpp | 6 ++++-- .../YeastSortFilterProxyModel.cpp | 6 ++++-- .../tableModels/BoilStepTableModel.cpp | 6 ++++-- src/qtModels/tableModels/BoilTableModel.cpp | 6 ++++-- src/qtModels/tableModels/BtTableModel.cpp | 6 ++++-- .../tableModels/EquipmentTableModel.cpp | 6 ++++-- .../tableModels/FermentableTableModel.cpp | 6 ++++-- .../tableModels/FermentationStepTableModel.cpp | 6 ++++-- .../tableModels/FermentationTableModel.cpp | 6 ++++-- src/qtModels/tableModels/HopTableModel.cpp | 6 ++++-- .../tableModels/MashStepTableModel.cpp | 6 ++++-- src/qtModels/tableModels/MashTableModel.cpp | 6 ++++-- src/qtModels/tableModels/MiscTableModel.cpp | 6 ++++-- .../RecipeAdditionFermentableTableModel.cpp | 6 ++++-- .../RecipeAdditionHopTableModel.cpp | 6 ++++-- .../RecipeAdditionMiscTableModel.cpp | 6 ++++-- .../RecipeAdditionYeastTableModel.cpp | 6 ++++-- .../RecipeAdjustmentSaltTableModel.cpp | 6 ++++-- src/qtModels/tableModels/SaltTableModel.cpp | 6 ++++-- src/qtModels/tableModels/StyleTableModel.cpp | 6 ++++-- src/qtModels/tableModels/WaterTableModel.cpp | 6 ++++-- src/qtModels/tableModels/YeastTableModel.cpp | 6 ++++-- src/trees/TreeFilterProxyModel.cpp | 6 ++++-- src/trees/TreeModel.cpp | 6 ++++-- src/trees/TreeView.cpp | 6 ++++-- src/widgets/Animator.cpp | 6 ++++-- src/widgets/BtComboBoxBool.cpp | 6 ++++-- src/widgets/BtComboBoxEnum.cpp | 6 ++++-- src/widgets/BtComboBoxNamedEntity.cpp | 6 ++++-- src/widgets/BtOptionalDateEdit.cpp | 6 ++++-- src/widgets/InfoButton.cpp | 6 ++++-- src/widgets/InfoText.cpp | 6 ++++-- src/widgets/SelectionControl.cpp | 6 ++++-- src/widgets/SmartCheckBox.cpp | 6 ++++-- src/widgets/SmartDigitWidget.cpp | 6 ++++-- src/widgets/SmartLabel.cpp | 6 ++++-- src/widgets/SmartLineEdit.cpp | 6 ++++-- src/widgets/ToggleSwitch.cpp | 6 ++++-- 166 files changed, 676 insertions(+), 336 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d5d613db3..7180624eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -456,6 +456,16 @@ endif() # declarations etc. set(CMAKE_AUTOMOC ON) +# Although AUTOMOC is pretty neat when it works, it can be problematic. Part of what it does is #include all the +# generated files (eg "moc_AboutDialog.cpp") into a single intermediate source file, which it then compiles. We have +# sometimes had compiler errors from this because of various Qt headers complaining about things being redefined. The +# brute-force workaround is, on CMake builds, to manually include these generated files in our corresponding .cpp file +# (eg "AboutDialog.cpp"), which then stops CMake pulling those generated files into its intermediate source file. +# +# (We don't want to do this extra manual include on the Meson builds because then we'd get duplicate symbols at the +# linking stage.) +add_compile_definitions(BUILDING_WITH_CMAKE) + # Set the AUTOUIC property on all targets. This tells CMake to automatically handle the Qt uic code generator, without # having to use commands such as QT4_WRAP_UI(), QT5_WRAP_UI(), etc. set(CMAKE_AUTOUIC ON) diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp index 7cc3599d6..4fca701e9 100644 --- a/src/AboutDialog.cpp +++ b/src/AboutDialog.cpp @@ -27,8 +27,10 @@ #include "config.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_AboutDialog.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_AboutDialog.cpp" +#endif AboutDialog::AboutDialog(QWidget * parent) : QDialog(parent), diff --git a/src/AlcoholTool.cpp b/src/AlcoholTool.cpp index 1aa9925e8..4b0eaaadc 100644 --- a/src/AlcoholTool.cpp +++ b/src/AlcoholTool.cpp @@ -34,8 +34,10 @@ #include "measurement/SystemOfMeasurement.h" #include "widgets/ToggleSwitch.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_AlcoholTool.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_AlcoholTool.cpp" +#endif // Settings we only use in this file under the PersistentSettings::Sections::alcoholTool section #define AddSettingName(name) namespace { BtStringConst const name{#name}; } diff --git a/src/AncestorDialog.cpp b/src/AncestorDialog.cpp index 6f5b6a009..9d36a7d8f 100644 --- a/src/AncestorDialog.cpp +++ b/src/AncestorDialog.cpp @@ -37,8 +37,10 @@ #include "model/NamedEntity.h" #include "model/Recipe.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_AncestorDialog.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_AncestorDialog.cpp" +#endif AncestorDialog::AncestorDialog(QWidget * parent) : QDialog(parent) { diff --git a/src/BeerColorWidget.cpp b/src/BeerColorWidget.cpp index 93b9d6ebf..7db4349fa 100644 --- a/src/BeerColorWidget.cpp +++ b/src/BeerColorWidget.cpp @@ -26,8 +26,10 @@ #include "config.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_BeerColorWidget.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_BeerColorWidget.cpp" +#endif // TODO: make the size adjust inside the container. BeerColorWidget::BeerColorWidget(QWidget* parent) : QWidget(parent) { diff --git a/src/BrewDayFormatter.cpp b/src/BrewDayFormatter.cpp index 567a07ced..888e58baf 100644 --- a/src/BrewDayFormatter.cpp +++ b/src/BrewDayFormatter.cpp @@ -30,8 +30,10 @@ #include "model/Style.h" #include "PersistentSettings.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_BrewDayFormatter.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_BrewDayFormatter.cpp" +#endif BrewDayFormatter::BrewDayFormatter(QObject * parent) : QObject(parent) { diff --git a/src/BrewDayScrollWidget.cpp b/src/BrewDayScrollWidget.cpp index 6a1e0b403..3d8cfc346 100644 --- a/src/BrewDayScrollWidget.cpp +++ b/src/BrewDayScrollWidget.cpp @@ -41,8 +41,10 @@ #include "PersistentSettings.h" #include "TimerWidget.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_BrewDayScrollWidget.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_BrewDayScrollWidget.cpp" +#endif namespace { QString styleName(Style const * style) { diff --git a/src/BrewNoteWidget.cpp b/src/BrewNoteWidget.cpp index 554ebc93d..ffe1e03bf 100644 --- a/src/BrewNoteWidget.cpp +++ b/src/BrewNoteWidget.cpp @@ -29,8 +29,10 @@ #include "model/BrewNote.h" #include "PersistentSettings.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_BrewNoteWidget.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_BrewNoteWidget.cpp" +#endif namespace { double const lowLimitPct = 0.95; diff --git a/src/BtDatePopup.cpp b/src/BtDatePopup.cpp index 716f1c953..dcf004295 100644 --- a/src/BtDatePopup.cpp +++ b/src/BtDatePopup.cpp @@ -20,8 +20,10 @@ #include #include "BtDatePopup.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_BtDatePopup.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_BtDatePopup.cpp" +#endif //! \brief set up the popup window. BtDatePopup::BtDatePopup(QWidget* parent) : QDialog(parent, Qt::Popup) diff --git a/src/BtSplashScreen.cpp b/src/BtSplashScreen.cpp index ef73aeba3..c678a919b 100644 --- a/src/BtSplashScreen.cpp +++ b/src/BtSplashScreen.cpp @@ -21,8 +21,10 @@ #include "config.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_BtSplashScreen.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_BtSplashScreen.cpp" +#endif namespace { static QString const logoFile = QString{":images/%1.svg"}.arg(CONFIG_APPLICATION_NAME_LC); diff --git a/src/BtTabWidget.cpp b/src/BtTabWidget.cpp index 1786ed1bf..e418f0fec 100644 --- a/src/BtTabWidget.cpp +++ b/src/BtTabWidget.cpp @@ -26,8 +26,10 @@ #include "model/Recipe.h" #include "model/Style.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_BtTabWidget.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_BtTabWidget.cpp" +#endif //! \brief set up the popup window. diff --git a/src/BtTextEdit.cpp b/src/BtTextEdit.cpp index c16d37995..3f386d767 100644 --- a/src/BtTextEdit.cpp +++ b/src/BtTextEdit.cpp @@ -22,8 +22,10 @@ #include #include -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_BtTextEdit.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_BtTextEdit.cpp" +#endif BtTextEdit::BtTextEdit([[maybe_unused]] QWidget * parent) : wasModified{false} { diff --git a/src/ConverterTool.cpp b/src/ConverterTool.cpp index 7eeceb194..af5f661eb 100644 --- a/src/ConverterTool.cpp +++ b/src/ConverterTool.cpp @@ -24,8 +24,10 @@ #include "measurement/Unit.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_ConverterTool.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_ConverterTool.cpp" +#endif ConverterTool::ConverterTool(QWidget* parent) : QDialog(parent) { this->doLayout(); diff --git a/src/HelpDialog.cpp b/src/HelpDialog.cpp index 664987e00..1fb84f121 100644 --- a/src/HelpDialog.cpp +++ b/src/HelpDialog.cpp @@ -25,8 +25,10 @@ #include "Logging.h" #include "PersistentSettings.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_HelpDialog.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_HelpDialog.cpp" +#endif // This private implementation class holds all private non-virtual members of HelpDialog class HelpDialog::impl { diff --git a/src/HydrometerTool.cpp b/src/HydrometerTool.cpp index d3ce9a4de..9b068dd4e 100644 --- a/src/HydrometerTool.cpp +++ b/src/HydrometerTool.cpp @@ -32,8 +32,10 @@ #include "Algorithms.h" #include "measurement/Unit.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_HydrometerTool.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_HydrometerTool.cpp" +#endif HydrometerTool::HydrometerTool(QWidget* parent) : QDialog(parent) { this->doLayout(); diff --git a/src/IbuGuSlider.cpp b/src/IbuGuSlider.cpp index 7f3b67026..821e46d2c 100644 --- a/src/IbuGuSlider.cpp +++ b/src/IbuGuSlider.cpp @@ -16,8 +16,10 @@ #include "IbuGuSlider.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_IbuGuSlider.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_IbuGuSlider.cpp" +#endif IbuGuSlider::IbuGuSlider(QWidget* parent) : RangedSlider(parent) diff --git a/src/LatestReleaseFinder.cpp b/src/LatestReleaseFinder.cpp index e7246b7fa..419427005 100644 --- a/src/LatestReleaseFinder.cpp +++ b/src/LatestReleaseFinder.cpp @@ -28,8 +28,10 @@ #include "config.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_LatestReleaseFinder.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_LatestReleaseFinder.cpp" +#endif void LatestReleaseFinder::checkMainRespository() { diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 2d4483fdf..941761fd0 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -159,8 +159,10 @@ #include "utils/BtStringConst.h" #include "utils/OptionalHelpers.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_MainWindow.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_MainWindow.cpp" +#endif namespace { diff --git a/src/MashDesigner.cpp b/src/MashDesigner.cpp index 3fddbdb84..cd7a6ee01 100644 --- a/src/MashDesigner.cpp +++ b/src/MashDesigner.cpp @@ -32,8 +32,10 @@ #include "model/Fermentable.h" #include "PhysicalConstants.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_MashDesigner.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_MashDesigner.cpp" +#endif MashDesigner::MashDesigner(QWidget * parent) : QDialog {parent}, m_recObs {nullptr}, diff --git a/src/MashWizard.cpp b/src/MashWizard.cpp index 0a66ccf2f..181cecbd8 100644 --- a/src/MashWizard.cpp +++ b/src/MashWizard.cpp @@ -37,8 +37,10 @@ #include "model/MashStep.h" #include "PhysicalConstants.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_MashWizard.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_MashWizard.cpp" +#endif MashWizard::MashWizard(QWidget* parent) : QDialog(parent), diff --git a/src/NamedEntitySortProxyModel.cpp b/src/NamedEntitySortProxyModel.cpp index 8cb5ac3cf..20d8ebffe 100644 --- a/src/NamedEntitySortProxyModel.cpp +++ b/src/NamedEntitySortProxyModel.cpp @@ -19,8 +19,10 @@ #include #include -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_NamedEntitySortProxyModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_NamedEntitySortProxyModel.cpp" +#endif NamedEntitySortProxyModel::NamedEntitySortProxyModel(QAbstractItemModel* sourceModel) : QSortFilterProxyModel(sourceModel) diff --git a/src/OgAdjuster.cpp b/src/OgAdjuster.cpp index 62c6fd2f5..556ff69e6 100644 --- a/src/OgAdjuster.cpp +++ b/src/OgAdjuster.cpp @@ -26,8 +26,10 @@ #include "model/Equipment.h" #include "model/Recipe.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_OgAdjuster.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_OgAdjuster.cpp" +#endif OgAdjuster::OgAdjuster( QWidget* parent ) : QDialog{parent}, diff --git a/src/OptionDialog.cpp b/src/OptionDialog.cpp index b106ec489..9ec0ddfb1 100644 --- a/src/OptionDialog.cpp +++ b/src/OptionDialog.cpp @@ -52,8 +52,10 @@ #include "measurement/UnitSystem.h" #include "PersistentSettings.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_OptionDialog.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_OptionDialog.cpp" +#endif // // Anonymous namespace for constants, global variables and functions used only in this file diff --git a/src/PitchDialog.cpp b/src/PitchDialog.cpp index a906648b7..c4c97c82c 100644 --- a/src/PitchDialog.cpp +++ b/src/PitchDialog.cpp @@ -29,8 +29,10 @@ #include "measurement/Unit.h" #include "PersistentSettings.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_PitchDialog.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_PitchDialog.cpp" +#endif PitchDialog::PitchDialog(QWidget* parent) : QDialog(parent) { setupUi(this); diff --git a/src/PrimingDialog.cpp b/src/PrimingDialog.cpp index f250df392..2aae5faf6 100644 --- a/src/PrimingDialog.cpp +++ b/src/PrimingDialog.cpp @@ -27,8 +27,10 @@ #include "measurement/Unit.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_PrimingDialog.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_PrimingDialog.cpp" +#endif PrimingDialog::PrimingDialog(QWidget* parent) : QDialog(parent) { this->setupUi(this); diff --git a/src/PrintAndPreviewDialog.cpp b/src/PrintAndPreviewDialog.cpp index b1cfcd0af..867302ac2 100644 --- a/src/PrintAndPreviewDialog.cpp +++ b/src/PrintAndPreviewDialog.cpp @@ -29,8 +29,10 @@ #include "InventoryFormatter.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_PrintAndPreviewDialog.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_PrintAndPreviewDialog.cpp" +#endif /** * @brief Construct a new Print And Preview Dialog:: Print And Preview Dialog object diff --git a/src/RangedSlider.cpp b/src/RangedSlider.cpp index 6260fe729..5f84d5d4e 100644 --- a/src/RangedSlider.cpp +++ b/src/RangedSlider.cpp @@ -34,8 +34,10 @@ #include #include -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RangedSlider.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RangedSlider.cpp" +#endif RangedSlider::RangedSlider(QWidget* parent) : QWidget(parent), diff --git a/src/RecipeExtrasWidget.cpp b/src/RecipeExtrasWidget.cpp index 203cb0764..2aa16a578 100644 --- a/src/RecipeExtrasWidget.cpp +++ b/src/RecipeExtrasWidget.cpp @@ -28,8 +28,10 @@ #include "undoRedo/Undoable.h" #include "utils/OptionalHelpers.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RecipeExtrasWidget.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RecipeExtrasWidget.cpp" +#endif RecipeExtrasWidget::RecipeExtrasWidget(QWidget* parent) : QWidget(parent), diff --git a/src/RecipeFormatter.cpp b/src/RecipeFormatter.cpp index 3be7aef61..a3a758a30 100644 --- a/src/RecipeFormatter.cpp +++ b/src/RecipeFormatter.cpp @@ -58,8 +58,10 @@ #include "model/Yeast.h" #include "PersistentSettings.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RecipeFormatter.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RecipeFormatter.cpp" +#endif namespace { //! Get the maximum number of characters in a list of strings. diff --git a/src/RefractoDialog.cpp b/src/RefractoDialog.cpp index cfc946692..c11693de9 100644 --- a/src/RefractoDialog.cpp +++ b/src/RefractoDialog.cpp @@ -29,8 +29,10 @@ #include "Algorithms.h" #include "measurement/Measurement.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RefractoDialog.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RefractoDialog.cpp" +#endif RefractoDialog::RefractoDialog(QWidget* parent) : QDialog(parent) { setupUi(this); diff --git a/src/ScaleRecipeTool.cpp b/src/ScaleRecipeTool.cpp index 5504a047e..b03e089f2 100644 --- a/src/ScaleRecipeTool.cpp +++ b/src/ScaleRecipeTool.cpp @@ -41,8 +41,10 @@ #include "model/Yeast.h" #include "NamedEntitySortProxyModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_ScaleRecipeTool.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_ScaleRecipeTool.cpp" +#endif ScaleRecipeTool::ScaleRecipeTool(QWidget* parent) : QWizard(parent), diff --git a/src/StrikeWaterDialog.cpp b/src/StrikeWaterDialog.cpp index 285d04154..462925981 100644 --- a/src/StrikeWaterDialog.cpp +++ b/src/StrikeWaterDialog.cpp @@ -22,8 +22,10 @@ #include -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_StrikeWaterDialog.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_StrikeWaterDialog.cpp" +#endif namespace { // From Northern Brewer ~0.38 but Jon Palmer suggest 0.41 diff --git a/src/StyleRangeWidget.cpp b/src/StyleRangeWidget.cpp index 176854390..9c400135a 100644 --- a/src/StyleRangeWidget.cpp +++ b/src/StyleRangeWidget.cpp @@ -19,8 +19,10 @@ #include #include -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_StyleRangeWidget.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_StyleRangeWidget.cpp" +#endif StyleRangeWidget::StyleRangeWidget(QWidget* parent) : RangedSlider(parent) { setBackgroundBrush(QColor(121,201,121)); diff --git a/src/TimerListDialog.cpp b/src/TimerListDialog.cpp index c64913af9..8307060ed 100644 --- a/src/TimerListDialog.cpp +++ b/src/TimerListDialog.cpp @@ -21,8 +21,10 @@ #include "TimerWidget.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_TimerListDialog.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_TimerListDialog.cpp" +#endif TimerListDialog::TimerListDialog(QWidget* parent, QList* timers) : QDialog(parent) { this->setWindowTitle(tr("Addition Timers")); diff --git a/src/TimerMainDialog.cpp b/src/TimerMainDialog.cpp index 1e66df26e..6882aa93b 100644 --- a/src/TimerMainDialog.cpp +++ b/src/TimerMainDialog.cpp @@ -29,8 +29,10 @@ #include "TimerListDialog.h" #include "TimerWidget.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_TimerMainDialog.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_TimerMainDialog.cpp" +#endif TimerMainDialog::TimerMainDialog(MainWindow* parent) : QDialog{parent}, diff --git a/src/TimerWidget.cpp b/src/TimerWidget.cpp index 1d5963f06..c26c63ee4 100644 --- a/src/TimerWidget.cpp +++ b/src/TimerWidget.cpp @@ -36,8 +36,10 @@ #include "TimerMainDialog.h" #include "utils/TimerUtils.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_TimerWidget.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_TimerWidget.cpp" +#endif TimerWidget::TimerWidget(TimerMainDialog *parent, BoilTime* bt) : QDialog{parent}, diff --git a/src/WaterDialog.cpp b/src/WaterDialog.cpp index 642eefcb7..dc7f176be 100644 --- a/src/WaterDialog.cpp +++ b/src/WaterDialog.cpp @@ -43,8 +43,10 @@ #include "qtModels/sortFilterProxyModels/WaterSortFilterProxyModel.h" #include "widgets/SmartDigitWidget.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_WaterDialog.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_WaterDialog.cpp" +#endif // diff --git a/src/boiltime.cpp b/src/boiltime.cpp index d095999d0..0a03914ea 100644 --- a/src/boiltime.cpp +++ b/src/boiltime.cpp @@ -17,8 +17,10 @@ #include "boiltime.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_boiltime.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_boiltime.cpp" +#endif BoilTime::BoilTime(QObject* parent): QObject(parent), time(0), diff --git a/src/buttons/BoilButton.cpp b/src/buttons/BoilButton.cpp index 7c39a70d0..2890c0068 100644 --- a/src/buttons/BoilButton.cpp +++ b/src/buttons/BoilButton.cpp @@ -15,7 +15,9 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "buttons/BoilButton.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_BoilButton.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_BoilButton.cpp" +#endif RECIPE_ATTRIBUTE_BUTTON_BASE_COMMON_CODE(Boil) diff --git a/src/buttons/EquipmentButton.cpp b/src/buttons/EquipmentButton.cpp index 34dbd7614..6d6a5dfd9 100644 --- a/src/buttons/EquipmentButton.cpp +++ b/src/buttons/EquipmentButton.cpp @@ -18,7 +18,9 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "buttons/EquipmentButton.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_EquipmentButton.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_EquipmentButton.cpp" +#endif RECIPE_ATTRIBUTE_BUTTON_BASE_COMMON_CODE(Equipment) diff --git a/src/buttons/FermentationButton.cpp b/src/buttons/FermentationButton.cpp index e1782ac53..440aa9228 100644 --- a/src/buttons/FermentationButton.cpp +++ b/src/buttons/FermentationButton.cpp @@ -15,7 +15,9 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "buttons/FermentationButton.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_FermentationButton.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_FermentationButton.cpp" +#endif RECIPE_ATTRIBUTE_BUTTON_BASE_COMMON_CODE(Fermentation) diff --git a/src/buttons/MashButton.cpp b/src/buttons/MashButton.cpp index fa9dcfe94..39b64bf89 100644 --- a/src/buttons/MashButton.cpp +++ b/src/buttons/MashButton.cpp @@ -18,7 +18,9 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "buttons/MashButton.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_MashButton.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_MashButton.cpp" +#endif RECIPE_ATTRIBUTE_BUTTON_BASE_COMMON_CODE(Mash) diff --git a/src/buttons/RecipeAttributeButton.cpp b/src/buttons/RecipeAttributeButton.cpp index b82154ccb..87898ce85 100644 --- a/src/buttons/RecipeAttributeButton.cpp +++ b/src/buttons/RecipeAttributeButton.cpp @@ -15,8 +15,10 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "buttons/RecipeAttributeButton.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RecipeAttributeButton.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RecipeAttributeButton.cpp" +#endif RecipeAttributeButton::RecipeAttributeButton(QWidget * parent) : QPushButton(parent) { diff --git a/src/buttons/StyleButton.cpp b/src/buttons/StyleButton.cpp index e4b6da9c8..878772073 100644 --- a/src/buttons/StyleButton.cpp +++ b/src/buttons/StyleButton.cpp @@ -18,7 +18,9 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "buttons/StyleButton.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_StyleButton.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_StyleButton.cpp" +#endif RECIPE_ATTRIBUTE_BUTTON_BASE_COMMON_CODE(Style) diff --git a/src/buttons/WaterButton.cpp b/src/buttons/WaterButton.cpp index e1d625ad5..c61f1dc21 100644 --- a/src/buttons/WaterButton.cpp +++ b/src/buttons/WaterButton.cpp @@ -16,7 +16,9 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "buttons/WaterButton.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_WaterButton.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_WaterButton.cpp" +#endif RECIPE_ATTRIBUTE_BUTTON_BASE_COMMON_CODE(Water) diff --git a/src/catalogs/EquipmentCatalog.cpp b/src/catalogs/EquipmentCatalog.cpp index 0b866d251..b61610eb5 100644 --- a/src/catalogs/EquipmentCatalog.cpp +++ b/src/catalogs/EquipmentCatalog.cpp @@ -17,8 +17,10 @@ #include "qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_EquipmentCatalog.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_EquipmentCatalog.cpp" +#endif // Insert the boiler-plate stuff that we cannot do in CatalogBase CATALOG_COMMON_CODE(Equipment) diff --git a/src/catalogs/FermentableCatalog.cpp b/src/catalogs/FermentableCatalog.cpp index 3ca1ff7b2..337a9d9dd 100644 --- a/src/catalogs/FermentableCatalog.cpp +++ b/src/catalogs/FermentableCatalog.cpp @@ -21,8 +21,10 @@ #include "qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_FermentableCatalog.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_FermentableCatalog.cpp" +#endif // Insert the boiler-plate stuff that we cannot do in CatalogBase CATALOG_COMMON_CODE(Fermentable) diff --git a/src/catalogs/HopCatalog.cpp b/src/catalogs/HopCatalog.cpp index bd705c30a..e9e2aa884 100644 --- a/src/catalogs/HopCatalog.cpp +++ b/src/catalogs/HopCatalog.cpp @@ -23,8 +23,10 @@ #include "qtModels/sortFilterProxyModels/HopSortFilterProxyModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_HopCatalog.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_HopCatalog.cpp" +#endif // Insert the boiler-plate stuff that we cannot do in CatalogBase CATALOG_COMMON_CODE(Hop) diff --git a/src/catalogs/MiscCatalog.cpp b/src/catalogs/MiscCatalog.cpp index 6622d7af3..1687d2bad 100644 --- a/src/catalogs/MiscCatalog.cpp +++ b/src/catalogs/MiscCatalog.cpp @@ -21,8 +21,10 @@ #include "qtModels/sortFilterProxyModels/MiscSortFilterProxyModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_MiscCatalog.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_MiscCatalog.cpp" +#endif // Insert the boiler-plate stuff that we cannot do in CatalogBase CATALOG_COMMON_CODE(Misc) diff --git a/src/catalogs/StyleCatalog.cpp b/src/catalogs/StyleCatalog.cpp index 6f063a36b..b9eb428e4 100644 --- a/src/catalogs/StyleCatalog.cpp +++ b/src/catalogs/StyleCatalog.cpp @@ -17,8 +17,10 @@ #include "qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_StyleCatalog.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_StyleCatalog.cpp" +#endif // Insert the boiler-plate stuff that we cannot do in CatalogBase CATALOG_COMMON_CODE(Style) diff --git a/src/catalogs/YeastCatalog.cpp b/src/catalogs/YeastCatalog.cpp index 6bdb756ec..ce6920a57 100644 --- a/src/catalogs/YeastCatalog.cpp +++ b/src/catalogs/YeastCatalog.cpp @@ -21,8 +21,10 @@ #include "qtModels/sortFilterProxyModels/YeastSortFilterProxyModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_YeastCatalog.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_YeastCatalog.cpp" +#endif // Insert the boiler-plate stuff that we cannot do in CatalogBase CATALOG_COMMON_CODE(Yeast) diff --git a/src/database/ObjectStore.cpp b/src/database/ObjectStore.cpp index cdcc6a0eb..6ccc558ec 100644 --- a/src/database/ObjectStore.cpp +++ b/src/database/ObjectStore.cpp @@ -36,8 +36,10 @@ #include "utils/MetaTypes.h" #include "utils/OptionalHelpers.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_ObjectStore.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_ObjectStore.cpp" +#endif // Private implementation details that don't need access to class member variables namespace { diff --git a/src/editors/BoilEditor.cpp b/src/editors/BoilEditor.cpp index 2d52c9bc6..37d1911b0 100644 --- a/src/editors/BoilEditor.cpp +++ b/src/editors/BoilEditor.cpp @@ -22,8 +22,10 @@ #include "model/Boil.h" #include "model/Recipe.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_BoilEditor.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_BoilEditor.cpp" +#endif BoilEditor::BoilEditor(QWidget* parent, QString const editorName) : QDialog(parent), diff --git a/src/editors/BoilStepEditor.cpp b/src/editors/BoilStepEditor.cpp index 61d0a0a28..7d4a971ff 100644 --- a/src/editors/BoilStepEditor.cpp +++ b/src/editors/BoilStepEditor.cpp @@ -18,8 +18,10 @@ #include "MainWindow.h" #include "measurement/Unit.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_BoilStepEditor.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_BoilStepEditor.cpp" +#endif BoilStepEditor::BoilStepEditor(QWidget* parent, QString const editorName) : QDialog{parent}, diff --git a/src/editors/EquipmentEditor.cpp b/src/editors/EquipmentEditor.cpp index a847ac258..2ccd97e92 100644 --- a/src/editors/EquipmentEditor.cpp +++ b/src/editors/EquipmentEditor.cpp @@ -41,8 +41,10 @@ #include "PersistentSettings.h" #include "PhysicalConstants.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_EquipmentEditor.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_EquipmentEditor.cpp" +#endif // // TODO: According to https://www.engineersedge.com/materials/specific_heat_capacity_of_metals_13259.htm, the specific diff --git a/src/editors/FermentableEditor.cpp b/src/editors/FermentableEditor.cpp index c08b0618a..e78876de9 100644 --- a/src/editors/FermentableEditor.cpp +++ b/src/editors/FermentableEditor.cpp @@ -27,8 +27,10 @@ #include "database/ObjectStoreWrapper.h" #include "measurement/Unit.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_FermentableEditor.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_FermentableEditor.cpp" +#endif // TODO: Need a separate editor for inventory diff --git a/src/editors/FermentationEditor.cpp b/src/editors/FermentationEditor.cpp index bc262b044..6eb7f5636 100644 --- a/src/editors/FermentationEditor.cpp +++ b/src/editors/FermentationEditor.cpp @@ -22,8 +22,10 @@ #include "model/Fermentation.h" #include "model/Recipe.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_FermentationEditor.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_FermentationEditor.cpp" +#endif FermentationEditor::FermentationEditor(QWidget* parent, QString const editorName) : QDialog(parent), diff --git a/src/editors/FermentationStepEditor.cpp b/src/editors/FermentationStepEditor.cpp index 610fe1790..c3909fdb5 100644 --- a/src/editors/FermentationStepEditor.cpp +++ b/src/editors/FermentationStepEditor.cpp @@ -18,8 +18,10 @@ #include "MainWindow.h" #include "measurement/Unit.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_FermentationStepEditor.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_FermentationStepEditor.cpp" +#endif FermentationStepEditor::FermentationStepEditor(QWidget* parent, QString const editorName) : QDialog{parent}, diff --git a/src/editors/HopEditor.cpp b/src/editors/HopEditor.cpp index 4070fd07a..fe415ac51 100644 --- a/src/editors/HopEditor.cpp +++ b/src/editors/HopEditor.cpp @@ -29,8 +29,10 @@ #include "database/ObjectStoreWrapper.h" #include "measurement/Unit.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_HopEditor.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_HopEditor.cpp" +#endif // TODO: Need a separate editor for inventory diff --git a/src/editors/MashEditor.cpp b/src/editors/MashEditor.cpp index 7b4b55b9a..5200ae814 100644 --- a/src/editors/MashEditor.cpp +++ b/src/editors/MashEditor.cpp @@ -28,8 +28,10 @@ #include "model/Mash.h" #include "model/Recipe.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_MashEditor.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_MashEditor.cpp" +#endif MashEditor::MashEditor(QWidget* parent) : QDialog(parent), diff --git a/src/editors/MashStepEditor.cpp b/src/editors/MashStepEditor.cpp index da8327ed1..20a72346c 100644 --- a/src/editors/MashStepEditor.cpp +++ b/src/editors/MashStepEditor.cpp @@ -21,8 +21,10 @@ #include "MainWindow.h" #include "measurement/Unit.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_MashStepEditor.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_MashStepEditor.cpp" +#endif MashStepEditor::MashStepEditor(QWidget* parent, QString const editorName) : QDialog{parent}, diff --git a/src/editors/MiscEditor.cpp b/src/editors/MiscEditor.cpp index 26db1db6e..b0c09c622 100644 --- a/src/editors/MiscEditor.cpp +++ b/src/editors/MiscEditor.cpp @@ -28,8 +28,10 @@ #include "database/ObjectStoreWrapper.h" #include "measurement/Unit.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_MiscEditor.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_MiscEditor.cpp" +#endif MiscEditor::MiscEditor(QWidget * parent, QString const editorName) : QDialog(parent), diff --git a/src/editors/NamedMashEditor.cpp b/src/editors/NamedMashEditor.cpp index 5e3976b24..afaefda43 100644 --- a/src/editors/NamedMashEditor.cpp +++ b/src/editors/NamedMashEditor.cpp @@ -28,8 +28,10 @@ #include "model/Mash.h" #include "model/Recipe.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_NamedMashEditor.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_NamedMashEditor.cpp" +#endif NamedMashEditor::NamedMashEditor(QWidget* parent, MashStepEditor* editor, bool singleMashEditor) : diff --git a/src/editors/StyleEditor.cpp b/src/editors/StyleEditor.cpp index b18739184..841bb1c5a 100644 --- a/src/editors/StyleEditor.cpp +++ b/src/editors/StyleEditor.cpp @@ -25,8 +25,10 @@ #include "measurement/Unit.h" #include "qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_StyleEditor.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_StyleEditor.cpp" +#endif StyleEditor::StyleEditor(QWidget* parent, QString const editorName) : QDialog{parent}, diff --git a/src/editors/WaterEditor.cpp b/src/editors/WaterEditor.cpp index e0df0e965..fdd4bca53 100644 --- a/src/editors/WaterEditor.cpp +++ b/src/editors/WaterEditor.cpp @@ -25,8 +25,10 @@ #include "database/ObjectStoreWrapper.h" #include "model/Water.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_WaterEditor.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_WaterEditor.cpp" +#endif namespace { auto const seriesNameCurrent {WaterEditor::tr("Current" )}; diff --git a/src/editors/YeastEditor.cpp b/src/editors/YeastEditor.cpp index b9b094198..043b57db3 100644 --- a/src/editors/YeastEditor.cpp +++ b/src/editors/YeastEditor.cpp @@ -29,8 +29,10 @@ #include "database/ObjectStoreWrapper.h" #include "measurement/Unit.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_YeastEditor.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_YeastEditor.cpp" +#endif YeastEditor::YeastEditor(QWidget * parent, QString const editorName) : QDialog(parent), diff --git a/src/model/Boil.cpp b/src/model/Boil.cpp index b470fb6e2..b8851a773 100644 --- a/src/model/Boil.cpp +++ b/src/model/Boil.cpp @@ -25,8 +25,10 @@ #include "model/NamedParameterBundle.h" #include "utils/AutoCompare.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_Boil.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_Boil.cpp" +#endif QString Boil::localisedName() { return tr("Boil"); } diff --git a/src/model/BoilStep.cpp b/src/model/BoilStep.cpp index 63c69309e..f079abb2d 100644 --- a/src/model/BoilStep.cpp +++ b/src/model/BoilStep.cpp @@ -20,8 +20,10 @@ #include "utils/OptionalHelpers.h" #include "utils/AutoCompare.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_BoilStep.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_BoilStep.cpp" +#endif QString BoilStep::localisedName() { return tr("Boil Step"); } diff --git a/src/model/BrewNote.cpp b/src/model/BrewNote.cpp index df3fd924d..6b8cb9488 100644 --- a/src/model/BrewNote.cpp +++ b/src/model/BrewNote.cpp @@ -38,8 +38,10 @@ #include "model/Recipe.h" #include "model/RecipeAdditionYeast.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_BrewNote.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_BrewNote.cpp" +#endif QString BrewNote::localisedName() { return tr("Brew Note"); } diff --git a/src/model/Equipment.cpp b/src/model/Equipment.cpp index b41146792..3061edae2 100644 --- a/src/model/Equipment.cpp +++ b/src/model/Equipment.cpp @@ -25,8 +25,10 @@ #include "model/Recipe.h" #include "utils/AutoCompare.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_Equipment.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_Equipment.cpp" +#endif QString Equipment::localisedName() { return tr("Equipment"); } diff --git a/src/model/Fermentable.cpp b/src/model/Fermentable.cpp index 3cc0741dc..d5b757b6f 100644 --- a/src/model/Fermentable.cpp +++ b/src/model/Fermentable.cpp @@ -35,8 +35,10 @@ #include "utils/AutoCompare.h" #include "utils/OptionalHelpers.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_Fermentable.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_Fermentable.cpp" +#endif QString Fermentable::localisedName() { return tr("Fermentable"); } diff --git a/src/model/Fermentation.cpp b/src/model/Fermentation.cpp index d94ce7b96..8a3cb7f88 100644 --- a/src/model/Fermentation.cpp +++ b/src/model/Fermentation.cpp @@ -17,8 +17,10 @@ #include "model/NamedParameterBundle.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_Fermentation.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_Fermentation.cpp" +#endif QString Fermentation::localisedName() { return tr("Fermentation"); } diff --git a/src/model/FermentationStep.cpp b/src/model/FermentationStep.cpp index f5579a983..03e5e70bd 100644 --- a/src/model/FermentationStep.cpp +++ b/src/model/FermentationStep.cpp @@ -19,8 +19,10 @@ #include "model/NamedParameterBundle.h" #include "utils/AutoCompare.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_FermentationStep.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_FermentationStep.cpp" +#endif QString FermentationStep::localisedName() { return tr("Fermentation Step"); } diff --git a/src/model/Folder.cpp b/src/model/Folder.cpp index 2bc221833..64f49b3ec 100644 --- a/src/model/Folder.cpp +++ b/src/model/Folder.cpp @@ -20,8 +20,10 @@ #include #include -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_Folder.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_Folder.cpp" +#endif Folder::Folder() : QObject() { setObjectName("Folder"); diff --git a/src/model/Hop.cpp b/src/model/Hop.cpp index 92864a98f..17ac7ee75 100644 --- a/src/model/Hop.cpp +++ b/src/model/Hop.cpp @@ -30,8 +30,10 @@ #include "model/Recipe.h" #include "utils/AutoCompare.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_Hop.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_Hop.cpp" +#endif QString Hop::localisedName() { return tr("Hop"); } diff --git a/src/model/Ingredient.cpp b/src/model/Ingredient.cpp index c480274ea..a7f8a24d4 100644 --- a/src/model/Ingredient.cpp +++ b/src/model/Ingredient.cpp @@ -17,8 +17,10 @@ #include "model/NamedParameterBundle.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_Ingredient.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_Ingredient.cpp" +#endif QString Ingredient::localisedName() { return tr("Ingredient"); } diff --git a/src/model/IngredientInRecipe.cpp b/src/model/IngredientInRecipe.cpp index a96c2972b..121aca443 100644 --- a/src/model/IngredientInRecipe.cpp +++ b/src/model/IngredientInRecipe.cpp @@ -17,8 +17,10 @@ #include "model/Recipe.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_IngredientInRecipe.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_IngredientInRecipe.cpp" +#endif QString IngredientInRecipe::localisedName() { return tr("Ingredient In Recipe"); } diff --git a/src/model/Instruction.cpp b/src/model/Instruction.cpp index f530942ed..a62ecbd43 100644 --- a/src/model/Instruction.cpp +++ b/src/model/Instruction.cpp @@ -22,8 +22,10 @@ #include "model/NamedParameterBundle.h" #include "model/Recipe.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_Instruction.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_Instruction.cpp" +#endif QString Instruction::localisedName() { return tr("Instruction"); } diff --git a/src/model/Inventory.cpp b/src/model/Inventory.cpp index 21680b721..7a62f391a 100644 --- a/src/model/Inventory.cpp +++ b/src/model/Inventory.cpp @@ -29,14 +29,16 @@ // produce moc_InventoryHop.cpp) etc but will not link the resulting code (because there is not a corresponding // InventoryHop.cpp. If we include the results of the MOC here, it guarantees they get linked into the final // executable. -#include "moc_InventoryFermentable.cpp" -#include "moc_InventoryHop.cpp" -#include "moc_InventoryMisc.cpp" -#include "moc_InventorySalt.cpp" -#include "moc_InventoryYeast.cpp" - -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_Inventory.cpp" + #include "moc_InventoryFermentable.cpp" + #include "moc_InventoryHop.cpp" + #include "moc_InventoryMisc.cpp" + #include "moc_InventorySalt.cpp" + #include "moc_InventoryYeast.cpp" + +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_Inventory.cpp" +#endif QString Inventory::localisedName() { return tr("Inventory"); } diff --git a/src/model/Mash.cpp b/src/model/Mash.cpp index 22a53d171..6ccfa2063 100644 --- a/src/model/Mash.cpp +++ b/src/model/Mash.cpp @@ -30,8 +30,10 @@ #include "model/Recipe.h" #include "utils/AutoCompare.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_Mash.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_Mash.cpp" +#endif QString Mash::localisedName() { return tr("Mash"); } diff --git a/src/model/MashStep.cpp b/src/model/MashStep.cpp index b9077a246..2659ce22d 100644 --- a/src/model/MashStep.cpp +++ b/src/model/MashStep.cpp @@ -27,8 +27,10 @@ #include "PhysicalConstants.h" #include "utils/AutoCompare.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_MashStep.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_MashStep.cpp" +#endif QString MashStep::localisedName() { return tr("Mash Step"); } diff --git a/src/model/Misc.cpp b/src/model/Misc.cpp index d8fa6f2fd..1f6bf61f3 100644 --- a/src/model/Misc.cpp +++ b/src/model/Misc.cpp @@ -33,8 +33,10 @@ #include "model/Recipe.h" #include "utils/AutoCompare.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_Misc.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_Misc.cpp" +#endif QString Misc::localisedName() { return tr("Miscellaneous"); } diff --git a/src/model/NamedEntity.cpp b/src/model/NamedEntity.cpp index 50d6c3a42..387ab2272 100644 --- a/src/model/NamedEntity.cpp +++ b/src/model/NamedEntity.cpp @@ -57,8 +57,10 @@ #include "model/Water.h" #include "model/Yeast.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_NamedEntity.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_NamedEntity.cpp" +#endif namespace { /** diff --git a/src/model/OutlineableNamedEntity.cpp b/src/model/OutlineableNamedEntity.cpp index 3ec7c2a2b..83dc0fb89 100644 --- a/src/model/OutlineableNamedEntity.cpp +++ b/src/model/OutlineableNamedEntity.cpp @@ -18,8 +18,10 @@ #include "BtFieldType.h" #include "model/NamedParameterBundle.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_OutlineableNamedEntity.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_OutlineableNamedEntity.cpp" +#endif QString OutlineableNamedEntity::localisedName() { return tr("Outlineable Named Entity"); } diff --git a/src/model/OwnedByRecipe.cpp b/src/model/OwnedByRecipe.cpp index 1dd84f517..604f8f74b 100644 --- a/src/model/OwnedByRecipe.cpp +++ b/src/model/OwnedByRecipe.cpp @@ -17,8 +17,10 @@ #include "model/Recipe.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_OwnedByRecipe.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_OwnedByRecipe.cpp" +#endif QString OwnedByRecipe::localisedName() { return tr("Owned By Recipe"); } diff --git a/src/model/Recipe.cpp b/src/model/Recipe.cpp index ea4dc2c8b..d0e8e8cad 100644 --- a/src/model/Recipe.cpp +++ b/src/model/Recipe.cpp @@ -70,8 +70,10 @@ #include "PhysicalConstants.h" #include "utils/AutoCompare.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_Recipe.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_Recipe.cpp" +#endif namespace { diff --git a/src/model/RecipeAddition.cpp b/src/model/RecipeAddition.cpp index 8714a8aaa..cf2c77595 100644 --- a/src/model/RecipeAddition.cpp +++ b/src/model/RecipeAddition.cpp @@ -23,8 +23,10 @@ #include "model/Recipe.h" #include "utils/AutoCompare.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RecipeAddition.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RecipeAddition.cpp" +#endif QString RecipeAddition::localisedName() { return tr("Recipe Addition"); } diff --git a/src/model/RecipeAdditionFermentable.cpp b/src/model/RecipeAdditionFermentable.cpp index a2bb011e2..26e5911e7 100644 --- a/src/model/RecipeAdditionFermentable.cpp +++ b/src/model/RecipeAdditionFermentable.cpp @@ -21,8 +21,10 @@ #include "model/Boil.h" #include "model/BoilStep.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RecipeAdditionFermentable.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RecipeAdditionFermentable.cpp" +#endif QString RecipeAdditionFermentable::localisedName() { return tr("Fermentable Addition"); } diff --git a/src/model/RecipeAdditionHop.cpp b/src/model/RecipeAdditionHop.cpp index 85a1f6780..2dd32d66d 100644 --- a/src/model/RecipeAdditionHop.cpp +++ b/src/model/RecipeAdditionHop.cpp @@ -21,8 +21,10 @@ #include "model/Boil.h" #include "model/BoilStep.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RecipeAdditionHop.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RecipeAdditionHop.cpp" +#endif QString RecipeAdditionHop::localisedName() { return tr("Hop Addition"); } diff --git a/src/model/RecipeAdditionMisc.cpp b/src/model/RecipeAdditionMisc.cpp index 76a03157b..6e7c6eb08 100644 --- a/src/model/RecipeAdditionMisc.cpp +++ b/src/model/RecipeAdditionMisc.cpp @@ -21,8 +21,10 @@ #include "model/Boil.h" #include "model/BoilStep.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RecipeAdditionMisc.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RecipeAdditionMisc.cpp" +#endif QString RecipeAdditionMisc::localisedName() { return tr("Misc Addition"); } diff --git a/src/model/RecipeAdditionYeast.cpp b/src/model/RecipeAdditionYeast.cpp index 747f64db2..0be19047e 100644 --- a/src/model/RecipeAdditionYeast.cpp +++ b/src/model/RecipeAdditionYeast.cpp @@ -19,8 +19,10 @@ #include "database/ObjectStoreWrapper.h" #include "model/NamedParameterBundle.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RecipeAdditionYeast.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RecipeAdditionYeast.cpp" +#endif QString RecipeAdditionYeast::localisedName() { return tr("Yeast Addition"); } diff --git a/src/model/RecipeAdjustmentSalt.cpp b/src/model/RecipeAdjustmentSalt.cpp index a5f7f3031..152f3bc15 100644 --- a/src/model/RecipeAdjustmentSalt.cpp +++ b/src/model/RecipeAdjustmentSalt.cpp @@ -21,8 +21,10 @@ #include "model/Boil.h" #include "model/BoilStep.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RecipeAdjustmentSalt.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RecipeAdjustmentSalt.cpp" +#endif QString RecipeAdjustmentSalt::localisedName() { return tr("Salt Addition"); } diff --git a/src/model/RecipeUseOfWater.cpp b/src/model/RecipeUseOfWater.cpp index 14147afa9..d3e020f0e 100644 --- a/src/model/RecipeUseOfWater.cpp +++ b/src/model/RecipeUseOfWater.cpp @@ -17,8 +17,10 @@ #include "model/NamedParameterBundle.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RecipeUseOfWater.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RecipeUseOfWater.cpp" +#endif QString RecipeUseOfWater::localisedName() { return tr("Recipe Use Of Water"); } diff --git a/src/model/Salt.cpp b/src/model/Salt.cpp index cfa5230ae..b0d1f4991 100644 --- a/src/model/Salt.cpp +++ b/src/model/Salt.cpp @@ -24,8 +24,10 @@ #include "model/Recipe.h" #include "utils/AutoCompare.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_Salt.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_Salt.cpp" +#endif namespace { // Constants used in our mass concentration calculations below diff --git a/src/model/Step.cpp b/src/model/Step.cpp index b088e2fb3..d0ed818f5 100644 --- a/src/model/Step.cpp +++ b/src/model/Step.cpp @@ -19,8 +19,10 @@ #include "PhysicalConstants.h" #include "utils/AutoCompare.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_Step.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_Step.cpp" +#endif QString Step::localisedName() { return tr("Step"); } diff --git a/src/model/StepExtended.cpp b/src/model/StepExtended.cpp index 1ab873449..e0a8afb03 100644 --- a/src/model/StepExtended.cpp +++ b/src/model/StepExtended.cpp @@ -19,8 +19,10 @@ #include "PhysicalConstants.h" #include "utils/AutoCompare.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_StepExtended.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_StepExtended.cpp" +#endif QString StepExtended::localisedName() { return tr("Extended Step"); } diff --git a/src/model/Style.cpp b/src/model/Style.cpp index 97b8c0639..11815941d 100644 --- a/src/model/Style.cpp +++ b/src/model/Style.cpp @@ -25,8 +25,10 @@ #include "model/Recipe.h" #include "utils/AutoCompare.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_Style.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_Style.cpp" +#endif QString Style::localisedName() { return tr("Style"); } diff --git a/src/model/Water.cpp b/src/model/Water.cpp index 8da9e2ab0..ccaa01774 100644 --- a/src/model/Water.cpp +++ b/src/model/Water.cpp @@ -23,8 +23,10 @@ #include "model/Recipe.h" #include "utils/AutoCompare.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_Water.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_Water.cpp" +#endif QString Water::localisedName() { return tr("Water"); } diff --git a/src/model/Yeast.cpp b/src/model/Yeast.cpp index c7c21fd5c..cab715563 100644 --- a/src/model/Yeast.cpp +++ b/src/model/Yeast.cpp @@ -29,8 +29,10 @@ #include "PhysicalConstants.h" #include "utils/AutoCompare.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_Yeast.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_Yeast.cpp" +#endif QString Yeast::localisedName() { return tr("Yeast"); } diff --git a/src/qtModels/listModels/BoilListModel.cpp b/src/qtModels/listModels/BoilListModel.cpp index 1b8c6d2af..3f4ea1f5b 100644 --- a/src/qtModels/listModels/BoilListModel.cpp +++ b/src/qtModels/listModels/BoilListModel.cpp @@ -15,8 +15,10 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/BoilListModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_BoilListModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_BoilListModel.cpp" +#endif // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Boil, PropertyNames::Recipe::boil) diff --git a/src/qtModels/listModels/EquipmentListModel.cpp b/src/qtModels/listModels/EquipmentListModel.cpp index 6d089f5fc..6d6587073 100644 --- a/src/qtModels/listModels/EquipmentListModel.cpp +++ b/src/qtModels/listModels/EquipmentListModel.cpp @@ -19,8 +19,10 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/EquipmentListModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_EquipmentListModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_EquipmentListModel.cpp" +#endif // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Equipment, PropertyNames::Recipe::equipment) diff --git a/src/qtModels/listModels/FermentableListModel.cpp b/src/qtModels/listModels/FermentableListModel.cpp index ee76aa26f..888c7bee7 100644 --- a/src/qtModels/listModels/FermentableListModel.cpp +++ b/src/qtModels/listModels/FermentableListModel.cpp @@ -15,8 +15,10 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/FermentableListModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_FermentableListModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_FermentableListModel.cpp" +#endif // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Fermentable, PropertyNames::Recipe::fermentableAdditions) diff --git a/src/qtModels/listModels/FermentationListModel.cpp b/src/qtModels/listModels/FermentationListModel.cpp index c40d1a1af..7c66e5a15 100644 --- a/src/qtModels/listModels/FermentationListModel.cpp +++ b/src/qtModels/listModels/FermentationListModel.cpp @@ -15,8 +15,10 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/FermentationListModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_FermentationListModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_FermentationListModel.cpp" +#endif // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Fermentation, PropertyNames::Recipe::fermentation) diff --git a/src/qtModels/listModels/HopListModel.cpp b/src/qtModels/listModels/HopListModel.cpp index 40bdec9bf..ceb6bb423 100644 --- a/src/qtModels/listModels/HopListModel.cpp +++ b/src/qtModels/listModels/HopListModel.cpp @@ -15,8 +15,10 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/HopListModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_HopListModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_HopListModel.cpp" +#endif // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Hop, PropertyNames::Recipe::hopAdditions) diff --git a/src/qtModels/listModels/MashListModel.cpp b/src/qtModels/listModels/MashListModel.cpp index da84bff1f..935177f03 100644 --- a/src/qtModels/listModels/MashListModel.cpp +++ b/src/qtModels/listModels/MashListModel.cpp @@ -19,8 +19,10 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/MashListModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_MashListModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_MashListModel.cpp" +#endif // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Mash, PropertyNames::Recipe::mash) diff --git a/src/qtModels/listModels/MashStepListModel.cpp b/src/qtModels/listModels/MashStepListModel.cpp index fb4c52e72..410ed95bd 100644 --- a/src/qtModels/listModels/MashStepListModel.cpp +++ b/src/qtModels/listModels/MashStepListModel.cpp @@ -15,8 +15,10 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/MashStepListModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_MashStepListModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_MashStepListModel.cpp" +#endif // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(MashStep, PropertyNames::Recipe::mash) diff --git a/src/qtModels/listModels/MiscListModel.cpp b/src/qtModels/listModels/MiscListModel.cpp index e52436376..6e13c8a7a 100644 --- a/src/qtModels/listModels/MiscListModel.cpp +++ b/src/qtModels/listModels/MiscListModel.cpp @@ -15,8 +15,10 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/MiscListModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_MiscListModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_MiscListModel.cpp" +#endif // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Misc, PropertyNames::Recipe::miscAdditions) diff --git a/src/qtModels/listModels/RecipeAdditionFermentableListModel.cpp b/src/qtModels/listModels/RecipeAdditionFermentableListModel.cpp index 4347526c1..d37fbce11 100644 --- a/src/qtModels/listModels/RecipeAdditionFermentableListModel.cpp +++ b/src/qtModels/listModels/RecipeAdditionFermentableListModel.cpp @@ -15,8 +15,10 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/RecipeAdditionFermentableListModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RecipeAdditionFermentableListModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RecipeAdditionFermentableListModel.cpp" +#endif // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(RecipeAdditionFermentable, PropertyNames::Recipe::fermentableAdditions) diff --git a/src/qtModels/listModels/RecipeAdditionHopListModel.cpp b/src/qtModels/listModels/RecipeAdditionHopListModel.cpp index d42a21a13..2d4d4a037 100644 --- a/src/qtModels/listModels/RecipeAdditionHopListModel.cpp +++ b/src/qtModels/listModels/RecipeAdditionHopListModel.cpp @@ -15,8 +15,10 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/RecipeAdditionHopListModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RecipeAdditionHopListModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RecipeAdditionHopListModel.cpp" +#endif // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(RecipeAdditionHop, PropertyNames::Recipe::hopAdditions) diff --git a/src/qtModels/listModels/RecipeAdditionMiscListModel.cpp b/src/qtModels/listModels/RecipeAdditionMiscListModel.cpp index 3addc72c9..cef69d02d 100644 --- a/src/qtModels/listModels/RecipeAdditionMiscListModel.cpp +++ b/src/qtModels/listModels/RecipeAdditionMiscListModel.cpp @@ -15,8 +15,10 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/RecipeAdditionMiscListModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RecipeAdditionMiscListModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RecipeAdditionMiscListModel.cpp" +#endif // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(RecipeAdditionMisc, PropertyNames::Recipe::miscAdditions) diff --git a/src/qtModels/listModels/RecipeAdditionYeastListModel.cpp b/src/qtModels/listModels/RecipeAdditionYeastListModel.cpp index 452288851..b0db9ac20 100644 --- a/src/qtModels/listModels/RecipeAdditionYeastListModel.cpp +++ b/src/qtModels/listModels/RecipeAdditionYeastListModel.cpp @@ -15,8 +15,10 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/RecipeAdditionYeastListModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RecipeAdditionYeastListModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RecipeAdditionYeastListModel.cpp" +#endif // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(RecipeAdditionYeast, PropertyNames::Recipe::yeastAdditions) diff --git a/src/qtModels/listModels/RecipeAdjustmentSaltListModel.cpp b/src/qtModels/listModels/RecipeAdjustmentSaltListModel.cpp index a1d72815d..ff4de6ae8 100644 --- a/src/qtModels/listModels/RecipeAdjustmentSaltListModel.cpp +++ b/src/qtModels/listModels/RecipeAdjustmentSaltListModel.cpp @@ -15,8 +15,10 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/RecipeAdjustmentSaltListModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RecipeAdjustmentSaltListModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RecipeAdjustmentSaltListModel.cpp" +#endif // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(RecipeAdjustmentSalt, PropertyNames::Recipe::saltAdjustments) diff --git a/src/qtModels/listModels/SaltListModel.cpp b/src/qtModels/listModels/SaltListModel.cpp index 4a6f8a5a5..b26bead34 100644 --- a/src/qtModels/listModels/SaltListModel.cpp +++ b/src/qtModels/listModels/SaltListModel.cpp @@ -15,8 +15,10 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/SaltListModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_SaltListModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_SaltListModel.cpp" +#endif // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Salt, PropertyNames::Recipe::saltAdjustments) diff --git a/src/qtModels/listModels/StyleListModel.cpp b/src/qtModels/listModels/StyleListModel.cpp index 63cb62a7f..b01b494a4 100644 --- a/src/qtModels/listModels/StyleListModel.cpp +++ b/src/qtModels/listModels/StyleListModel.cpp @@ -19,8 +19,10 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/StyleListModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_StyleListModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_StyleListModel.cpp" +#endif // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Style, PropertyNames::Recipe::style) diff --git a/src/qtModels/listModels/WaterListModel.cpp b/src/qtModels/listModels/WaterListModel.cpp index d5eda53ae..817b81934 100644 --- a/src/qtModels/listModels/WaterListModel.cpp +++ b/src/qtModels/listModels/WaterListModel.cpp @@ -16,8 +16,10 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/WaterListModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_WaterListModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_WaterListModel.cpp" +#endif // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Water, PropertyNames::Recipe::waterUses) diff --git a/src/qtModels/listModels/YeastListModel.cpp b/src/qtModels/listModels/YeastListModel.cpp index 570b81433..07da5a3cc 100644 --- a/src/qtModels/listModels/YeastListModel.cpp +++ b/src/qtModels/listModels/YeastListModel.cpp @@ -15,8 +15,10 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "qtModels/listModels/YeastListModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_YeastListModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_YeastListModel.cpp" +#endif // Insert the boiler-plate stuff that we cannot do in ListModelBase LIST_MODEL_COMMON_CODE(Yeast, PropertyNames::Recipe::yeastAdditions) diff --git a/src/qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.cpp index 8e2bfc4e4..922124f58 100644 --- a/src/qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/BoilSortFilterProxyModel.cpp @@ -18,8 +18,10 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_BoilSortFilterProxyModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_BoilSortFilterProxyModel.cpp" +#endif bool BoilSortFilterProxyModel::isLessThan(BoilTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, diff --git a/src/qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp index 05eabe942..d2730034a 100644 --- a/src/qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/EquipmentSortFilterProxyModel.cpp @@ -19,8 +19,10 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_EquipmentSortFilterProxyModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_EquipmentSortFilterProxyModel.cpp" +#endif bool EquipmentSortFilterProxyModel::isLessThan(EquipmentTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, diff --git a/src/qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.cpp index 0fde827ae..8c01ea75f 100644 --- a/src/qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/FermentableSortFilterProxyModel.cpp @@ -25,8 +25,10 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_FermentableSortFilterProxyModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_FermentableSortFilterProxyModel.cpp" +#endif bool FermentableSortFilterProxyModel::isLessThan(FermentableTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, diff --git a/src/qtModels/sortFilterProxyModels/FermentationSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/FermentationSortFilterProxyModel.cpp index 0cbacc85b..b680910b6 100644 --- a/src/qtModels/sortFilterProxyModels/FermentationSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/FermentationSortFilterProxyModel.cpp @@ -19,8 +19,10 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_FermentationSortFilterProxyModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_FermentationSortFilterProxyModel.cpp" +#endif bool FermentationSortFilterProxyModel::isLessThan(FermentationTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, diff --git a/src/qtModels/sortFilterProxyModels/HopSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/HopSortFilterProxyModel.cpp index 7e1fd4133..5736afa1b 100644 --- a/src/qtModels/sortFilterProxyModels/HopSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/HopSortFilterProxyModel.cpp @@ -24,8 +24,10 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_HopSortFilterProxyModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_HopSortFilterProxyModel.cpp" +#endif bool HopSortFilterProxyModel::isLessThan(HopTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, diff --git a/src/qtModels/sortFilterProxyModels/MashSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/MashSortFilterProxyModel.cpp index ec7f0f8aa..25e5d68bf 100644 --- a/src/qtModels/sortFilterProxyModels/MashSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/MashSortFilterProxyModel.cpp @@ -18,8 +18,10 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_MashSortFilterProxyModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_MashSortFilterProxyModel.cpp" +#endif bool MashSortFilterProxyModel::isLessThan(MashTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, diff --git a/src/qtModels/sortFilterProxyModels/MiscSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/MiscSortFilterProxyModel.cpp index b5f123938..7105e5bce 100644 --- a/src/qtModels/sortFilterProxyModels/MiscSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/MiscSortFilterProxyModel.cpp @@ -23,8 +23,10 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_MiscSortFilterProxyModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_MiscSortFilterProxyModel.cpp" +#endif bool MiscSortFilterProxyModel::isLessThan(MiscTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, diff --git a/src/qtModels/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.cpp index af33940c0..9efeee8a2 100644 --- a/src/qtModels/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/RecipeAdditionFermentableSortFilterProxyModel.cpp @@ -24,8 +24,10 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RecipeAdditionFermentableSortFilterProxyModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RecipeAdditionFermentableSortFilterProxyModel.cpp" +#endif bool RecipeAdditionFermentableSortFilterProxyModel::isLessThan(RecipeAdditionFermentableTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, diff --git a/src/qtModels/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.cpp index 4f3dd1c24..4512f1b46 100644 --- a/src/qtModels/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/RecipeAdditionHopSortFilterProxyModel.cpp @@ -24,8 +24,10 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RecipeAdditionHopSortFilterProxyModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RecipeAdditionHopSortFilterProxyModel.cpp" +#endif bool RecipeAdditionHopSortFilterProxyModel::isLessThan(RecipeAdditionHopTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, diff --git a/src/qtModels/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.cpp index 568333bb3..b5ea0517d 100644 --- a/src/qtModels/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/RecipeAdditionMiscSortFilterProxyModel.cpp @@ -24,8 +24,10 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RecipeAdditionMiscSortFilterProxyModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RecipeAdditionMiscSortFilterProxyModel.cpp" +#endif bool RecipeAdditionMiscSortFilterProxyModel::isLessThan(RecipeAdditionMiscTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, diff --git a/src/qtModels/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.cpp index 8e1d24432..9ccb61118 100644 --- a/src/qtModels/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/RecipeAdditionYeastSortFilterProxyModel.cpp @@ -24,8 +24,10 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RecipeAdditionYeastSortFilterProxyModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RecipeAdditionYeastSortFilterProxyModel.cpp" +#endif bool RecipeAdditionYeastSortFilterProxyModel::isLessThan(RecipeAdditionYeastTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, diff --git a/src/qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.cpp index d4df84112..4e8b7c472 100644 --- a/src/qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/StyleSortFilterProxyModel.cpp @@ -20,8 +20,10 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_StyleSortFilterProxyModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_StyleSortFilterProxyModel.cpp" +#endif bool StyleSortFilterProxyModel::isLessThan(StyleTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, diff --git a/src/qtModels/sortFilterProxyModels/WaterSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/WaterSortFilterProxyModel.cpp index b090694de..28a6382a8 100644 --- a/src/qtModels/sortFilterProxyModels/WaterSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/WaterSortFilterProxyModel.cpp @@ -22,8 +22,10 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_WaterSortFilterProxyModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_WaterSortFilterProxyModel.cpp" +#endif bool WaterSortFilterProxyModel::isLessThan(WaterTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, diff --git a/src/qtModels/sortFilterProxyModels/YeastSortFilterProxyModel.cpp b/src/qtModels/sortFilterProxyModels/YeastSortFilterProxyModel.cpp index 4b8dbdba3..7af419b1c 100644 --- a/src/qtModels/sortFilterProxyModels/YeastSortFilterProxyModel.cpp +++ b/src/qtModels/sortFilterProxyModels/YeastSortFilterProxyModel.cpp @@ -23,8 +23,10 @@ #include "measurement/Measurement.h" #include "measurement/PhysicalQuantity.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_YeastSortFilterProxyModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_YeastSortFilterProxyModel.cpp" +#endif bool YeastSortFilterProxyModel::isLessThan(YeastTableModel::ColumnIndex const columnIndex, QVariant const & leftItem, diff --git a/src/qtModels/tableModels/BoilStepTableModel.cpp b/src/qtModels/tableModels/BoilStepTableModel.cpp index b241a95ab..38661687b 100644 --- a/src/qtModels/tableModels/BoilStepTableModel.cpp +++ b/src/qtModels/tableModels/BoilStepTableModel.cpp @@ -24,8 +24,10 @@ #include "model/BoilStep.h" #include "qtModels/tableModels/BtTableModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_BoilStepTableModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_BoilStepTableModel.cpp" +#endif BoilStepTableModel::BoilStepTableModel(QTableView * parent, bool editable) : BtTableModel{ diff --git a/src/qtModels/tableModels/BoilTableModel.cpp b/src/qtModels/tableModels/BoilTableModel.cpp index fc5e94818..93953e8db 100644 --- a/src/qtModels/tableModels/BoilTableModel.cpp +++ b/src/qtModels/tableModels/BoilTableModel.cpp @@ -23,8 +23,10 @@ #include "model/Boil.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_BoilTableModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_BoilTableModel.cpp" +#endif BoilTableModel::BoilTableModel(QTableView * parent, bool editable) : BtTableModel{ diff --git a/src/qtModels/tableModels/BtTableModel.cpp b/src/qtModels/tableModels/BtTableModel.cpp index 8fd7f5c37..d40ab9cc3 100644 --- a/src/qtModels/tableModels/BtTableModel.cpp +++ b/src/qtModels/tableModels/BtTableModel.cpp @@ -28,8 +28,10 @@ #include "widgets/SmartAmounts.h" #include "widgets/UnitAndScalePopUpMenu.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_BtTableModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_BtTableModel.cpp" +#endif BtTableModelRecipeObserver::BtTableModelRecipeObserver(QTableView * parent, bool editable, diff --git a/src/qtModels/tableModels/EquipmentTableModel.cpp b/src/qtModels/tableModels/EquipmentTableModel.cpp index 405b96e3d..8b904a7e8 100644 --- a/src/qtModels/tableModels/EquipmentTableModel.cpp +++ b/src/qtModels/tableModels/EquipmentTableModel.cpp @@ -20,8 +20,10 @@ #include #include -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_EquipmentTableModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_EquipmentTableModel.cpp" +#endif EquipmentTableModel::EquipmentTableModel(QTableView* parent, bool editable) : BtTableModel{ diff --git a/src/qtModels/tableModels/FermentableTableModel.cpp b/src/qtModels/tableModels/FermentableTableModel.cpp index 17a013927..7e671fa08 100644 --- a/src/qtModels/tableModels/FermentableTableModel.cpp +++ b/src/qtModels/tableModels/FermentableTableModel.cpp @@ -43,8 +43,10 @@ #include "utils/BtStringConst.h" #include "widgets/BtComboBoxEnum.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_FermentableTableModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_FermentableTableModel.cpp" +#endif //=====================CLASS FermentableTableModel============================== FermentableTableModel::FermentableTableModel(QTableView* parent, bool editable) : diff --git a/src/qtModels/tableModels/FermentationStepTableModel.cpp b/src/qtModels/tableModels/FermentationStepTableModel.cpp index 139d4360b..f8735ac79 100644 --- a/src/qtModels/tableModels/FermentationStepTableModel.cpp +++ b/src/qtModels/tableModels/FermentationStepTableModel.cpp @@ -34,8 +34,10 @@ #include "model/FermentationStep.h" #include "PersistentSettings.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_FermentationStepTableModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_FermentationStepTableModel.cpp" +#endif FermentationStepTableModel::FermentationStepTableModel(QTableView * parent, bool editable) : BtTableModel{ diff --git a/src/qtModels/tableModels/FermentationTableModel.cpp b/src/qtModels/tableModels/FermentationTableModel.cpp index 503fc1292..042e08300 100644 --- a/src/qtModels/tableModels/FermentationTableModel.cpp +++ b/src/qtModels/tableModels/FermentationTableModel.cpp @@ -23,8 +23,10 @@ #include "model/Fermentation.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_FermentationTableModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_FermentationTableModel.cpp" +#endif FermentationTableModel::FermentationTableModel(QTableView * parent, bool editable) : BtTableModel{ diff --git a/src/qtModels/tableModels/HopTableModel.cpp b/src/qtModels/tableModels/HopTableModel.cpp index 62bfa4b46..91e50d8f8 100644 --- a/src/qtModels/tableModels/HopTableModel.cpp +++ b/src/qtModels/tableModels/HopTableModel.cpp @@ -30,8 +30,10 @@ #include #include -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_HopTableModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_HopTableModel.cpp" +#endif HopTableModel::HopTableModel(QTableView * parent, bool editable) : BtTableModel{ diff --git a/src/qtModels/tableModels/MashStepTableModel.cpp b/src/qtModels/tableModels/MashStepTableModel.cpp index 005bee8ab..484087610 100644 --- a/src/qtModels/tableModels/MashStepTableModel.cpp +++ b/src/qtModels/tableModels/MashStepTableModel.cpp @@ -30,8 +30,10 @@ #include "model/MashStep.h" #include "qtModels/tableModels/BtTableModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_MashStepTableModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_MashStepTableModel.cpp" +#endif MashStepTableModel::MashStepTableModel(QTableView * parent, bool editable) : BtTableModel{ diff --git a/src/qtModels/tableModels/MashTableModel.cpp b/src/qtModels/tableModels/MashTableModel.cpp index 71bbe0b9d..94b185954 100644 --- a/src/qtModels/tableModels/MashTableModel.cpp +++ b/src/qtModels/tableModels/MashTableModel.cpp @@ -23,8 +23,10 @@ #include "model/Mash.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_MashTableModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_MashTableModel.cpp" +#endif MashTableModel::MashTableModel(QTableView * parent, bool editable) : BtTableModel{ diff --git a/src/qtModels/tableModels/MiscTableModel.cpp b/src/qtModels/tableModels/MiscTableModel.cpp index cf47aecde..f1dc4b693 100644 --- a/src/qtModels/tableModels/MiscTableModel.cpp +++ b/src/qtModels/tableModels/MiscTableModel.cpp @@ -28,8 +28,10 @@ #include #include -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_MiscTableModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_MiscTableModel.cpp" +#endif MiscTableModel::MiscTableModel(QTableView* parent, bool editable) : BtTableModel{ diff --git a/src/qtModels/tableModels/RecipeAdditionFermentableTableModel.cpp b/src/qtModels/tableModels/RecipeAdditionFermentableTableModel.cpp index 9a8b4a90f..78c1caa62 100644 --- a/src/qtModels/tableModels/RecipeAdditionFermentableTableModel.cpp +++ b/src/qtModels/tableModels/RecipeAdditionFermentableTableModel.cpp @@ -37,8 +37,10 @@ #include "model/Inventory.h" #include "model/Recipe.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RecipeAdditionFermentableTableModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RecipeAdditionFermentableTableModel.cpp" +#endif RecipeAdditionFermentableTableModel::RecipeAdditionFermentableTableModel(QTableView * parent, bool editable) : BtTableModelRecipeObserver{ diff --git a/src/qtModels/tableModels/RecipeAdditionHopTableModel.cpp b/src/qtModels/tableModels/RecipeAdditionHopTableModel.cpp index d0cda5b8d..bb27e7754 100644 --- a/src/qtModels/tableModels/RecipeAdditionHopTableModel.cpp +++ b/src/qtModels/tableModels/RecipeAdditionHopTableModel.cpp @@ -36,8 +36,10 @@ #include "model/Inventory.h" #include "model/Recipe.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RecipeAdditionHopTableModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RecipeAdditionHopTableModel.cpp" +#endif RecipeAdditionHopTableModel::RecipeAdditionHopTableModel(QTableView * parent, bool editable) : BtTableModelRecipeObserver{ diff --git a/src/qtModels/tableModels/RecipeAdditionMiscTableModel.cpp b/src/qtModels/tableModels/RecipeAdditionMiscTableModel.cpp index a1380fd50..abda939ac 100644 --- a/src/qtModels/tableModels/RecipeAdditionMiscTableModel.cpp +++ b/src/qtModels/tableModels/RecipeAdditionMiscTableModel.cpp @@ -36,8 +36,10 @@ #include "model/Inventory.h" #include "model/Recipe.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RecipeAdditionMiscTableModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RecipeAdditionMiscTableModel.cpp" +#endif RecipeAdditionMiscTableModel::RecipeAdditionMiscTableModel(QTableView * parent, bool editable) : BtTableModelRecipeObserver{ diff --git a/src/qtModels/tableModels/RecipeAdditionYeastTableModel.cpp b/src/qtModels/tableModels/RecipeAdditionYeastTableModel.cpp index 0b8a916fe..1cd0125d0 100644 --- a/src/qtModels/tableModels/RecipeAdditionYeastTableModel.cpp +++ b/src/qtModels/tableModels/RecipeAdditionYeastTableModel.cpp @@ -37,8 +37,10 @@ #include "model/Inventory.h" #include "model/Recipe.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RecipeAdditionYeastTableModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RecipeAdditionYeastTableModel.cpp" +#endif RecipeAdditionYeastTableModel::RecipeAdditionYeastTableModel(QTableView * parent, bool editable) : BtTableModelRecipeObserver{ diff --git a/src/qtModels/tableModels/RecipeAdjustmentSaltTableModel.cpp b/src/qtModels/tableModels/RecipeAdjustmentSaltTableModel.cpp index 8c49d4619..0870b028a 100644 --- a/src/qtModels/tableModels/RecipeAdjustmentSaltTableModel.cpp +++ b/src/qtModels/tableModels/RecipeAdjustmentSaltTableModel.cpp @@ -32,8 +32,10 @@ #include "model/Mash.h" #include "model/Recipe.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_RecipeAdjustmentSaltTableModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_RecipeAdjustmentSaltTableModel.cpp" +#endif RecipeAdjustmentSaltTableModel::RecipeAdjustmentSaltTableModel(QTableView* parent, bool editable) : BtTableModelRecipeObserver{ diff --git a/src/qtModels/tableModels/SaltTableModel.cpp b/src/qtModels/tableModels/SaltTableModel.cpp index 9f1b47d43..073011513 100644 --- a/src/qtModels/tableModels/SaltTableModel.cpp +++ b/src/qtModels/tableModels/SaltTableModel.cpp @@ -24,8 +24,10 @@ #include #include -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_SaltTableModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_SaltTableModel.cpp" +#endif SaltTableModel::SaltTableModel(QTableView* parent, bool editable) : BtTableModel{ diff --git a/src/qtModels/tableModels/StyleTableModel.cpp b/src/qtModels/tableModels/StyleTableModel.cpp index c11c4647d..83a53ebd6 100644 --- a/src/qtModels/tableModels/StyleTableModel.cpp +++ b/src/qtModels/tableModels/StyleTableModel.cpp @@ -20,8 +20,10 @@ #include #include -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_StyleTableModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_StyleTableModel.cpp" +#endif StyleTableModel::StyleTableModel(QTableView* parent, bool editable) : BtTableModel{ diff --git a/src/qtModels/tableModels/WaterTableModel.cpp b/src/qtModels/tableModels/WaterTableModel.cpp index 5b4803abb..5ca4063e5 100644 --- a/src/qtModels/tableModels/WaterTableModel.cpp +++ b/src/qtModels/tableModels/WaterTableModel.cpp @@ -27,8 +27,10 @@ #include "Localization.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_WaterTableModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_WaterTableModel.cpp" +#endif WaterTableModel::WaterTableModel(QTableView * parent, bool editable) : BtTableModel{ diff --git a/src/qtModels/tableModels/YeastTableModel.cpp b/src/qtModels/tableModels/YeastTableModel.cpp index 21845e64d..b96464653 100644 --- a/src/qtModels/tableModels/YeastTableModel.cpp +++ b/src/qtModels/tableModels/YeastTableModel.cpp @@ -28,8 +28,10 @@ #include #include -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_YeastTableModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_YeastTableModel.cpp" +#endif YeastTableModel::YeastTableModel(QTableView * parent, bool editable) : BtTableModel{ diff --git a/src/trees/TreeFilterProxyModel.cpp b/src/trees/TreeFilterProxyModel.cpp index 90f3e0963..eeafda950 100644 --- a/src/trees/TreeFilterProxyModel.cpp +++ b/src/trees/TreeFilterProxyModel.cpp @@ -32,8 +32,10 @@ #include "model/Water.h" #include "model/Yeast.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_TreeFilterProxyModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_TreeFilterProxyModel.cpp" +#endif namespace { diff --git a/src/trees/TreeModel.cpp b/src/trees/TreeModel.cpp index 27043bb22..29a9ea849 100644 --- a/src/trees/TreeModel.cpp +++ b/src/trees/TreeModel.cpp @@ -49,8 +49,10 @@ #include "utils/BtStringConst.h" #include "PersistentSettings.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_TreeModel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_TreeModel.cpp" +#endif namespace { NamedEntity * getElement(TreeNode::Type oType, int id) { diff --git a/src/trees/TreeView.cpp b/src/trees/TreeView.cpp index 2fefa29f8..b739b0a10 100644 --- a/src/trees/TreeView.cpp +++ b/src/trees/TreeView.cpp @@ -48,8 +48,10 @@ #include "model/Yeast.h" #include "trees/TreeModel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_TreeView.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_TreeView.cpp" +#endif TreeView::TreeView(QWidget * parent, TreeModel::TypeMasks type) : QTreeView{parent}, diff --git a/src/widgets/Animator.cpp b/src/widgets/Animator.cpp index df8e64463..f307fcfef 100644 --- a/src/widgets/Animator.cpp +++ b/src/widgets/Animator.cpp @@ -21,8 +21,10 @@ #include #include -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_Animator.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_Animator.cpp" +#endif Animator::Animator(QObject * target, QObject * parent) : QVariantAnimation(parent) { setTargetObject(target); diff --git a/src/widgets/BtComboBoxBool.cpp b/src/widgets/BtComboBoxBool.cpp index 42e5d6558..5a990c667 100644 --- a/src/widgets/BtComboBoxBool.cpp +++ b/src/widgets/BtComboBoxBool.cpp @@ -20,8 +20,10 @@ #include "utils/MetaTypes.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_BtComboBoxBool.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_BtComboBoxBool.cpp" +#endif namespace { // We store string values inside the combo box as it's less confusing when the value is optional diff --git a/src/widgets/BtComboBoxEnum.cpp b/src/widgets/BtComboBoxEnum.cpp index 3fc29df94..9cf921546 100644 --- a/src/widgets/BtComboBoxEnum.cpp +++ b/src/widgets/BtComboBoxEnum.cpp @@ -17,8 +17,10 @@ #include "widgets/SmartLineEdit.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_BtComboBoxEnum.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_BtComboBoxEnum.cpp" +#endif // This private implementation class holds all private non-virtual members of BtComboBoxEnum class BtComboBoxEnum::impl { diff --git a/src/widgets/BtComboBoxNamedEntity.cpp b/src/widgets/BtComboBoxNamedEntity.cpp index 3e635d1a3..dac42a770 100644 --- a/src/widgets/BtComboBoxNamedEntity.cpp +++ b/src/widgets/BtComboBoxNamedEntity.cpp @@ -21,8 +21,10 @@ #include #include -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_BtComboBoxNamedEntity.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_BtComboBoxNamedEntity.cpp" +#endif BtComboBoxNamedEntity::BtComboBoxNamedEntity(char const * const name, QWidget* parent) : QComboBox{parent}, diff --git a/src/widgets/BtOptionalDateEdit.cpp b/src/widgets/BtOptionalDateEdit.cpp index 7f968da39..820f25680 100644 --- a/src/widgets/BtOptionalDateEdit.cpp +++ b/src/widgets/BtOptionalDateEdit.cpp @@ -23,8 +23,10 @@ #include #include -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_BtOptionalDateEdit.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_BtOptionalDateEdit.cpp" +#endif // // This private implementation class holds all private non-virtual members of BtOptionalDateEdit diff --git a/src/widgets/InfoButton.cpp b/src/widgets/InfoButton.cpp index 069558ea0..10c956497 100644 --- a/src/widgets/InfoButton.cpp +++ b/src/widgets/InfoButton.cpp @@ -25,8 +25,10 @@ #include "utils/Fonts.h" #include "widgets/InfoText.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_InfoButton.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_InfoButton.cpp" +#endif namespace { QColor const backgroundColorInfoShown {0x14, 0x82, 0x63}; diff --git a/src/widgets/InfoText.cpp b/src/widgets/InfoText.cpp index c1048620c..e7d6fb633 100644 --- a/src/widgets/InfoText.cpp +++ b/src/widgets/InfoText.cpp @@ -19,8 +19,10 @@ #include "widgets/InfoButton.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_InfoText.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_InfoText.cpp" +#endif InfoText::InfoText(QWidget * parent, Qt::WindowFlags flags) : QLabel(parent, flags), m_infoButton{nullptr} { this->setWordWrap(true); diff --git a/src/widgets/SelectionControl.cpp b/src/widgets/SelectionControl.cpp index 0f5973697..dbf93dc95 100644 --- a/src/widgets/SelectionControl.cpp +++ b/src/widgets/SelectionControl.cpp @@ -16,8 +16,10 @@ ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌*/ #include "widgets/SelectionControl.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_SelectionControl.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_SelectionControl.cpp" +#endif SelectionControl::SelectionControl(QWidget * parent) : QAbstractButton(parent) { setObjectName("SelectionControl"); diff --git a/src/widgets/SmartCheckBox.cpp b/src/widgets/SmartCheckBox.cpp index 12d0139f4..c71fba32b 100644 --- a/src/widgets/SmartCheckBox.cpp +++ b/src/widgets/SmartCheckBox.cpp @@ -21,8 +21,10 @@ #include "widgets/SmartLineEdit.h" #include "utils/TypeLookup.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_SmartCheckBox.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_SmartCheckBox.cpp" +#endif // This private implementation class holds all private non-virtual members of SmartCheckBox class SmartCheckBox::impl { diff --git a/src/widgets/SmartDigitWidget.cpp b/src/widgets/SmartDigitWidget.cpp index 8dad6fa95..43cb86c11 100644 --- a/src/widgets/SmartDigitWidget.cpp +++ b/src/widgets/SmartDigitWidget.cpp @@ -31,8 +31,10 @@ #include "PersistentSettings.h" #include "widgets/SmartLabel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_SmartDigitWidget.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_SmartDigitWidget.cpp" +#endif // This private implementation class holds all private non-virtual members of SmartDigitWidget class SmartDigitWidget::impl { diff --git a/src/widgets/SmartLabel.cpp b/src/widgets/SmartLabel.cpp index d14cf8de5..8feb44d68 100644 --- a/src/widgets/SmartLabel.cpp +++ b/src/widgets/SmartLabel.cpp @@ -33,8 +33,10 @@ #include "widgets/SmartField.h" #include "widgets/UnitAndScalePopUpMenu.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_SmartLabel.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_SmartLabel.cpp" +#endif // This private implementation class holds all private non-virtual members of SmartLabel class SmartLabel::impl { diff --git a/src/widgets/SmartLineEdit.cpp b/src/widgets/SmartLineEdit.cpp index 1a982cc01..e9c9436cc 100644 --- a/src/widgets/SmartLineEdit.cpp +++ b/src/widgets/SmartLineEdit.cpp @@ -34,8 +34,10 @@ #include "utils/TypeLookup.h" #include "widgets/SmartLabel.h" -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_SmartLineEdit.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_SmartLineEdit.cpp" +#endif namespace { // diff --git a/src/widgets/ToggleSwitch.cpp b/src/widgets/ToggleSwitch.cpp index 995c3bb77..feefcf618 100644 --- a/src/widgets/ToggleSwitch.cpp +++ b/src/widgets/ToggleSwitch.cpp @@ -18,8 +18,10 @@ #include -// Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake -#include "moc_ToggleSwitch.cpp" +#ifdef BUILDING_WITH_CMAKE + // Explicitly doing this include reduces potential problems with AUTOMOC when compiling with CMake + #include "moc_ToggleSwitch.cpp" +#endif Q_DECL_IMPORT void qt_blurImage(QPainter * p, QImage & blurImage, qreal radius, bool quality, bool alphaOnly, int transposed = 0); // src/widgets/effects/qpixmapfilter.cpp