diff --git a/resources/share/shared/bootstrap/bootstrap.json b/resources/share/shared/bootstrap/bootstrap.json index 380e02baf..8486ce417 100644 --- a/resources/share/shared/bootstrap/bootstrap.json +++ b/resources/share/shared/bootstrap/bootstrap.json @@ -1,7 +1,4 @@ { - "crashReportServerUrl": { - "url": "http://swift-project.sp.backtrace.io:6097/" - }, "dbDebugFlag": false, "dbHttpPort": 80, "dbHttpsPort": 443, diff --git a/src/blackcore/data/globalsetup.cpp b/src/blackcore/data/globalsetup.cpp index 409dc3fa2..e0239904b 100644 --- a/src/blackcore/data/globalsetup.cpp +++ b/src/blackcore/data/globalsetup.cpp @@ -163,9 +163,7 @@ namespace BlackCore::Data % u"AFV voice server URL: " % getAfvApiServerUrl().toQString(i18n) % separator - % u"AFV map URL: " % getAfvMapUrl().toQString(i18n) % separator - - % u"Crash report server: " % getCrashReportServerUrl().toQString(i18n); + % u"AFV map URL: " % getAfvMapUrl().toQString(i18n); return s; } @@ -185,10 +183,9 @@ namespace BlackCore::Data case IndexVatsimData: return QVariant::fromValue(m_vatsimDataFileUrls); case IndexVatsimServer: return QVariant::fromValue(m_vatsimServerFileUrl); case IndexVatsimHttpFsd: return QVariant::fromValue(m_vatsimFsdHttpUrl); - case IndexVatsimMetars: return QVariant::fromValue(m_vatsimMetarsUrls); - case IndexSharedUrls: return QVariant::fromValue(m_sharedUrls); - case IndexOnlineHelpUrls: return QVariant::fromValue(m_onlineHelpUrls); - case IndexCrashReportServerUrl: return QVariant::fromValue(m_crashReportServerUrl); + case IndexVatsimMetars: return QVariant::fromValue(m_vatsimMetarsUrl); + case IndexSharedUrl: return QVariant::fromValue(m_sharedUrl); + case IndexOnlineHelpUrl: return QVariant::fromValue(m_onlineHelpUrl); case IndexMappingMinimumVersion: return QVariant::fromValue(m_mappingMinimumVersion); case IndexPredefinedServers: return QVariant::fromValue(m_predefinedServers); case IndexAfvApiServerUrl: return QVariant::fromValue(m_afvApiServerUrl); @@ -218,7 +215,6 @@ namespace BlackCore::Data case IndexVatsimMetars: m_vatsimMetarsUrls = variant.value(); break; case IndexSharedUrls: m_sharedUrls = variant.value(); break; case IndexOnlineHelpUrls: m_onlineHelpUrls = variant.value(); break; - case IndexCrashReportServerUrl: m_crashReportServerUrl = variant.value(); break; case IndexMappingMinimumVersion: m_mappingMinimumVersion = variant.toString(); break; case IndexPredefinedServers: m_predefinedServers = variant.value(); break; case IndexAfvApiServerUrl: m_afvApiServerUrl = variant.value(); break; diff --git a/src/blackcore/data/globalsetup.h b/src/blackcore/data/globalsetup.h index f4d54bdc8..a5b9099b5 100644 --- a/src/blackcore/data/globalsetup.h +++ b/src/blackcore/data/globalsetup.h @@ -44,7 +44,6 @@ namespace BlackCore::Data IndexVatsimServer, IndexVatsimHttpFsd, IndexOnlineHelpUrls, - IndexCrashReportServerUrl, IndexSharedUrls, IndexMappingMinimumVersion, IndexPredefinedServers, @@ -67,10 +66,6 @@ namespace BlackCore::Data //! Set debug flag void setServerDebugFlag(bool debug); - //! Crash report server url - //! \deprecated NOT used anymore as by RR's info: https://discordapp.com/channels/539048679160676382/539925070550794240/586879411002015756 - BlackMisc::Network::CUrl getCrashReportServerUrl() const { return m_crashReportServerUrl; } - //! Root directory of DB const BlackMisc::Network::CUrl &getDbRootDirectoryUrl() const { return m_dbRootDirectoryUrl; } @@ -181,7 +176,6 @@ namespace BlackCore::Data int m_dbHttpPort = 80; //!< port int m_dbHttpsPort = 443; //!< SSL port QString m_mappingMinimumVersion; //!< minimum version - BlackMisc::Network::CUrl m_crashReportServerUrl; //!< crash report server BlackMisc::Network::CUrl m_dbRootDirectoryUrl; //!< Root directory of DB BlackMisc::Network::CUrlList m_vatsimMetarsUrls; //!< METAR data BlackMisc::Network::CUrlList m_vatsimStatusFileUrls; //!< Status file, where to find the VATSIM files (METAR, data, ATIS, other status files) @@ -201,7 +195,6 @@ namespace BlackCore::Data BLACK_METACLASS( CGlobalSetup, - BLACK_METAMEMBER(crashReportServerUrl, 0, RequiredForJson), BLACK_METAMEMBER(dbRootDirectoryUrl, 0, RequiredForJson), BLACK_METAMEMBER(dbHttpPort, 0, RequiredForJson), BLACK_METAMEMBER(dbHttpsPort, 0, RequiredForJson),