set conf 2, merge upstream update

2019-10-31 17:23:44 +01:00
parent 0590d14693 3d66568ceb
commit edfbbe2da9
16 changed files with 521 additions and 56 deletions
--- a/src/settings.h
+++ b/src/settings.h
@@ -4,6 +4,8 @@
 #include "precompiled.h"
 #include "camount.h"

+using json = nlohmann::json;
+
 struct Config {
    QString server;
 };
@@ -119,4 +121,10 @@ private:
    double  ZECPrice          = 0.0;
 };

+
+inline bool isJsonSuccess(const json& res) {
+    return res.find("result") != res.end() && 
+                    QString::fromStdString(res["result"].get<json::string_t>()) == "success";
+}
+
 #endif // SETTINGS_H