From 34cb0abdf0f2c91606c77ec191635b768617b389 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 4 Dec 2018 14:34:45 +0100 Subject: [PATCH] Ref T442, style --- src/blackgui/models/aircrafticaolistmodel.cpp | 32 +++++++++---------- src/blackgui/models/airportlistmodel.cpp | 16 +++++----- src/blackgui/models/distributorlistmodel.cpp | 30 ++++++++--------- src/blackgui/models/windlayerlistmodel.cpp | 10 +++--- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/blackgui/models/aircrafticaolistmodel.cpp b/src/blackgui/models/aircrafticaolistmodel.cpp index 0f52e25d3..89ed68a60 100644 --- a/src/blackgui/models/aircrafticaolistmodel.cpp +++ b/src/blackgui/models/aircrafticaolistmodel.cpp @@ -26,25 +26,25 @@ namespace BlackGui CAircraftIcaoCodeListModel::CAircraftIcaoCodeListModel(QObject *parent) : CListModelDbObjects("AircraftIcaoListModel", parent) { - this->m_columns.addColumn(CColumn::standardString("id", CAircraftIcaoCode::IndexDbIntegerKey, CDefaultFormatter::alignRightVCenter())); - this->m_columns.addColumn(CColumn::standardString("ICAO", CAircraftIcaoCode::IndexAircraftDesignator)); - this->m_columns.addColumn(CColumn::standardString("IATA", CAircraftIcaoCode::IndexIataCode)); - this->m_columns.addColumn(CColumn::standardValueObject("rank", CAircraftIcaoCode::IndexRank, CDefaultFormatter::alignRightVCenter())); - this->m_columns.addColumn(CColumn::standardString("manufacturer", CAircraftIcaoCode::IndexManufacturer)); - this->m_columns.addColumn(CColumn::standardString("family", CAircraftIcaoCode::IndexFamily)); - this->m_columns.addColumn(CColumn::standardString("ICAO desc.", "ICAO description", CAircraftIcaoCode::IndexModelDescription)); - this->m_columns.addColumn(CColumn::standardString("IATA desc.", "IATA description", CAircraftIcaoCode::IndexModelIataDescription)); - this->m_columns.addColumn(CColumn::standardString("swift desc.", "swift description", CAircraftIcaoCode::IndexModelSwiftDescription)); - this->m_columns.addColumn(CColumn::standardString("type", "combined type", CAircraftIcaoCode::IndexCombinedAircraftType)); - this->m_columns.addColumn(CColumn::standardString("WTC", "wake turbulence category", CAircraftIcaoCode::IndexWtc)); - this->m_columns.addColumn(CColumn("mil.", "military", CAircraftIcaoCode::IndexIsMilitary, new CBoolIconFormatter("military", "civil"))); - this->m_columns.addColumn(CColumn("VTOL", "vertical take-off and landing", CAircraftIcaoCode::IndexIsVtol, new CBoolIconFormatter("VTOL", "non VTOL"))); this->m_columns.addColumn(CColumn("leg.", "legacy", CAircraftIcaoCode::IndexIsLegacy, new CBoolIconFormatter("legacy", "operating"))); - this->m_columns.addColumn(CColumn("real.", "real world aircraft", CAircraftIcaoCode::IndexIsRealworld, new CBoolIconFormatter("real", "non real"))); - this->m_columns.addColumn(CColumn::standardString("changed", CAircraftIcaoCode::IndexUtcTimestampFormattedYmdhms)); + m_columns.addColumn(CColumn::standardString("id", CAircraftIcaoCode::IndexDbIntegerKey, CDefaultFormatter::alignRightVCenter())); + m_columns.addColumn(CColumn::standardString("ICAO", CAircraftIcaoCode::IndexAircraftDesignator)); + m_columns.addColumn(CColumn::standardString("IATA", CAircraftIcaoCode::IndexIataCode)); + m_columns.addColumn(CColumn::standardValueObject("rank", CAircraftIcaoCode::IndexRank, CDefaultFormatter::alignRightVCenter())); + m_columns.addColumn(CColumn::standardString("manufacturer", CAircraftIcaoCode::IndexManufacturer)); + m_columns.addColumn(CColumn::standardString("family", CAircraftIcaoCode::IndexFamily)); + m_columns.addColumn(CColumn::standardString("ICAO desc.", "ICAO description", CAircraftIcaoCode::IndexModelDescription)); + m_columns.addColumn(CColumn::standardString("IATA desc.", "IATA description", CAircraftIcaoCode::IndexModelIataDescription)); + m_columns.addColumn(CColumn::standardString("swift desc.", "swift description", CAircraftIcaoCode::IndexModelSwiftDescription)); + m_columns.addColumn(CColumn::standardString("type", "combined type", CAircraftIcaoCode::IndexCombinedAircraftType)); + m_columns.addColumn(CColumn::standardString("WTC", "wake turbulence category", CAircraftIcaoCode::IndexWtc)); + m_columns.addColumn(CColumn("mil.", "military", CAircraftIcaoCode::IndexIsMilitary, new CBoolIconFormatter("military", "civil"))); + m_columns.addColumn(CColumn("VTOL", "vertical take-off and landing", CAircraftIcaoCode::IndexIsVtol, new CBoolIconFormatter("VTOL", "non VTOL"))); m_columns.addColumn(CColumn("leg.", "legacy", CAircraftIcaoCode::IndexIsLegacy, new CBoolIconFormatter("legacy", "operating"))); + m_columns.addColumn(CColumn("real.", "real world aircraft", CAircraftIcaoCode::IndexIsRealworld, new CBoolIconFormatter("real", "non real"))); + m_columns.addColumn(CColumn::standardString("changed", CAircraftIcaoCode::IndexUtcTimestampFormattedYmdhms)); // default sort order this->setSortColumnByPropertyIndex(CAircraftIcaoCode::IndexAircraftDesignator); - this->m_sortOrder = Qt::AscendingOrder; + m_sortOrder = Qt::AscendingOrder; } } // ns } // ns diff --git a/src/blackgui/models/airportlistmodel.cpp b/src/blackgui/models/airportlistmodel.cpp index 669dcbc9d..c8133cfe2 100644 --- a/src/blackgui/models/airportlistmodel.cpp +++ b/src/blackgui/models/airportlistmodel.cpp @@ -28,17 +28,17 @@ namespace BlackGui CAirportListModel::CAirportListModel(QObject *parent) : CListModelBase("AirportListModel", parent) { - this->m_columns.addColumn(CColumn::standardValueObject("ICAO", CAirport::IndexIcao)); - this->m_columns.addColumn(CColumn("distance", CAirport::IndexRelativeDistance, new CAirspaceDistanceFormatter())); - this->m_columns.addColumn(CColumn("bearing", CAirport::IndexRelativeBearing, new CAngleDegreeFormatter())); - this->m_columns.addColumn(CColumn::standardString("name", CAirport::IndexDescriptiveName)); - this->m_columns.addColumn(CColumn("elevation", CAirport::IndexElevation, new CAltitudeFormatter())); - this->m_columns.addColumn(CColumn("latitude", CAirport::IndexLatitude, new CLatLonFormatter())); - this->m_columns.addColumn(CColumn("longitude", CAirport::IndexLongitude, new CLatLonFormatter())); + m_columns.addColumn(CColumn::standardValueObject("ICAO", CAirport::IndexIcao)); + m_columns.addColumn(CColumn("distance", CAirport::IndexRelativeDistance, new CAirspaceDistanceFormatter())); + m_columns.addColumn(CColumn("bearing", CAirport::IndexRelativeBearing, new CAngleDegreeFormatter())); + m_columns.addColumn(CColumn::standardString("name", CAirport::IndexDescriptiveName)); + m_columns.addColumn(CColumn("elevation", CAirport::IndexElevation, new CAltitudeFormatter())); + m_columns.addColumn(CColumn("latitude", CAirport::IndexLatitude, new CLatLonFormatter())); + m_columns.addColumn(CColumn("longitude", CAirport::IndexLongitude, new CLatLonFormatter())); // default sort order this->setSortColumnByPropertyIndex(CAirport::IndexRelativeDistance); - this->m_sortOrder = Qt::AscendingOrder; + m_sortOrder = Qt::AscendingOrder; // force strings for translation in resource files (void)QT_TRANSLATE_NOOP("ModelAirportList", "ICAO"); diff --git a/src/blackgui/models/distributorlistmodel.cpp b/src/blackgui/models/distributorlistmodel.cpp index a85806923..94c17d905 100644 --- a/src/blackgui/models/distributorlistmodel.cpp +++ b/src/blackgui/models/distributorlistmodel.cpp @@ -40,41 +40,41 @@ namespace BlackGui void CDistributorListModel::setDistributorMode(CDistributorListModel::DistributorMode distributorMode) { - if (this->m_distributorMode == distributorMode) { return; } - this->m_distributorMode = distributorMode; - this->m_columns.clear(); + if (m_distributorMode == distributorMode) { return; } + m_distributorMode = distributorMode; + m_columns.clear(); switch (distributorMode) { case NormalWithOrder: - this->m_columns.addColumn(CColumn::orderColumn()); + m_columns.addColumn(CColumn::orderColumn()); BLACK_FALLTHROUGH; case NotSet: case Normal: { - this->m_columns.addColumn(CColumn::standardString("key", CDistributor::IndexDbStringKey)); - this->m_columns.addColumn(CColumn::standardString("description", CDistributor::IndexDescription)); - this->m_columns.addColumn(CColumn::standardString("alias1", CDistributor::IndexAlias1)); - this->m_columns.addColumn(CColumn::standardString("alias2", CDistributor::IndexAlias2)); - this->m_columns.addColumn(CColumn::standardString("sim.", "simulator", { CDistributor::IndexSimulator, CSimulatorInfo::IndexString})); - this->m_columns.addColumn(CColumn::standardString("changed", CDistributor::IndexUtcTimestampFormattedYmdhms)); + m_columns.addColumn(CColumn::standardString("key", CDistributor::IndexDbStringKey)); + m_columns.addColumn(CColumn::standardString("description", CDistributor::IndexDescription)); + m_columns.addColumn(CColumn::standardString("alias1", CDistributor::IndexAlias1)); + m_columns.addColumn(CColumn::standardString("alias2", CDistributor::IndexAlias2)); + m_columns.addColumn(CColumn::standardString("sim.", "simulator", { CDistributor::IndexSimulator, CSimulatorInfo::IndexString})); + m_columns.addColumn(CColumn::standardString("changed", CDistributor::IndexUtcTimestampFormattedYmdhms)); // default sort order this->setSortColumnByPropertyIndex(CDistributor::IndexDbStringKey); - this->m_sortOrder = Qt::AscendingOrder; + m_sortOrder = Qt::AscendingOrder; } break; case MinimalWithOrder: - this->m_columns.addColumn(CColumn::orderColumn()); + m_columns.addColumn(CColumn::orderColumn()); BLACK_FALLTHROUGH; case Minimal: { - this->m_columns.addColumn(CColumn::standardString("key", CDistributor::IndexDbStringKey)); - this->m_columns.addColumn(CColumn::standardString("description", CDistributor::IndexDescription)); + m_columns.addColumn(CColumn::standardString("key", CDistributor::IndexDbStringKey)); + m_columns.addColumn(CColumn::standardString("description", CDistributor::IndexDescription)); // default sort order this->setSortColumnByPropertyIndex(CDistributor::IndexDbStringKey); - this->m_sortOrder = Qt::AscendingOrder; + m_sortOrder = Qt::AscendingOrder; } break; diff --git a/src/blackgui/models/windlayerlistmodel.cpp b/src/blackgui/models/windlayerlistmodel.cpp index e5369b92b..26504163c 100644 --- a/src/blackgui/models/windlayerlistmodel.cpp +++ b/src/blackgui/models/windlayerlistmodel.cpp @@ -24,14 +24,14 @@ namespace BlackGui CWindLayerListModel::CWindLayerListModel(QObject *parent) : CListModelBase("WindLayerListModel", parent) { - this->m_columns.addColumn(CColumn("level", CWindLayer::IndexLevel, new CAltitudeFormatter())); - this->m_columns.addColumn(CColumn("direction", CWindLayer::IndexDirection, new CAngleDegreeFormatter())); - this->m_columns.addColumn(CColumn("speed", CWindLayer::IndexSpeed, new CSpeedKtsFormatter())); - this->m_columns.addColumn(CColumn("gust speed", CWindLayer::IndexGustSpeed, new CSpeedKtsFormatter())); + m_columns.addColumn(CColumn("level", CWindLayer::IndexLevel, new CAltitudeFormatter())); + m_columns.addColumn(CColumn("direction", CWindLayer::IndexDirection, new CAngleDegreeFormatter())); + m_columns.addColumn(CColumn("speed", CWindLayer::IndexSpeed, new CSpeedKtsFormatter())); + m_columns.addColumn(CColumn("gust speed", CWindLayer::IndexGustSpeed, new CSpeedKtsFormatter())); // default sort order this->setSortColumnByPropertyIndex(CWindLayer::IndexLevel); - this->m_sortOrder = Qt::AscendingOrder; + m_sortOrder = Qt::AscendingOrder; // force strings for translation in resource files (void)QT_TRANSLATE_NOOP("ModelWindLayerList", "level");