diff -r 1ce50e72a6b1 -r 224be4d9f8eb src/EditRecipe.h --- a/src/EditRecipe.h Wed Apr 06 12:10:33 2022 +0200 +++ b/src/EditRecipe.h Wed Apr 06 20:26:47 2022 +0200 @@ -227,16 +227,11 @@ * that belong with the loaded recipe data and are present to * make things easier. */ - int fermentables_records; ///< Total records int fermentables_current; ///< Current record, -1 is invalid. bool fermentables_use100; ///< Use percentages instead of amount - int hops_records; int hops_current; - int misc_records; int misc_current; - int yeasts_records; int yeasts_current; - int mashs_records; int mashs_current; }; @@ -269,7 +264,6 @@ void refreshYeasts(); void refreshMashs(); void refreshAll(); - void cell_Fermentable_changed(int nRow, int nCol); void ferment_amount_changed(double val); void ferment_pct_changed(double val); void on_deleteFermentRow_clicked(); @@ -292,18 +286,17 @@ int recno, editrow; bool textIsChanged = false; bool ignoreChanges = false; - bool use_to100 = false; Recipe *recipe; /* * Variables for popup ingredients editing. */ - QJsonDocument fermentables, hops, miscs, yeasts; - QJsonObject work, backup; + QJsonDocument hops, miscs, yeasts; QComboBox *selectEdit, *addedEdit; QLineEdit *nameEdit, *supplierEdit; QDoubleSpinBox *amountEdit, *pctEdit, *maxEdit; QCheckBox *to100Edit, *instockEdit; + static bool ferment_sort_test(const Fermentables &D1, const Fermentables &D2); void WindowTitle(); void fermentable_Json(); void calcFermentables();