From 02213e860dfd9fdde0766d935c7d0fff5cb91278 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 6 Dec 2018 03:14:58 +0100 Subject: [PATCH] Ref T442, style --- src/blackgui/models/airlineicaolistmodel.cpp | 26 +++++++++---------- src/blackgui/models/atcstationlistmodel.cpp | 2 +- src/blackgui/models/countrylistmodel.cpp | 16 ++++++------ src/blackgui/models/listmodelbase.cpp | 4 +-- src/blackgui/models/listmodelbase.h | 8 +++--- src/blackgui/models/liverylistmodel.cpp | 24 ++++++++--------- src/blackgui/models/serverlistmodel.cpp | 16 ++++++------ .../models/temperaturelayerlistmodel.cpp | 10 +++---- 8 files changed, 53 insertions(+), 53 deletions(-) diff --git a/src/blackgui/models/airlineicaolistmodel.cpp b/src/blackgui/models/airlineicaolistmodel.cpp index 8270cd729..ef58cfaf8 100644 --- a/src/blackgui/models/airlineicaolistmodel.cpp +++ b/src/blackgui/models/airlineicaolistmodel.cpp @@ -29,27 +29,27 @@ namespace BlackGui CAirlineIcaoCodeListModel::CAirlineIcaoCodeListModel(QObject *parent) : CListModelDbObjects("AircraftIcaoListModel", parent) { - this->m_columns.addColumn(CColumn::standardString("id", CAirlineIcaoCode::IndexDbIntegerKey, CDefaultFormatter::alignRightVCenter())); - this->m_columns.addColumn(CColumn::standardValueObject("ICAO", CAirlineIcaoCode::IndexAirlineDesignator)); + m_columns.addColumn(CColumn::standardString("id", CAirlineIcaoCode::IndexDbIntegerKey, CDefaultFormatter::alignRightVCenter())); + m_columns.addColumn(CColumn::standardValueObject("ICAO", CAirlineIcaoCode::IndexAirlineDesignator)); CColumn col("airline", CAirlineIcaoCode::IndexIcon); col.setSortPropertyIndex(CAirlineIcaoCode::IndexAirlineDesignator); - this->m_columns.addColumn(col); - this->m_columns.addColumn(CColumn("VA", "virtual airline", CAirlineIcaoCode::IndexIsVirtualAirline, new CBoolIconFormatter("VA", "real airline"))); - this->m_columns.addColumn(CColumn("mil.", "military (air force)", CAirlineIcaoCode::IndexIsMilitary, new CBoolIconFormatter("military", "civilian"))); - this->m_columns.addColumn(CColumn("op.", "operating", CAirlineIcaoCode::IndexIsOperating, new CBoolIconFormatter("operating", "ceased"))); - this->m_columns.addColumn(CColumn::standardValueObject("name", CAirlineIcaoCode::IndexAirlineName)); - this->m_columns.addColumn(CColumn::standardValueObject("gr.des.", "group designator", CAirlineIcaoCode::IndexGroupDesignator)); - this->m_columns.addColumn(CColumn::standardValueObject("groupname", CAirlineIcaoCode::IndexGroupName)); + m_columns.addColumn(col); + m_columns.addColumn(CColumn("VA", "virtual airline", CAirlineIcaoCode::IndexIsVirtualAirline, new CBoolIconFormatter("VA", "real airline"))); + m_columns.addColumn(CColumn("mil.", "military (air force)", CAirlineIcaoCode::IndexIsMilitary, new CBoolIconFormatter("military", "civilian"))); + m_columns.addColumn(CColumn("op.", "operating", CAirlineIcaoCode::IndexIsOperating, new CBoolIconFormatter("operating", "ceased"))); + m_columns.addColumn(CColumn::standardValueObject("name", CAirlineIcaoCode::IndexAirlineName)); + m_columns.addColumn(CColumn::standardValueObject("gr.des.", "group designator", CAirlineIcaoCode::IndexGroupDesignator)); + m_columns.addColumn(CColumn::standardValueObject("groupname", CAirlineIcaoCode::IndexGroupName)); col = CColumn("country", {CAirlineIcaoCode::IndexAirlineCountry, CCountry::IndexIcon}); col.setSortPropertyIndex(CAirlineIcaoCode::IndexAirlineDesignator); - this->m_columns.addColumn(col); - this->m_columns.addColumn(CColumn::standardValueObject("country", "country", CAirlineIcaoCode::IndexAirlineCountry)); - this->m_columns.addColumn(CColumn::standardString("changed", CAirlineIcaoCode::IndexUtcTimestampFormattedYmdhms)); + m_columns.addColumn(col); + m_columns.addColumn(CColumn::standardValueObject("country", "country", CAirlineIcaoCode::IndexAirlineCountry)); + m_columns.addColumn(CColumn::standardString("changed", CAirlineIcaoCode::IndexUtcTimestampFormattedYmdhms)); // default sort order this->setSortColumnByPropertyIndex(CAirlineIcaoCode::IndexAirlineDesignator); - this->m_sortOrder = Qt::AscendingOrder; + m_sortOrder = Qt::AscendingOrder; // force strings for translation in resource files (void)QT_TRANSLATE_NOOP("ModelAirlineIcaoList", "ICAO"); diff --git a/src/blackgui/models/atcstationlistmodel.cpp b/src/blackgui/models/atcstationlistmodel.cpp index 4a53b8a03..e7ff10dc5 100644 --- a/src/blackgui/models/atcstationlistmodel.cpp +++ b/src/blackgui/models/atcstationlistmodel.cpp @@ -121,7 +121,7 @@ namespace BlackGui if (station.getCallsign().isEmpty()) { return; } if (added) { - bool c = m_container.contains(&CAtcStation::getCallsign, station.getCallsign()); + const bool c = m_container.contains(&CAtcStation::getCallsign, station.getCallsign()); if (!c) { this->insert(station); } } else diff --git a/src/blackgui/models/countrylistmodel.cpp b/src/blackgui/models/countrylistmodel.cpp index 2587806ab..7137d3eac 100644 --- a/src/blackgui/models/countrylistmodel.cpp +++ b/src/blackgui/models/countrylistmodel.cpp @@ -27,17 +27,17 @@ namespace BlackGui { CColumn col("country", CCountry::IndexIcon); col.setSortPropertyIndex(CCountry::IndexIsoCode); - this->m_columns.addColumn(col); - this->m_columns.addColumn(CColumn::standardString("ISO2", CCountry::IndexIsoCode)); - this->m_columns.addColumn(CColumn::standardString("ISO3", CCountry::IndexIso3Code)); - this->m_columns.addColumn(CColumn::standardString("name", CCountry::IndexName)); - this->m_columns.addColumn(CColumn::standardString("alias 1", CCountry::IndexAlias1)); - this->m_columns.addColumn(CColumn::standardString("alias 2", CCountry::IndexAlias2)); - this->m_columns.addColumn(CColumn::standardString("changed", CCountry::IndexUtcTimestampFormattedYmdhms)); + m_columns.addColumn(col); + m_columns.addColumn(CColumn::standardString("ISO2", CCountry::IndexIsoCode)); + m_columns.addColumn(CColumn::standardString("ISO3", CCountry::IndexIso3Code)); + m_columns.addColumn(CColumn::standardString("name", CCountry::IndexName)); + m_columns.addColumn(CColumn::standardString("alias 1", CCountry::IndexAlias1)); + m_columns.addColumn(CColumn::standardString("alias 2", CCountry::IndexAlias2)); + m_columns.addColumn(CColumn::standardString("changed", CCountry::IndexUtcTimestampFormattedYmdhms)); // default sort order this->setSortColumnByPropertyIndex(CCountry::IndexIsoCode); - this->m_sortOrder = Qt::AscendingOrder; + m_sortOrder = Qt::AscendingOrder; // force strings for translation in resource files (void)QT_TRANSLATE_NOOP("ModelCountryList", "cty."); diff --git a/src/blackgui/models/listmodelbase.cpp b/src/blackgui/models/listmodelbase.cpp index 9ec507640..c6d080b2f 100644 --- a/src/blackgui/models/listmodelbase.cpp +++ b/src/blackgui/models/listmodelbase.cpp @@ -53,12 +53,12 @@ namespace BlackGui if (role == Qt::DisplayRole) { - QString header = m_columns.at(section).getColumnName(false); + const QString header = m_columns.at(section).getColumnName(false); return QVariant(header); } if (role == Qt::ToolTipRole) { - QString header = m_columns.at(section).getColumnToolTip(false); + const QString header = m_columns.at(section).getColumnToolTip(false); return header.isEmpty() ? QVariant() : QVariant(header); } return QVariant(); diff --git a/src/blackgui/models/listmodelbase.h b/src/blackgui/models/listmodelbase.h index ee1f92dc9..1f8a1fd28 100644 --- a/src/blackgui/models/listmodelbase.h +++ b/src/blackgui/models/listmodelbase.h @@ -78,7 +78,7 @@ namespace BlackGui virtual BlackMisc::CPropertyIndex modelIndexToPropertyIndex(const QModelIndex &index) const; //! Set sort column - virtual void setSortColumn(int column) { this->m_sortColumn = column; } + virtual void setSortColumn(int column) { m_sortColumn = column; } //! Sort by index void sortByPropertyIndex(const BlackMisc::CPropertyIndex &propertyIndex, Qt::SortOrder order = Qt::AscendingOrder); @@ -91,13 +91,13 @@ namespace BlackGui virtual void setSorting(const BlackMisc::CPropertyIndex &propertyIndex, Qt::SortOrder order = Qt::AscendingOrder); //! Get sort column property index - virtual int getSortColumn() const { return this->m_sortColumn; } + virtual int getSortColumn() const { return m_sortColumn; } //! Has valid sort column? virtual bool hasValidSortColumn() const; //! Get sort order - virtual Qt::SortOrder getSortOrder() const { return this->m_sortOrder; } + virtual Qt::SortOrder getSortOrder() const { return m_sortOrder; } //! Translation context virtual const QString &getTranslationContext() const; @@ -118,7 +118,7 @@ namespace BlackGui virtual bool hasHighlightedRows() const; //! Drop actions - void setDropActions(Qt::DropActions dropActions) { this->m_dropActions = dropActions; } + void setDropActions(Qt::DropActions dropActions) { m_dropActions = dropActions; } //! Send signal that data have been changed. //! \note Meant for scenarios where the container is directly updated and a subsequent signal is required diff --git a/src/blackgui/models/liverylistmodel.cpp b/src/blackgui/models/liverylistmodel.cpp index 344efb70a..2a379494f 100644 --- a/src/blackgui/models/liverylistmodel.cpp +++ b/src/blackgui/models/liverylistmodel.cpp @@ -29,22 +29,22 @@ namespace BlackGui CLiveryListModel::CLiveryListModel(QObject *parent) : CListModelDbObjects("ModelLiveryList", parent) { - this->m_columns.addColumn(CColumn::standardString("id", CLivery::IndexDbIntegerKey, CDefaultFormatter::alignRightVCenter())); - this->m_columns.addColumn(CColumn::standardString("code", CLivery::IndexCombinedCode)); - this->m_columns.addColumn(CColumn::standardString("description", CLivery::IndexDescription)); - this->m_columns.addColumn(CColumn("fuselage", "fuselage color", CLivery::IndexColorFuselage, new CColorFormatter())); - this->m_columns.addColumn(CColumn("tail", "tail color", CLivery::IndexColorTail, new CColorFormatter())); - this->m_columns.addColumn(CColumn("mil.", "military", CLivery::IndexIsMilitary, new CBoolIconFormatter("military", "civil"))); - this->m_columns.addColumn(CColumn::standardString("des.", "designator", { CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexAirlineDesignator })); + m_columns.addColumn(CColumn::standardString("id", CLivery::IndexDbIntegerKey, CDefaultFormatter::alignRightVCenter())); + m_columns.addColumn(CColumn::standardString("code", CLivery::IndexCombinedCode)); + m_columns.addColumn(CColumn::standardString("description", CLivery::IndexDescription)); + m_columns.addColumn(CColumn("fuselage", "fuselage color", CLivery::IndexColorFuselage, new CColorFormatter())); + m_columns.addColumn(CColumn("tail", "tail color", CLivery::IndexColorTail, new CColorFormatter())); + m_columns.addColumn(CColumn("mil.", "military", CLivery::IndexIsMilitary, new CBoolIconFormatter("military", "civil"))); + m_columns.addColumn(CColumn::standardString("des.", "designator", { CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexAirlineDesignator })); CColumn col = CColumn("airline", { CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexIcon }); col.setSortPropertyIndex({ CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexAirlineCountryIso}); - this->m_columns.addColumn(col); - this->m_columns.addColumn(CColumn::standardString("name", { CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexAirlineName })); + m_columns.addColumn(col); + m_columns.addColumn(CColumn::standardString("name", { CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexAirlineName })); col = CColumn("airline country", { CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexAirlineCountry, CCountry::IndexIcon }); col.setSortPropertyIndex({ CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexAirlineCountryIso}); - this->m_columns.addColumn(col); - this->m_columns.addColumn(CColumn::standardString("telephony", { CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexTelephonyDesignator })); - this->m_columns.addColumn(CColumn::standardString("changed", CLivery::IndexUtcTimestampFormattedYmdhms)); + m_columns.addColumn(col); + m_columns.addColumn(CColumn::standardString("telephony", { CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexTelephonyDesignator })); + m_columns.addColumn(CColumn::standardString("changed", CLivery::IndexUtcTimestampFormattedYmdhms)); // force strings for translation in resource files (void)QT_TRANSLATE_NOOP("ModelLiveryList", "key"); diff --git a/src/blackgui/models/serverlistmodel.cpp b/src/blackgui/models/serverlistmodel.cpp index ffbe96300..0c4d3eaa7 100644 --- a/src/blackgui/models/serverlistmodel.cpp +++ b/src/blackgui/models/serverlistmodel.cpp @@ -23,14 +23,14 @@ namespace BlackGui CServerListModel::CServerListModel(QObject *parent) : CListModelBase("ServerListModel", parent) { - this->m_columns.addColumn(CColumn::standardString("name", CServer::IndexName)); - this->m_columns.addColumn(CColumn::standardString("description", CServer::IndexDescription)); - this->m_columns.addColumn(CColumn::standardString("address", CServer::IndexAddress)); - this->m_columns.addColumn(CColumn::standardString("port", CServer::IndexPort)); - this->m_columns.addColumn(CColumn::standardString("realname", { CServer::IndexUser, CUser::IndexRealName })); - this->m_columns.addColumn(CColumn::standardString("userid", { CServer::IndexUser, CUser::IndexId })); - this->m_columns.addColumn(CColumn::standardString("eco", { CServer::IndexEcosystem, CEcosystem::IndexSystemString })); - this->m_columns.addColumn(CColumn::standardString("type", CServer::IndexServerTypeAsString)); + m_columns.addColumn(CColumn::standardString("name", CServer::IndexName)); + m_columns.addColumn(CColumn::standardString("description", CServer::IndexDescription)); + m_columns.addColumn(CColumn::standardString("address", CServer::IndexAddress)); + m_columns.addColumn(CColumn::standardString("port", CServer::IndexPort)); + m_columns.addColumn(CColumn::standardString("realname", { CServer::IndexUser, CUser::IndexRealName })); + m_columns.addColumn(CColumn::standardString("userid", { CServer::IndexUser, CUser::IndexId })); + m_columns.addColumn(CColumn::standardString("eco", { CServer::IndexEcosystem, CEcosystem::IndexSystemString })); + m_columns.addColumn(CColumn::standardString("type", CServer::IndexServerTypeAsString)); // force strings for translation in resource files (void)QT_TRANSLATE_NOOP("ServerListModel", "name"); diff --git a/src/blackgui/models/temperaturelayerlistmodel.cpp b/src/blackgui/models/temperaturelayerlistmodel.cpp index 5381ba532..219ceaca3 100644 --- a/src/blackgui/models/temperaturelayerlistmodel.cpp +++ b/src/blackgui/models/temperaturelayerlistmodel.cpp @@ -54,14 +54,14 @@ namespace BlackGui CTemperatureLayerListModel::CTemperatureLayerListModel(QObject *parent) : CListModelBase("TemperatureLayerListModel", parent) { - this->m_columns.addColumn(CColumn("level", CTemperatureLayer::IndexLevel, new CAltitudeFormatter())); - this->m_columns.addColumn(CColumn("temperature", CTemperatureLayer::IndexTemperature, new CTemperatureFormatter())); - this->m_columns.addColumn(CColumn("dew point", CTemperatureLayer::IndexDewPoint, new CTemperatureFormatter())); - this->m_columns.addColumn(CColumn("relative humidity", CTemperatureLayer::IndexRelativeHumidity, new CRelativeHumidityFormatter())); + m_columns.addColumn(CColumn("level", CTemperatureLayer::IndexLevel, new CAltitudeFormatter())); + m_columns.addColumn(CColumn("temperature", CTemperatureLayer::IndexTemperature, new CTemperatureFormatter())); + m_columns.addColumn(CColumn("dew point", CTemperatureLayer::IndexDewPoint, new CTemperatureFormatter())); + m_columns.addColumn(CColumn("relative humidity", CTemperatureLayer::IndexRelativeHumidity, new CRelativeHumidityFormatter())); // default sort order this->setSortColumnByPropertyIndex(CTemperatureLayer::IndexLevel); - this->m_sortOrder = Qt::AscendingOrder; + m_sortOrder = Qt::AscendingOrder; // force strings for translation in resource files (void)QT_TRANSLATE_NOOP("ModelTemperatureLayerList", "level");