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

CAircraftIcaoCode/CAirlineIcao style

Browse Source
This commit is contained in:
Klaus Basan
2019-03-05 03:25:58 +01:00
committed by Mat Sutcliffe
parent 8154b67fcc
commit 4e20c20274
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/blackmisc/aviation/aircrafticaocode.cpp
View File

@@ -585,19 +585,19 @@ namespace BlackMisc
case IndexAircraftDesignator: return CVariant::fromValue(m_designator); case IndexAircraftDesignator: return CVariant::fromValue(m_designator);
case IndexCategory: return m_category.propertyByIndex(index.copyFrontRemoved()); case IndexCategory: return m_category.propertyByIndex(index.copyFrontRemoved());
case IndexIataCode: return CVariant::fromValue(m_iataCode); case IndexIataCode: return CVariant::fromValue(m_iataCode);
case IndexFamily: return CVariant::fromValue(m_family); case IndexFamily: return CVariant::fromValue(m_family);
case IndexCombinedAircraftType: return CVariant::fromValue(m_combinedType); case IndexCombinedAircraftType: return CVariant::fromValue(m_combinedType);
case IndexModelDescription: return CVariant::fromValue(m_modelDescription); case IndexModelDescription: return CVariant::fromValue(m_modelDescription);
case IndexModelIataDescription: return CVariant::fromValue(m_modelIataDescription); case IndexModelIataDescription: return CVariant::fromValue(m_modelIataDescription);
case IndexModelSwiftDescription: return CVariant::fromValue(m_modelSwiftDescription); case IndexModelSwiftDescription: return CVariant::fromValue(m_modelSwiftDescription);
case IndexCombinedDescription: return CVariant::fromValue(this->getCombinedModelDescription()); case IndexCombinedDescription: return CVariant::fromValue(this->getCombinedModelDescription());
case IndexManufacturer: return CVariant::fromValue(m_manufacturer); case IndexManufacturer: return CVariant::fromValue(m_manufacturer);
case IndexWtc: return CVariant::fromValue(m_wtc); case IndexWtc: return CVariant::fromValue(m_wtc);
case IndexIsVtol: return CVariant::fromValue(this->isVtol()); case IndexIsVtol: return CVariant::fromValue(this->isVtol());
case IndexIsLegacy: return CVariant::fromValue(m_legacy); case IndexIsLegacy: return CVariant::fromValue(m_legacy);
case IndexIsMilitary: return CVariant::fromValue(m_military); case IndexIsMilitary: return CVariant::fromValue(m_military);
case IndexIsRealworld: return CVariant::fromValue(m_realWorld); case IndexIsRealworld: return CVariant::fromValue(m_realWorld);
case IndexRank: return CVariant::fromValue(m_rank); case IndexRank: return CVariant::fromValue(m_rank);
case IndexDesignatorManufacturer: return CVariant::fromValue(this->getDesignatorManufacturer()); case IndexDesignatorManufacturer: return CVariant::fromValue(this->getDesignatorManufacturer());
default: return CValueObject::propertyByIndex(index); default: return CValueObject::propertyByIndex(index);
} }
@@ -637,10 +637,10 @@ namespace BlackMisc
case IndexAircraftDesignator: return m_designator.compare(compareValue.getDesignator(), Qt::CaseInsensitive); case IndexAircraftDesignator: return m_designator.compare(compareValue.getDesignator(), Qt::CaseInsensitive);
case IndexCategory: return m_category.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getCategory()); case IndexCategory: return m_category.comparePropertyByIndex(index.copyFrontRemoved(), compareValue.getCategory());
case IndexIataCode: return m_iataCode.compare(compareValue.getIataCode(), Qt::CaseInsensitive); case IndexIataCode: return m_iataCode.compare(compareValue.getIataCode(), Qt::CaseInsensitive);
case IndexFamily: return m_family.compare(compareValue.getFamily(), Qt::CaseInsensitive); case IndexFamily: return m_family.compare(compareValue.getFamily(), Qt::CaseInsensitive);
case IndexCombinedAircraftType: return m_combinedType.compare(compareValue.getCombinedType(), Qt::CaseInsensitive); case IndexCombinedAircraftType: return m_combinedType.compare(compareValue.getCombinedType(), Qt::CaseInsensitive);
case IndexModelDescription: return m_modelDescription.compare(compareValue.getModelDescription(), Qt::CaseInsensitive); case IndexModelDescription: return m_modelDescription.compare(compareValue.getModelDescription(), Qt::CaseInsensitive);
case IndexModelIataDescription: return m_modelIataDescription.compare(compareValue.getModelIataDescription(), Qt::CaseInsensitive); case IndexModelIataDescription: return m_modelIataDescription.compare(compareValue.getModelIataDescription(), Qt::CaseInsensitive);
case IndexModelSwiftDescription: return m_modelSwiftDescription.compare(compareValue.getModelSwiftDescription(), Qt::CaseInsensitive); case IndexModelSwiftDescription: return m_modelSwiftDescription.compare(compareValue.getModelSwiftDescription(), Qt::CaseInsensitive);
case IndexCombinedDescription: case IndexCombinedDescription:
{ {
@@ -657,12 +657,12 @@ namespace BlackMisc
return c; return c;
} }
case IndexManufacturer: return m_manufacturer.compare(compareValue.getManufacturer(), Qt::CaseInsensitive); case IndexManufacturer: return m_manufacturer.compare(compareValue.getManufacturer(), Qt::CaseInsensitive);
case IndexWtc: return m_wtc.compare(compareValue.getWtc(), Qt::CaseInsensitive); case IndexWtc: return m_wtc.compare(compareValue.getWtc(), Qt::CaseInsensitive);
case IndexIsLegacy: return Compare::compare(m_legacy, compareValue.isLegacyAircraft()); case IndexIsLegacy: return Compare::compare(m_legacy, compareValue.isLegacyAircraft());
case IndexIsMilitary: return Compare::compare(m_military, compareValue.isMilitary()); case IndexIsMilitary: return Compare::compare(m_military, compareValue.isMilitary());
case IndexIsVtol: return Compare::compare(isVtol(), compareValue.isVtol()); case IndexIsVtol: return Compare::compare(isVtol(), compareValue.isVtol());
case IndexIsRealworld: return Compare::compare(m_realWorld, compareValue.isRealWorld()); case IndexIsRealworld: return Compare::compare(m_realWorld, compareValue.isRealWorld());
case IndexRank: return Compare::compare(m_rank, compareValue.getRank()); case IndexRank: return Compare::compare(m_rank, compareValue.getRank());
case IndexDesignatorManufacturer: return getDesignatorManufacturer().compare(compareValue.getDesignatorManufacturer(), Qt::CaseInsensitive); case IndexDesignatorManufacturer: return getDesignatorManufacturer().compare(compareValue.getDesignatorManufacturer(), Qt::CaseInsensitive);
default: return CValueObject::comparePropertyByIndex(index, *this); default: return CValueObject::comparePropertyByIndex(index, *this);
} }
@@ -804,7 +804,7 @@ namespace BlackMisc
real, legacy, military, rank real, legacy, military, rank
); );
code.setKeyVersionTimestampFromDatabaseJson(json, prefix); code.setKeyVersionTimestampFromDatabaseJson(json, prefix);
if (categoryId >=0) { code.setCategoryId(categoryId); } if (categoryId >= 0) { code.setCategoryId(categoryId); }
return code; return code;
} }

2
src/blackmisc/aviation/aircrafticaocode.h
View File

@@ -299,7 +299,7 @@ namespace BlackMisc
void updateMissingParts(const CAircraftIcaoCode &otherIcaoCode); void updateMissingParts(const CAircraftIcaoCode &otherIcaoCode);
//! Validate data //! Validate data
BlackMisc::CStatusMessageList validate() const; CStatusMessageList validate() const;
//! As a brief HTML summary (e.g. used in tooltips) //! As a brief HTML summary (e.g. used in tooltips)
QString asHtmlSummary() const; QString asHtmlSummary() const;

2
src/blackmisc/aviation/airlineicaocode.h
View File

@@ -213,7 +213,7 @@ namespace BlackMisc
//! \copydoc Mixin::Index::setPropertyByIndex //! \copydoc Mixin::Index::setPropertyByIndex
void setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant); void setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant);
//! Compare for index //! \copydoc Mixin::Index::comparePropertyByIndex
int comparePropertyByIndex(const CPropertyIndex &index, const CAirlineIcaoCode &compareValue) const; int comparePropertyByIndex(const CPropertyIndex &index, const CAirlineIcaoCode &compareValue) const;
//! Validate data //! Validate data