# HG changeset patch
# User Michiel Broek <mbroek@mbse.eu>
# Date 1655110463 -7200
# Node ID efc213beb6052d30dfa3997df8dd4886f182002a
# Parent  8540fd0166e79a17b886ce03f0740b97be926cab
Member names of miscs normalized. This was a leftover from porting from php code.

diff -r 8540fd0166e7 -r efc213beb605 src/EditProductExport.cpp
--- a/src/EditProductExport.cpp	Sun Jun 12 20:06:39 2022 +0200
+++ b/src/EditProductExport.cpp	Mon Jun 13 10:54:23 2022 +0200
@@ -172,12 +172,12 @@
     for (int i = 0; i < product->miscs.size(); i++) {
         xmlWriter->writeStartElement("MISC");
         xmlWriter->writeTextElement("VERSION", "1");
-        xmlWriter->writeTextElement("NAME", product->miscs.at(i).m_name);
-	xmlWriter->writeTextElement("TYPE", misc_type[product->miscs.at(i).m_type]);
-	xmlWriter->writeTextElement("AMOUNT", QString::number(product->miscs.at(i).m_amount, 'f', 5));
-	xmlWriter->writeTextElement("AMOUNT_IS_WEIGHT", product->miscs.at(i).m_amount_is_weight ? "TRUE":"FALSE");
-	xmlWriter->writeTextElement("USE", misc_use[product->miscs.at(i).m_use_use]);
-	xmlWriter->writeTextElement("TIME", QString::number(product->miscs.at(i).m_time, 'f', 0));
+        xmlWriter->writeTextElement("NAME", product->miscs.at(i).name);
+	xmlWriter->writeTextElement("TYPE", misc_type[product->miscs.at(i).type]);
+	xmlWriter->writeTextElement("AMOUNT", QString::number(product->miscs.at(i).amount, 'f', 5));
+	xmlWriter->writeTextElement("AMOUNT_IS_WEIGHT", product->miscs.at(i).amount_is_weight ? "TRUE":"FALSE");
+	xmlWriter->writeTextElement("USE", misc_use[product->miscs.at(i).use_use]);
+	xmlWriter->writeTextElement("TIME", QString::number(product->miscs.at(i).time, 'f', 0));
 	xmlWriter->writeEndElement();
     }
     xmlWriter->writeEndElement();	// MISCS
@@ -492,13 +492,13 @@
     memo.append("[tabular]\n");
     memo.append("[head]Specerij, kruid, brouwzout[/head][head]Type grondstof[/head][head]Gebruik tijdens[/head][head]Hoeveel[/head]\n");
     for (int i = 0; i < product->miscs.size(); i++) {
-        memo.append("[row][data]" + product->miscs.at(i).m_name + "[/data]");
-        memo.append("[data]" + misc_type[product->miscs.at(i).m_type] + "[/data]");
-        if (product->miscs.at(i).m_use_use == MISC_USES_BOIL)
-            memo.append("[data]" + misc_use[product->miscs.at(i).m_use_use] + " " + QString::number(product->miscs.at(i).m_time) + " min[/data]");
+        memo.append("[row][data]" + product->miscs.at(i).name + "[/data]");
+        memo.append("[data]" + misc_type[product->miscs.at(i).type] + "[/data]");
+        if (product->miscs.at(i).use_use == MISC_USES_BOIL)
+            memo.append("[data]" + misc_use[product->miscs.at(i).use_use] + " " + QString::number(product->miscs.at(i).time) + " min[/data]");
         else
-            memo.append("[data]" + misc_use[product->miscs.at(i).m_use_use] + "[/data]");
-        memo.append("[data]"+QString::number(product->miscs.at(i).m_amount * 1000, 'f', 2)+((product->miscs.at(i).m_amount_is_weight)?" gr":" ml")+"[/data][/row]\n");
+            memo.append("[data]" + misc_use[product->miscs.at(i).use_use] + "[/data]");
+        memo.append("[data]"+QString::number(product->miscs.at(i).amount * 1000, 'f', 2)+((product->miscs.at(i).amount_is_weight)?" gr":" ml")+"[/data][/row]\n");
     }
     memo.append("[/tabular]\n\n");
 
@@ -932,7 +932,7 @@
 		sp->hops[j].h_amount = round(sp->hops.at(j).h_amount * factor * 100000) / 100000;
 	    }
 	    for (int j = 0; j < sp->miscs.size(); j++) {
-                sp->miscs[j].m_amount = round(sp->miscs.at(j).m_amount * factor * 100000) / 100000;
+                sp->miscs[j].amount = round(sp->miscs.at(j).amount * factor * 100000) / 100000;
             }
 	    for (int j = 0; j < sp->yeasts.size(); j++) {
                 sp->yeasts[j].y_amount = round(sp->yeasts.at(j).y_amount * factor * 100000) / 100000;
@@ -989,7 +989,7 @@
                 sp->hops[j].h_amount = round(sp->hops.at(j).h_amount * factor * 100000) / 100000;
             }
             for (int j = 0; j < sp->miscs.size(); j++) {
-                sp->miscs[j].m_amount = round(sp->miscs.at(j).m_amount * factor * 100000) / 100000;
+                sp->miscs[j].amount = round(sp->miscs.at(j).amount * factor * 100000) / 100000;
             }
             for (int j = 0; j < sp->yeasts.size(); j++) {
                 sp->yeasts[j].y_amount = round(sp->yeasts.at(j).y_amount * factor * 100000) / 100000;
diff -r 8540fd0166e7 -r efc213beb605 src/EditProductTab5.cpp
--- a/src/EditProductTab5.cpp	Sun Jun 12 20:06:39 2022 +0200
+++ b/src/EditProductTab5.cpp	Mon Jun 13 10:54:23 2022 +0200
@@ -20,15 +20,15 @@
 
 bool EditProduct::misc_sort_test(const Miscs &D1, const Miscs &D2)
 {
-    if (D1.m_use_use > D2.m_use_use)
+    if (D1.use_use > D2.use_use)
 	return false;
-    if (D1.m_use_use < D2.m_use_use)
+    if (D1.use_use < D2.use_use)
 	return true;
-    if (D1.m_type > D2.m_type)
+    if (D1.type > D2.type)
 	return false;
-    if (D1.m_type < D2.m_type)
+    if (D1.type < D2.type)
 	return true;
-    return (D1.m_amount > D2.m_amount);
+    return (D1.amount > D2.amount);
 }
 
 
@@ -69,39 +69,39 @@
 
     for (int i = 0; i < product->miscs.size(); i++) {
 
-	ui->miscsTable->setItem(i, 0, new QTableWidgetItem(product->miscs.at(i).m_name));
+	ui->miscsTable->setItem(i, 0, new QTableWidgetItem(product->miscs.at(i).name));
 
-	item = new QTableWidgetItem(misc_types[product->miscs.at(i).m_type]);
+	item = new QTableWidgetItem(misc_types[product->miscs.at(i).type]);
         item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
         ui->miscsTable->setItem(i, 1, item);
 
-	item = new QTableWidgetItem(misc_uses[product->miscs.at(i).m_use_use]);
+	item = new QTableWidgetItem(misc_uses[product->miscs.at(i).use_use]);
         item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
         ui->miscsTable->setItem(i, 2, item);
 
-	if (product->miscs.at(i).m_use_use == MISC_USES_BOIL) {
-	    item = new QTableWidgetItem(QString("%1 min.").arg(product->miscs.at(i).m_time, 1, 'f', 0, '0'));
-	} else if (product->miscs.at(i).m_use_use == MISC_USES_PRIMARY || product->miscs.at(i).m_use_use == MISC_USES_SECONDARY) {
-	    item = new QTableWidgetItem(QString("%1 days.").arg(product->miscs.at(i).m_time / 1440, 1, 'f', 0, '0'));
+	if (product->miscs.at(i).use_use == MISC_USES_BOIL) {
+	    item = new QTableWidgetItem(QString("%1 min.").arg(product->miscs.at(i).time, 1, 'f', 0, '0'));
+	} else if (product->miscs.at(i).use_use == MISC_USES_PRIMARY || product->miscs.at(i).use_use == MISC_USES_SECONDARY) {
+	    item = new QTableWidgetItem(QString("%1 days.").arg(product->miscs.at(i).time / 1440, 1, 'f', 0, '0'));
 	} else {
 	    item = new QTableWidgetItem(QString(""));
 	}
 	item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
         ui->miscsTable->setItem(i, 3, item);
 
-	if (product->miscs.at(i).m_amount_is_weight)
-	    item = new QTableWidgetItem(QString("%1 gr").arg(product->miscs.at(i).m_amount * 1000.0, 3, 'f', 2, '0'));
+	if (product->miscs.at(i).amount_is_weight)
+	    item = new QTableWidgetItem(QString("%1 gr").arg(product->miscs.at(i).amount * 1000.0, 3, 'f', 2, '0'));
 	else
-	    item = new QTableWidgetItem(QString("%1 ml").arg(product->miscs.at(i).m_amount * 1000.0, 3, 'f', 2, '0'));
+	    item = new QTableWidgetItem(QString("%1 ml").arg(product->miscs.at(i).amount * 1000.0, 3, 'f', 2, '0'));
 	item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
         ui->miscsTable->setItem(i, 4, item);
 
-	if (product->miscs.at(i).m_amount_is_weight)
-            item = new QTableWidgetItem(QString("%1 gr").arg(product->miscs.at(i).m_inventory * 1000.0, 3, 'f', 2, '0'));
+	if (product->miscs.at(i).amount_is_weight)
+            item = new QTableWidgetItem(QString("%1 gr").arg(product->miscs.at(i).inventory * 1000.0, 3, 'f', 2, '0'));
         else
-            item = new QTableWidgetItem(QString("%1 ml").arg(product->miscs.at(i).m_inventory * 1000.0, 3, 'f', 2, '0'));
+            item = new QTableWidgetItem(QString("%1 ml").arg(product->miscs.at(i).inventory * 1000.0, 3, 'f', 2, '0'));
         item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
-	if (product->miscs.at(i).m_inventory < product->miscs.at(i).m_amount)
+	if (product->miscs.at(i).inventory < product->miscs.at(i).amount)
             item->setForeground(QBrush(QColor(Qt::red)));
         ui->miscsTable->setItem(i, 5, item);
 
@@ -109,7 +109,7 @@
 	 * Add the Delete and Edit row buttons.
 	 * Not for water agents, these are set on the water tab.
 	 */
-	if (product->miscs.at(i).m_type == MISC_TYPES_WATER_AGENT) {
+	if (product->miscs.at(i).type == MISC_TYPES_WATER_AGENT) {
 	    ui->miscsTable->removeCellWidget(i, 6);	/* to remove the unneeded button */
 	    item = new QTableWidgetItem("");
             item->setToolTip(tr("Edit this from the water tab"));
@@ -151,45 +151,45 @@
 	/*
 	 * Update the water agents.
 	 */
-	if (product->miscs.at(i).m_type == MISC_TYPES_WATER_AGENT) {
-	    if (product->miscs.at(i).m_name == "CaCl2") {
-		ui->bs_cacl2Edit->setValue(product->miscs.at(i).m_amount * 1000.0);
-	    } else if (product->miscs.at(i).m_name == "CaSO4") {
-		ui->bs_caso4Edit->setValue(product->miscs.at(i).m_amount * 1000.0);
-	    } else if (product->miscs.at(i).m_name == "MgSO4") {
-		ui->bs_mgso4Edit->setValue(product->miscs.at(i).m_amount * 1000.0);
-	    } else if (product->miscs.at(i).m_name == "NaCl") {
-		ui->bs_naclEdit->setValue(product->miscs.at(i).m_amount * 1000.0);
-	    } else if (product->miscs.at(i).m_name == "MgCl2") {
-		ui->bs_mgcl2Edit->setValue(product->miscs.at(i).m_amount * 1000.0);
-	    } else if (product->miscs.at(i).m_name == "NaHCO3") {
-		ui->bs_nahco3Edit->setValue(product->miscs.at(i).m_amount * 1000.0);
-	    } else if (product->miscs.at(i).m_name == "CaCO3") {
-		ui->bs_caco3Edit->setValue(product->miscs.at(i).m_amount * 1000.0);
-	    } else if (product->miscs.at(i).m_name == "Melkzuur" || product->miscs.at(i).m_name == "Lactic") {
+	if (product->miscs.at(i).type == MISC_TYPES_WATER_AGENT) {
+	    if (product->miscs.at(i).name == "CaCl2") {
+		ui->bs_cacl2Edit->setValue(product->miscs.at(i).amount * 1000.0);
+	    } else if (product->miscs.at(i).name == "CaSO4") {
+		ui->bs_caso4Edit->setValue(product->miscs.at(i).amount * 1000.0);
+	    } else if (product->miscs.at(i).name == "MgSO4") {
+		ui->bs_mgso4Edit->setValue(product->miscs.at(i).amount * 1000.0);
+	    } else if (product->miscs.at(i).name == "NaCl") {
+		ui->bs_naclEdit->setValue(product->miscs.at(i).amount * 1000.0);
+	    } else if (product->miscs.at(i).name == "MgCl2") {
+		ui->bs_mgcl2Edit->setValue(product->miscs.at(i).amount * 1000.0);
+	    } else if (product->miscs.at(i).name == "NaHCO3") {
+		ui->bs_nahco3Edit->setValue(product->miscs.at(i).amount * 1000.0);
+	    } else if (product->miscs.at(i).name == "CaCO3") {
+		ui->bs_caco3Edit->setValue(product->miscs.at(i).amount * 1000.0);
+	    } else if (product->miscs.at(i).name == "Melkzuur" || product->miscs.at(i).name == "Lactic") {
 		product->wa_acid_name = 0;
 		product->wa_acid_perc = my_acids.at(0).AcidPrc;
 		ui->mw_acidPick->setCurrentIndex(0);
 		ui->mw_acidpercEdit->setValue(my_acids.at(0).AcidPrc);
-		ui->mw_acidvolEdit->setValue(product->miscs.at(i).m_amount * 1000.0);
-	    } else if (product->miscs.at(i).m_name == "Zoutzuur" || product->miscs.at(i).m_name == "Hydrochloric") {
+		ui->mw_acidvolEdit->setValue(product->miscs.at(i).amount * 1000.0);
+	    } else if (product->miscs.at(i).name == "Zoutzuur" || product->miscs.at(i).name == "Hydrochloric") {
                 product->wa_acid_name = 1;
                 product->wa_acid_perc = my_acids.at(1).AcidPrc;
 		ui->mw_acidPick->setCurrentIndex(1);
                 ui->mw_acidpercEdit->setValue(my_acids.at(1).AcidPrc);
-                ui->mw_acidvolEdit->setValue(product->miscs.at(i).m_amount * 1000.0);
-	    } else if (product->miscs.at(i).m_name == "Fosforzuur" || product->miscs.at(i).m_name == "Phosphoric") {
+                ui->mw_acidvolEdit->setValue(product->miscs.at(i).amount * 1000.0);
+	    } else if (product->miscs.at(i).name == "Fosforzuur" || product->miscs.at(i).name == "Phosphoric") {
                 product->wa_acid_name = 2;
                 product->wa_acid_perc = my_acids.at(2).AcidPrc;
 		ui->mw_acidPick->setCurrentIndex(2);
                 ui->mw_acidpercEdit->setValue(my_acids.at(2).AcidPrc);
-                ui->mw_acidvolEdit->setValue(product->miscs.at(i).m_amount * 1000.0);
-	    } else if (product->miscs.at(i).m_name == "Zwavelzuur" || product->miscs.at(i).m_name == "Sulfuric") {
+                ui->mw_acidvolEdit->setValue(product->miscs.at(i).amount * 1000.0);
+	    } else if (product->miscs.at(i).name == "Zwavelzuur" || product->miscs.at(i).name == "Sulfuric") {
                 product->wa_acid_name = 3;
                 product->wa_acid_perc = my_acids.at(3).AcidPrc;
 		ui->mw_acidPick->setCurrentIndex(3);
                 ui->mw_acidpercEdit->setValue(my_acids.at(3).AcidPrc);
-                ui->mw_acidvolEdit->setValue(product->miscs.at(i).m_amount * 1000.0);
+                ui->mw_acidvolEdit->setValue(product->miscs.at(i).amount * 1000.0);
 	    }
 	}
     }
@@ -200,11 +200,11 @@
 {
     product->miscs_ok = true;
     for (int i = 0; i < product->miscs.size(); i++) {
-	if ((((product->inventory_reduced <= PROD_STAGE_BREW)     && (product->miscs.at(i).m_use_use <= MISC_USES_BOIL)) ||  // Starter, Mash, Boil
-             ((product->inventory_reduced <= PROD_STAGE_PRIMARY)  && (product->miscs.at(i).m_use_use == MISC_USES_PRIMARY)) ||
-             ((product->inventory_reduced <= PROD_STAGE_TERTIARY) && (product->miscs.at(i).m_use_use == MISC_USES_SECONDARY)) ||
-             ((product->inventory_reduced <= PROD_STAGE_PACKAGE)  && (product->miscs.at(i).m_use_use == MISC_USES_BOTTLING))) &&
-              (product->miscs.at(i).m_inventory < product->miscs.at(i).m_amount)) {
+	if ((((product->inventory_reduced <= PROD_STAGE_BREW)     && (product->miscs.at(i).use_use <= MISC_USES_BOIL)) ||  // Starter, Mash, Boil
+             ((product->inventory_reduced <= PROD_STAGE_PRIMARY)  && (product->miscs.at(i).use_use == MISC_USES_PRIMARY)) ||
+             ((product->inventory_reduced <= PROD_STAGE_TERTIARY) && (product->miscs.at(i).use_use == MISC_USES_SECONDARY)) ||
+             ((product->inventory_reduced <= PROD_STAGE_PACKAGE)  && (product->miscs.at(i).use_use == MISC_USES_BOTTLING))) &&
+              (product->miscs.at(i).inventory < product->miscs.at(i).amount)) {
 	    product->miscs_ok = false;
 	}
     }
@@ -224,7 +224,7 @@
 	 * Remove this salt if it is in the table.
 	 */
 	for (int i = 0; i < product->miscs.size(); i++) {
-	    if (salt.contains(product->miscs.at(i).m_name)) {
+	    if (salt.contains(product->miscs.at(i).name)) {
 		qDebug() << "  brewing_salt_sub delete" << salt;
 		product->miscs.removeAt(i);
 		refreshMiscs();
@@ -240,9 +240,9 @@
      * If it is, update the amount.
      */
     for (int i = 0; i < product->miscs.size(); i++) {
-	if (salt.contains(product->miscs.at(i).m_name)) {
-	    product->miscs[i].m_amount = val / 1000.0;
-	    if (product->miscs.at(i).m_amount_is_weight)
+	if (salt.contains(product->miscs.at(i).name)) {
+	    product->miscs[i].amount = val / 1000.0;
+	    if (product->miscs.at(i).amount_is_weight)
             	item = new QTableWidgetItem(QString("%1 gr").arg(val, 3, 'f', 2, '0'));
             else
 	    	item = new QTableWidgetItem(QString("%1 ml").arg(val, 3, 'f', 2, '0'));
@@ -263,14 +263,14 @@
 	if (salt.contains(query.value(1).toString())) {
 	    qDebug() << "  found it, append";
 	    Miscs m;
-	    m.m_name = query.value(1).toString();
-            m.m_amount = val / 1000.0;
-            m.m_type = query.value(2).toInt();
-            m.m_use_use = query.value(3).toInt();
-            m.m_time = query.value(4).toDouble();
-            m.m_amount_is_weight = query.value(5).toInt() ? true:false;
-            m.m_cost = query.value(10).toDouble();
-	    m.m_inventory = query.value(9).toDouble();
+	    m.name = query.value(1).toString();
+            m.amount = val / 1000.0;
+            m.type = query.value(2).toInt();
+            m.use_use = query.value(3).toInt();
+            m.time = query.value(4).toDouble();
+            m.amount_is_weight = query.value(5).toInt() ? true:false;
+            m.cost = query.value(10).toDouble();
+	    m.inventory = query.value(9).toDouble();
             product->miscs.append(m);
 	    refreshMiscs();
 	    return;
@@ -299,17 +299,17 @@
     Miscs newm;
 
     for (int i = 0; i < product->miscs.size(); i++) {
-        if (product->miscs.at(i).m_amount == 0)
+        if (product->miscs.at(i).amount == 0)
             return;     // Add only one at a time.
     }
 
-    newm.m_name = "Select one";
-    newm.m_amount = 0;
-    newm.m_type = MISC_TYPES_SPICE;
-    newm.m_use_use = MISC_USES_STARTER;
-    newm.m_time = 0;
-    newm.m_amount_is_weight = true;
-    newm.m_cost = 0;
+    newm.name = "Select one";
+    newm.amount = 0;
+    newm.type = MISC_TYPES_SPICE;
+    newm.use_use = MISC_USES_STARTER;
+    newm.time = 0;
+    newm.amount_is_weight = true;
+    newm.cost = 0;
     product->miscs.append(newm);
     is_changed();
     refreshMiscs();
@@ -325,7 +325,7 @@
     int row = pb->objectName().toInt();
     qDebug() << "Delete misc row" << row << product->miscs.size();
 
-    int rc = QMessageBox::warning(this, tr("Delete misc"), tr("Delete %1").arg(product->miscs.at(row).m_name),
+    int rc = QMessageBox::warning(this, tr("Delete misc"), tr("Delete %1").arg(product->miscs.at(row).name),
                     QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
     if (rc == QMessageBox::No)
         return;
@@ -342,11 +342,11 @@
 
     qDebug() << "misc_amount_changed()" << product->miscs_row << val;
 
-    product->miscs[product->miscs_row].m_amount = val / 1000.0;
-    if (product->miscs.at(product->miscs_row).m_amount_is_weight) {
-        item = new QTableWidgetItem(QString("%1 gr").arg(product->miscs.at(product->miscs_row).m_amount * 1000.0, 3, 'f', 2, '0'));
+    product->miscs[product->miscs_row].amount = val / 1000.0;
+    if (product->miscs.at(product->miscs_row).amount_is_weight) {
+        item = new QTableWidgetItem(QString("%1 gr").arg(product->miscs.at(product->miscs_row).amount * 1000.0, 3, 'f', 2, '0'));
     } else {
-        item = new QTableWidgetItem(QString("%1 ml").arg(product->miscs.at(product->miscs_row).m_amount * 1000.0, 3, 'f', 2, '0'));
+        item = new QTableWidgetItem(QString("%1 ml").arg(product->miscs.at(product->miscs_row).amount * 1000.0, 3, 'f', 2, '0'));
     }
     item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
     ui->miscsTable->setItem(product->miscs_row, 4, item);
@@ -361,12 +361,12 @@
 
     qDebug() << "misc_time_changed()" << product->miscs_row << val;
 
-    if (product->miscs.at(product->miscs_row).m_use_use == MISC_USES_BOIL) {
-	product->miscs[product->miscs_row].m_time = val;
+    if (product->miscs.at(product->miscs_row).use_use == MISC_USES_BOIL) {
+	product->miscs[product->miscs_row].time = val;
 	item = new QTableWidgetItem(QString("%1 min.").arg(val, 1, 'f', 0, '0'));
-    } else if (product->miscs.at(product->miscs_row).m_use_use == MISC_USES_PRIMARY ||
-	       product->miscs.at(product->miscs_row).m_use_use == MISC_USES_SECONDARY) {
-	product->miscs[product->miscs_row].m_time = val * 1440;
+    } else if (product->miscs.at(product->miscs_row).use_use == MISC_USES_PRIMARY ||
+	       product->miscs.at(product->miscs_row).use_use == MISC_USES_SECONDARY) {
+	product->miscs[product->miscs_row].time = val * 1440;
 	item = new QTableWidgetItem(QString("%1 days.").arg(val, 1, 'f', 0, '0'));
     } else {
 	item = new QTableWidgetItem(QString(""));
@@ -409,39 +409,39 @@
     /*
      * Replace the misc record contents
      */
-    product->miscs[product->miscs_row].m_name = query.value(0).toString();
-    product->miscs[product->miscs_row].m_type = query.value(1).toInt();
-    product->miscs[product->miscs_row].m_use_use = query.value(2).toInt();
-    product->miscs[product->miscs_row].m_time = query.value(3).toDouble();
-    product->miscs[product->miscs_row].m_amount_is_weight = query.value(4).toInt() ? true:false;
-    product->miscs[product->miscs_row].m_cost = query.value(5).toDouble();
-    product->miscs[product->miscs_row].m_inventory = query.value(6).toDouble();
+    product->miscs[product->miscs_row].name = query.value(0).toString();
+    product->miscs[product->miscs_row].type = query.value(1).toInt();
+    product->miscs[product->miscs_row].use_use = query.value(2).toInt();
+    product->miscs[product->miscs_row].time = query.value(3).toDouble();
+    product->miscs[product->miscs_row].amount_is_weight = query.value(4).toInt() ? true:false;
+    product->miscs[product->miscs_row].cost = query.value(5).toDouble();
+    product->miscs[product->miscs_row].inventory = query.value(6).toDouble();
 
     /*
      * Update the visible fields
      */
-    mnameEdit->setText(product->miscs.at(product->miscs_row).m_name);
-    ui->miscsTable->setItem(product->miscs_row, 0, new QTableWidgetItem(product->miscs.at(product->miscs_row).m_name));
+    mnameEdit->setText(product->miscs.at(product->miscs_row).name);
+    ui->miscsTable->setItem(product->miscs_row, 0, new QTableWidgetItem(product->miscs.at(product->miscs_row).name));
 
-    item = new QTableWidgetItem(misc_types[product->miscs.at(product->miscs_row).m_type]);
+    item = new QTableWidgetItem(misc_types[product->miscs.at(product->miscs_row).type]);
     item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
     ui->miscsTable->setItem(product->miscs_row, 1, item);
 
-    item = new QTableWidgetItem(misc_uses[product->miscs.at(product->miscs_row).m_use_use]);
+    item = new QTableWidgetItem(misc_uses[product->miscs.at(product->miscs_row).use_use]);
     item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
     ui->miscsTable->setItem(product->miscs_row, 2, item);
-    useatEdit->setCurrentIndex(product->miscs.at(product->miscs_row).m_use_use);
+    useatEdit->setCurrentIndex(product->miscs.at(product->miscs_row).use_use);
 
-    if (product->miscs.at(product->miscs_row).m_use_use == 3 || product->miscs.at(product->miscs_row).m_use_use == 4) {     // Fermentation stages
-        mtimeEdit->setValue(product->miscs.at(product->miscs_row).m_time / 1440);
+    if (product->miscs.at(product->miscs_row).use_use == 3 || product->miscs.at(product->miscs_row).use_use == 4) {     // Fermentation stages
+        mtimeEdit->setValue(product->miscs.at(product->miscs_row).time / 1440);
         mtimeEdit->setReadOnly(false);
 	mtimeLabel->setText(tr("Time in days:"));
-	item = new QTableWidgetItem(QString("%1 days.").arg(product->miscs.at(product->miscs_row).m_time / 1440, 1, 'f', 0, '0'));
-    } else if (product->miscs.at(product->miscs_row).m_use_use == 2) {    // Boil
-        mtimeEdit->setValue(product->miscs.at(product->miscs_row).m_time);
+	item = new QTableWidgetItem(QString("%1 days.").arg(product->miscs.at(product->miscs_row).time / 1440, 1, 'f', 0, '0'));
+    } else if (product->miscs.at(product->miscs_row).use_use == 2) {    // Boil
+        mtimeEdit->setValue(product->miscs.at(product->miscs_row).time);
         mtimeEdit->setReadOnly(false);
 	mtimeLabel->setText(tr("Time in minutes:"));
-	item = new QTableWidgetItem(QString("%1 min.").arg(product->miscs.at(product->miscs_row).m_time, 1, 'f', 0, '0'));
+	item = new QTableWidgetItem(QString("%1 min.").arg(product->miscs.at(product->miscs_row).time, 1, 'f', 0, '0'));
     } else {
         mtimeEdit->setReadOnly(true);
 	mtimeLabel->setText("");
@@ -450,22 +450,22 @@
     item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
     ui->miscsTable->setItem(product->miscs_row, 3, item);
 
-    if (product->miscs.at(product->miscs_row).m_amount_is_weight) {
+    if (product->miscs.at(product->miscs_row).amount_is_weight) {
 	mamountLabel->setText(tr("Amount in gr:"));
-	item = new QTableWidgetItem(QString("%1 gr").arg(product->miscs.at(product->miscs_row).m_amount * 1000.0, 3, 'f', 2, '0'));
+	item = new QTableWidgetItem(QString("%1 gr").arg(product->miscs.at(product->miscs_row).amount * 1000.0, 3, 'f', 2, '0'));
     } else {
 	mamountLabel->setText(tr("Amount in ml:"));
-	item = new QTableWidgetItem(QString("%1 ml").arg(product->miscs.at(product->miscs_row).m_amount * 1000.0, 3, 'f', 2, '0'));
+	item = new QTableWidgetItem(QString("%1 ml").arg(product->miscs.at(product->miscs_row).amount * 1000.0, 3, 'f', 2, '0'));
     }
     item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
     ui->miscsTable->setItem(product->miscs_row, 4, item);
 
-    if (product->miscs.at(product->miscs_row).m_amount_is_weight)
-	item = new QTableWidgetItem(QString("%1 gr").arg(product->miscs.at(product->miscs_row).m_inventory * 1000.0, 3, 'f', 2, '0'));
+    if (product->miscs.at(product->miscs_row).amount_is_weight)
+	item = new QTableWidgetItem(QString("%1 gr").arg(product->miscs.at(product->miscs_row).inventory * 1000.0, 3, 'f', 2, '0'));
     else
-	item = new QTableWidgetItem(QString("%1 ml").arg(product->miscs.at(product->miscs_row).m_inventory * 1000.0, 3, 'f', 2, '0'));
+	item = new QTableWidgetItem(QString("%1 ml").arg(product->miscs.at(product->miscs_row).inventory * 1000.0, 3, 'f', 2, '0'));
     item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
-    if (product->miscs.at(product->miscs_row).m_inventory < product->miscs.at(product->miscs_row).m_amount)
+    if (product->miscs.at(product->miscs_row).inventory < product->miscs.at(product->miscs_row).amount)
 	item->setForeground(QBrush(QColor(Qt::red)));
     ui->miscsTable->setItem(product->miscs_row, 5, item);
 
@@ -476,9 +476,9 @@
      * The order of the list is changed, lookup the item we just added.
      */
     for (int i = 0; i < product->miscs.size(); i++) {
-	if ((product->miscs.at(i).m_name == query.value(0).toString()) &&
-	    (product->miscs.at(i).m_type == query.value(1).toInt()) &&
-	    (product->miscs.at(i).m_use_use == query.value(2).toInt())) {
+	if ((product->miscs.at(i).name == query.value(0).toString()) &&
+	    (product->miscs.at(i).type == query.value(1).toInt()) &&
+	    (product->miscs.at(i).use_use == query.value(2).toInt())) {
 	    product->miscs_row = i;
 	    break;
 	}
@@ -516,23 +516,23 @@
     QTableWidgetItem *item;
 
     qDebug() << "misc_useat_changed" << val;
-    product->miscs[product->miscs_row].m_use_use = val;
+    product->miscs[product->miscs_row].use_use = val;
     item = new QTableWidgetItem(misc_uses[val]);
     item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
     ui->miscsTable->setItem(product->miscs_row, 2, item);
 
     if (val == MISC_USES_PRIMARY || val == MISC_USES_SECONDARY) {
-	product->miscs[product->miscs_row].m_time = mtimeEdit->value() * 1440;
+	product->miscs[product->miscs_row].time = mtimeEdit->value() * 1440;
         mtimeEdit->setReadOnly(false);
         mtimeLabel->setText(tr("Time in days:"));
-        item = new QTableWidgetItem(QString("%1 days.").arg(product->miscs.at(product->miscs_row).m_time / 1440, 1, 'f', 0, '0'));
+        item = new QTableWidgetItem(QString("%1 days.").arg(product->miscs.at(product->miscs_row).time / 1440, 1, 'f', 0, '0'));
     } else if (val == MISC_USES_BOIL) {
-	product->miscs[product->miscs_row].m_time = mtimeEdit->value();
+	product->miscs[product->miscs_row].time = mtimeEdit->value();
         mtimeEdit->setReadOnly(false);
         mtimeLabel->setText(tr("Time in minutes:"));
-        item = new QTableWidgetItem(QString("%1 min.").arg(product->miscs.at(product->miscs_row).m_time, 1, 'f', 0, '0'));
+        item = new QTableWidgetItem(QString("%1 min.").arg(product->miscs.at(product->miscs_row).time, 1, 'f', 0, '0'));
     } else {
-	product->miscs[product->miscs_row].m_time = 0;
+	product->miscs[product->miscs_row].time = 0;
 	mtimeEdit->setValue(0);
         mtimeEdit->setReadOnly(true);
         mtimeLabel->setText("");
@@ -575,7 +575,7 @@
 
     mamountLabel = new QLabel(dialog);
     mamountLabel->setObjectName(QString::fromUtf8("mamountLabel"));
-    if (product->miscs.at(product->miscs_row).m_amount_is_weight)
+    if (product->miscs.at(product->miscs_row).amount_is_weight)
     	mamountLabel->setText(tr("Amount in gr:"));
     else
 	mamountLabel->setText(tr("Amount in ml:"));
@@ -584,9 +584,9 @@
 
     mtimeLabel = new QLabel(dialog);
     mtimeLabel->setObjectName(QString::fromUtf8("mtimeLabel"));
-    if (product->miscs.at(product->miscs_row).m_use_use == MISC_USES_PRIMARY || product->miscs.at(product->miscs_row).m_use_use == MISC_USES_SECONDARY)
+    if (product->miscs.at(product->miscs_row).use_use == MISC_USES_PRIMARY || product->miscs.at(product->miscs_row).use_use == MISC_USES_SECONDARY)
         mtimeLabel->setText(tr("Time in days:"));
-    else if (product->miscs.at(product->miscs_row).m_use_use == MISC_USES_BOIL)
+    else if (product->miscs.at(product->miscs_row).use_use == MISC_USES_BOIL)
         mtimeLabel->setText(tr("Time in minutes:"));
     else
         mtimeLabel->setText("");
@@ -610,7 +610,7 @@
 
     mnameEdit = new QLineEdit(dialog);
     mnameEdit->setObjectName(QString::fromUtf8("mnameEdit"));
-    mnameEdit->setText(product->miscs.at(product->miscs_row).m_name);
+    mnameEdit->setText(product->miscs.at(product->miscs_row).name);
     mnameEdit->setGeometry(QRect(160, 10, 511, 23));
     mnameEdit->setReadOnly(true);
 
@@ -622,7 +622,7 @@
     mamountEdit->setDecimals(2);
     mamountEdit->setMaximum(1000000.0);
     mamountEdit->setSingleStep(0.1);
-    mamountEdit->setValue(product->miscs.at(product->miscs_row).m_amount * 1000.0);
+    mamountEdit->setValue(product->miscs.at(product->miscs_row).amount * 1000.0);
 
     mtimeEdit = new QSpinBox(dialog);
     mtimeEdit->setObjectName(QString::fromUtf8("mtimeEdit"));
@@ -630,11 +630,11 @@
     mtimeEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
     mtimeEdit->setAccelerated(true);
     mtimeEdit->setMaximum(10000.0);
-    if (product->miscs.at(product->miscs_row).m_use_use == MISC_USES_PRIMARY || product->miscs.at(product->miscs_row).m_use_use == MISC_USES_SECONDARY) {
-	mtimeEdit->setValue(product->miscs.at(product->miscs_row).m_time / 1440);
+    if (product->miscs.at(product->miscs_row).use_use == MISC_USES_PRIMARY || product->miscs.at(product->miscs_row).use_use == MISC_USES_SECONDARY) {
+	mtimeEdit->setValue(product->miscs.at(product->miscs_row).time / 1440);
         mtimeEdit->setReadOnly(false);
-    } else if (product->miscs.at(product->miscs_row).m_use_use == MISC_USES_BOIL) {
-	mtimeEdit->setValue(product->miscs.at(product->miscs_row).m_time);
+    } else if (product->miscs.at(product->miscs_row).use_use == MISC_USES_BOIL) {
+	mtimeEdit->setValue(product->miscs.at(product->miscs_row).time);
         mtimeEdit->setReadOnly(false);
     } else {
 	mtimeEdit->setReadOnly(true);
@@ -649,7 +649,7 @@
     useatEdit->addItem(tr("Primary"));
     useatEdit->addItem(tr("Secondary"));
     useatEdit->addItem(tr("Bottling"));
-    useatEdit->setCurrentIndex(product->miscs.at(product->miscs_row).m_use_use);
+    useatEdit->setCurrentIndex(product->miscs.at(product->miscs_row).use_use);
 
     minstockEdit = new QCheckBox(dialog);
     minstockEdit->setObjectName(QString::fromUtf8("minstockEdit"));
@@ -673,11 +673,11 @@
         product->miscs[product->miscs_row] = backup;
     } else {
         /* Clear time if misc is not used for boil or fermentation. */
-        if (! (product->miscs.at(product->miscs_row).m_use_use == MISC_USES_BOIL ||
-               product->miscs.at(product->miscs_row).m_use_use == MISC_USES_PRIMARY ||
-               product->miscs.at(product->miscs_row).m_use_use == MISC_USES_SECONDARY)) {
-            if (product->miscs.at(product->miscs_row).m_time) {
-                product->miscs[product->miscs_row].m_time = 0;
+        if (! (product->miscs.at(product->miscs_row).use_use == MISC_USES_BOIL ||
+               product->miscs.at(product->miscs_row).use_use == MISC_USES_PRIMARY ||
+               product->miscs.at(product->miscs_row).use_use == MISC_USES_SECONDARY)) {
+            if (product->miscs.at(product->miscs_row).time) {
+                product->miscs[product->miscs_row].time = 0;
                 is_changed();
             }
         }
@@ -711,35 +711,35 @@
     const QSignalBlocker blocker9(ui->mw_acidvolEdit);
 
     for (int i = 0; i < product->miscs.size(); i++) {
-	amount = product->miscs.at(i).m_amount * factor;
-	product->miscs[i].m_amount = amount;
+	amount = product->miscs.at(i).amount * factor;
+	product->miscs[i].amount = amount;
 
 	/*
          * Update the water agents.
          */
-        if (product->miscs.at(i).m_type == MISC_TYPES_WATER_AGENT) {
-            if (product->miscs.at(i).m_name == "CaCl2") {
-                ui->bs_cacl2Edit->setValue(product->miscs.at(i).m_amount * 1000.0);
-            } else if (product->miscs.at(i).m_name == "CaSO4") {
-                ui->bs_caso4Edit->setValue(product->miscs.at(i).m_amount * 1000.0);
-            } else if (product->miscs.at(i).m_name == "MgSO4") {
-                ui->bs_mgso4Edit->setValue(product->miscs.at(i).m_amount * 1000.0);
-            } else if (product->miscs.at(i).m_name == "NaCl") {
-                ui->bs_naclEdit->setValue(product->miscs.at(i).m_amount * 1000.0);
-            } else if (product->miscs.at(i).m_name == "MgCl2") {
-                ui->bs_mgcl2Edit->setValue(product->miscs.at(i).m_amount * 1000.0);
-            } else if (product->miscs.at(i).m_name == "NaHCO3") {
-                ui->bs_nahco3Edit->setValue(product->miscs.at(i).m_amount * 1000.0);
-            } else if (product->miscs.at(i).m_name == "CaCO3") {
-                ui->bs_caco3Edit->setValue(product->miscs.at(i).m_amount * 1000.0);
-            } else if (product->miscs.at(i).m_name == "Melkzuur" || product->miscs.at(i).m_name == "Lactic") {
-                ui->mw_acidvolEdit->setValue(product->miscs.at(i).m_amount * 1000.0);
-            } else if (product->miscs.at(i).m_name == "Zoutzuur" || product->miscs.at(i).m_name == "Hydrochloric") {
-                ui->mw_acidvolEdit->setValue(product->miscs.at(i).m_amount * 1000.0);
-            } else if (product->miscs.at(i).m_name == "Fosforzuur" || product->miscs.at(i).m_name == "Phosphoric") {
-                ui->mw_acidvolEdit->setValue(product->miscs.at(i).m_amount * 1000.0);
-            } else if (product->miscs.at(i).m_name == "Zwavelzuur" || product->miscs.at(i).m_name == "Sulfuric") {
-                ui->mw_acidvolEdit->setValue(product->miscs.at(i).m_amount * 1000.0);
+        if (product->miscs.at(i).type == MISC_TYPES_WATER_AGENT) {
+            if (product->miscs.at(i).name == "CaCl2") {
+                ui->bs_cacl2Edit->setValue(product->miscs.at(i).amount * 1000.0);
+            } else if (product->miscs.at(i).name == "CaSO4") {
+                ui->bs_caso4Edit->setValue(product->miscs.at(i).amount * 1000.0);
+            } else if (product->miscs.at(i).name == "MgSO4") {
+                ui->bs_mgso4Edit->setValue(product->miscs.at(i).amount * 1000.0);
+            } else if (product->miscs.at(i).name == "NaCl") {
+                ui->bs_naclEdit->setValue(product->miscs.at(i).amount * 1000.0);
+            } else if (product->miscs.at(i).name == "MgCl2") {
+                ui->bs_mgcl2Edit->setValue(product->miscs.at(i).amount * 1000.0);
+            } else if (product->miscs.at(i).name == "NaHCO3") {
+                ui->bs_nahco3Edit->setValue(product->miscs.at(i).amount * 1000.0);
+            } else if (product->miscs.at(i).name == "CaCO3") {
+                ui->bs_caco3Edit->setValue(product->miscs.at(i).amount * 1000.0);
+            } else if (product->miscs.at(i).name == "Melkzuur" || product->miscs.at(i).name == "Lactic") {
+                ui->mw_acidvolEdit->setValue(product->miscs.at(i).amount * 1000.0);
+            } else if (product->miscs.at(i).name == "Zoutzuur" || product->miscs.at(i).name == "Hydrochloric") {
+                ui->mw_acidvolEdit->setValue(product->miscs.at(i).amount * 1000.0);
+            } else if (product->miscs.at(i).name == "Fosforzuur" || product->miscs.at(i).name == "Phosphoric") {
+                ui->mw_acidvolEdit->setValue(product->miscs.at(i).amount * 1000.0);
+            } else if (product->miscs.at(i).name == "Zwavelzuur" || product->miscs.at(i).name == "Sulfuric") {
+                ui->mw_acidvolEdit->setValue(product->miscs.at(i).amount * 1000.0);
             }
         }
     }
diff -r 8540fd0166e7 -r efc213beb605 src/EditRecipeExport.cpp
--- a/src/EditRecipeExport.cpp	Sun Jun 12 20:06:39 2022 +0200
+++ b/src/EditRecipeExport.cpp	Mon Jun 13 10:54:23 2022 +0200
@@ -162,12 +162,12 @@
     for (int i = 0; i < recipe->miscs.size(); i++) {
         xmlWriter->writeStartElement("MISC");
         xmlWriter->writeTextElement("VERSION", "1");
-        xmlWriter->writeTextElement("NAME", recipe->miscs.at(i).m_name);
-	xmlWriter->writeTextElement("TYPE", misc_type[recipe->miscs.at(i).m_type]);
-	xmlWriter->writeTextElement("AMOUNT", QString::number(recipe->miscs.at(i).m_amount, 'f', 5));
-	xmlWriter->writeTextElement("AMOUNT_IS_WEIGHT", recipe->miscs.at(i).m_amount_is_weight ? "TRUE":"FALSE");
-	xmlWriter->writeTextElement("USE", misc_use[recipe->miscs.at(i).m_use_use]);
-	xmlWriter->writeTextElement("TIME", QString::number(recipe->miscs.at(i).m_time, 'f', 0));
+        xmlWriter->writeTextElement("NAME", recipe->miscs.at(i).name);
+	xmlWriter->writeTextElement("TYPE", misc_type[recipe->miscs.at(i).type]);
+	xmlWriter->writeTextElement("AMOUNT", QString::number(recipe->miscs.at(i).amount, 'f', 5));
+	xmlWriter->writeTextElement("AMOUNT_IS_WEIGHT", recipe->miscs.at(i).amount_is_weight ? "TRUE":"FALSE");
+	xmlWriter->writeTextElement("USE", misc_use[recipe->miscs.at(i).use_use]);
+	xmlWriter->writeTextElement("TIME", QString::number(recipe->miscs.at(i).time, 'f', 0));
 	xmlWriter->writeEndElement();
     }
     xmlWriter->writeEndElement();	// MISCS
@@ -509,13 +509,13 @@
     memo.append("[tabular]\n");
     memo.append("[head]Specerij, kruid, brouwzout[/head][head]Type grondstof[/head][head]Gebruik tijdens[/head][head]Hoeveel[/head]\n");
     for (int i = 0; i < recipe->miscs.size(); i++) {
-	memo.append("[row][data]" + recipe->miscs.at(i).m_name + "[/data]");
-	memo.append("[data]" + misc_type[recipe->miscs.at(i).m_type] + "[/data]");
-	if (recipe->miscs.at(i).m_use_use == MISC_USES_BOIL)
-	    memo.append("[data]" + misc_use[recipe->miscs.at(i).m_use_use] + " " + QString::number(recipe->miscs.at(i).m_time) + " min[/data]");
+	memo.append("[row][data]" + recipe->miscs.at(i).name + "[/data]");
+	memo.append("[data]" + misc_type[recipe->miscs.at(i).type] + "[/data]");
+	if (recipe->miscs.at(i).use_use == MISC_USES_BOIL)
+	    memo.append("[data]" + misc_use[recipe->miscs.at(i).use_use] + " " + QString::number(recipe->miscs.at(i).time) + " min[/data]");
 	else
-	    memo.append("[data]" + misc_use[recipe->miscs.at(i).m_use_use] + "[/data]");
-	memo.append("[data]"+QString::number(recipe->miscs.at(i).m_amount * 1000, 'f', 2)+((recipe->miscs.at(i).m_amount_is_weight)?" gr":" ml")+"[/data][/row]\n");
+	    memo.append("[data]" + misc_use[recipe->miscs.at(i).use_use] + "[/data]");
+	memo.append("[data]"+QString::number(recipe->miscs.at(i).amount * 1000, 'f', 2)+((recipe->miscs.at(i).amount_is_weight)?" gr":" ml")+"[/data][/row]\n");
     }
     memo.append("[/tabular]\n\n");
 
diff -r 8540fd0166e7 -r efc213beb605 src/EditRecipeTab4.cpp
--- a/src/EditRecipeTab4.cpp	Sun Jun 12 20:06:39 2022 +0200
+++ b/src/EditRecipeTab4.cpp	Mon Jun 13 10:54:23 2022 +0200
@@ -20,15 +20,15 @@
 
 bool EditRecipe::misc_sort_test(const Miscs &D1, const Miscs &D2)
 {
-    if (D1.m_use_use > D2.m_use_use)
+    if (D1.use_use > D2.use_use)
 	return false;
-    if (D1.m_use_use < D2.m_use_use)
+    if (D1.use_use < D2.use_use)
 	return true;
-    if (D1.m_type > D2.m_type)
+    if (D1.type > D2.type)
 	return false;
-    if (D1.m_type < D2.m_type)
+    if (D1.type < D2.type)
 	return true;
-    return (D1.m_amount > D2.m_amount);
+    return (D1.amount > D2.amount);
 }
 
 
@@ -68,30 +68,30 @@
 
     for (int i = 0; i < recipe->miscs.size(); i++) {
 
-	ui->miscsTable->setItem(i, 0, new QTableWidgetItem(recipe->miscs.at(i).m_name));
+	ui->miscsTable->setItem(i, 0, new QTableWidgetItem(recipe->miscs.at(i).name));
 
-	item = new QTableWidgetItem(misc_types[recipe->miscs.at(i).m_type]);
+	item = new QTableWidgetItem(misc_types[recipe->miscs.at(i).type]);
         item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
         ui->miscsTable->setItem(i, 1, item);
 
-	item = new QTableWidgetItem(misc_uses[recipe->miscs.at(i).m_use_use]);
+	item = new QTableWidgetItem(misc_uses[recipe->miscs.at(i).use_use]);
         item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
         ui->miscsTable->setItem(i, 2, item);
 
-	if (recipe->miscs.at(i).m_use_use == MISC_USES_BOIL) {
-	    item = new QTableWidgetItem(QString("%1 min.").arg(recipe->miscs.at(i).m_time, 1, 'f', 0, '0'));
-	} else if (recipe->miscs.at(i).m_use_use == MISC_USES_PRIMARY || recipe->miscs.at(i).m_use_use == MISC_USES_SECONDARY) {
-	    item = new QTableWidgetItem(QString("%1 days.").arg(recipe->miscs.at(i).m_time / 1440, 1, 'f', 0, '0'));
+	if (recipe->miscs.at(i).use_use == MISC_USES_BOIL) {
+	    item = new QTableWidgetItem(QString("%1 min.").arg(recipe->miscs.at(i).time, 1, 'f', 0, '0'));
+	} else if (recipe->miscs.at(i).use_use == MISC_USES_PRIMARY || recipe->miscs.at(i).use_use == MISC_USES_SECONDARY) {
+	    item = new QTableWidgetItem(QString("%1 days.").arg(recipe->miscs.at(i).time / 1440, 1, 'f', 0, '0'));
 	} else {
 	    item = new QTableWidgetItem(QString(""));
 	}
 	item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
         ui->miscsTable->setItem(i, 3, item);
 
-	if (recipe->miscs.at(i).m_amount_is_weight)
-	    item = new QTableWidgetItem(QString("%1 gr").arg(recipe->miscs.at(i).m_amount * 1000.0, 3, 'f', 2, '0'));
+	if (recipe->miscs.at(i).amount_is_weight)
+	    item = new QTableWidgetItem(QString("%1 gr").arg(recipe->miscs.at(i).amount * 1000.0, 3, 'f', 2, '0'));
 	else
-	    item = new QTableWidgetItem(QString("%1 ml").arg(recipe->miscs.at(i).m_amount * 1000.0, 3, 'f', 2, '0'));
+	    item = new QTableWidgetItem(QString("%1 ml").arg(recipe->miscs.at(i).amount * 1000.0, 3, 'f', 2, '0'));
 	item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
         ui->miscsTable->setItem(i, 4, item);
 
@@ -99,7 +99,7 @@
 	 * Add the Delete and Edit row buttons.
 	 * Not for water agents, these are set on the water tab.
 	 */
-	if (recipe->miscs.at(i).m_type == MISC_TYPES_WATER_AGENT) {
+	if (recipe->miscs.at(i).type == MISC_TYPES_WATER_AGENT) {
 	    ui->miscsTable->removeCellWidget(i, 5);
 	    ui->miscsTable->removeCellWidget(i, 6);
 	    item = new QTableWidgetItem("");
@@ -141,45 +141,45 @@
 	/*
 	 * Update the water agents.
 	 */
-	if (recipe->miscs.at(i).m_type == MISC_TYPES_WATER_AGENT) {
-	    if (recipe->miscs.at(i).m_name == "CaCl2") {
-		ui->bs_cacl2Edit->setValue(recipe->miscs.at(i).m_amount * 1000.0);
-	    } else if (recipe->miscs.at(i).m_name == "CaSO4") {
-		ui->bs_caso4Edit->setValue(recipe->miscs.at(i).m_amount * 1000.0);
-	    } else if (recipe->miscs.at(i).m_name == "MgSO4") {
-		ui->bs_mgso4Edit->setValue(recipe->miscs.at(i).m_amount * 1000.0);
-	    } else if (recipe->miscs.at(i).m_name == "NaCl") {
-		ui->bs_naclEdit->setValue(recipe->miscs.at(i).m_amount * 1000.0);
-	    } else if (recipe->miscs.at(i).m_name == "MgCl2") {
-		ui->bs_mgcl2Edit->setValue(recipe->miscs.at(i).m_amount * 1000.0);
-	    } else if (recipe->miscs.at(i).m_name == "NaHCO3") {
-		ui->bs_nahco3Edit->setValue(recipe->miscs.at(i).m_amount * 1000.0);
-	    } else if (recipe->miscs.at(i).m_name == "CaCO3") {
-		ui->bs_caco3Edit->setValue(recipe->miscs.at(i).m_amount * 1000.0);
-	    } else if (recipe->miscs.at(i).m_name == "Melkzuur" || recipe->miscs.at(i).m_name == "Lactic") {
+	if (recipe->miscs.at(i).type == MISC_TYPES_WATER_AGENT) {
+	    if (recipe->miscs.at(i).name == "CaCl2") {
+		ui->bs_cacl2Edit->setValue(recipe->miscs.at(i).amount * 1000.0);
+	    } else if (recipe->miscs.at(i).name == "CaSO4") {
+		ui->bs_caso4Edit->setValue(recipe->miscs.at(i).amount * 1000.0);
+	    } else if (recipe->miscs.at(i).name == "MgSO4") {
+		ui->bs_mgso4Edit->setValue(recipe->miscs.at(i).amount * 1000.0);
+	    } else if (recipe->miscs.at(i).name == "NaCl") {
+		ui->bs_naclEdit->setValue(recipe->miscs.at(i).amount * 1000.0);
+	    } else if (recipe->miscs.at(i).name == "MgCl2") {
+		ui->bs_mgcl2Edit->setValue(recipe->miscs.at(i).amount * 1000.0);
+	    } else if (recipe->miscs.at(i).name == "NaHCO3") {
+		ui->bs_nahco3Edit->setValue(recipe->miscs.at(i).amount * 1000.0);
+	    } else if (recipe->miscs.at(i).name == "CaCO3") {
+		ui->bs_caco3Edit->setValue(recipe->miscs.at(i).amount * 1000.0);
+	    } else if (recipe->miscs.at(i).name == "Melkzuur" || recipe->miscs.at(i).name == "Lactic") {
 		recipe->wa_acid_name = 0;
 		recipe->wa_acid_perc = my_acids.at(0).AcidPrc;
 		ui->mw_acidPick->setCurrentIndex(0);
 		ui->mw_acidpercEdit->setValue(my_acids.at(0).AcidPrc);
-		ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).m_amount * 1000.0);
-	    } else if (recipe->miscs.at(i).m_name == "Zoutzuur" || recipe->miscs.at(i).m_name == "Hydrochloric") {
+		ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).amount * 1000.0);
+	    } else if (recipe->miscs.at(i).name == "Zoutzuur" || recipe->miscs.at(i).name == "Hydrochloric") {
                 recipe->wa_acid_name = 1;
                 recipe->wa_acid_perc = my_acids.at(1).AcidPrc;
 		ui->mw_acidPick->setCurrentIndex(1);
                 ui->mw_acidpercEdit->setValue(my_acids.at(1).AcidPrc);
-                ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).m_amount * 1000.0);
-	    } else if (recipe->miscs.at(i).m_name == "Fosforzuur" || recipe->miscs.at(i).m_name == "Phosphoric") {
+                ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).amount * 1000.0);
+	    } else if (recipe->miscs.at(i).name == "Fosforzuur" || recipe->miscs.at(i).name == "Phosphoric") {
                 recipe->wa_acid_name = 2;
                 recipe->wa_acid_perc = my_acids.at(2).AcidPrc;
 		ui->mw_acidPick->setCurrentIndex(2);
                 ui->mw_acidpercEdit->setValue(my_acids.at(2).AcidPrc);
-                ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).m_amount * 1000.0);
-	    } else if (recipe->miscs.at(i).m_name == "Zwavelzuur" || recipe->miscs.at(i).m_name == "Sulfuric") {
+                ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).amount * 1000.0);
+	    } else if (recipe->miscs.at(i).name == "Zwavelzuur" || recipe->miscs.at(i).name == "Sulfuric") {
                 recipe->wa_acid_name = 3;
                 recipe->wa_acid_perc = my_acids.at(3).AcidPrc;
 		ui->mw_acidPick->setCurrentIndex(3);
                 ui->mw_acidpercEdit->setValue(my_acids.at(3).AcidPrc);
-                ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).m_amount * 1000.0);
+                ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).amount * 1000.0);
 	    }
 	}
     }
@@ -199,7 +199,7 @@
 	 * Remove this salt if it is in the table.
 	 */
 	for (int i = 0; i < recipe->miscs.size(); i++) {
-	    if (salt.contains(recipe->miscs.at(i).m_name)) {
+	    if (salt.contains(recipe->miscs.at(i).name)) {
 		qDebug() << "  brewing_salt_sub delete" << salt;
 		recipe->miscs.removeAt(i);
 		refreshMiscs();
@@ -214,9 +214,9 @@
      * If it is, update the amount.
      */
     for (int i = 0; i < recipe->miscs.size(); i++) {
-	if (salt.contains(recipe->miscs.at(i).m_name)) {
-	    recipe->miscs[i].m_amount = val / 1000.0;
-	    if (recipe->miscs.at(i).m_amount_is_weight)
+	if (salt.contains(recipe->miscs.at(i).name)) {
+	    recipe->miscs[i].amount = val / 1000.0;
+	    if (recipe->miscs.at(i).amount_is_weight)
             	item = new QTableWidgetItem(QString("%1 gr").arg(val, 3, 'f', 2, '0'));
             else
 	    	item = new QTableWidgetItem(QString("%1 ml").arg(val, 3, 'f', 2, '0'));
@@ -237,13 +237,13 @@
 	if (salt.contains(query.value(1).toString())) {
 	    qDebug() << "  found it, append";
 	    Miscs m;
-	    m.m_name = query.value(1).toString();
-            m.m_amount = val / 1000.0;
-            m.m_type = query.value(2).toInt();
-            m.m_use_use = query.value(3).toInt();
-            m.m_time = query.value(4).toDouble();
-            m.m_amount_is_weight = query.value(5).toInt() ? true:false;
-            m.m_cost = query.value(10).toDouble();
+	    m.name = query.value(1).toString();
+            m.amount = val / 1000.0;
+            m.type = query.value(2).toInt();
+            m.use_use = query.value(3).toInt();
+            m.time = query.value(4).toDouble();
+            m.amount_is_weight = query.value(5).toInt() ? true:false;
+            m.cost = query.value(10).toDouble();
             recipe->miscs.append(m);
 	    refreshMiscs();
 	    return;
@@ -272,17 +272,17 @@
     Miscs newm;
 
     for (int i = 0; i < recipe->miscs.size(); i++) {
-        if (recipe->miscs.at(i).m_amount == 0)
+        if (recipe->miscs.at(i).amount == 0)
             return;     // Add only one at a time.
     }
 
-    newm.m_name = "Select one";
-    newm.m_amount = 0;
-    newm.m_type = 0;
-    newm.m_use_use = 0;
-    newm.m_time = 0;
-    newm.m_amount_is_weight = true;
-    newm.m_cost = 0;
+    newm.name = "Select one";
+    newm.amount = 0;
+    newm.type = 0;
+    newm.use_use = 0;
+    newm.time = 0;
+    newm.amount_is_weight = true;
+    newm.cost = 0;
     recipe->miscs.append(newm);
     is_changed();
     refreshMiscs();
@@ -298,7 +298,7 @@
     int row = pb->objectName().toInt();
     qDebug() << "Delete misc row" << row << recipe->miscs.size();
 
-    int rc = QMessageBox::warning(this, tr("Delete misc"), tr("Delete %1").arg(recipe->miscs.at(row).m_name),
+    int rc = QMessageBox::warning(this, tr("Delete misc"), tr("Delete %1").arg(recipe->miscs.at(row).name),
                     QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
     if (rc == QMessageBox::No)
         return;
@@ -315,11 +315,11 @@
 
     qDebug() << "misc_amount_changed()" << recipe->miscs_row << val;
 
-    recipe->miscs[recipe->miscs_row].m_amount = val / 1000.0;
-    if (recipe->miscs.at(recipe->miscs_row).m_amount_is_weight) {
-        item = new QTableWidgetItem(QString("%1 gr").arg(recipe->miscs.at(recipe->miscs_row).m_amount * 1000.0, 3, 'f', 2, '0'));
+    recipe->miscs[recipe->miscs_row].amount = val / 1000.0;
+    if (recipe->miscs.at(recipe->miscs_row).amount_is_weight) {
+        item = new QTableWidgetItem(QString("%1 gr").arg(recipe->miscs.at(recipe->miscs_row).amount * 1000.0, 3, 'f', 2, '0'));
     } else {
-        item = new QTableWidgetItem(QString("%1 ml").arg(recipe->miscs.at(recipe->miscs_row).m_amount * 1000.0, 3, 'f', 2, '0'));
+        item = new QTableWidgetItem(QString("%1 ml").arg(recipe->miscs.at(recipe->miscs_row).amount * 1000.0, 3, 'f', 2, '0'));
     }
     item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
     ui->miscsTable->setItem(recipe->miscs_row, 4, item);
@@ -334,12 +334,12 @@
 
     qDebug() << "misc_time_changed()" << recipe->miscs_row << val;
 
-    if (recipe->miscs.at(recipe->miscs_row).m_use_use == MISC_USES_BOIL) {
-	recipe->miscs[recipe->miscs_row].m_time = val;
+    if (recipe->miscs.at(recipe->miscs_row).use_use == MISC_USES_BOIL) {
+	recipe->miscs[recipe->miscs_row].time = val;
 	item = new QTableWidgetItem(QString("%1 min.").arg(val, 1, 'f', 0, '0'));
-    } else if (recipe->miscs.at(recipe->miscs_row).m_use_use == MISC_USES_PRIMARY ||
-	       recipe->miscs.at(recipe->miscs_row).m_use_use == MISC_USES_SECONDARY) {
-	recipe->miscs[recipe->miscs_row].m_time = val * 1440;
+    } else if (recipe->miscs.at(recipe->miscs_row).use_use == MISC_USES_PRIMARY ||
+	       recipe->miscs.at(recipe->miscs_row).use_use == MISC_USES_SECONDARY) {
+	recipe->miscs[recipe->miscs_row].time = val * 1440;
 	item = new QTableWidgetItem(QString("%1 days.").arg(val, 1, 'f', 0, '0'));
     } else {
 	item = new QTableWidgetItem(QString(""));
@@ -382,38 +382,38 @@
     /*
      * Replace the misc record contents
      */
-    recipe->miscs[recipe->miscs_row].m_name = query.value(0).toString();
-    recipe->miscs[recipe->miscs_row].m_type = query.value(1).toInt();
-    recipe->miscs[recipe->miscs_row].m_use_use = query.value(2).toInt();
-    recipe->miscs[recipe->miscs_row].m_time = query.value(3).toDouble();
-    recipe->miscs[recipe->miscs_row].m_amount_is_weight = query.value(4).toInt() ? true:false;
-    recipe->miscs[recipe->miscs_row].m_cost = query.value(5).toDouble();
+    recipe->miscs[recipe->miscs_row].name = query.value(0).toString();
+    recipe->miscs[recipe->miscs_row].type = query.value(1).toInt();
+    recipe->miscs[recipe->miscs_row].use_use = query.value(2).toInt();
+    recipe->miscs[recipe->miscs_row].time = query.value(3).toDouble();
+    recipe->miscs[recipe->miscs_row].amount_is_weight = query.value(4).toInt() ? true:false;
+    recipe->miscs[recipe->miscs_row].cost = query.value(5).toDouble();
 
     /*
      * Update the visible fields
      */
-    mnameEdit->setText(recipe->miscs.at(recipe->miscs_row).m_name);
-    ui->miscsTable->setItem(recipe->miscs_row, 0, new QTableWidgetItem(recipe->miscs.at(recipe->miscs_row).m_name));
+    mnameEdit->setText(recipe->miscs.at(recipe->miscs_row).name);
+    ui->miscsTable->setItem(recipe->miscs_row, 0, new QTableWidgetItem(recipe->miscs.at(recipe->miscs_row).name));
 
-    item = new QTableWidgetItem(misc_types[recipe->miscs.at(recipe->miscs_row).m_type]);
+    item = new QTableWidgetItem(misc_types[recipe->miscs.at(recipe->miscs_row).type]);
     item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
     ui->miscsTable->setItem(recipe->miscs_row, 1, item);
 
-    item = new QTableWidgetItem(misc_uses[recipe->miscs.at(recipe->miscs_row).m_use_use]);
+    item = new QTableWidgetItem(misc_uses[recipe->miscs.at(recipe->miscs_row).use_use]);
     item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
     ui->miscsTable->setItem(recipe->miscs_row, 2, item);
-    useatEdit->setCurrentIndex(recipe->miscs.at(recipe->miscs_row).m_use_use);
+    useatEdit->setCurrentIndex(recipe->miscs.at(recipe->miscs_row).use_use);
 
-    if (recipe->miscs.at(recipe->miscs_row).m_use_use == 3 || recipe->miscs.at(recipe->miscs_row).m_use_use == 4) {     // Fermentation stages
-        mtimeEdit->setValue(recipe->miscs.at(recipe->miscs_row).m_time / 1440);
+    if (recipe->miscs.at(recipe->miscs_row).use_use == 3 || recipe->miscs.at(recipe->miscs_row).use_use == 4) {     // Fermentation stages
+        mtimeEdit->setValue(recipe->miscs.at(recipe->miscs_row).time / 1440);
         mtimeEdit->setReadOnly(false);
 	mtimeLabel->setText(tr("Time in days:"));
-	item = new QTableWidgetItem(QString("%1 days.").arg(recipe->miscs.at(recipe->miscs_row).m_time / 1440, 1, 'f', 0, '0'));
-    } else if (recipe->miscs.at(recipe->miscs_row).m_use_use == 2) {    // Boil
-        mtimeEdit->setValue(recipe->miscs.at(recipe->miscs_row).m_time);
+	item = new QTableWidgetItem(QString("%1 days.").arg(recipe->miscs.at(recipe->miscs_row).time / 1440, 1, 'f', 0, '0'));
+    } else if (recipe->miscs.at(recipe->miscs_row).use_use == 2) {    // Boil
+        mtimeEdit->setValue(recipe->miscs.at(recipe->miscs_row).time);
         mtimeEdit->setReadOnly(false);
 	mtimeLabel->setText(tr("Time in minutes:"));
-	item = new QTableWidgetItem(QString("%1 min.").arg(recipe->miscs.at(recipe->miscs_row).m_time, 1, 'f', 0, '0'));
+	item = new QTableWidgetItem(QString("%1 min.").arg(recipe->miscs.at(recipe->miscs_row).time, 1, 'f', 0, '0'));
     } else {
         mtimeEdit->setReadOnly(true);
 	mtimeLabel->setText("");
@@ -422,12 +422,12 @@
     item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
     ui->miscsTable->setItem(recipe->miscs_row, 3, item);
 
-    if (recipe->miscs.at(recipe->miscs_row).m_amount_is_weight) {
+    if (recipe->miscs.at(recipe->miscs_row).amount_is_weight) {
 	mamountLabel->setText(tr("Amount in gr:"));
-	item = new QTableWidgetItem(QString("%1 gr").arg(recipe->miscs.at(recipe->miscs_row).m_amount * 1000.0, 3, 'f', 2, '0'));
+	item = new QTableWidgetItem(QString("%1 gr").arg(recipe->miscs.at(recipe->miscs_row).amount * 1000.0, 3, 'f', 2, '0'));
     } else {
 	mamountLabel->setText(tr("Amount in ml:"));
-	item = new QTableWidgetItem(QString("%1 ml").arg(recipe->miscs.at(recipe->miscs_row).m_amount * 1000.0, 3, 'f', 2, '0'));
+	item = new QTableWidgetItem(QString("%1 ml").arg(recipe->miscs.at(recipe->miscs_row).amount * 1000.0, 3, 'f', 2, '0'));
     }
     item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
     ui->miscsTable->setItem(recipe->miscs_row, 4, item);
@@ -439,9 +439,9 @@
      * The order of the list is changed, lookup the item we just added.
      */
     for (int i = 0; i < recipe->miscs.size(); i++) {
-        if ((recipe->miscs.at(i).m_name == query.value(0).toString()) &&
-            (recipe->miscs.at(i).m_type == query.value(1).toInt()) &&
-            (recipe->miscs.at(i).m_use_use == query.value(2).toInt())) {
+        if ((recipe->miscs.at(i).name == query.value(0).toString()) &&
+            (recipe->miscs.at(i).type == query.value(1).toInt()) &&
+            (recipe->miscs.at(i).use_use == query.value(2).toInt())) {
             recipe->miscs_row = i;
             break;
         }
@@ -479,23 +479,23 @@
     QTableWidgetItem *item;
 
     qDebug() << "misc_useat_changed" << val;
-    recipe->miscs[recipe->miscs_row].m_use_use = val;
+    recipe->miscs[recipe->miscs_row].use_use = val;
     item = new QTableWidgetItem(misc_uses[val]);
     item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
     ui->miscsTable->setItem(recipe->miscs_row, 2, item);
 
     if (val == MISC_USES_PRIMARY || val == MISC_USES_SECONDARY) {
-	recipe->miscs[recipe->miscs_row].m_time = mtimeEdit->value() * 1440;
+	recipe->miscs[recipe->miscs_row].time = mtimeEdit->value() * 1440;
         mtimeEdit->setReadOnly(false);
         mtimeLabel->setText(tr("Time in days:"));
-        item = new QTableWidgetItem(QString("%1 days.").arg(recipe->miscs.at(recipe->miscs_row).m_time / 1440, 1, 'f', 0, '0'));
+        item = new QTableWidgetItem(QString("%1 days.").arg(recipe->miscs.at(recipe->miscs_row).time / 1440, 1, 'f', 0, '0'));
     } else if (val == MISC_USES_BOIL) {
-	recipe->miscs[recipe->miscs_row].m_time = mtimeEdit->value();
+	recipe->miscs[recipe->miscs_row].time = mtimeEdit->value();
         mtimeEdit->setReadOnly(false);
         mtimeLabel->setText(tr("Time in minutes:"));
-        item = new QTableWidgetItem(QString("%1 min.").arg(recipe->miscs.at(recipe->miscs_row).m_time, 1, 'f', 0, '0'));
+        item = new QTableWidgetItem(QString("%1 min.").arg(recipe->miscs.at(recipe->miscs_row).time, 1, 'f', 0, '0'));
     } else {
-	recipe->miscs[recipe->miscs_row].m_time = 0;
+	recipe->miscs[recipe->miscs_row].time = 0;
 	mtimeEdit->setValue(0);
         mtimeEdit->setReadOnly(true);
         mtimeLabel->setText("");
@@ -538,7 +538,7 @@
 
     mamountLabel = new QLabel(dialog);
     mamountLabel->setObjectName(QString::fromUtf8("mamountLabel"));
-    if (recipe->miscs.at(recipe->miscs_row).m_amount_is_weight)
+    if (recipe->miscs.at(recipe->miscs_row).amount_is_weight)
     	mamountLabel->setText(tr("Amount in gr:"));
     else
 	mamountLabel->setText(tr("Amount in ml:"));
@@ -547,9 +547,9 @@
 
     mtimeLabel = new QLabel(dialog);
     mtimeLabel->setObjectName(QString::fromUtf8("mtimeLabel"));
-    if (recipe->miscs.at(recipe->miscs_row).m_use_use == 3 || recipe->miscs.at(recipe->miscs_row).m_use_use == 4)	// Fermentation stages
+    if (recipe->miscs.at(recipe->miscs_row).use_use == 3 || recipe->miscs.at(recipe->miscs_row).use_use == 4)	// Fermentation stages
         mtimeLabel->setText(tr("Time in days:"));
-    else if (recipe->miscs.at(recipe->miscs_row).m_use_use == 2)  // Boil
+    else if (recipe->miscs.at(recipe->miscs_row).use_use == 2)  // Boil
         mtimeLabel->setText(tr("Time in minutes:"));
     else
         mtimeLabel->setText("");
@@ -573,7 +573,7 @@
 
     mnameEdit = new QLineEdit(dialog);
     mnameEdit->setObjectName(QString::fromUtf8("mnameEdit"));
-    mnameEdit->setText(recipe->miscs.at(recipe->miscs_row).m_name);
+    mnameEdit->setText(recipe->miscs.at(recipe->miscs_row).name);
     mnameEdit->setGeometry(QRect(160, 10, 511, 23));
     mnameEdit->setReadOnly(true);
 
@@ -585,7 +585,7 @@
     mamountEdit->setDecimals(2);
     mamountEdit->setMaximum(1000000.0);
     mamountEdit->setSingleStep(0.1);
-    mamountEdit->setValue(recipe->miscs.at(recipe->miscs_row).m_amount * 1000.0);
+    mamountEdit->setValue(recipe->miscs.at(recipe->miscs_row).amount * 1000.0);
 
     mtimeEdit = new QSpinBox(dialog);
     mtimeEdit->setObjectName(QString::fromUtf8("mtimeEdit"));
@@ -593,11 +593,11 @@
     mtimeEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
     mtimeEdit->setAccelerated(true);
     mtimeEdit->setMaximum(10000.0);
-    if (recipe->miscs.at(recipe->miscs_row).m_use_use == 3 || recipe->miscs.at(recipe->miscs_row).m_use_use == 4) {	// Fermentation stages
-	mtimeEdit->setValue(recipe->miscs.at(recipe->miscs_row).m_time / 1440);
+    if (recipe->miscs.at(recipe->miscs_row).use_use == 3 || recipe->miscs.at(recipe->miscs_row).use_use == 4) {	// Fermentation stages
+	mtimeEdit->setValue(recipe->miscs.at(recipe->miscs_row).time / 1440);
         mtimeEdit->setReadOnly(false);
-    } else if (recipe->miscs.at(recipe->miscs_row).m_use_use == 2) {	// Boil
-	mtimeEdit->setValue(recipe->miscs.at(recipe->miscs_row).m_time);
+    } else if (recipe->miscs.at(recipe->miscs_row).use_use == 2) {	// Boil
+	mtimeEdit->setValue(recipe->miscs.at(recipe->miscs_row).time);
         mtimeEdit->setReadOnly(false);
     } else {
 	mtimeEdit->setReadOnly(true);
@@ -612,7 +612,7 @@
     useatEdit->addItem(tr("Primary"));
     useatEdit->addItem(tr("Secondary"));
     useatEdit->addItem(tr("Bottling"));
-    useatEdit->setCurrentIndex(recipe->miscs.at(recipe->miscs_row).m_use_use);
+    useatEdit->setCurrentIndex(recipe->miscs.at(recipe->miscs_row).use_use);
 
     minstockEdit = new QCheckBox(dialog);
     minstockEdit->setObjectName(QString::fromUtf8("minstockEdit"));
@@ -636,11 +636,11 @@
         recipe->miscs[recipe->miscs_row] = backup;
     } else {
         /* Clear time if misc is not used for boil or fermentation. */
-        if (! (recipe->miscs.at(recipe->miscs_row).m_use_use == 2 ||
-               recipe->miscs.at(recipe->miscs_row).m_use_use == 3 ||
-               recipe->miscs.at(recipe->miscs_row).m_use_use == 4)) {
-            if (recipe->miscs.at(recipe->miscs_row).m_time) {
-                recipe->miscs[recipe->miscs_row].m_time = 0;
+        if (! (recipe->miscs.at(recipe->miscs_row).use_use == 2 ||
+               recipe->miscs.at(recipe->miscs_row).use_use == 3 ||
+               recipe->miscs.at(recipe->miscs_row).use_use == 4)) {
+            if (recipe->miscs.at(recipe->miscs_row).time) {
+                recipe->miscs[recipe->miscs_row].time = 0;
                 is_changed();
             }
         }
@@ -674,35 +674,35 @@
     const QSignalBlocker blocker9(ui->mw_acidvolEdit);
 
     for (int i = 0; i < recipe->miscs.size(); i++) {
-	amount = recipe->miscs.at(i).m_amount * factor;
-	recipe->miscs[i].m_amount = amount;
+	amount = recipe->miscs.at(i).amount * factor;
+	recipe->miscs[i].amount = amount;
 
 	/*
          * Update the water agents.
          */
-        if (recipe->miscs.at(i).m_type == MISC_TYPES_WATER_AGENT) {
-            if (recipe->miscs.at(i).m_name == "CaCl2") {
-                ui->bs_cacl2Edit->setValue(recipe->miscs.at(i).m_amount * 1000.0);
-            } else if (recipe->miscs.at(i).m_name == "CaSO4") {
-                ui->bs_caso4Edit->setValue(recipe->miscs.at(i).m_amount * 1000.0);
-            } else if (recipe->miscs.at(i).m_name == "MgSO4") {
-                ui->bs_mgso4Edit->setValue(recipe->miscs.at(i).m_amount * 1000.0);
-            } else if (recipe->miscs.at(i).m_name == "NaCl") {
-                ui->bs_naclEdit->setValue(recipe->miscs.at(i).m_amount * 1000.0);
-            } else if (recipe->miscs.at(i).m_name == "MgCl2") {
-                ui->bs_mgcl2Edit->setValue(recipe->miscs.at(i).m_amount * 1000.0);
-            } else if (recipe->miscs.at(i).m_name == "NaHCO3") {
-                ui->bs_nahco3Edit->setValue(recipe->miscs.at(i).m_amount * 1000.0);
-            } else if (recipe->miscs.at(i).m_name == "CaCO3") {
-                ui->bs_caco3Edit->setValue(recipe->miscs.at(i).m_amount * 1000.0);
-            } else if (recipe->miscs.at(i).m_name == "Melkzuur" || recipe->miscs.at(i).m_name == "Lactic") {
-                ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).m_amount * 1000.0);
-            } else if (recipe->miscs.at(i).m_name == "Zoutzuur" || recipe->miscs.at(i).m_name == "Hydrochloric") {
-                ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).m_amount * 1000.0);
-            } else if (recipe->miscs.at(i).m_name == "Fosforzuur" || recipe->miscs.at(i).m_name == "Phosphoric") {
-                ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).m_amount * 1000.0);
-            } else if (recipe->miscs.at(i).m_name == "Zwavelzuur" || recipe->miscs.at(i).m_name == "Sulfuric") {
-                ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).m_amount * 1000.0);
+        if (recipe->miscs.at(i).type == MISC_TYPES_WATER_AGENT) {
+            if (recipe->miscs.at(i).name == "CaCl2") {
+                ui->bs_cacl2Edit->setValue(recipe->miscs.at(i).amount * 1000.0);
+            } else if (recipe->miscs.at(i).name == "CaSO4") {
+                ui->bs_caso4Edit->setValue(recipe->miscs.at(i).amount * 1000.0);
+            } else if (recipe->miscs.at(i).name == "MgSO4") {
+                ui->bs_mgso4Edit->setValue(recipe->miscs.at(i).amount * 1000.0);
+            } else if (recipe->miscs.at(i).name == "NaCl") {
+                ui->bs_naclEdit->setValue(recipe->miscs.at(i).amount * 1000.0);
+            } else if (recipe->miscs.at(i).name == "MgCl2") {
+                ui->bs_mgcl2Edit->setValue(recipe->miscs.at(i).amount * 1000.0);
+            } else if (recipe->miscs.at(i).name == "NaHCO3") {
+                ui->bs_nahco3Edit->setValue(recipe->miscs.at(i).amount * 1000.0);
+            } else if (recipe->miscs.at(i).name == "CaCO3") {
+                ui->bs_caco3Edit->setValue(recipe->miscs.at(i).amount * 1000.0);
+            } else if (recipe->miscs.at(i).name == "Melkzuur" || recipe->miscs.at(i).name == "Lactic") {
+                ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).amount * 1000.0);
+            } else if (recipe->miscs.at(i).name == "Zoutzuur" || recipe->miscs.at(i).name == "Hydrochloric") {
+                ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).amount * 1000.0);
+            } else if (recipe->miscs.at(i).name == "Fosforzuur" || recipe->miscs.at(i).name == "Phosphoric") {
+                ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).amount * 1000.0);
+            } else if (recipe->miscs.at(i).name == "Zwavelzuur" || recipe->miscs.at(i).name == "Sulfuric") {
+                ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).amount * 1000.0);
             }
         }
     }
diff -r 8540fd0166e7 -r efc213beb605 src/PrinterDialog.cpp
--- a/src/PrinterDialog.cpp	Sun Jun 12 20:06:39 2022 +0200
+++ b/src/PrinterDialog.cpp	Mon Jun 13 10:54:23 2022 +0200
@@ -63,7 +63,7 @@
     const QColor mf_line(  95, 180,  25, 255);
     const QColor ms_line( 240, 250,  65, 255);
     const QColor mo_line( 210, 245, 255, 255);
-    const QColor m_line(  175, 175, 255, 255); // also y_line
+    const QColor line(  175, 175, 255, 255); // also y_line
     const QColor w_line(  120, 255, 250, 255);
 
     const QStringList y_unit({tr("pkg"), tr("gr"), tr("ml"), tr("ml"), tr("ml"), tr("ml"), tr("gr")});
@@ -524,27 +524,27 @@
         painter.setFont(QFont("Helvetica", 9, QFont::Normal));
         double cost_miscs = 0;
 	for (int i = 0; i < recipe->miscs.size(); i++) {
-	    double cost = recipe->miscs.at(i).m_amount * recipe->miscs.at(i).m_cost;
+	    double cost = recipe->miscs.at(i).amount * recipe->miscs.at(i).cost;
 	    cost_miscs += cost;
 
-	    if (recipe->miscs.at(i).m_use_use == 2)
-		use = misc_uses[recipe->miscs.at(i).m_use_use] + QString(" %1 min").arg(recipe->miscs.at(i).m_time);
+	    if (recipe->miscs.at(i).use_use == 2)
+		use = misc_uses[recipe->miscs.at(i).use_use] + QString(" %1 min").arg(recipe->miscs.at(i).time);
 	    else
-		use = misc_uses[recipe->miscs.at(i).m_use_use];
+		use = misc_uses[recipe->miscs.at(i).use_use];
 
-	    if (recipe->miscs.at(i).m_type == 4)					// Water agent
+	    if (recipe->miscs.at(i).type == 4)					// Water agent
 		painter.fillRect( 20, y,   715, 20, mw_line);
-	    else if (recipe->miscs.at(i).m_type == 3)					// Fining
+	    else if (recipe->miscs.at(i).type == 3)					// Fining
 		painter.fillRect( 20, y,   715, 20, mf_line);
-	    else if (recipe->miscs.at(i).m_type < 3 || recipe->miscs.at(i).m_type == 5)	// Spice, Herb, Flavour, Yeast nutrient
+	    else if (recipe->miscs.at(i).type < 3 || recipe->miscs.at(i).type == 5)	// Spice, Herb, Flavour, Yeast nutrient
 		painter.fillRect( 20, y,   715, 20, ms_line);
 	    else
 	    	painter.fillRect( 20, y,   715, 20, mo_line);
-            painter.drawText( 20, y+4, 410, 20, Qt::AlignLeft,  recipe->miscs.at(i).m_name);
-	    painter.drawText(435, y+4,  80, 20, Qt::AlignLeft,	misc_types[recipe->miscs.at(i).m_type]);
+            painter.drawText( 20, y+4, 410, 20, Qt::AlignLeft,  recipe->miscs.at(i).name);
+	    painter.drawText(435, y+4,  80, 20, Qt::AlignLeft,	misc_types[recipe->miscs.at(i).type]);
 	    painter.drawText(520, y+4,  80, 20, Qt::AlignLeft,	use);
 	    painter.drawText(605, y+4,  60, 20, Qt::AlignRight,
-			    QString("%1 %2").arg(recipe->miscs.at(i).m_amount * 1000.0, 1, 'f', 1).arg(recipe->miscs.at(i).m_amount_is_weight ? "gr":"ml"));
+			    QString("%1 %2").arg(recipe->miscs.at(i).amount * 1000.0, 1, 'f', 1).arg(recipe->miscs.at(i).amount_is_weight ? "gr":"ml"));
 	    painter.drawText(670, y+4,  60, 20, Qt::AlignRight, QString("%1 €").arg(cost, 1, 'f', 3));
 	    y += 20;
 	}
@@ -574,7 +574,7 @@
         y += 20;
         painter.setFont(QFont("Helvetica", 9, QFont::Normal));
 	for (int i = 0; i < recipe->mashs.size(); i++) {
-	    painter.fillRect( 20, y,   715, 20, m_line);
+	    painter.fillRect( 20, y,   715, 20, line);
 	    painter.drawText( 20, y+4, 160, 20, Qt::AlignLeft,	recipe->mashs.at(i).step_name);
 	    painter.drawText(180, y+4,  80, 20, Qt::AlignLeft,	step_types[recipe->mashs.at(i).step_type]);
 	    painter.drawText(260, y+4,  60, 20, Qt::AlignRight, QString("%1").arg(recipe->mashs.at(i).step_temp, 1, 'f', 1));
@@ -940,27 +940,27 @@
         painter.setFont(QFont("Helvetica", 9, QFont::Normal));
         double cost_miscs = 0;
         for (int i = 0; i < product->miscs.size(); i++) {
-            double cost = product->miscs.at(i).m_amount * product->miscs.at(i).m_cost;
+            double cost = product->miscs.at(i).amount * product->miscs.at(i).cost;
             cost_miscs += cost;
 
-            if (product->miscs.at(i).m_use_use == 2)
-                use = misc_uses[product->miscs.at(i).m_use_use] + QString(" %1 min").arg(product->miscs.at(i).m_time);
+            if (product->miscs.at(i).use_use == 2)
+                use = misc_uses[product->miscs.at(i).use_use] + QString(" %1 min").arg(product->miscs.at(i).time);
             else
-                use = misc_uses[product->miscs.at(i).m_use_use];
+                use = misc_uses[product->miscs.at(i).use_use];
 
-            if (product->miscs.at(i).m_type == 4)                                        // Water agent
+            if (product->miscs.at(i).type == 4)                                        // Water agent
                 painter.fillRect( 20, y,   715, 20, mw_line);
-            else if (product->miscs.at(i).m_type == 3)                                   // Fining
+            else if (product->miscs.at(i).type == 3)                                   // Fining
                 painter.fillRect( 20, y,   715, 20, mf_line);
-            else if (product->miscs.at(i).m_type < 3 || product->miscs.at(i).m_type == 5) // Spice, Herb, Flavour, Yeast nutrient
+            else if (product->miscs.at(i).type < 3 || product->miscs.at(i).type == 5) // Spice, Herb, Flavour, Yeast nutrient
                 painter.fillRect( 20, y,   715, 20, ms_line);
             else
                 painter.fillRect( 20, y,   715, 20, mo_line);
-            painter.drawText( 20, y+4, 410, 20, Qt::AlignLeft,  product->miscs.at(i).m_name);
-            painter.drawText(435, y+4,  80, 20, Qt::AlignLeft,  misc_types[product->miscs.at(i).m_type]);
+            painter.drawText( 20, y+4, 410, 20, Qt::AlignLeft,  product->miscs.at(i).name);
+            painter.drawText(435, y+4,  80, 20, Qt::AlignLeft,  misc_types[product->miscs.at(i).type]);
             painter.drawText(520, y+4,  80, 20, Qt::AlignLeft,  use);
             painter.drawText(605, y+4,  60, 20, Qt::AlignRight,
-                            QString("%1 %2").arg(product->miscs.at(i).m_amount * 1000.0, 1, 'f', 1).arg(product->miscs.at(i).m_amount_is_weight ? "gr":"ml"));
+                            QString("%1 %2").arg(product->miscs.at(i).amount * 1000.0, 1, 'f', 1).arg(product->miscs.at(i).amount_is_weight ? "gr":"ml"));
             painter.drawText(670, y+4,  60, 20, Qt::AlignRight, QString("%1 €").arg(cost, 1, 'f', 3));
             y += 20;
         }
@@ -990,7 +990,7 @@
         y += 20;
         painter.setFont(QFont("Helvetica", 9, QFont::Normal));
         for (int i = 0; i < product->mashs.size(); i++) {
-            painter.fillRect( 20, y,   715, 20, m_line);
+            painter.fillRect( 20, y,   715, 20, line);
             painter.drawText( 20, y+4, 160, 20, Qt::AlignLeft,  product->mashs.at(i).step_name);
             painter.drawText(180, y+4,  80, 20, Qt::AlignLeft,  step_types[product->mashs.at(i).step_type]);
             painter.drawText(260, y+4,  60, 20, Qt::AlignRight, QString("%1").arg(product->mashs.at(i).step_temp, 1, 'f', 1));
@@ -1136,7 +1136,7 @@
                 y += 40;
             }
 	    painter.setFont(QFont("Helvetica", 9, QFont::Bold));
-	    painter.fillRect( 20, y,   715, 20, m_line);
+	    painter.fillRect( 20, y,   715, 20, line);
 	    painter.drawText( 40, y+4, 250, 20, Qt::AlignLeft, tr("Mash step"));
 	    painter.drawText(290, y+4, 120, 20, Qt::AlignLeft, tr("Step type"));
 	    painter.drawText(400, y+4, 110, 20, Qt::AlignLeft, tr("Temperature"));
@@ -1167,7 +1167,7 @@
                 y += 20;
             }
 	    painter.setFont(QFont("Helvetica", 9, QFont::Bold));
-            painter.fillRect( 20, y,   715, 20, m_line);
+            painter.fillRect( 20, y,   715, 20, line);
             painter.drawText( 20, y+4, 230, 20, Qt::AlignLeft, tr("Brew item"));
 	    painter.drawText(250, y+4, 200, 20, Qt::AlignLeft, tr("Expected"));
 	    painter.drawText(450, y+4, 200, 20, Qt::AlignLeft, tr("Reached"));
@@ -1391,9 +1391,9 @@
 	    }
 	    y += 5;
 	    painter.setFont(QFont("Helvetica", 9, QFont::Bold));
-	    painter.fillRect( 20, y,   330, 20, m_line);
+	    painter.fillRect( 20, y,   330, 20, line);
 	    painter.drawText( 20, y+2, 330, 20, Qt::AlignCenter, tr("Bottles"));
-	    painter.fillRect(405, y,   330, 20, m_line);
+	    painter.fillRect(405, y,   330, 20, line);
 	    painter.drawText(405, y+2, 330, 20, Qt::AlignCenter, tr("Kegs"));
 	    y += 20;
 	    painter.setFont(QFont("Helvetica", 9, QFont::Normal));
@@ -1602,9 +1602,9 @@
 	    mashwater += product->w2_amount * factor;
 	}
 	for (int i = 0; i < product->miscs.size(); i++) {
-	    if (product->miscs.at(i).m_type == MISC_TYPES_WATER_AGENT) {
-		QString unit = (product->miscs.at(i).m_amount_is_weight) ? "gr":"ml";
-		checkLine(&painter, &y, QString("%1 %2 %3").arg(product->miscs.at(i).m_amount * 1000 * factor, 1, 'f', 2).arg(unit).arg(product->miscs.at(i).m_name));
+	    if (product->miscs.at(i).type == MISC_TYPES_WATER_AGENT) {
+		QString unit = (product->miscs.at(i).amount_is_weight) ? "gr":"ml";
+		checkLine(&painter, &y, QString("%1 %2 %3").arg(product->miscs.at(i).amount * 1000 * factor, 1, 'f', 2).arg(unit).arg(product->miscs.at(i).name));
 		numsalts++;
 	    }
 	}
@@ -1644,10 +1644,10 @@
 		    }
 		}
 		for (int j = 0; j < product->miscs.size(); j++) {
-		    if ((product->miscs.at(j).m_use_use == MISC_USES_MASH) && (product->miscs.at(j).m_type != MISC_TYPES_WATER_AGENT)) {
-			QString unit = (product->miscs.at(j).m_amount_is_weight) ? "gr":"ml";
-			checkLine(&painter, &y, QString(tr("Add %1 %2 `%3`")).arg(product->miscs.at(j).m_amount * 1000 * factor, 1, 'f', 2)
-				.arg(unit).arg(product->miscs.at(j).m_name));
+		    if ((product->miscs.at(j).use_use == MISC_USES_MASH) && (product->miscs.at(j).type != MISC_TYPES_WATER_AGENT)) {
+			QString unit = (product->miscs.at(j).amount_is_weight) ? "gr":"ml";
+			checkLine(&painter, &y, QString(tr("Add %1 %2 `%3`")).arg(product->miscs.at(j).amount * 1000 * factor, 1, 'f', 2)
+				.arg(unit).arg(product->miscs.at(j).name));
 		    }
 		}
 	    } else {	// loop > 0
@@ -1733,7 +1733,7 @@
 		    lines++;
 	   }
 	   for (int i = 0; i < product->miscs.size(); i++) {
-		if (product->miscs.at(i).m_use_use == MISC_USES_BOIL)
+		if (product->miscs.at(i).use_use == MISC_USES_BOIL)
 		    lines++;
 	   }
 	}
@@ -1770,14 +1770,14 @@
 		    }
 		}
 		for (int j = 0; j < product->miscs.size(); j++) {
-		    if (product->miscs.at(j).m_use_use == MISC_USES_BOIL && product->miscs.at(j).m_time == i) {
-			QString unit = (product->miscs.at(j).m_amount_is_weight) ? "gr":"ml";
+		    if (product->miscs.at(j).use_use == MISC_USES_BOIL && product->miscs.at(j).time == i) {
+			QString unit = (product->miscs.at(j).amount_is_weight) ? "gr":"ml";
 			if (i == 0)
 			    checkLine(&painter, &y, QString(tr("%1 %2 `%3` at flameout"))
-				.arg(product->miscs.at(j).m_amount * 1000 * factor, 1, 'f', 2).arg(unit).arg(product->miscs.at(j).m_name));
+				.arg(product->miscs.at(j).amount * 1000 * factor, 1, 'f', 2).arg(unit).arg(product->miscs.at(j).name));
 			else
 			    checkLine(&painter, &y, QString(tr("%1 %2 `%3` at %4 minutes before end of boil"))
-				.arg(product->miscs.at(j).m_amount * 1000 * factor, 1, 'f', 2).arg(unit).arg(product->miscs.at(j).m_name).arg(i));
+				.arg(product->miscs.at(j).amount * 1000 * factor, 1, 'f', 2).arg(unit).arg(product->miscs.at(j).name).arg(i));
 		    }
 		}
 	    }
@@ -1906,7 +1906,7 @@
 	    if (product->fermentables.at(i).f_added == FERMENTABLE_ADDED_FERMENTATION)
 		lines++;
 	for (int i = 0; i < product->miscs.size(); i++)
-	    if (product->miscs.at(i).m_use_use == MISC_USES_PRIMARY)
+	    if (product->miscs.at(i).use_use == MISC_USES_PRIMARY)
 		lines++;
 	if (lines) {
 	    if ((y + 20 + (lines * 20)) > painter.device()->height()) {
@@ -1923,10 +1923,10 @@
 			.arg(product->fermentables.at(i).f_name));
 	    }
 	    for (int i = 0; i < product->miscs.size(); i++) {
-		if (product->miscs.at(i).m_use_use == MISC_USES_PRIMARY) {
-		    QString unit = (product->miscs.at(i).m_amount_is_weight) ? "gr":"ml";
-		    checkLine(&painter, &y, QString(tr("Add %1 %2 `%3` on day 3 or 4")).arg(product->miscs.at(i).m_amount * 1000 * factor, 1, 'f', 3)
-			.arg(unit).arg(product->miscs.at(i).m_name));
+		if (product->miscs.at(i).use_use == MISC_USES_PRIMARY) {
+		    QString unit = (product->miscs.at(i).amount_is_weight) ? "gr":"ml";
+		    checkLine(&painter, &y, QString(tr("Add %1 %2 `%3` on day 3 or 4")).arg(product->miscs.at(i).amount * 1000 * factor, 1, 'f', 3)
+			.arg(unit).arg(product->miscs.at(i).name));
 		}
 	    }
 	}
@@ -1982,7 +1982,7 @@
 	    if (product->hops.at(i).h_useat == HOP_USEAT_DRY_HOP)
 		lines++;
         for (int i = 0; i < product->miscs.size(); i++)
-            if (product->miscs.at(i).m_use_use == MISC_USES_SECONDARY)
+            if (product->miscs.at(i).use_use == MISC_USES_SECONDARY)
                 lines++;
         for (int i = 0; i < product->yeasts.size(); i++) {
             if (product->yeasts.at(i).y_use == YEAST_USE_TERTIARY)
@@ -2024,10 +2024,10 @@
                 }
 	    }
             for (int i = 0; i < product->miscs.size(); i++) {
-                if (product->miscs.at(i).m_use_use == MISC_USES_SECONDARY) {
-                    QString unit = (product->miscs.at(i).m_amount_is_weight) ? "gr":"ml";
-                    checkLine(&painter, &y, QString(tr("Add %1 %2 `%3` for %4 days")).arg(product->miscs.at(i).m_amount * 1000.0 * factor, 1, 'f', 2)
-                        .arg(unit).arg(product->miscs.at(i).m_name).arg(product->miscs.at(i).m_time / 1440));
+                if (product->miscs.at(i).use_use == MISC_USES_SECONDARY) {
+                    QString unit = (product->miscs.at(i).amount_is_weight) ? "gr":"ml";
+                    checkLine(&painter, &y, QString(tr("Add %1 %2 `%3` for %4 days")).arg(product->miscs.at(i).amount * 1000.0 * factor, 1, 'f', 2)
+                        .arg(unit).arg(product->miscs.at(i).name).arg(product->miscs.at(i).time / 1440));
                 }
             }
 	}
@@ -2040,7 +2040,7 @@
             if (product->fermentables.at(i).f_added >= FERMENTABLE_ADDED_BOTTLE)
                 lines++;
         for (int i = 0; i < product->miscs.size(); i++)
-            if (product->miscs.at(i).m_use_use == MISC_USES_BOTTLING)
+            if (product->miscs.at(i).use_use == MISC_USES_BOTTLING)
                 lines++;
         for (int i = 0; i < product->yeasts.size(); i++)
             if (product->yeasts.at(i).y_use == YEAST_USE_BOTTLE)
@@ -2081,10 +2081,10 @@
 		}
 	    }
 	    for (int i = 0; i < product->miscs.size(); i++) {
-                if (product->miscs.at(i).m_use_use == MISC_USES_BOTTLING) {
-                    QString unit = (product->miscs.at(i).m_amount_is_weight) ? "gr":"ml";
-                    checkLine(&painter, &y, QString(tr("Add %1 %2 `%3` during bottling")).arg(product->miscs.at(i).m_amount * 1000 * factor, 1, 'f', 2)
-                        .arg(unit).arg(product->miscs.at(i).m_name));
+                if (product->miscs.at(i).use_use == MISC_USES_BOTTLING) {
+                    QString unit = (product->miscs.at(i).amount_is_weight) ? "gr":"ml";
+                    checkLine(&painter, &y, QString(tr("Add %1 %2 `%3` during bottling")).arg(product->miscs.at(i).amount * 1000 * factor, 1, 'f', 2)
+                        .arg(unit).arg(product->miscs.at(i).name));
                 }
             }
 	}
diff -r 8540fd0166e7 -r efc213beb605 src/database/db_product.cpp
--- a/src/database/db_product.cpp	Sun Jun 12 20:06:39 2022 +0200
+++ b/src/database/db_product.cpp	Mon Jun 13 10:54:23 2022 +0200
@@ -381,9 +381,9 @@
 	qDebug() << "empty hops";
     }
 
-    const auto& m_json = query.value("json_miscs").toString();
-    if (!m_json.trimmed().isEmpty()) {
-            const auto& formattedJson = QString("%1").arg(m_json);
+    const auto& json = query.value("json_miscs").toString();
+    if (!json.trimmed().isEmpty()) {
+            const auto& formattedJson = QString("%1").arg(json);
             QJsonDocument miscs = QJsonDocument::fromJson(formattedJson.toUtf8(), &parseError);
             if (parseError.error != QJsonParseError::NoError) {
                 qWarning() << "Parse error: " << parseError.errorString() << "at" << parseError.offset;
@@ -391,22 +391,22 @@
 		for (int i = 0; i < miscs.array().size(); i++) {
 		    QJsonObject obj = miscs.array().at(i).toObject();
 		    Miscs m;
-		    m.m_avail = false;
-		    m.m_inventory = 0;
-		    m.m_name = obj["m_name"].toString();
-		    m.m_amount = obj["m_amount"].toDouble();
-		    m.m_type = obj["m_type"].toInt();
-		    m.m_use_use = obj["m_use_use"].toInt();
-		    m.m_time = obj["m_time"].toDouble();
-		    m.m_amount_is_weight = obj["m_amount_is_weight"].toInt() ? true:false;
-		    m.m_cost = obj["m_cost"].toDouble();
+		    m.avail = false;
+		    m.inventory = 0;
+		    m.name = obj["name"].toString();
+		    m.amount = obj["amount"].toDouble();
+		    m.type = obj["type"].toInt();
+		    m.use_use = obj["use_use"].toInt();
+		    m.time = obj["time"].toDouble();
+		    m.amount_is_weight = obj["amount_is_weight"].toInt() ? true:false;
+		    m.cost = obj["cost"].toDouble();
 		    /* Check and update inventory */
                     yquery.prepare("SELECT inventory FROM inventory_miscs WHERE name=:name");
-                    yquery.bindValue(":name", m.m_name);
+                    yquery.bindValue(":name", m.name);
                     yquery.exec();
                     if (yquery.first()) {
-                        m.m_avail = true;
-                        m.m_inventory = yquery.value(0).toDouble();
+                        m.avail = true;
+                        m.inventory = yquery.value(0).toDouble();
                     }
 		    prod->miscs.append(m);
 		}
@@ -905,13 +905,13 @@
         QJsonArray array;
         for (int i = 0; i < prod->miscs.size(); i++) {
                 QJsonObject obj;
-		obj.insert("m_name", prod->miscs.at(i).m_name);
-		obj.insert("m_amount", round(prod->miscs.at(i).m_amount * 100000) / 100000);
-		obj.insert("m_type", prod->miscs.at(i).m_type);
-		obj.insert("m_use_use", prod->miscs.at(i).m_use_use);
-		obj.insert("m_time", round(prod->miscs.at(i).m_time));
-		obj.insert("m_amount_is_weight", prod->miscs.at(i).m_amount_is_weight ? 1:0);
-		obj.insert("m_cost", round(prod->miscs.at(i).m_cost * 10000) / 10000);
+		obj.insert("name", prod->miscs.at(i).name);
+		obj.insert("amount", round(prod->miscs.at(i).amount * 100000) / 100000);
+		obj.insert("type", prod->miscs.at(i).type);
+		obj.insert("use_use", prod->miscs.at(i).use_use);
+		obj.insert("time", round(prod->miscs.at(i).time));
+		obj.insert("amount_is_weight", prod->miscs.at(i).amount_is_weight ? 1:0);
+		obj.insert("cost", round(prod->miscs.at(i).cost * 10000) / 10000);
 //                qDebug() << "miscs_Json" << i << obj;
                 array.append(obj);      /* Append this object */
         }
diff -r 8540fd0166e7 -r efc213beb605 src/database/db_recipe.cpp
--- a/src/database/db_recipe.cpp	Sun Jun 12 20:06:39 2022 +0200
+++ b/src/database/db_recipe.cpp	Mon Jun 13 10:54:23 2022 +0200
@@ -216,9 +216,9 @@
 	qDebug() << "empty hops";
     }
 
-    const auto& m_json = query.value("json_miscs").toString();
-    if (!m_json.trimmed().isEmpty()) {
-	const auto& formattedJson = QString("%1").arg(m_json);
+    const auto& json = query.value("json_miscs").toString();
+    if (!json.trimmed().isEmpty()) {
+	const auto& formattedJson = QString("%1").arg(json);
 	QJsonDocument miscs = QJsonDocument::fromJson(formattedJson.toUtf8(), &parseError);
 	if (parseError.error != QJsonParseError::NoError) {
 	    qWarning() << "Parse error: " << parseError.errorString() << "at" << parseError.offset;
@@ -226,13 +226,13 @@
 	    for (int i = 0; i < miscs.array().size(); i++) {
 		QJsonObject obj = miscs.array().at(i).toObject();
 		Miscs m;
-		m.m_name = obj["m_name"].toString();
-		m.m_amount = obj["m_amount"].toDouble();
-		m.m_type = obj["m_type"].toInt();
-		m.m_use_use = obj["m_use_use"].toInt();
-		m.m_time = obj["m_time"].toDouble();
-		m.m_amount_is_weight = obj["m_amount_is_weight"].toInt() ? true:false;
-		m.m_cost = obj["m_cost"].toDouble();
+		m.name = obj["name"].toString();
+		m.amount = obj["amount"].toDouble();
+		m.type = obj["type"].toInt();
+		m.use_use = obj["use_use"].toInt();
+		m.time = obj["time"].toDouble();
+		m.amount_is_weight = obj["amount_is_weight"].toInt() ? true:false;
+		m.cost = obj["cost"].toDouble();
 		reci->miscs.append(m);
 	    }
 	}
@@ -549,13 +549,13 @@
         QJsonArray array;
         for (int i = 0; i < reci->miscs.size(); i++) {
                 QJsonObject obj;
-		obj.insert("m_name", reci->miscs.at(i).m_name);
-		obj.insert("m_amount", round(reci->miscs.at(i).m_amount * 10000) / 10000);
-		obj.insert("m_type", reci->miscs.at(i).m_type);
-		obj.insert("m_use_use", reci->miscs.at(i).m_use_use);
-		obj.insert("m_time", round(reci->miscs.at(i).m_time));
-		obj.insert("m_amount_is_weight", reci->miscs.at(i).m_amount_is_weight ? 1:0);
-		obj.insert("m_cost", round(reci->miscs.at(i).m_cost * 10000) / 10000);
+		obj.insert("name", reci->miscs.at(i).name);
+		obj.insert("amount", round(reci->miscs.at(i).amount * 10000) / 10000);
+		obj.insert("type", reci->miscs.at(i).type);
+		obj.insert("use_use", reci->miscs.at(i).use_use);
+		obj.insert("time", round(reci->miscs.at(i).time));
+		obj.insert("amount_is_weight", reci->miscs.at(i).amount_is_weight ? 1:0);
+		obj.insert("cost", round(reci->miscs.at(i).cost * 10000) / 10000);
                 array.append(obj);      /* Append this object */
         }
 	QJsonDocument doc;
diff -r 8540fd0166e7 -r efc213beb605 src/global.h
--- a/src/global.h	Sun Jun 12 20:06:39 2022 +0200
+++ b/src/global.h	Mon Jun 13 10:54:23 2022 +0200
@@ -109,15 +109,18 @@
 
 struct Miscs
 {
-    QString	m_name;
-    double	m_amount;
-    int		m_type;
-    int		m_use_use;
-    double	m_time;
-    bool	m_amount_is_weight;
-    double	m_cost;
-    double	m_inventory;		///< In product, current inventory.
-    bool	m_avail;		///< Product available in database.
+    QString	name;
+    QString	notes;
+    QString	use_for;
+    double	amount;
+    int		type;
+    int		use_use;
+    double	time;
+    bool	amount_is_weight;
+    bool	always_on_stock;
+    double	cost;
+    double	inventory;		///< In product, current inventory.
+    bool	avail;			///< Product available in database.
 };