From f71e717ec145296bb6a9a02e017c311e93e9cf2d Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 6 Mar 2017 02:30:22 +0100 Subject: [PATCH] refs #899, formatting, renaming, include guard names --- src/blackgui/models/atcstationlistmodel.h | 4 ++-- src/blackgui/models/listmodeldbobjects.cpp | 18 ++++++++++---- src/blackgui/models/listmodeldbobjects.h | 24 +++++-------------- .../models/simulatedaircraftlistmodel.h | 6 ++--- src/blackgui/views/atcstationview.cpp | 6 ++--- src/blackgui/views/atcstationview.h | 2 -- src/blackgui/views/simulatedaircraftview.cpp | 1 - src/blackgui/views/simulatedaircraftview.h | 4 ++-- src/blackgui/views/viewdbobjects.cpp | 13 ++++++++++ src/blackgui/views/viewdbobjects.h | 19 +++------------ src/blackmisc/aviation/callsignobjectlist.cpp | 2 +- src/blackmisc/aviation/callsignobjectlist.h | 6 ++--- 12 files changed, 49 insertions(+), 56 deletions(-) diff --git a/src/blackgui/models/atcstationlistmodel.h b/src/blackgui/models/atcstationlistmodel.h index e756d8e15..5e5021584 100644 --- a/src/blackgui/models/atcstationlistmodel.h +++ b/src/blackgui/models/atcstationlistmodel.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_ATCLISTMODEL_H -#define BLACKGUI_ATCLISTMODEL_H +#ifndef BLACKGUI_MODELS_ATCLISTMODEL_H +#define BLACKGUI_MODELS_ATCLISTMODEL_H #include "blackgui/blackguiexport.h" #include "blackgui/models/listmodelbase.h" diff --git a/src/blackgui/models/listmodeldbobjects.cpp b/src/blackgui/models/listmodeldbobjects.cpp index a96545c0d..1d0c345ae 100644 --- a/src/blackgui/models/listmodeldbobjects.cpp +++ b/src/blackgui/models/listmodeldbobjects.cpp @@ -10,6 +10,18 @@ #include "listmodeldbobjects.h" #include "allmodelcontainers.h" #include "blackmisc/db/datastoreobjectlist.h" +#include "blackmisc/simulation/aircraftmodel.h" +#include "blackmisc/simulation/aircraftmodellist.h" +#include "blackmisc/simulation/distributor.h" +#include "blackmisc/simulation/distributorlist.h" +#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackmisc/aviation/aircrafticaocodelist.h" +#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/aviation/airlineicaocodelist.h" +#include "blackmisc/aviation/livery.h" +#include "blackmisc/aviation/liverylist.h" +#include "blackmisc/country.h" +#include "blackmisc/countrylist.h" #include "blackmisc/orderable.h" #include @@ -37,7 +49,7 @@ namespace BlackGui QVariant CListModelDbObjects::data(const QModelIndex &index, int role) const { if (role != Qt::BackgroundRole) { return CListModelBase::data(index, role); } - if (isHighlightIndex(index)) { return QBrush(m_highlightColor); } + if (isHighlightedIndex(index)) { return QBrush(m_highlightColor); } return CListModelBase::data(index, role); } @@ -49,7 +61,7 @@ namespace BlackGui } template - bool CListModelDbObjects::isHighlightIndex(const QModelIndex &index) const + bool CListModelDbObjects::isHighlightedIndex(const QModelIndex &index) const { if (!index.isValid()) { return false; } if (m_highlightKeys.isEmpty()) { return false; } @@ -97,8 +109,6 @@ namespace BlackGui return CListModelDbObjects::update(container, sort); } - // see here for the reason of thess forward instantiations - // https://isocpp.org/wiki/faq/templates#separate-template-fn-defn-from-decl template class CListModelDbObjects; template class CListModelDbObjects; template class CListModelDbObjects; diff --git a/src/blackgui/models/listmodeldbobjects.h b/src/blackgui/models/listmodeldbobjects.h index 44631fd3b..d2a826108 100644 --- a/src/blackgui/models/listmodeldbobjects.h +++ b/src/blackgui/models/listmodeldbobjects.h @@ -9,22 +9,10 @@ //! \file -#ifndef BLACKGUI_LISTMODELDBOBJECTS_H -#define BLACKGUI_LISTMODELDBOBJECTS_H +#ifndef BLACKGUI_MODELS_LISTMODELDBOBJECTS_H +#define BLACKGUI_MODELS_LISTMODELDBOBJECTS_H #include "blackgui/models/listmodelbase.h" -#include "blackmisc/aviation/aircrafticaocode.h" -#include "blackmisc/aviation/aircrafticaocodelist.h" -#include "blackmisc/aviation/airlineicaocode.h" -#include "blackmisc/aviation/airlineicaocodelist.h" -#include "blackmisc/aviation/livery.h" -#include "blackmisc/aviation/liverylist.h" -#include "blackmisc/country.h" -#include "blackmisc/countrylist.h" -#include "blackmisc/simulation/aircraftmodel.h" -#include "blackmisc/simulation/aircraftmodellist.h" -#include "blackmisc/simulation/distributor.h" -#include "blackmisc/simulation/distributorlist.h" #include #include @@ -48,15 +36,15 @@ namespace BlackGui virtual ~CListModelDbObjects() {} //! Keys to be highlighted - void setHighlightDbKeys(const QList &keys) { m_highlightKeys = keys; } + void setHighlightedDbKeys(const QList &keys) { m_highlightKeys = keys; } //! Clear the highlighted keys - void clearHighlightingDbKeys() { m_highlightKeys.clear(); } + void clearHighlightedDbKeys() { m_highlightKeys.clear(); } //! \copydoc BlackGui::Models::CListModelBaseNonTemplate::clearHighlighting virtual void clearHighlighting() override { - this->clearHighlightingDbKeys(); + this->clearHighlightedDbKeys(); CListModelBase::clearHighlighting(); } @@ -70,7 +58,7 @@ namespace BlackGui KeyType dbKeyForIndex(const QModelIndex &index) const; //! Highlight index - bool isHighlightIndex(const QModelIndex &index) const; + bool isHighlightedIndex(const QModelIndex &index) const; protected: //! Constructor diff --git a/src/blackgui/models/simulatedaircraftlistmodel.h b/src/blackgui/models/simulatedaircraftlistmodel.h index 7e998d9fe..759005122 100644 --- a/src/blackgui/models/simulatedaircraftlistmodel.h +++ b/src/blackgui/models/simulatedaircraftlistmodel.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_SIMULATEDAIRCRAFTLISTMODEL_H -#define BLACKGUI_SIMULATEDAIRCRAFTLISTMODEL_H +#ifndef BLACKGUI_MODELS_SIMULATEDAIRCRAFTLISTMODEL_H +#define BLACKGUI_MODELS_SIMULATEDAIRCRAFTLISTMODEL_H #include "blackgui/blackguiexport.h" #include "blackgui/models/listmodelbase.h" @@ -19,12 +19,10 @@ class QObject; namespace BlackMisc { namespace Simulation { class CSimulatedAircraft; } } - namespace BlackGui { namespace Models { - //! Aircraft list model class BLACKGUI_EXPORT CSimulatedAircraftListModel : public CListModelBase diff --git a/src/blackgui/views/atcstationview.cpp b/src/blackgui/views/atcstationview.cpp index 1ecc66d7d..9e81d5dd7 100644 --- a/src/blackgui/views/atcstationview.cpp +++ b/src/blackgui/views/atcstationview.cpp @@ -73,21 +73,21 @@ namespace BlackGui void CAtcStationView::ps_tuneInAtcCom1() { - CAtcStation s(this->selectedObject()); + const CAtcStation s(this->selectedObject()); if (s.getCallsign().isEmpty()) { return; } emit this->requestComFrequency(s.getFrequency(), CComSystem::Com1); } void CAtcStationView::ps_tuneInAtcCom2() { - CAtcStation s(this->selectedObject()); + const CAtcStation s(this->selectedObject()); if (s.getCallsign().isEmpty()) { return; } emit this->requestComFrequency(s.getFrequency(), CComSystem::Com2); } void CAtcStationView::ps_requestTextMessage() { - CAtcStation s(this->selectedObject()); + const CAtcStation s(this->selectedObject()); if (s.getCallsign().isEmpty()) { return; } emit this->requestTextMessageWidget(s.getCallsign()); } diff --git a/src/blackgui/views/atcstationview.h b/src/blackgui/views/atcstationview.h index 1d300e433..c20e9fa49 100644 --- a/src/blackgui/views/atcstationview.h +++ b/src/blackgui/views/atcstationview.h @@ -27,11 +27,9 @@ class QAction; class QWidget; namespace BlackMisc { namespace Aviation { class CCallsign; } } - namespace BlackGui { namespace Menus { class CMenuActions; } - namespace Views { //! ATC stations view diff --git a/src/blackgui/views/simulatedaircraftview.cpp b/src/blackgui/views/simulatedaircraftview.cpp index a23d19423..a067fd249 100644 --- a/src/blackgui/views/simulatedaircraftview.cpp +++ b/src/blackgui/views/simulatedaircraftview.cpp @@ -94,6 +94,5 @@ namespace BlackGui if (aircraft.getCallsign().isEmpty()) { return; } emit requestHighlightInSimulator(aircraft); } - } // ns } // ns diff --git a/src/blackgui/views/simulatedaircraftview.h b/src/blackgui/views/simulatedaircraftview.h index 90130eb05..aa45f3a89 100644 --- a/src/blackgui/views/simulatedaircraftview.h +++ b/src/blackgui/views/simulatedaircraftview.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKGUI_SIMULATEDAIRCRAFTVIEW_H -#define BLACKGUI_SIMULATEDAIRCRAFTVIEW_H +#ifndef BLACKGUI_VIEWS_SIMULATEDAIRCRAFTVIEW_H +#define BLACKGUI_VIEWS_SIMULATEDAIRCRAFTVIEW_H #include "blackgui/blackguiexport.h" #include "blackgui/models/simulatedaircraftlistmodel.h" diff --git a/src/blackgui/views/viewdbobjects.cpp b/src/blackgui/views/viewdbobjects.cpp index 9f55f17b8..9223e099a 100644 --- a/src/blackgui/views/viewdbobjects.cpp +++ b/src/blackgui/views/viewdbobjects.cpp @@ -9,7 +9,20 @@ #include "blackgui/menus/menuaction.h" #include "blackgui/views/viewdbobjects.h" +#include "blackgui/models/aircrafticaolistmodel.h" +#include "blackgui/models/aircraftmodellistmodel.h" +#include "blackgui/models/airlineicaolistmodel.h" +#include "blackgui/models/countrylistmodel.h" +#include "blackgui/models/distributorlistmodel.h" +#include "blackgui/models/liverylistmodel.h" +#include "blackmisc/aviation/aircrafticaocodelist.h" +#include "blackmisc/aviation/airlineicaocodelist.h" +#include "blackmisc/aviation/liverylist.h" #include "blackmisc/icons.h" +#include "blackmisc/countrylist.h" +#include "blackmisc/simulation/aircraftmodellist.h" +#include "blackmisc/simulation/distributor.h" +#include "blackmisc/simulation/distributorlist.h" #include #include diff --git a/src/blackgui/views/viewdbobjects.h b/src/blackgui/views/viewdbobjects.h index 6e3a5858a..ceb78c50a 100644 --- a/src/blackgui/views/viewdbobjects.h +++ b/src/blackgui/views/viewdbobjects.h @@ -9,24 +9,10 @@ //! \file -#ifndef BLACKGUI_VIEWDBOBJECTS_H -#define BLACKGUI_VIEWDBOBJECTS_H +#ifndef BLACKGUI_VIEWS_VIEWDBOBJECTS_H +#define BLACKGUI_VIEWS_VIEWDBOBJECTS_H -#include "blackgui/models/aircrafticaolistmodel.h" -#include "blackgui/models/aircraftmodellistmodel.h" -#include "blackgui/models/airlineicaolistmodel.h" -#include "blackgui/models/countrylistmodel.h" -#include "blackgui/models/distributorlistmodel.h" -#include "blackgui/models/liverylistmodel.h" #include "blackgui/views/viewbase.h" -#include "blackmisc/aviation/aircrafticaocodelist.h" -#include "blackmisc/aviation/airlineicaocodelist.h" -#include "blackmisc/aviation/liverylist.h" -#include "blackmisc/countrylist.h" -#include "blackmisc/simulation/aircraftmodellist.h" -#include "blackmisc/simulation/distributor.h" -#include "blackmisc/simulation/distributorlist.h" - #include #include #include @@ -34,6 +20,7 @@ class QAction; class QIntValidator; +class QFrame; class QLineEdit; class QWidget; diff --git a/src/blackmisc/aviation/callsignobjectlist.cpp b/src/blackmisc/aviation/callsignobjectlist.cpp index dd749014b..9bc7fbef0 100644 --- a/src/blackmisc/aviation/callsignobjectlist.cpp +++ b/src/blackmisc/aviation/callsignobjectlist.cpp @@ -122,7 +122,7 @@ namespace BlackMisc template int ICallsignObjectList::removeByCallsigns(const CCallsignSet &callsigns) { - return this->container().removeIf([ & ](const OBJ &obj) { return callsigns.contains(obj.getCallsign()); }); + return this->container().removeIf([ & ](const OBJ & obj) { return callsigns.contains(obj.getCallsign()); }); } template diff --git a/src/blackmisc/aviation/callsignobjectlist.h b/src/blackmisc/aviation/callsignobjectlist.h index aaf91e590..a64c196ac 100644 --- a/src/blackmisc/aviation/callsignobjectlist.h +++ b/src/blackmisc/aviation/callsignobjectlist.h @@ -48,7 +48,6 @@ namespace BlackMisc class ICallsignObjectList { public: - //! Contains callsign? bool containsCallsign(const BlackMisc::Aviation::CCallsign &callsign) const; @@ -88,12 +87,13 @@ namespace BlackMisc //! Split into 0..n containers as per callsign QHash splitPerCallsign() const; - //! Sort by callsign - void sortByCallsign(); //! Incremental update or add object int incrementalUpdateOrAdd(const OBJ &objectBeforeChanged, const BlackMisc::CPropertyIndexVariantMap &changedValues); + //! Sort by callsign + void sortByCallsign(); + protected: //! Constructor ICallsignObjectList();