merge manually

2019-11-19 13:39:49 +01:00
parent 9283062dbd d81fac8b08
commit 1f1a93006c
26 changed files with 196 additions and 165 deletions
--- a/src/connection.h
+++ b/src/connection.h
@@ -123,8 +123,12 @@ public:

    void showTxError(const QString& error);

+    json    getInfo() { return serverInfo; }
+    void    setInfo(const json& info) { serverInfo = info; }
+
 private:
-    bool shutdownInProgress = false;    
+    bool shutdownInProgress = false;
+    json serverInfo;
 };

 #endif