From aa47d7bb0319a228c0d54b4053cf3280161ac0f3 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 4 Feb 2019 17:20:53 +0100 Subject: [PATCH] Ref T529, style --- src/blackgui/models/columns.cpp | 2 +- src/blackgui/models/distributorlistmodel.h | 5 +---- src/blackgui/models/listmodelbasenontemplate.cpp | 2 +- src/blackgui/models/statusmessagelistmodel.h | 4 +--- src/blackgui/views/statusmessageview.h | 2 +- src/blackgui/views/viewbase.h | 4 ++-- src/blackgui/views/viewbasenontemplate.cpp | 2 +- src/blackmisc/orderable.h | 8 ++++---- src/blackmisc/orderablelist.h | 1 - src/blackmisc/simulation/aircraftmodelloader.h | 8 ++++---- src/blackmisc/statusmessage.h | 7 ++++--- src/blackmisc/statusmessagelist.h | 11 ++++++----- 12 files changed, 26 insertions(+), 30 deletions(-) diff --git a/src/blackgui/models/columns.cpp b/src/blackgui/models/columns.cpp index 85583d89d..8c139b9ea 100644 --- a/src/blackgui/models/columns.cpp +++ b/src/blackgui/models/columns.cpp @@ -171,7 +171,7 @@ namespace BlackGui bool CColumns::isSortable(int column) const { - if (!isValidColumn(column)) return false; + if (!isValidColumn(column)) { return false; } return m_columns.at(column).isSortable(); } diff --git a/src/blackgui/models/distributorlistmodel.h b/src/blackgui/models/distributorlistmodel.h index 80822c5f7..89d30d80d 100644 --- a/src/blackgui/models/distributorlistmodel.h +++ b/src/blackgui/models/distributorlistmodel.h @@ -18,10 +18,7 @@ #include -class QObject; - namespace BlackMisc { namespace Simulation { class CDistributor; } } - namespace BlackGui { namespace Models @@ -47,7 +44,7 @@ namespace BlackGui explicit CDistributorListModel(QObject *parent = nullptr); //! Destructor - virtual ~CDistributorListModel() {} + virtual ~CDistributorListModel() override {} //! Set mode void setDistributorMode(DistributorMode distributorMode); diff --git a/src/blackgui/models/listmodelbasenontemplate.cpp b/src/blackgui/models/listmodelbasenontemplate.cpp index b9a740a65..a2dbf9aaa 100644 --- a/src/blackgui/models/listmodelbasenontemplate.cpp +++ b/src/blackgui/models/listmodelbasenontemplate.cpp @@ -111,7 +111,7 @@ namespace BlackGui } const bool changedColumn = this->setSortColumnByPropertyIndex(propertyIndex); - const bool changedOrder = (m_sortOrder == order); + const bool changedOrder = (m_sortOrder == order); m_sortOrder = order; return changedColumn || changedOrder; } diff --git a/src/blackgui/models/statusmessagelistmodel.h b/src/blackgui/models/statusmessagelistmodel.h index 7debfc53c..12cbd42d0 100644 --- a/src/blackgui/models/statusmessagelistmodel.h +++ b/src/blackgui/models/statusmessagelistmodel.h @@ -12,12 +12,10 @@ #ifndef BLACKGUI_MODELS_STATUSMESSAGELISTMODEL_H #define BLACKGUI_MODELS_STATUSMESSAGELISTMODEL_H -#include "blackgui/blackguiexport.h" #include "blackgui/models/listmodeltimestampobjects.h" +#include "blackgui/blackguiexport.h" #include "blackmisc/statusmessagelist.h" -class QObject; - namespace BlackGui { namespace Models diff --git a/src/blackgui/views/statusmessageview.h b/src/blackgui/views/statusmessageview.h index 52b497fec..e52167cbd 100644 --- a/src/blackgui/views/statusmessageview.h +++ b/src/blackgui/views/statusmessageview.h @@ -35,7 +35,7 @@ namespace BlackGui explicit CStatusMessageView(QWidget *parent = nullptr); //! Set mode - void setMode(BlackGui::Models::CStatusMessageListModel::Mode mode); + void setMode(Models::CStatusMessageListModel::Mode mode); //! Add my own filter dialog void addFilterDialog(); diff --git a/src/blackgui/views/viewbase.h b/src/blackgui/views/viewbase.h index 3b3135345..f16e4bb78 100644 --- a/src/blackgui/views/viewbase.h +++ b/src/blackgui/views/viewbase.h @@ -538,7 +538,7 @@ namespace BlackGui bool m_acceptDoubleClickSelection = false; //!< double clicked bool m_displayAutomatically = true; //!< display directly when loaded bool m_enableDeleteSelectedRows = false; //!< selected rows can be deleted - bool m_dropIndicator = false; //!< draw indicator + bool m_dropIndicator = false; //!< drop indicator bool m_forceColumnsToMaxSize = true; //!< force that columns are extended to full viewport width bool m_allowCacheFileJson = true; //!< allow Cache format JSON to be loaded QWidget *m_filterWidget = nullptr; //!< filter widget or dialog @@ -548,7 +548,7 @@ namespace BlackGui CLoadIndicator *m_loadIndicator = nullptr; //!< load indicator if needed Components::CTextEditDialog *m_textEditDialog = nullptr; //!< text edit dialog QMap m_menuFlagActions; //!< initialized actions for menu flag (enum) - QString m_saveFileName; //!< save file name (JSON) + QString m_saveFileName; //!< save file name (JSON) BlackMisc::CDirectories::ColumnIndex m_dirSettingsIndex = BlackMisc::CDirectories::IndexDirLastViewJsonOrDefault; //!< allows to set more specialized directories //!< remember last JSON directory, having this member allows to have specific dir BlackMisc::CSetting m_dirSettings { this }; //!< directory for load/save BlackMisc::CSettingReadOnly m_guiSettings { this, &CViewBaseNonTemplate::settingsChanged }; //!< general GUI settings diff --git a/src/blackgui/views/viewbasenontemplate.cpp b/src/blackgui/views/viewbasenontemplate.cpp index e17e56411..5f73814fa 100644 --- a/src/blackgui/views/viewbasenontemplate.cpp +++ b/src/blackgui/views/viewbasenontemplate.cpp @@ -695,7 +695,7 @@ namespace BlackGui int CViewBaseNonTemplate::showLoadIndicator(int containerSizeDependent, int timeoutMs, bool processEvents) { if (!m_enabledLoadIndicator) { return -1; } - if (m_showingLoadIndicator) { return -1; } + if (m_showingLoadIndicator) { return -1; } if (this->hasDockWidgetArea()) { if (!this->isVisibleWidget()) { return -1; } diff --git a/src/blackmisc/orderable.h b/src/blackmisc/orderable.h index de9d3f3e4..cbf33642b 100644 --- a/src/blackmisc/orderable.h +++ b/src/blackmisc/orderable.h @@ -44,7 +44,7 @@ namespace BlackMisc bool hasValidOrder() const; //! Can given index be handled - static bool canHandleIndex(const BlackMisc::CPropertyIndex &index); + static bool canHandleIndex(const CPropertyIndex &index); protected: //! Constructor @@ -54,12 +54,12 @@ namespace BlackMisc IOrderable(int order); //! \copydoc BlackMisc::Mixin::Index::propertyByIndex - CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const; + CVariant propertyByIndex(const CPropertyIndex &index) const; //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex - void setPropertyByIndex(const BlackMisc::CPropertyIndex &index, const CVariant &variant); + void setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant); - //! Compare for index + //! \copydoc BlackMisc::Mixin::Index::comparePropertyByIndex int comparePropertyByIndex(const CPropertyIndex &index, const IOrderable &compareValue) const; int m_order = -1; //!< order number diff --git a/src/blackmisc/orderablelist.h b/src/blackmisc/orderablelist.h index 871fffa46..f09edc280 100644 --- a/src/blackmisc/orderablelist.h +++ b/src/blackmisc/orderablelist.h @@ -13,7 +13,6 @@ #define BLACKMISC_ORDERABLELIST_H #include "blackmisc/blackmiscexport.h" - #include namespace BlackMisc diff --git a/src/blackmisc/simulation/aircraftmodelloader.h b/src/blackmisc/simulation/aircraftmodelloader.h index 33e0515f7..fd35d3b32 100644 --- a/src/blackmisc/simulation/aircraftmodelloader.h +++ b/src/blackmisc/simulation/aircraftmodelloader.h @@ -225,16 +225,16 @@ namespace BlackMisc signals: //! \copydoc IAircraftModelLoader::loadingFinished - void loadingFinished(const BlackMisc::CStatusMessageList &status, const BlackMisc::Simulation::CSimulatorInfo &simulator, BlackMisc::Simulation::IAircraftModelLoader::LoadFinishedInfo info); + void loadingFinished(const BlackMisc::CStatusMessageList &status, const CSimulatorInfo &simulator, IAircraftModelLoader::LoadFinishedInfo info); //! \copydoc IAircraftModelLoader::diskLoadingStarted - void diskLoadingStarted(const BlackMisc::Simulation::CSimulatorInfo &simulator, BlackMisc::Simulation::IAircraftModelLoader::LoadMode mode); + void diskLoadingStarted(const CSimulatorInfo &simulator, IAircraftModelLoader::LoadMode mode); //! \copydoc IAircraftModelLoader::loadingProgress - void loadingProgress(const BlackMisc::Simulation::CSimulatorInfo &simulator, const QString &message, int progressPercentage); + void loadingProgress(const CSimulatorInfo &simulator, const QString &message, int progressPercentage); //! \copydoc IAircraftModelLoader::cacheChanged - void cacheChanged(const BlackMisc::Simulation::CSimulatorInfo &simulator); + void cacheChanged(const CSimulatorInfo &simulator); private: IAircraftModelLoader *m_loaderFsx = nullptr; diff --git a/src/blackmisc/statusmessage.h b/src/blackmisc/statusmessage.h index a2e914bcd..05c1ecd63 100644 --- a/src/blackmisc/statusmessage.h +++ b/src/blackmisc/statusmessage.h @@ -12,12 +12,13 @@ #ifndef BLACKMISC_STATUSMESSAGE_H #define BLACKMISC_STATUSMESSAGE_H -#include "blackmiscexport.h" -#include "icon.h" -#include "propertyindex.h" #include "logcategorylist.h" #include "timestampbased.h" +#include "orderable.h" +#include "icon.h" +#include "propertyindex.h" #include "typetraits.h" +#include "blackmiscexport.h" #include diff --git a/src/blackmisc/statusmessagelist.h b/src/blackmisc/statusmessagelist.h index ac70e6e4f..2fe1e5038 100644 --- a/src/blackmisc/statusmessagelist.h +++ b/src/blackmisc/statusmessagelist.h @@ -12,14 +12,15 @@ #ifndef BLACKMISC_STATUSMESSAGELIST_H #define BLACKMISC_STATUSMESSAGELIST_H -#include "blackmisc/blackmiscexport.h" -#include "blackmisc/collection.h" -#include "blackmisc/logcategory.h" -#include "blackmisc/logcategorylist.h" -#include "blackmisc/sequence.h" #include "blackmisc/statusmessage.h" +#include "blackmisc/logcategorylist.h" +#include "blackmisc/logcategory.h" +#include "blackmisc/collection.h" +#include "blackmisc/sequence.h" #include "blackmisc/timestampobjectlist.h" +#include "blackmisc/orderablelist.h" #include "blackmisc/variant.h" +#include "blackmisc/blackmiscexport.h" #include #include