--- a/src/global.h Mon Jun 13 12:26:27 2022 +0200 +++ b/src/global.h Mon Jun 13 15:47:16 2022 +0200 @@ -54,56 +54,56 @@ */ struct Fermentables { - QString f_name; - QString f_origin; - QString f_supplier; - QString f_notes; - double f_amount; - double f_cost; - int f_type; - double f_yield; - double f_color; - double f_coarse_fine_diff; - double f_moisture; - double f_diastatic_power; - double f_protein; - double f_dissolved_protein; - double f_max_in_batch; - int f_graintype; - int f_added; - bool f_recommend_mash; - bool f_add_after_boil; - bool f_adjust_to_total_100; - double f_percentage; - double f_di_ph; - double f_acid_to_ph_57; - double f_inventory; ///< In product, current inventory. - bool f_avail; ///< Product available in database. + QString name; + QString origin; + QString supplier; + QString notes; + double amount; + double cost; + int type; + double yield; + double color; + double coarse_fine_diff; + double moisture; + double diastatic_power; + double protein; + double dissolved_protein; + double max_in_batch; + int graintype; + int added; + bool recommend_mash; + bool add_after_boil; + bool adjust_to_total_100; + double percentage; + double di_ph; + double acid_to_ph_57; + double inventory; ///< In product, current inventory. + bool avail; ///< Product available in database. }; struct Hops { - QString h_name; - QString h_origin; - QString h_notes; - QString h_substitutes; - double h_amount; - double h_cost; - int h_type; - int h_form; - int h_useat; - double h_time; - double h_alpha; - double h_beta; - double h_hsi; - double h_humulene; - double h_caryophyllene; - double h_cohumulone; - double h_myrcene; - double h_total_oil; - double h_inventory; ///< In product, current inventory. - bool h_avail; ///< Product available in database. + QString name; + QString origin; + QString notes; + QString substitutes; + double amount; + double cost; + int type; + int form; + int useat; + double time; + double alpha; + double beta; + double hsi; + double humulene; + double caryophyllene; + double cohumulone; + double myrcene; + double total_oil; + double inventory; ///< In product, current inventory. + bool avail; ///< Product available in database. };