Models guard names and style

This commit is contained in:
Klaus Basan
2019-02-01 16:59:42 +01:00
committed by Mat Sutcliffe
parent f78d13047e
commit 74be37339e
24 changed files with 51 additions and 56 deletions

View File

@@ -9,8 +9,8 @@
//! \file //! \file
#ifndef BLACKGUI_ACTIONHOTKEYLISTMODEL_H #ifndef BLACKGUI_MODELS_ACTIONHOTKEYLISTMODEL_H
#define BLACKGUI_ACTIONHOTKEYLISTMODEL_H #define BLACKGUI_MODELS_ACTIONHOTKEYLISTMODEL_H
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"
#include "blackmisc/input/actionhotkeylist.h" #include "blackmisc/input/actionhotkeylist.h"
@@ -43,7 +43,7 @@ namespace BlackGui
CActionHotkeyListModel(QObject *parent = nullptr); CActionHotkeyListModel(QObject *parent = nullptr);
//! Destructor //! Destructor
virtual ~CActionHotkeyListModel() {} virtual ~CActionHotkeyListModel() override {}
//! \copydoc QAbstractTableModel::rowCount //! \copydoc QAbstractTableModel::rowCount
int rowCount(const QModelIndex &parent = QModelIndex()) const override; int rowCount(const QModelIndex &parent = QModelIndex()) const override;

View File

@@ -9,8 +9,8 @@
//! \file //! \file
#ifndef BLACKGUI_ACTIONITEM_H #ifndef BLACKGUI_MODELS_ACTIONITEM_H
#define BLACKGUI_ACTIONITEM_H #define BLACKGUI_MODELS_ACTIONITEM_H
#include <QList> #include <QList>
#include <QString> #include <QString>

View File

@@ -9,8 +9,8 @@
//! \file //! \file
#ifndef BLACKGUI_ACTIONMODEL_H #ifndef BLACKGUI_MODELS_ACTIONMODEL_H
#define BLACKGUI_ACTIONMODEL_H #define BLACKGUI_MODELS_ACTIONMODEL_H
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"

View File

@@ -9,12 +9,12 @@
//! \file //! \file
#ifndef BLACKGUI_AIRCRAFTICAOLISTMODEL_H #ifndef BLACKGUI_MODELS_AIRCRAFTICAOLISTMODEL_H
#define BLACKGUI_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/aircrafticaocodelist.h"
#include "blackmisc/aviation/aircrafticaocode.h"
#include "blackgui/models/listmodeldbobjects.h"
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"
namespace BlackGui namespace BlackGui

View File

@@ -9,8 +9,8 @@
//! \file //! \file
#ifndef BLACKGUI_AIRCRAFTMODELFILTER_H #ifndef BLACKGUI_MODELS_AIRCRAFTMODELFILTER_H
#define BLACKGUI_AIRCRAFTMODELFILTER_H #define BLACKGUI_MODELS_AIRCRAFTMODELFILTER_H
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"
#include "blackgui/models/modelfilter.h" #include "blackgui/models/modelfilter.h"

View File

@@ -9,8 +9,8 @@
//! \file //! \file
#ifndef BLACKGUI_AIRCRAFTMODELLISTMODEL_H #ifndef BLACKGUI_MODELS_AIRCRAFTMODELLISTMODEL_H
#define BLACKGUI_AIRCRAFTMODELLISTMODEL_H #define BLACKGUI_MODELS_AIRCRAFTMODELLISTMODEL_H
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"
#include "blackgui/models/listmodeldbobjects.h" #include "blackgui/models/listmodeldbobjects.h"

View File

@@ -9,8 +9,8 @@
//! \file //! \file
#ifndef BLACKGUI_AIRPORTLISTMODEL_H #ifndef BLACKGUI_MODELS_AIRPORTLISTMODEL_H
#define BLACKGUI_AIRPORTLISTMODEL_H #define BLACKGUI_MODELS_AIRPORTLISTMODEL_H
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"
#include "blackgui/models/listmodelbase.h" #include "blackgui/models/listmodelbase.h"

View File

@@ -9,8 +9,8 @@
//! \file //! \file
#ifndef BLACKGUI_CLOUDLAYERLISTMODEL_H #ifndef BLACKGUI_MODELS_CLOUDLAYERLISTMODEL_H
#define BLACKGUI_CLOUDLAYERLISTMODEL_H #define BLACKGUI_MODELS_CLOUDLAYERLISTMODEL_H
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"
#include "blackgui/models/listmodelbase.h" #include "blackgui/models/listmodelbase.h"

View File

@@ -9,8 +9,8 @@
//! \file //! \file
#ifndef BLACKGUI_COLUMNFORMATTERS_H #ifndef BLACKGUI_MODELS_COLUMNFORMATTERS_H
#define BLACKGUI_COLUMNFORMATTERS_H #define BLACKGUI_MODELS_COLUMNFORMATTERS_H
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"
#include "blackgui/led.h" #include "blackgui/led.h"

View File

@@ -9,8 +9,8 @@
//! \file //! \file
#ifndef BLACKGUI_COLUMNS_H #ifndef BLACKGUI_MODELS_COLUMNS_H
#define BLACKGUI_COLUMNS_H #define BLACKGUI_MODELS_COLUMNS_H
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"
#include "blackgui/models/columnformatters.h" #include "blackgui/models/columnformatters.h"

View File

@@ -9,8 +9,8 @@
//! \file //! \file
#ifndef BLACKGUI_COUNTRYFILTER_H #ifndef BLACKGUI_MODELS_COUNTRYFILTER_H
#define BLACKGUI_COUNTRYFILTER_H #define BLACKGUI_MODELS_COUNTRYFILTER_H
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"
#include "blackgui/models/modelfilter.h" #include "blackgui/models/modelfilter.h"

View File

@@ -9,8 +9,8 @@
//! \file //! \file
#ifndef BLACKGUI_DISTRIBUTORFILTER_H #ifndef BLACKGUI_MODELS_DISTRIBUTORFILTER_H
#define BLACKGUI_DISTRIBUTORFILTER_H #define BLACKGUI_MODELS_DISTRIBUTORFILTER_H
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"
#include "blackgui/models/modelfilter.h" #include "blackgui/models/modelfilter.h"

View File

@@ -9,8 +9,8 @@
//! \file //! \file
#ifndef BLACKGUI_DISTRIBUTORLISTMODEL_H #ifndef BLACKGUI_MODELS_DISTRIBUTORLISTMODEL_H
#define BLACKGUI_DISTRIBUTORLISTMODEL_H #define BLACKGUI_MODELS_DISTRIBUTORLISTMODEL_H
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"
#include "blackgui/models/listmodeldbobjects.h" #include "blackgui/models/listmodeldbobjects.h"

View File

@@ -9,8 +9,8 @@
//! \file //! \file
#ifndef BLACKGUI_IDENTIFIERLISTMODEL_H #ifndef BLACKGUI_MODELS_IDENTIFIERLISTMODEL_H
#define BLACKGUI_IDENTIFIERLISTMODEL_H #define BLACKGUI_MODELS_IDENTIFIERLISTMODEL_H
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"
#include "blackgui/models/listmodelbase.h" #include "blackgui/models/listmodelbase.h"

View File

@@ -9,17 +9,12 @@
//! \file //! \file
#ifndef BLACKGUI_LISTMODELBASE_H #ifndef BLACKGUI_MODELS_LISTMODELBASE_H
#define BLACKGUI_LISTMODELBASE_H #define BLACKGUI_MODELS_LISTMODELBASE_H
#include "blackgui/models/listmodelbasenontemplate.h" #include "blackgui/models/listmodelbasenontemplate.h"
//#include "blackgui/models/columns.h"
#include "blackgui/models/modelfilter.h" #include "blackgui/models/modelfilter.h"
#include "blackgui/models/selectionmodel.h" #include "blackgui/models/selectionmodel.h"
//#include "blackgui/dropbase.h"
//#include "blackgui/blackguiexport.h"
//#include "blackmisc/digestsignal.h"
//#include "blackmisc/variant.h"
#include <QJsonDocument> #include <QJsonDocument>
#include <QJsonObject> #include <QJsonObject>

View File

@@ -9,8 +9,8 @@
//! \file //! \file
#ifndef BLACKGUI_LISTMODELBASENONTEMPLATE_H #ifndef BLACKGUI_MODELS_LISTMODELBASENONTEMPLATE_H
#define BLACKGUI_LISTMODELBASENONTEMPLATE_H #define BLACKGUI_MODELS_LISTMODELBASENONTEMPLATE_H
#include "blackgui/models/columns.h" #include "blackgui/models/columns.h"
#include "blackgui/dropbase.h" #include "blackgui/dropbase.h"

View File

@@ -9,8 +9,8 @@
//! \file //! \file
#ifndef BLACKGUI_LISTMODELFILTER_H #ifndef BLACKGUI_MODELS_LISTMODELFILTER_H
#define BLACKGUI_LISTMODELFILTER_H #define BLACKGUI_MODELS_LISTMODELFILTER_H
#include "blackmisc/aviation/aircrafticaocodelist.h" #include "blackmisc/aviation/aircrafticaocodelist.h"
#include "blackmisc/aviation/airlineicaocodelist.h" #include "blackmisc/aviation/airlineicaocodelist.h"

View File

@@ -9,8 +9,8 @@
//! \file //! \file
#ifndef BLACKGUI_SELECTIONMODEL_H #ifndef BLACKGUI_MODELS_SELECTIONMODEL_H
#define BLACKGUI_SELECTIONMODEL_H #define BLACKGUI_MODELS_SELECTIONMODEL_H
namespace BlackGui namespace BlackGui
{ {

View File

@@ -9,8 +9,8 @@
//! \file //! \file
#ifndef BLACKGUI_SERVERLISTMODEL_H #ifndef BLACKGUI_MODELS_SERVERLISTMODEL_H
#define BLACKGUI_SERVERLISTMODEL_H #define BLACKGUI_MODELS_SERVERLISTMODEL_H
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"
#include "blackgui/models/listmodelbase.h" #include "blackgui/models/listmodelbase.h"

View File

@@ -9,8 +9,8 @@
//! \file //! \file
#ifndef BLACKGUI_STATUSMESSAGEFILTER_H #ifndef BLACKGUI_MODELS_STATUSMESSAGEFILTER_H
#define BLACKGUI_STATUSMESSAGEFILTER_H #define BLACKGUI_MODELS_STATUSMESSAGEFILTER_H
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"
#include "blackgui/models/modelfilter.h" #include "blackgui/models/modelfilter.h"

View File

@@ -9,8 +9,8 @@
//! \file //! \file
#ifndef BLACKGUI_STATUSMESSAGELISTMODEL_H #ifndef BLACKGUI_MODELS_STATUSMESSAGELISTMODEL_H
#define BLACKGUI_STATUSMESSAGELISTMODEL_H #define BLACKGUI_MODELS_STATUSMESSAGELISTMODEL_H
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"
#include "blackgui/models/listmodeltimestampobjects.h" #include "blackgui/models/listmodeltimestampobjects.h"

View File

@@ -9,8 +9,8 @@
//! \file //! \file
#ifndef BLACKGUI_TEXTMESSAGELISTMODEL_H #ifndef BLACKGUI_MODELS_TEXTMESSAGELISTMODEL_H
#define BLACKGUI_TEXTMESSAGELISTMODEL_H #define BLACKGUI_MODELS_TEXTMESSAGELISTMODEL_H
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"
#include "blackgui/models/listmodelbase.h" #include "blackgui/models/listmodelbase.h"

View File

@@ -9,8 +9,8 @@
//! \file //! \file
#ifndef BLACKGUI_USERLISTMODEL_H #ifndef BLACKGUI_MODELS_USERLISTMODEL_H
#define BLACKGUI_USERLISTMODEL_H #define BLACKGUI_MODELS_USERLISTMODEL_H
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"
#include "blackgui/models/listmodelbase.h" #include "blackgui/models/listmodelbase.h"

View File

@@ -9,8 +9,8 @@
//! \file //! \file
#ifndef BLACKGUI_WINDLAYERLISTMODEL_H #ifndef BLACKGUI_MODELS_WINDLAYERLISTMODEL_H
#define BLACKGUI_WINDLAYERLISTMODEL_H #define BLACKGUI_MODELS_WINDLAYERLISTMODEL_H
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"
#include "blackgui/models/listmodelbase.h" #include "blackgui/models/listmodelbase.h"