From 7143458781359cfe4a7c8b0724b1c047daa158f2 Mon Sep 17 00:00:00 2001 From: acetone Date: Sat, 4 Mar 2023 21:30:13 +0300 Subject: [PATCH] common commit --- src/adminircpanel.h | 2 +- src/config.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/adminircpanel.h b/src/adminircpanel.h index de417c2..de92a19 100644 --- a/src/adminircpanel.h +++ b/src/adminircpanel.h @@ -31,6 +31,6 @@ public: static bool parse(const QString& networkName, const QString& input, QStringList& answer); private: - static qint64 m_identifiedTimestamp; + static QMap m_identifiedTimestamps; }; diff --git a/src/config.cpp b/src/config.cpp index 0fbf083..ed9e56b 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -36,7 +36,7 @@ constexpr const char CFG_USE_UTC_TIME[] = "useUTC"; constexpr const char CFG_IRC_ADMIN_TIMEOUT[] = "ircabotAdminAutorizationTimeout"; constexpr const char CFG_WEBUI[] = "webUI"; -constexpr const char CFG_WEBUI_BASE_URL[] = "baseUrl"; +constexpr const char CFG_WEBUI_BASE_URLS[] = "baseUrls"; constexpr const char CFG_WEBUI_ADDRESS[] = "address"; constexpr const char CFG_WEBUI_PORT[] = "port"; constexpr const char CFG_WEBUI_THREADS[] = "threads"; @@ -118,7 +118,7 @@ bool Config::initFromJson(const QJsonObject &config, QString* errorString) m_webUiThreads = webUi.value(CFG_WEBUI_THREADS) .toInt(0); // if <1, then system number m_webUiBaseUrls.clear(); - QJsonArray baseUrls = webUi.value(CFG_WEBUI_BASE_URL).toArray(); + QJsonArray baseUrls = webUi.value(CFG_WEBUI_BASE_URLS).toArray(); for (const auto& jurl: baseUrls) { auto url = jurl.toString(); @@ -224,7 +224,7 @@ bool Config::updateConfigWithCurrentData(QString *errorString) const auto url = baseUrlsIter.next(); baseUrls.push_back(url); } - webui.insert(CFG_WEBUI_BASE_URL, baseUrls); + webui.insert(CFG_WEBUI_BASE_URLS, baseUrls); config.insert(CFG_WEBUI, webui);