From 74be37339e6d669df4d0f8c567c58d73c46bca67 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 1 Feb 2019 16:59:42 +0100 Subject: [PATCH] Models guard names and style --- src/blackgui/models/actionhotkeylistmodel.h | 6 +++--- src/blackgui/models/actionitem.h | 4 ++-- src/blackgui/models/actionmodel.h | 4 ++-- src/blackgui/models/aircrafticaolistmodel.h | 8 ++++---- src/blackgui/models/aircraftmodelfilter.h | 4 ++-- src/blackgui/models/aircraftmodellistmodel.h | 4 ++-- src/blackgui/models/airportlistmodel.h | 4 ++-- src/blackgui/models/cloudlayerlistmodel.h | 4 ++-- src/blackgui/models/columnformatters.h | 4 ++-- src/blackgui/models/columns.h | 4 ++-- src/blackgui/models/countryfilter.h | 4 ++-- src/blackgui/models/distributorfilter.h | 4 ++-- src/blackgui/models/distributorlistmodel.h | 4 ++-- src/blackgui/models/identifierlistmodel.h | 4 ++-- src/blackgui/models/listmodelbase.h | 9 ++------- src/blackgui/models/listmodelbasenontemplate.h | 4 ++-- src/blackgui/models/modelfilter.h | 4 ++-- src/blackgui/models/selectionmodel.h | 4 ++-- src/blackgui/models/serverlistmodel.h | 4 ++-- src/blackgui/models/statusmessagefilter.h | 4 ++-- src/blackgui/models/statusmessagelistmodel.h | 4 ++-- src/blackgui/models/textmessagelistmodel.h | 4 ++-- src/blackgui/models/userlistmodel.h | 4 ++-- src/blackgui/models/windlayerlistmodel.h | 4 ++-- 24 files changed, 51 insertions(+), 56 deletions(-) diff --git a/src/blackgui/models/actionhotkeylistmodel.h b/src/blackgui/models/actionhotkeylistmodel.h index c3ef26e5b..45894a067 100644 --- a/src/blackgui/models/actionhotkeylistmodel.h +++ b/src/blackgui/models/actionhotkeylistmodel.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_ACTIONHOTKEYLISTMODEL_H -#define BLACKGUI_ACTIONHOTKEYLISTMODEL_H +#ifndef BLACKGUI_MODELS_ACTIONHOTKEYLISTMODEL_H +#define BLACKGUI_MODELS_ACTIONHOTKEYLISTMODEL_H #include "blackgui/blackguiexport.h" #include "blackmisc/input/actionhotkeylist.h" @@ -43,7 +43,7 @@ namespace BlackGui CActionHotkeyListModel(QObject *parent = nullptr); //! Destructor - virtual ~CActionHotkeyListModel() {} + virtual ~CActionHotkeyListModel() override {} //! \copydoc QAbstractTableModel::rowCount int rowCount(const QModelIndex &parent = QModelIndex()) const override; diff --git a/src/blackgui/models/actionitem.h b/src/blackgui/models/actionitem.h index 898002971..5eb615032 100644 --- a/src/blackgui/models/actionitem.h +++ b/src/blackgui/models/actionitem.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_ACTIONITEM_H -#define BLACKGUI_ACTIONITEM_H +#ifndef BLACKGUI_MODELS_ACTIONITEM_H +#define BLACKGUI_MODELS_ACTIONITEM_H #include #include diff --git a/src/blackgui/models/actionmodel.h b/src/blackgui/models/actionmodel.h index 3132b2e51..6bee37221 100644 --- a/src/blackgui/models/actionmodel.h +++ b/src/blackgui/models/actionmodel.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_ACTIONMODEL_H -#define BLACKGUI_ACTIONMODEL_H +#ifndef BLACKGUI_MODELS_ACTIONMODEL_H +#define BLACKGUI_MODELS_ACTIONMODEL_H #include "blackgui/blackguiexport.h" diff --git a/src/blackgui/models/aircrafticaolistmodel.h b/src/blackgui/models/aircrafticaolistmodel.h index d48db0739..a0e7b9218 100644 --- a/src/blackgui/models/aircrafticaolistmodel.h +++ b/src/blackgui/models/aircrafticaolistmodel.h @@ -9,12 +9,12 @@ //! \file -#ifndef BLACKGUI_AIRCRAFTICAOLISTMODEL_H -#define BLACKGUI_AIRCRAFTICAOLISTMODEL_H +#ifndef BLACKGUI_MODELS_AIRCRAFTICAOLISTMODEL_H +#define BLACKGUI_MODELS_AIRCRAFTICAOLISTMODEL_H -#include "blackgui/models/listmodeldbobjects.h" -#include "blackmisc/aviation/aircrafticaocode.h" #include "blackmisc/aviation/aircrafticaocodelist.h" +#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackgui/models/listmodeldbobjects.h" #include "blackgui/blackguiexport.h" namespace BlackGui diff --git a/src/blackgui/models/aircraftmodelfilter.h b/src/blackgui/models/aircraftmodelfilter.h index d72589f93..9c245f6ac 100644 --- a/src/blackgui/models/aircraftmodelfilter.h +++ b/src/blackgui/models/aircraftmodelfilter.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_AIRCRAFTMODELFILTER_H -#define BLACKGUI_AIRCRAFTMODELFILTER_H +#ifndef BLACKGUI_MODELS_AIRCRAFTMODELFILTER_H +#define BLACKGUI_MODELS_AIRCRAFTMODELFILTER_H #include "blackgui/blackguiexport.h" #include "blackgui/models/modelfilter.h" diff --git a/src/blackgui/models/aircraftmodellistmodel.h b/src/blackgui/models/aircraftmodellistmodel.h index 3b8ff4e4d..06da0d654 100644 --- a/src/blackgui/models/aircraftmodellistmodel.h +++ b/src/blackgui/models/aircraftmodellistmodel.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_AIRCRAFTMODELLISTMODEL_H -#define BLACKGUI_AIRCRAFTMODELLISTMODEL_H +#ifndef BLACKGUI_MODELS_AIRCRAFTMODELLISTMODEL_H +#define BLACKGUI_MODELS_AIRCRAFTMODELLISTMODEL_H #include "blackgui/blackguiexport.h" #include "blackgui/models/listmodeldbobjects.h" diff --git a/src/blackgui/models/airportlistmodel.h b/src/blackgui/models/airportlistmodel.h index 5d5c9d6ab..abaa10789 100644 --- a/src/blackgui/models/airportlistmodel.h +++ b/src/blackgui/models/airportlistmodel.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_AIRPORTLISTMODEL_H -#define BLACKGUI_AIRPORTLISTMODEL_H +#ifndef BLACKGUI_MODELS_AIRPORTLISTMODEL_H +#define BLACKGUI_MODELS_AIRPORTLISTMODEL_H #include "blackgui/blackguiexport.h" #include "blackgui/models/listmodelbase.h" diff --git a/src/blackgui/models/cloudlayerlistmodel.h b/src/blackgui/models/cloudlayerlistmodel.h index 0bfd46f3b..dff5f4583 100644 --- a/src/blackgui/models/cloudlayerlistmodel.h +++ b/src/blackgui/models/cloudlayerlistmodel.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_CLOUDLAYERLISTMODEL_H -#define BLACKGUI_CLOUDLAYERLISTMODEL_H +#ifndef BLACKGUI_MODELS_CLOUDLAYERLISTMODEL_H +#define BLACKGUI_MODELS_CLOUDLAYERLISTMODEL_H #include "blackgui/blackguiexport.h" #include "blackgui/models/listmodelbase.h" diff --git a/src/blackgui/models/columnformatters.h b/src/blackgui/models/columnformatters.h index cb597f9a2..d9091a246 100644 --- a/src/blackgui/models/columnformatters.h +++ b/src/blackgui/models/columnformatters.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_COLUMNFORMATTERS_H -#define BLACKGUI_COLUMNFORMATTERS_H +#ifndef BLACKGUI_MODELS_COLUMNFORMATTERS_H +#define BLACKGUI_MODELS_COLUMNFORMATTERS_H #include "blackgui/blackguiexport.h" #include "blackgui/led.h" diff --git a/src/blackgui/models/columns.h b/src/blackgui/models/columns.h index 6652fa40d..c73100ad3 100644 --- a/src/blackgui/models/columns.h +++ b/src/blackgui/models/columns.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_COLUMNS_H -#define BLACKGUI_COLUMNS_H +#ifndef BLACKGUI_MODELS_COLUMNS_H +#define BLACKGUI_MODELS_COLUMNS_H #include "blackgui/blackguiexport.h" #include "blackgui/models/columnformatters.h" diff --git a/src/blackgui/models/countryfilter.h b/src/blackgui/models/countryfilter.h index dffdf339e..893a84b93 100644 --- a/src/blackgui/models/countryfilter.h +++ b/src/blackgui/models/countryfilter.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_COUNTRYFILTER_H -#define BLACKGUI_COUNTRYFILTER_H +#ifndef BLACKGUI_MODELS_COUNTRYFILTER_H +#define BLACKGUI_MODELS_COUNTRYFILTER_H #include "blackgui/blackguiexport.h" #include "blackgui/models/modelfilter.h" diff --git a/src/blackgui/models/distributorfilter.h b/src/blackgui/models/distributorfilter.h index 34fccb09d..5d6cd887b 100644 --- a/src/blackgui/models/distributorfilter.h +++ b/src/blackgui/models/distributorfilter.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_DISTRIBUTORFILTER_H -#define BLACKGUI_DISTRIBUTORFILTER_H +#ifndef BLACKGUI_MODELS_DISTRIBUTORFILTER_H +#define BLACKGUI_MODELS_DISTRIBUTORFILTER_H #include "blackgui/blackguiexport.h" #include "blackgui/models/modelfilter.h" diff --git a/src/blackgui/models/distributorlistmodel.h b/src/blackgui/models/distributorlistmodel.h index 65b49b544..80822c5f7 100644 --- a/src/blackgui/models/distributorlistmodel.h +++ b/src/blackgui/models/distributorlistmodel.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_DISTRIBUTORLISTMODEL_H -#define BLACKGUI_DISTRIBUTORLISTMODEL_H +#ifndef BLACKGUI_MODELS_DISTRIBUTORLISTMODEL_H +#define BLACKGUI_MODELS_DISTRIBUTORLISTMODEL_H #include "blackgui/blackguiexport.h" #include "blackgui/models/listmodeldbobjects.h" diff --git a/src/blackgui/models/identifierlistmodel.h b/src/blackgui/models/identifierlistmodel.h index 93ae9af23..460d40ea0 100644 --- a/src/blackgui/models/identifierlistmodel.h +++ b/src/blackgui/models/identifierlistmodel.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_IDENTIFIERLISTMODEL_H -#define BLACKGUI_IDENTIFIERLISTMODEL_H +#ifndef BLACKGUI_MODELS_IDENTIFIERLISTMODEL_H +#define BLACKGUI_MODELS_IDENTIFIERLISTMODEL_H #include "blackgui/blackguiexport.h" #include "blackgui/models/listmodelbase.h" diff --git a/src/blackgui/models/listmodelbase.h b/src/blackgui/models/listmodelbase.h index 0a35d9dbf..e7e2a7851 100644 --- a/src/blackgui/models/listmodelbase.h +++ b/src/blackgui/models/listmodelbase.h @@ -9,17 +9,12 @@ //! \file -#ifndef BLACKGUI_LISTMODELBASE_H -#define BLACKGUI_LISTMODELBASE_H +#ifndef BLACKGUI_MODELS_LISTMODELBASE_H +#define BLACKGUI_MODELS_LISTMODELBASE_H #include "blackgui/models/listmodelbasenontemplate.h" -//#include "blackgui/models/columns.h" #include "blackgui/models/modelfilter.h" #include "blackgui/models/selectionmodel.h" -//#include "blackgui/dropbase.h" -//#include "blackgui/blackguiexport.h" -//#include "blackmisc/digestsignal.h" -//#include "blackmisc/variant.h" #include #include diff --git a/src/blackgui/models/listmodelbasenontemplate.h b/src/blackgui/models/listmodelbasenontemplate.h index c392b5fc5..1dd1da493 100644 --- a/src/blackgui/models/listmodelbasenontemplate.h +++ b/src/blackgui/models/listmodelbasenontemplate.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_LISTMODELBASENONTEMPLATE_H -#define BLACKGUI_LISTMODELBASENONTEMPLATE_H +#ifndef BLACKGUI_MODELS_LISTMODELBASENONTEMPLATE_H +#define BLACKGUI_MODELS_LISTMODELBASENONTEMPLATE_H #include "blackgui/models/columns.h" #include "blackgui/dropbase.h" diff --git a/src/blackgui/models/modelfilter.h b/src/blackgui/models/modelfilter.h index 7d3856bbd..5009783f3 100644 --- a/src/blackgui/models/modelfilter.h +++ b/src/blackgui/models/modelfilter.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_LISTMODELFILTER_H -#define BLACKGUI_LISTMODELFILTER_H +#ifndef BLACKGUI_MODELS_LISTMODELFILTER_H +#define BLACKGUI_MODELS_LISTMODELFILTER_H #include "blackmisc/aviation/aircrafticaocodelist.h" #include "blackmisc/aviation/airlineicaocodelist.h" diff --git a/src/blackgui/models/selectionmodel.h b/src/blackgui/models/selectionmodel.h index fd209463c..52d888fde 100644 --- a/src/blackgui/models/selectionmodel.h +++ b/src/blackgui/models/selectionmodel.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_SELECTIONMODEL_H -#define BLACKGUI_SELECTIONMODEL_H +#ifndef BLACKGUI_MODELS_SELECTIONMODEL_H +#define BLACKGUI_MODELS_SELECTIONMODEL_H namespace BlackGui { diff --git a/src/blackgui/models/serverlistmodel.h b/src/blackgui/models/serverlistmodel.h index cf5b6c823..1e033d283 100644 --- a/src/blackgui/models/serverlistmodel.h +++ b/src/blackgui/models/serverlistmodel.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_SERVERLISTMODEL_H -#define BLACKGUI_SERVERLISTMODEL_H +#ifndef BLACKGUI_MODELS_SERVERLISTMODEL_H +#define BLACKGUI_MODELS_SERVERLISTMODEL_H #include "blackgui/blackguiexport.h" #include "blackgui/models/listmodelbase.h" diff --git a/src/blackgui/models/statusmessagefilter.h b/src/blackgui/models/statusmessagefilter.h index 8b818b404..a29b8debc 100644 --- a/src/blackgui/models/statusmessagefilter.h +++ b/src/blackgui/models/statusmessagefilter.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_STATUSMESSAGEFILTER_H -#define BLACKGUI_STATUSMESSAGEFILTER_H +#ifndef BLACKGUI_MODELS_STATUSMESSAGEFILTER_H +#define BLACKGUI_MODELS_STATUSMESSAGEFILTER_H #include "blackgui/blackguiexport.h" #include "blackgui/models/modelfilter.h" diff --git a/src/blackgui/models/statusmessagelistmodel.h b/src/blackgui/models/statusmessagelistmodel.h index 09a6f95f3..7debfc53c 100644 --- a/src/blackgui/models/statusmessagelistmodel.h +++ b/src/blackgui/models/statusmessagelistmodel.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_STATUSMESSAGELISTMODEL_H -#define BLACKGUI_STATUSMESSAGELISTMODEL_H +#ifndef BLACKGUI_MODELS_STATUSMESSAGELISTMODEL_H +#define BLACKGUI_MODELS_STATUSMESSAGELISTMODEL_H #include "blackgui/blackguiexport.h" #include "blackgui/models/listmodeltimestampobjects.h" diff --git a/src/blackgui/models/textmessagelistmodel.h b/src/blackgui/models/textmessagelistmodel.h index 36548ef10..19bbdc408 100644 --- a/src/blackgui/models/textmessagelistmodel.h +++ b/src/blackgui/models/textmessagelistmodel.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_TEXTMESSAGELISTMODEL_H -#define BLACKGUI_TEXTMESSAGELISTMODEL_H +#ifndef BLACKGUI_MODELS_TEXTMESSAGELISTMODEL_H +#define BLACKGUI_MODELS_TEXTMESSAGELISTMODEL_H #include "blackgui/blackguiexport.h" #include "blackgui/models/listmodelbase.h" diff --git a/src/blackgui/models/userlistmodel.h b/src/blackgui/models/userlistmodel.h index d210d58ba..ee9d6bb9c 100644 --- a/src/blackgui/models/userlistmodel.h +++ b/src/blackgui/models/userlistmodel.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_USERLISTMODEL_H -#define BLACKGUI_USERLISTMODEL_H +#ifndef BLACKGUI_MODELS_USERLISTMODEL_H +#define BLACKGUI_MODELS_USERLISTMODEL_H #include "blackgui/blackguiexport.h" #include "blackgui/models/listmodelbase.h" diff --git a/src/blackgui/models/windlayerlistmodel.h b/src/blackgui/models/windlayerlistmodel.h index be2f52614..74ca515ec 100644 --- a/src/blackgui/models/windlayerlistmodel.h +++ b/src/blackgui/models/windlayerlistmodel.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_WINDLAYERLISTMODEL_H -#define BLACKGUI_WINDLAYERLISTMODEL_H +#ifndef BLACKGUI_MODELS_WINDLAYERLISTMODEL_H +#define BLACKGUI_MODELS_WINDLAYERLISTMODEL_H #include "blackgui/blackguiexport.h" #include "blackgui/models/listmodelbase.h"