Mercurial > bmsapp / file diff

--- a/src/EditRecipeTab2.cpp	Sat Apr 23 08:47:50 2022 +0200
+++ b/src/EditRecipeTab2.cpp	Sat Apr 23 13:18:47 2022 +0200
@@ -86,15 +86,15 @@
         item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
         ui->fermentablesTable->setItem(i, 2, item);
 
-	item = new QTableWidgetItem(f_types[recipe->fermentables.at(i).f_type]);
+	item = new QTableWidgetItem(fermentable_types[recipe->fermentables.at(i).f_type]);
 	item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
 	ui->fermentablesTable->setItem(i, 3, item);
 
-        item = new QTableWidgetItem(f_graintypes[recipe->fermentables.at(i).f_graintype]);
+        item = new QTableWidgetItem(fermentable_graintypes[recipe->fermentables.at(i).f_graintype]);
         item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
         ui->fermentablesTable->setItem(i, 4, item);
 
-        item = new QTableWidgetItem(f_added[recipe->fermentables.at(i).f_added]);
+        item = new QTableWidgetItem(fermentable_added[recipe->fermentables.at(i).f_added]);
         item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
         ui->fermentablesTable->setItem(i, 5, item);
 
@@ -710,11 +710,11 @@
     item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
     ui->fermentablesTable->setItem(recipe->fermentables_row, 2, item);
 
-    item = new QTableWidgetItem(f_types[recipe->fermentables.at(recipe->fermentables_row).f_type]);
+    item = new QTableWidgetItem(fermentable_types[recipe->fermentables.at(recipe->fermentables_row).f_type]);
     item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
     ui->fermentablesTable->setItem(recipe->fermentables_row, 3, item);
 
-    item = new QTableWidgetItem(f_graintypes[recipe->fermentables.at(recipe->fermentables_row).f_graintype]);
+    item = new QTableWidgetItem(fermentable_graintypes[recipe->fermentables.at(recipe->fermentables_row).f_graintype]);
     item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
     ui->fermentablesTable->setItem(recipe->fermentables_row, 4, item);
 
@@ -756,7 +756,7 @@
     qDebug() << "ferment_added_changed()" << recipe->fermentables_row << val;
 
     recipe->fermentables[recipe->fermentables_row].f_added = val;
-    QTableWidgetItem *item = new QTableWidgetItem(f_added[val]);
+    QTableWidgetItem *item = new QTableWidgetItem(fermentable_added[val]);
     item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
     ui->fermentablesTable->setItem(recipe->fermentables_row, 5, item);