From afbb87298fac33618f9ad80e1fe2e3b603c74800 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 8 May 2017 02:57:02 +0200 Subject: [PATCH] Ref T77, prefix for getDbKeyAsStringInParentheses --- src/blackmisc/aviation/aircrafticaocode.cpp | 6 +++--- src/blackmisc/aviation/airlineicaocode.cpp | 4 ++-- src/blackmisc/db/datastore.cpp | 4 ++-- src/blackmisc/db/datastore.h | 2 +- src/blackmisc/network/authenticateduser.cpp | 2 +- src/blackmisc/network/role.cpp | 2 +- src/blackmisc/simulation/aircraftmodel.cpp | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/blackmisc/aviation/aircrafticaocode.cpp b/src/blackmisc/aviation/aircrafticaocode.cpp index 2c588d4be..addf5f9a6 100644 --- a/src/blackmisc/aviation/aircrafticaocode.cpp +++ b/src/blackmisc/aviation/aircrafticaocode.cpp @@ -336,7 +336,7 @@ namespace BlackMisc if (s.isEmpty()) s = "????"; if (hasManufacturer()) { s = s.append(" ").append(getManufacturer()); } if (hasModelDescription()) { s = s.append(" ").append(getModelDescription()); } - return s.append(" ").append(getDbKeyAsStringInParentheses()); + return s.append(getDbKeyAsStringInParentheses(" ")); } QString CAircraftIcaoCode::getCombinedIataStringWithKey() const @@ -347,7 +347,7 @@ namespace BlackMisc if (hasDesignator()) { s.append(" ").append(getDesignator()); } if (hasManufacturer()) { s = s.append(" ").append(getManufacturer()); } if (hasModelDescription()) { s = s.append(" ").append(getModelDescription()); } - return s.append(" ").append(getDbKeyAsStringInParentheses()); + return s.append(getDbKeyAsStringInParentheses(" ")); } QString CAircraftIcaoCode::getCombinedFamilyStringWithKey() const @@ -358,7 +358,7 @@ namespace BlackMisc if (hasDesignator()) { s.append(" ").append(getDesignator()); } if (hasManufacturer()) { s.append(" ").append(getManufacturer()); } if (hasModelDescription()) { s.append(" ").append(getModelDescription()); } - return s.append(" ").append(getDbKeyAsStringInParentheses()); + return s.append(getDbKeyAsStringInParentheses(" ")); } bool CAircraftIcaoCode::hasCompleteData() const diff --git a/src/blackmisc/aviation/airlineicaocode.cpp b/src/blackmisc/aviation/airlineicaocode.cpp index 9c2e4c708..27b9d6308 100644 --- a/src/blackmisc/aviation/airlineicaocode.cpp +++ b/src/blackmisc/aviation/airlineicaocode.cpp @@ -62,7 +62,7 @@ namespace BlackMisc { if (this->isLoadedFromDb()) { - return this->getVDesignator() % QLatin1Char(' ') % this->getDbKeyAsStringInParentheses(); + return this->getVDesignator() % this->getDbKeyAsStringInParentheses(" "); } else { @@ -350,7 +350,7 @@ namespace BlackMisc QString s(getVDesignator()); if (s.isEmpty()) s = "????"; if (hasName()) { s = s.append(" ").append(getName()); } - return s.append(" ").append(getDbKeyAsStringInParentheses()); + return s.append(getDbKeyAsStringInParentheses(" ")); } CAirlineIcaoCode CAirlineIcaoCode::thisOrCallsignCode(const CCallsign &callsign) const diff --git a/src/blackmisc/db/datastore.cpp b/src/blackmisc/db/datastore.cpp index 641dc52df..6ace72931 100644 --- a/src/blackmisc/db/datastore.cpp +++ b/src/blackmisc/db/datastore.cpp @@ -25,10 +25,10 @@ namespace BlackMisc return QString::number(this->m_dbKey); } - QString IDatastoreObjectWithIntegerKey::getDbKeyAsStringInParentheses() const + QString IDatastoreObjectWithIntegerKey::getDbKeyAsStringInParentheses(const QString &prefix) const { if (this->m_dbKey < 0) { return ""; } - return "(" + QString::number(this->m_dbKey) + ")"; + return prefix + "(" + QString::number(this->m_dbKey) + ")"; } void IDatastoreObjectWithIntegerKey::setDbKey(const QString &key) diff --git a/src/blackmisc/db/datastore.h b/src/blackmisc/db/datastore.h index e1b6ab68d..8ff45826f 100644 --- a/src/blackmisc/db/datastore.h +++ b/src/blackmisc/db/datastore.h @@ -62,7 +62,7 @@ namespace BlackMisc QJsonValue getDbKeyAsJsonValue() const; //! Db ley in parentheses, e.g. "(3)" - QString getDbKeyAsStringInParentheses() const; + QString getDbKeyAsStringInParentheses(const QString &prefix = {}) const; //! Set the DB key void setDbKey(int key) { m_dbKey = key; } diff --git a/src/blackmisc/network/authenticateduser.cpp b/src/blackmisc/network/authenticateduser.cpp index 144fad362..4be5844b0 100644 --- a/src/blackmisc/network/authenticateduser.cpp +++ b/src/blackmisc/network/authenticateduser.cpp @@ -53,7 +53,7 @@ namespace BlackMisc QString s = this->m_realname; if (this->hasValidDbKey()) { - s.append(" ").append(this->getDbKeyAsStringInParentheses()); + s.append(this->getDbKeyAsStringInParentheses(" ")); } return s; } diff --git a/src/blackmisc/network/role.cpp b/src/blackmisc/network/role.cpp index a040f9038..8001a4b07 100644 --- a/src/blackmisc/network/role.cpp +++ b/src/blackmisc/network/role.cpp @@ -24,7 +24,7 @@ namespace BlackMisc Q_UNUSED(i18n); return "Role: " + m_name + " description: " + m_description + - " " + this->getDbKeyAsStringInParentheses(); + this->getDbKeyAsStringInParentheses(" "); } CVariant CRole::propertyByIndex(const CPropertyIndex &index) const diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp index aaa8825f0..3c135eb2d 100644 --- a/src/blackmisc/simulation/aircraftmodel.cpp +++ b/src/blackmisc/simulation/aircraftmodel.cpp @@ -145,7 +145,7 @@ namespace BlackMisc if (this->hasValidDbKey()) { return this->hasModelString() ? - QString(this->getModelString()).append(" ").append(this->getDbKeyAsStringInParentheses()) : + QString(this->getModelString() + this->getDbKeyAsStringInParentheses(" ")) : this->getDbKeyAsString(); } else