mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-22 23:05:36 +08:00
refactor: Remove timestamp from bootstrap.json
As the bootstrap.json is now exclusivley loaded from a file, the timestamp is not used anymore.
This commit is contained in:
@@ -34,7 +34,6 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"timestampMSecsSinceEpoch": 1559602257000,
|
||||
"vatsimDataFileUrls": {
|
||||
"containerbase": [
|
||||
{
|
||||
|
||||
@@ -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<ColumnIndex>();
|
||||
switch (i)
|
||||
@@ -235,11 +231,6 @@ namespace BlackCore::Data
|
||||
(*this) = variant.value<CGlobalSetup>();
|
||||
return;
|
||||
}
|
||||
if (ITimestampBased::canHandleIndex(index))
|
||||
{
|
||||
ITimestampBased::setPropertyByIndex(index, variant);
|
||||
return;
|
||||
}
|
||||
|
||||
const ColumnIndex i = index.frontCasted<ColumnIndex>();
|
||||
switch (i)
|
||||
|
||||
@@ -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<CGlobalSetup>,
|
||||
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),
|
||||
|
||||
Reference in New Issue
Block a user