flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-10 05:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Remove timestamp from bootstrap.json

Browse Source 
As the bootstrap.json is now exclusivley loaded from a file, the
timestamp is not used anymore.
This commit is contained in:
Lars Toenning
2024-02-09 13:59:58 +01:00
parent 2bac39d869
commit 65e4c9742b
3 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
resources/share/shared/bootstrap/bootstrap.json
View File

@@ -34,7 +34,6 @@
} }
] ]
}, },
"timestampMSecsSinceEpoch": 1559602257000,
"vatsimDataFileUrls": { "vatsimDataFileUrls": {
"containerbase": [ "containerbase": [
{ {

13
src/blackcore/data/globalsetup.cpp
View File

@@ -27,8 +27,7 @@ BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackCore::Data, CGlobalSetup)
namespace BlackCore::Data namespace BlackCore::Data
{ {
CGlobalSetup::CGlobalSetup() : CIdentifiable("CGlobalSetup"), CGlobalSetup::CGlobalSetup() : CIdentifiable("CGlobalSetup")
ITimestampBased(0)
{} {}
CUrl CGlobalSetup::getDbIcaoReaderUrl() const CUrl CGlobalSetup::getDbIcaoReaderUrl() const
@@ -183,9 +182,7 @@ namespace BlackCore::Data
QString CGlobalSetup::convertToQString(const QString &separator, bool i18n) const QString CGlobalSetup::convertToQString(const QString &separator, bool i18n) const
{ {
QString s = QString s =
u"timestamp: " % this->getFormattedUtcTimestampYmdhms() % separator % u"Global setup loaded: " u"Global setup loaded: " % separator % u"Mapping min.version: " % this->getMappingMinimumVersionString() % separator
% u"Mapping min.version: " % this->getMappingMinimumVersionString() % separator
% u"Distribution URLs: " % getSwiftUpdateInfoFileUrls().toQString(i18n) % separator % u"Help URLs: " % m_onlineHelpUrls.toQString(i18n) % separator; % u"Distribution URLs: " % getSwiftUpdateInfoFileUrls().toQString(i18n) % separator % u"Help URLs: " % m_onlineHelpUrls.toQString(i18n) % separator;
s += s +=
@@ -203,7 +200,6 @@ namespace BlackCore::Data
QVariant CGlobalSetup::propertyByIndex(BlackMisc::CPropertyIndexRef index) const QVariant CGlobalSetup::propertyByIndex(BlackMisc::CPropertyIndexRef index) const
{ {
if (index.isMyself()) { return CVariant::fromValue(*this); } if (index.isMyself()) { return CVariant::fromValue(*this); }
if (ITimestampBased::canHandleIndex(index)) { return ITimestampBased::propertyByIndex(index); }
const ColumnIndex i = index.frontCasted<ColumnIndex>(); const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i) switch (i)
@@ -235,11 +231,6 @@ namespace BlackCore::Data
(*this) = variant.value<CGlobalSetup>(); (*this) = variant.value<CGlobalSetup>();
return; return;
} }
if (ITimestampBased::canHandleIndex(index))
{
ITimestampBased::setPropertyByIndex(index, variant);
return;
}
const ColumnIndex i = index.frontCasted<ColumnIndex>(); const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i) switch (i)

5
src/blackcore/data/globalsetup.h
View File

@@ -14,7 +14,6 @@
#include "blackmisc/datacache.h" #include "blackmisc/datacache.h"
#include "blackmisc/metaclass.h" #include "blackmisc/metaclass.h"
#include "blackmisc/propertyindex.h" #include "blackmisc/propertyindex.h"
#include "blackmisc/timestampbased.h"
#include "blackmisc/valueobject.h" #include "blackmisc/valueobject.h"
#include "blackmisc/variant.h" #include "blackmisc/variant.h"
@@ -29,8 +28,7 @@ namespace BlackCore::Data
//! \note also called the bootstrap file as it is required once to get information where all the data are located //! \note also called the bootstrap file as it is required once to get information where all the data are located
class BLACKCORE_EXPORT CGlobalSetup : class BLACKCORE_EXPORT CGlobalSetup :
public BlackMisc::CValueObject<CGlobalSetup>, public BlackMisc::CValueObject<CGlobalSetup>,
public BlackMisc::CIdentifiable, public BlackMisc::CIdentifiable
public BlackMisc::ITimestampBased
{ {
public: public:
//! Properties by index //! Properties by index
@@ -222,7 +220,6 @@ namespace BlackCore::Data
BLACK_METACLASS( BLACK_METACLASS(
CGlobalSetup, CGlobalSetup,
BLACK_METAMEMBER(timestampMSecsSinceEpoch),
BLACK_METAMEMBER(crashReportServerUrl), BLACK_METAMEMBER(crashReportServerUrl),
BLACK_METAMEMBER(dbRootDirectoryUrl), BLACK_METAMEMBER(dbRootDirectoryUrl),
BLACK_METAMEMBER(dbHttpPort), BLACK_METAMEMBER(dbHttpPort),