diff --git a/resources/share/shared/bootstrap/bootstrap.json b/resources/share/shared/bootstrap/bootstrap.json index 97ede2dc7..0a1ab4127 100644 --- a/resources/share/shared/bootstrap/bootstrap.json +++ b/resources/share/shared/bootstrap/bootstrap.json @@ -1,6 +1,5 @@ { "dbDebugFlag": false, - "dbHttpPort": 80, "dbHttpsPort": 443, "dbRootDirectoryUrl": { "url": "https://datastore.swift-project.org/" diff --git a/src/blackcore/data/globalsetup.cpp b/src/blackcore/data/globalsetup.cpp index fb68fe034..d04ab0192 100644 --- a/src/blackcore/data/globalsetup.cpp +++ b/src/blackcore/data/globalsetup.cpp @@ -152,7 +152,6 @@ namespace BlackCore::Data switch (i) { case IndexDbRootDirectory: return QVariant::fromValue(m_dbRootDirectoryUrl); - case IndexDbHttpPort: return QVariant::fromValue(m_dbHttpPort); case IndexDbHttpsPort: return QVariant::fromValue(m_dbHttpsPort); case IndexDbLoginService: return QVariant::fromValue(this->getDbLoginServiceUrl()); case IndexVatsimStatus: return QVariant::fromValue(m_vatsimStatusFileUrl); @@ -182,7 +181,6 @@ namespace BlackCore::Data switch (i) { case IndexDbRootDirectory: m_dbRootDirectoryUrl.setPropertyByIndex(index.copyFrontRemoved(), variant); break; - case IndexDbHttpPort: m_dbHttpPort = variant.toInt(); break; case IndexDbHttpsPort: m_dbHttpsPort = variant.toInt(); break; case IndexDbLoginService: break; // cannot be changed case IndexVatsimData: m_vatsimDataFileUrl = variant.value(); break; diff --git a/src/blackcore/data/globalsetup.h b/src/blackcore/data/globalsetup.h index 9e912366d..6dd1fb4af 100644 --- a/src/blackcore/data/globalsetup.h +++ b/src/blackcore/data/globalsetup.h @@ -34,7 +34,6 @@ namespace BlackCore::Data enum ColumnIndex { IndexDbRootDirectory = BlackMisc::CPropertyIndexRef::GlobalIndexCGlobalSetup, - IndexDbHttpPort, IndexDbHttpsPort, IndexDbLoginService, IndexVatsimStatus, @@ -53,9 +52,6 @@ namespace BlackCore::Data //! Default constructor CGlobalSetup(); - //! Http port - int getDbHttpPort() const { return m_dbHttpPort; } - //! Https port int getDbHttpsPort() const { return m_dbHttpsPort; } @@ -165,7 +161,6 @@ namespace BlackCore::Data static const QString &schemaVersionString(); private: - int m_dbHttpPort = 80; //!< port int m_dbHttpsPort = 443; //!< SSL port QString m_mappingMinimumVersion; //!< minimum version BlackMisc::Network::CUrl m_dbRootDirectoryUrl; //!< Root directory of DB @@ -187,7 +182,6 @@ namespace BlackCore::Data BLACK_METACLASS( CGlobalSetup, BLACK_METAMEMBER(dbRootDirectoryUrl, 0, RequiredForJson), - BLACK_METAMEMBER(dbHttpPort, 0, RequiredForJson), BLACK_METAMEMBER(dbHttpsPort, 0, RequiredForJson), BLACK_METAMEMBER(vatsimStatusFileUrl, 0, RequiredForJson), BLACK_METAMEMBER(vatsimDataFileUrl, 0, RequiredForJson),