diff --git a/src/blackmisc/aviation/aircrafticaocode.cpp b/src/blackmisc/aviation/aircrafticaocode.cpp index 3b91e0fd2..fe5bca76f 100644 --- a/src/blackmisc/aviation/aircrafticaocode.cpp +++ b/src/blackmisc/aviation/aircrafticaocode.cpp @@ -794,7 +794,7 @@ namespace BlackMisc model, modelIata, modelSwift, wtc, real, legacy, military, rank ); - code.setKeyAndTimestampFromDatabaseJson(json, prefix); + code.setKeyVersionTimestampFromDatabaseJson(json, prefix); return code; } diff --git a/src/blackmisc/aviation/airlineicaocode.cpp b/src/blackmisc/aviation/airlineicaocode.cpp index a42be3ead..1cc458b64 100644 --- a/src/blackmisc/aviation/airlineicaocode.cpp +++ b/src/blackmisc/aviation/airlineicaocode.cpp @@ -455,7 +455,7 @@ namespace BlackMisc code.setGroupDesignator(groupDesignator); code.setGroupId(groupId); code.setGroupName(groupName); - code.setKeyAndTimestampFromDatabaseJson(json, prefix); + code.setKeyVersionTimestampFromDatabaseJson(json, prefix); return code; } diff --git a/src/blackmisc/aviation/airport.cpp b/src/blackmisc/aviation/airport.cpp index 0b0b2432a..fe185379a 100644 --- a/src/blackmisc/aviation/airport.cpp +++ b/src/blackmisc/aviation/airport.cpp @@ -101,7 +101,7 @@ namespace BlackMisc const CCountry country = CCountry::fromDatabaseJson(json, "ctry_"); airport.setCountry(country); - airport.setKeyAndTimestampFromDatabaseJson(json, prefix); + airport.setKeyVersionTimestampFromDatabaseJson(json, prefix); return airport; } diff --git a/src/blackmisc/aviation/livery.cpp b/src/blackmisc/aviation/livery.cpp index 357097ed1..0e8f7445d 100644 --- a/src/blackmisc/aviation/livery.cpp +++ b/src/blackmisc/aviation/livery.cpp @@ -243,7 +243,7 @@ namespace BlackMisc if (combinedCode.isEmpty()) { CLivery liveryStub; // only consists of id, maybe key and timestamp - liveryStub.setKeyAndTimestampFromDatabaseJson(json, prefix); + liveryStub.setKeyVersionTimestampFromDatabaseJson(json, prefix); return liveryStub; } @@ -255,7 +255,7 @@ namespace BlackMisc CAirlineIcaoCode airline; if (!isColorLivery) { airline = CAirlineIcaoCode::fromDatabaseJson(json, "al_"); } CLivery livery(combinedCode, airline, description, colorFuselage, colorTail, military); - livery.setKeyAndTimestampFromDatabaseJson(json, prefix); + livery.setKeyVersionTimestampFromDatabaseJson(json, prefix); // color liveries must have default ICAO, but airline liveries must have DB airline BLACK_VERIFY_X((livery.isColorLivery() && !livery.getAirlineIcaoCode().hasValidDbKey()) || (livery.isAirlineLivery() && livery.getAirlineIcaoCode().hasValidDbKey()), Q_FUNC_INFO, "inconsistent data"); @@ -275,7 +275,7 @@ namespace BlackMisc if (combinedCode.isEmpty()) { CLivery liveryStub; // only consists of id, maybe key and timestamp - liveryStub.setKeyAndTimestampFromDatabaseJson(json, prefix); + liveryStub.setKeyVersionTimestampFromDatabaseJson(json, prefix); return liveryStub; } @@ -303,7 +303,7 @@ namespace BlackMisc } CLivery livery(combinedCode, airline, description, colorFuselage, colorTail, military); - livery.setKeyAndTimestampFromDatabaseJson(json, prefix); + livery.setKeyVersionTimestampFromDatabaseJson(json, prefix); // color liveries must have default ICAO, but airline liveries must have DB airline BLACK_VERIFY_X((livery.isColorLivery() && !livery.getAirlineIcaoCode().hasValidDbKey()) || (livery.isAirlineLivery() && livery.getAirlineIcaoCode().hasValidDbKey()), Q_FUNC_INFO, "inconsistent data"); diff --git a/src/blackmisc/country.cpp b/src/blackmisc/country.cpp index 324c4c454..c9bad43ba 100644 --- a/src/blackmisc/country.cpp +++ b/src/blackmisc/country.cpp @@ -197,7 +197,7 @@ namespace BlackMisc country.setAlias2(alias2); country.setIso3Code(iso3); country.setHistoric(stringToBool(historic)); - country.setKeyAndTimestampFromDatabaseJson(json, prefix); + country.setKeyVersionTimestampFromDatabaseJson(json, prefix); return country; } diff --git a/src/blackmisc/db/artifact.cpp b/src/blackmisc/db/artifact.cpp index 1712e865c..c230e3f01 100644 --- a/src/blackmisc/db/artifact.cpp +++ b/src/blackmisc/db/artifact.cpp @@ -175,7 +175,7 @@ namespace BlackMisc const bool existing = json.value("existing").toBool(); CArtifact artifact(name, version, md5, type, size, existing, platform); - artifact.setKeyAndTimestampFromDatabaseJson(json); + artifact.setKeyVersionTimestampFromDatabaseJson(json); if (json.contains("distributions")) { const QJsonObject distJson = json.value("distributions").toObject(); diff --git a/src/blackmisc/db/datastore.cpp b/src/blackmisc/db/datastore.cpp index 5f82ff41a..9481470e8 100644 --- a/src/blackmisc/db/datastore.cpp +++ b/src/blackmisc/db/datastore.cpp @@ -20,7 +20,7 @@ namespace BlackMisc { namespace Db { - void IDatastoreObject::setTimestampAndVersionFromDatabaseJson(const QJsonObject &json, const QString &prefix) + void IDatastoreObject::setTimestampVersionFromDatabaseJson(const QJsonObject &json, const QString &prefix) { // we check 2 formats, the DB format and the backend object format QString timestampString(json.value(prefix % u"lastupdated").toString()); @@ -84,12 +84,12 @@ namespace BlackMisc return QJsonValue(); } - void IDatastoreObjectWithIntegerKey::setKeyAndTimestampFromDatabaseJson(const QJsonObject &json, const QString &prefix) + void IDatastoreObjectWithIntegerKey::setKeyVersionTimestampFromDatabaseJson(const QJsonObject &json, const QString &prefix) { // this function is performance sensitive, as it is called for all DB data const int dbKey = json.value(prefix % u"id").toInt(-1); this->setDbKey(dbKey); - IDatastoreObject::setTimestampAndVersionFromDatabaseJson(json, prefix); + IDatastoreObject::setTimestampVersionFromDatabaseJson(json, prefix); } bool IDatastoreObjectWithIntegerKey::existsKey(const QJsonObject &json, const QString &prefix) @@ -176,11 +176,11 @@ namespace BlackMisc return empty; } - void IDatastoreObjectWithStringKey::setKeyAndTimestampFromDatabaseJson(const QJsonObject &json, const QString &prefix) + void IDatastoreObjectWithStringKey::setKeyVersionTimestampFromDatabaseJson(const QJsonObject &json, const QString &prefix) { QString dbKey = json.value(prefix % u"id").toString(); this->setDbKey(dbKey); - IDatastoreObject::setTimestampAndVersionFromDatabaseJson(json, prefix); + IDatastoreObject::setTimestampVersionFromDatabaseJson(json, prefix); } bool IDatastoreObjectWithStringKey::existsKey(const QJsonObject &json, const QString &prefix) diff --git a/src/blackmisc/db/datastore.h b/src/blackmisc/db/datastore.h index 29f9d2d59..e043f4e75 100644 --- a/src/blackmisc/db/datastore.h +++ b/src/blackmisc/db/datastore.h @@ -58,7 +58,7 @@ namespace BlackMisc protected: //! Set versionn and timestamp values - void setTimestampAndVersionFromDatabaseJson(const QJsonObject &json, const QString &prefix = QString()); + void setTimestampVersionFromDatabaseJson(const QJsonObject &json, const QString &prefix = QString()); QString m_version; //!< version info }; @@ -128,7 +128,7 @@ namespace BlackMisc IDatastoreObjectWithIntegerKey(int key) : m_dbKey(key) {} //! Set key and timestamp values - void setKeyAndTimestampFromDatabaseJson(const QJsonObject &json, const QString &prefix = QString()); + void setKeyVersionTimestampFromDatabaseJson(const QJsonObject &json, const QString &prefix = QString()); //! Is a key available? static bool existsKey(const QJsonObject &json, const QString &prefix = QString()); @@ -209,7 +209,7 @@ namespace BlackMisc IDatastoreObjectWithStringKey(const QString &key) : m_dbKey(key) {} //! Set key and timestamp values - void setKeyAndTimestampFromDatabaseJson(const QJsonObject &json, const QString &prefix = QString()); + void setKeyVersionTimestampFromDatabaseJson(const QJsonObject &json, const QString &prefix = QString()); //! Is a key available? static bool existsKey(const QJsonObject &json, const QString &prefix = QString()); diff --git a/src/blackmisc/db/dbinfo.cpp b/src/blackmisc/db/dbinfo.cpp index 18c417cff..85e29dab8 100644 --- a/src/blackmisc/db/dbinfo.cpp +++ b/src/blackmisc/db/dbinfo.cpp @@ -148,7 +148,7 @@ namespace BlackMisc const int entries(json.value(prefix + "entries").toInt()); const QString tableName(json.value(prefix + "tablename").toString()); CDbInfo dbInfo(id, tableName, entries); - dbInfo.setKeyAndTimestampFromDatabaseJson(json, prefix); + dbInfo.setKeyVersionTimestampFromDatabaseJson(json, prefix); return dbInfo; } diff --git a/src/blackmisc/db/distribution.cpp b/src/blackmisc/db/distribution.cpp index aa11a8715..f2073e1ae 100644 --- a/src/blackmisc/db/distribution.cpp +++ b/src/blackmisc/db/distribution.cpp @@ -134,7 +134,7 @@ namespace BlackMisc const bool restricted = json.value("restricted").toBool(); const int stability = json.value("stability").toInt(); CDistribution distribution(channel, stability, restricted); - distribution.setKeyAndTimestampFromDatabaseJson(json); + distribution.setKeyVersionTimestampFromDatabaseJson(json); // add the URLs for (int i = 0; i < 5; i++) diff --git a/src/blackmisc/simulation/distributor.cpp b/src/blackmisc/simulation/distributor.cpp index c39efb598..5b8cfb88f 100644 --- a/src/blackmisc/simulation/distributor.cpp +++ b/src/blackmisc/simulation/distributor.cpp @@ -170,7 +170,7 @@ namespace BlackMisc { // stub, only key, maybe also timestamps CDistributor distributorStub; - distributorStub.setKeyAndTimestampFromDatabaseJson(json, prefix); + distributorStub.setKeyVersionTimestampFromDatabaseJson(json, prefix); return distributorStub; } @@ -179,7 +179,7 @@ namespace BlackMisc const QString alias2(json.value(prefix % u"alias2").toString()); Q_ASSERT_X(!description.isEmpty(), Q_FUNC_INFO, "Missing description"); CDistributor distributor("", description, alias1, alias2, simulator); - distributor.setKeyAndTimestampFromDatabaseJson(json, prefix); + distributor.setKeyVersionTimestampFromDatabaseJson(json, prefix); distributor.setLoadedFromDb(true); return distributor; }