merge

2019-10-24 22:35:37 +02:00
parent a1a7130729 bd289466b5
commit 8e29dbc7e2
18 changed files with 588 additions and 35 deletions
--- a/src/settings.h
+++ b/src/settings.h
@@ -119,6 +119,8 @@ public:
    static bool    addTohushConf(QString confLocation, QString line);
    static bool    removeFromhushConf(QString confLocation, QString option);

+    static QString getChainName() { return QString("test"); }
+
    static const QString labelRegExp;

    static const int     updateSpeed         = 20 * 1000;        // 10 sec