From 17f67d6106d25dd20b17aa87f81d204eb5add2b2 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 30 Jan 2019 12:28:39 +0100 Subject: [PATCH] Style --- src/blackgui/models/listmodelbase.cpp | 4 ++-- src/blackgui/models/listmodeldbobjects.cpp | 12 ++++++------ src/blackgui/views/statusmessageview.cpp | 2 +- src/blackgui/views/statusmessageview.h | 2 +- src/blackmisc/db/datastore.h | 2 +- src/blackmisc/sequence.h | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/blackgui/models/listmodelbase.cpp b/src/blackgui/models/listmodelbase.cpp index d5be7c510..38a98044d 100644 --- a/src/blackgui/models/listmodelbase.cpp +++ b/src/blackgui/models/listmodelbase.cpp @@ -237,11 +237,11 @@ namespace BlackGui if (container.size() > asyncThreshold && sort) { // larger container with sorting - updateAsync(container, sort); + this->updateAsync(container, sort); } else { - update(container, sort); + this->update(container, sort); } } diff --git a/src/blackgui/models/listmodeldbobjects.cpp b/src/blackgui/models/listmodeldbobjects.cpp index 6cc5618dd..d07d12f2f 100644 --- a/src/blackgui/models/listmodeldbobjects.cpp +++ b/src/blackgui/models/listmodeldbobjects.cpp @@ -10,18 +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/aircraftmodel.h" #include "blackmisc/simulation/distributorlist.h" -#include "blackmisc/aviation/aircrafticaocode.h" +#include "blackmisc/simulation/distributor.h" #include "blackmisc/aviation/aircrafticaocodelist.h" -#include "blackmisc/aviation/airlineicaocode.h" +#include "blackmisc/aviation/aircrafticaocode.h" #include "blackmisc/aviation/airlineicaocodelist.h" -#include "blackmisc/aviation/livery.h" +#include "blackmisc/aviation/airlineicaocode.h" #include "blackmisc/aviation/liverylist.h" -#include "blackmisc/country.h" +#include "blackmisc/aviation/livery.h" #include "blackmisc/countrylist.h" +#include "blackmisc/country.h" #include "blackmisc/orderable.h" #include diff --git a/src/blackgui/views/statusmessageview.cpp b/src/blackgui/views/statusmessageview.cpp index dee1d03b4..99aab2f6a 100644 --- a/src/blackgui/views/statusmessageview.cpp +++ b/src/blackgui/views/statusmessageview.cpp @@ -23,8 +23,8 @@ namespace BlackGui CStatusMessageView::CStatusMessageView(QWidget *parent) : CViewBase(parent) { m_menus |= MenuClear; - this->menuRemoveItems(MenuRefresh | MenuBackend | MenuToggleSelectionMode); m_acceptRowSelection = true; + this->menuRemoveItems(MenuRefresh | MenuBackend | MenuToggleSelectionMode); this->standardInit(new CStatusMessageListModel(this)); } diff --git a/src/blackgui/views/statusmessageview.h b/src/blackgui/views/statusmessageview.h index 442ae3904..808cde679 100644 --- a/src/blackgui/views/statusmessageview.h +++ b/src/blackgui/views/statusmessageview.h @@ -44,7 +44,7 @@ namespace BlackGui void keepLatest(int desiredSize); //! Filter dialog if any - BlackGui::Filters::CStatusMessageFilterDialog *getFilterDialog() const; + Filters::CStatusMessageFilterDialog *getFilterDialog() const; }; } // ns } // ns diff --git a/src/blackmisc/db/datastore.h b/src/blackmisc/db/datastore.h index e043f4e75..94cf8b3a7 100644 --- a/src/blackmisc/db/datastore.h +++ b/src/blackmisc/db/datastore.h @@ -46,7 +46,7 @@ namespace BlackMisc class BLACKMISC_EXPORT IDatastoreObject : public ITimestampBased { // since we use different keys all the compares, set, get are in the derived class - // in general we can say, it was a bad decisio to use different key types + // in general we can say, it was a bad decision to use different key types // IndexDbIntegerKey = CPropertyIndex::GlobalIndexIDatastore for future usage public: diff --git a/src/blackmisc/sequence.h b/src/blackmisc/sequence.h index 83a218f27..e1ff70577 100644 --- a/src/blackmisc/sequence.h +++ b/src/blackmisc/sequence.h @@ -243,7 +243,7 @@ namespace BlackMisc //! Removes an element at the end of the sequence. void pop_back() { Q_ASSERT(!empty()); m_impl.pop_back(); } - //! Removes an element at the end of the sequence. + //! Removes an element at the front of the sequence. void pop_front() { Q_ASSERT(!empty()); erase(begin()); } //! Remove the element pointed to by the given iterator.