From 9deca92e0776a97e6364b6e6f36cc8a8718ea2cb Mon Sep 17 00:00:00 2001 From: xiphon Date: Fri, 28 Feb 2020 10:25:57 +0000 Subject: fix multiple minor issues (c-style casts, default branch, etc.) --- src/daemon/DaemonManager.cpp | 8 +++++--- src/daemon/DaemonManager.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/daemon') diff --git a/src/daemon/DaemonManager.cpp b/src/daemon/DaemonManager.cpp index 215cd0a2..74f1077a 100644 --- a/src/daemon/DaemonManager.cpp +++ b/src/daemon/DaemonManager.cpp @@ -49,13 +49,15 @@ namespace { DaemonManager * DaemonManager::m_instance = nullptr; QStringList DaemonManager::m_clArgs; -DaemonManager *DaemonManager::instance(const QStringList *args) +DaemonManager *DaemonManager::instance(const QStringList *args/* = nullptr*/) { if (!m_instance) { m_instance = new DaemonManager; // store command line arguments for later use - m_clArgs = *args; - m_clArgs.removeFirst(); + if (args != nullptr) + { + m_clArgs = *args; + } } return m_instance; diff --git a/src/daemon/DaemonManager.h b/src/daemon/DaemonManager.h index 774aecb3..e670373c 100644 --- a/src/daemon/DaemonManager.h +++ b/src/daemon/DaemonManager.h @@ -42,7 +42,7 @@ class DaemonManager : public QObject public: - static DaemonManager * instance(const QStringList *args); + static DaemonManager * instance(const QStringList *args = nullptr); Q_INVOKABLE bool start(const QString &flags, NetworkType::Type nettype, const QString &dataDir = "", const QString &bootstrapNodeAddress = "", bool noSync = false); Q_INVOKABLE void stopAsync(NetworkType::Type nettype, const QJSValue& callback); -- cgit v1.2.3