diff --git a/resources/share/shared/bootstrap/bootstrap.json b/resources/share/shared/bootstrap/bootstrap.json index 92f59d697..463f796c0 100644 --- a/resources/share/shared/bootstrap/bootstrap.json +++ b/resources/share/shared/bootstrap/bootstrap.json @@ -34,7 +34,6 @@ } ] }, - "timestampMSecsSinceEpoch": 1559602257000, "vatsimDataFileUrls": { "containerbase": [ { diff --git a/src/blackcore/data/globalsetup.cpp b/src/blackcore/data/globalsetup.cpp index 31280e145..25ce3fdfb 100644 --- a/src/blackcore/data/globalsetup.cpp +++ b/src/blackcore/data/globalsetup.cpp @@ -27,8 +27,7 @@ BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackCore::Data, CGlobalSetup) namespace BlackCore::Data { - CGlobalSetup::CGlobalSetup() : CIdentifiable("CGlobalSetup"), - ITimestampBased(0) + CGlobalSetup::CGlobalSetup() : CIdentifiable("CGlobalSetup") {} CUrl CGlobalSetup::getDbIcaoReaderUrl() const @@ -183,9 +182,7 @@ namespace BlackCore::Data QString CGlobalSetup::convertToQString(const QString &separator, bool i18n) const { QString s = - u"timestamp: " % this->getFormattedUtcTimestampYmdhms() % separator % u"Global setup loaded: " - - % u"Mapping min.version: " % this->getMappingMinimumVersionString() % separator + u"Global setup loaded: " % separator % u"Mapping min.version: " % this->getMappingMinimumVersionString() % separator % u"Distribution URLs: " % getSwiftUpdateInfoFileUrls().toQString(i18n) % separator % u"Help URLs: " % m_onlineHelpUrls.toQString(i18n) % separator; s += @@ -203,7 +200,6 @@ namespace BlackCore::Data QVariant CGlobalSetup::propertyByIndex(BlackMisc::CPropertyIndexRef index) const { if (index.isMyself()) { return CVariant::fromValue(*this); } - if (ITimestampBased::canHandleIndex(index)) { return ITimestampBased::propertyByIndex(index); } const ColumnIndex i = index.frontCasted(); switch (i) @@ -235,11 +231,6 @@ namespace BlackCore::Data (*this) = variant.value(); return; } - if (ITimestampBased::canHandleIndex(index)) - { - ITimestampBased::setPropertyByIndex(index, variant); - return; - } const ColumnIndex i = index.frontCasted(); switch (i) diff --git a/src/blackcore/data/globalsetup.h b/src/blackcore/data/globalsetup.h index d4f0cd648..9a3c0b520 100644 --- a/src/blackcore/data/globalsetup.h +++ b/src/blackcore/data/globalsetup.h @@ -14,7 +14,6 @@ #include "blackmisc/datacache.h" #include "blackmisc/metaclass.h" #include "blackmisc/propertyindex.h" -#include "blackmisc/timestampbased.h" #include "blackmisc/valueobject.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 class BLACKCORE_EXPORT CGlobalSetup : public BlackMisc::CValueObject, - public BlackMisc::CIdentifiable, - public BlackMisc::ITimestampBased + public BlackMisc::CIdentifiable { public: //! Properties by index @@ -222,7 +220,6 @@ namespace BlackCore::Data BLACK_METACLASS( CGlobalSetup, - BLACK_METAMEMBER(timestampMSecsSinceEpoch), BLACK_METAMEMBER(crashReportServerUrl), BLACK_METAMEMBER(dbRootDirectoryUrl), BLACK_METAMEMBER(dbHttpPort),