From 24637aea09c846a32c0605437b9c8051f5a6d89f Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Sun, 4 Feb 2024 17:58:36 +0100 Subject: [PATCH] refactor: Remove unused method This method is not used. The setup reader instead directly uses the convertFromJson method from the JSON mixin. --- src/blackcore/data/globalsetup.cpp | 7 ------- src/blackcore/data/globalsetup.h | 3 --- 2 files changed, 10 deletions(-) diff --git a/src/blackcore/data/globalsetup.cpp b/src/blackcore/data/globalsetup.cpp index f8c98b4b4..31280e145 100644 --- a/src/blackcore/data/globalsetup.cpp +++ b/src/blackcore/data/globalsetup.cpp @@ -158,13 +158,6 @@ namespace BlackCore::Data return url; } - CGlobalSetup CGlobalSetup::fromJsonFile(const QString &fileNameAndPath, bool acceptCacheFormat) - { - CGlobalSetup setup; - loadFromJsonFile(setup, fileNameAndPath, acceptCacheFormat); - return setup; - } - CServerList CGlobalSetup::getPredefinedServersPlusHardcodedServers() const { static const CServerList hardcoded( diff --git a/src/blackcore/data/globalsetup.h b/src/blackcore/data/globalsetup.h index a69c6483a..d4f0cd648 100644 --- a/src/blackcore/data/globalsetup.h +++ b/src/blackcore/data/globalsetup.h @@ -199,9 +199,6 @@ namespace BlackCore::Data //! Build the full dbdata directory URL from shared URL static BlackMisc::Network::CUrl buildDbDataDirectoryUrl(const BlackMisc::Network::CUrl &candidate); - //! Object initialized by JSON file - static CGlobalSetup fromJsonFile(const QString &fileNameAndPath, bool acceptCacheFormat); - private: int m_dbHttpPort = 80; //!< port int m_dbHttpsPort = 443; //!< SSL port