Mercurial > bmsapp / file diff

--- 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 */
         }