Tue, 14 Jun 2022 10:42:39 +0200
Renamed struct Mashs to MashSteps
--- a/src/EditProductTab7.cpp Tue Jun 14 09:39:31 2022 +0200 +++ b/src/EditProductTab7.cpp Tue Jun 14 10:42:39 2022 +0200 @@ -263,7 +263,7 @@ void EditProduct::addMashRow_clicked() { - Mashs newm; + MashSteps newm; for (int i = 0; i < product->mashs.size(); i++) { if (product->mashs.at(i).step_time == 0) @@ -320,7 +320,7 @@ int row = pb->objectName().toInt(); qDebug() << "Move up mash row" << row << product->mashs.size(); - Mashs temp; + MashSteps temp; temp = product->mashs[row - 1]; product->mashs[row - 1] = product->mashs[row]; product->mashs[row] = temp; @@ -338,7 +338,7 @@ int row = pb->objectName().toInt(); qDebug() << "Move down mash row" << row << product->mashs.size(); - Mashs temp; + MashSteps temp; temp = product->mashs[row + 1]; product->mashs[row + 1] = product->mashs[row]; product->mashs[row] = temp; @@ -535,7 +535,7 @@ QToolButton *pb = qobject_cast<QToolButton *>(QObject::sender()); product->mashs_row = pb->objectName().toInt(); qDebug() << "Edit mash row" << product->mashs_row; - Mashs backup = product->mashs.at(product->mashs_row); + MashSteps backup = product->mashs.at(product->mashs_row); QDialog* dialog = new QDialog(this); dialog->resize(738, 290); @@ -796,7 +796,7 @@ if (newsteps.isArray()) { for (i = 0; i < newsteps.array().size(); i++) { QJsonObject obj = newsteps.array().at(i).toObject(); - Mashs m; + MashSteps m; m.step_name = obj["step_name"].toString(); if (obj["step_type"].isString()) m.step_type = QString(obj["step_type"].toString()).toInt();
--- a/src/EditRecipeTab6.cpp Tue Jun 14 09:39:31 2022 +0200 +++ b/src/EditRecipeTab6.cpp Tue Jun 14 10:42:39 2022 +0200 @@ -245,7 +245,7 @@ void EditRecipe::addMashRow_clicked() { - Mashs newm; + MashSteps newm; for (int i = 0; i < recipe->mashs.size(); i++) { if (recipe->mashs.at(i).step_time == 0) @@ -302,7 +302,7 @@ int row = pb->objectName().toInt(); qDebug() << "Move up mash row" << row << recipe->mashs.size(); - Mashs temp; + MashSteps temp; temp = recipe->mashs[row - 1]; recipe->mashs[row - 1] = recipe->mashs[row]; recipe->mashs[row] = temp; @@ -320,7 +320,7 @@ int row = pb->objectName().toInt(); qDebug() << "Move down mash row" << row << recipe->mashs.size(); - Mashs temp; + MashSteps temp; temp = recipe->mashs[row + 1]; recipe->mashs[row + 1] = recipe->mashs[row]; recipe->mashs[row] = temp; @@ -436,7 +436,7 @@ QPushButton *pb = qobject_cast<QPushButton *>(QObject::sender()); recipe->mashs_row = pb->objectName().toInt(); qDebug() << "Edit mash row" << recipe->mashs_row; - Mashs backup = recipe->mashs.at(recipe->mashs_row); + MashSteps backup = recipe->mashs.at(recipe->mashs_row); QDialog* dialog = new QDialog(this); dialog->resize(738, 230); @@ -642,7 +642,7 @@ if (newsteps.isArray()) { for (i = 0; i < newsteps.array().size(); i++) { QJsonObject obj = newsteps.array().at(i).toObject(); - Mashs m; + MashSteps m; m.step_name = obj["step_name"].toString(); if (obj["step_type"].isString()) m.step_type = QString(obj["step_type"].toString()).toInt();
--- a/src/database/db_product.cpp Tue Jun 14 09:39:31 2022 +0200 +++ b/src/database/db_product.cpp Tue Jun 14 10:42:39 2022 +0200 @@ -508,7 +508,7 @@ } else if (mashs.isArray()) { for (int i = 0; i < mashs.array().size(); i++) { QJsonObject obj = mashs.array().at(i).toObject(); - Mashs m; + MashSteps m; m.step_name = obj["step_name"].toString(); m.step_type = obj["step_type"].toInt(); m.step_volume = obj["step_volume"].toDouble();
--- a/src/database/db_recipe.cpp Tue Jun 14 09:39:31 2022 +0200 +++ b/src/database/db_recipe.cpp Tue Jun 14 10:42:39 2022 +0200 @@ -330,7 +330,7 @@ } else if (mashs.isArray()) { for (int i = 0; i < mashs.array().size(); i++) { QJsonObject obj = mashs.array().at(i).toObject(); - Mashs m; + MashSteps m; m.step_name = obj["step_name"].toString(); m.step_type = obj["step_type"].toInt(); m.step_volume = obj["step_volume"].toDouble();
--- a/src/global.h Tue Jun 14 09:39:31 2022 +0200 +++ b/src/global.h Tue Jun 14 10:42:39 2022 +0200 @@ -163,7 +163,7 @@ }; -struct Mashs +struct MashSteps { QString step_name; int step_type; @@ -363,7 +363,7 @@ QList<Hops> hops; QList<Miscs> miscs; QList<Yeasts> yeasts; - QList<Mashs> mashs; + QList<MashSteps> mashs; /* * These are not in the MySL database, but are global variables @@ -608,7 +608,7 @@ QList<Hops> hops; QList<Miscs> miscs; QList<Yeasts> yeasts; - QList<Mashs> mashs; + QList<MashSteps> mashs; /* * These are not in the MySL database, but are global variables