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