From eddaeddfc473b4500b60f36d9459e55d39683bcc Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 6 Jan 2019 11:20:24 +0100 Subject: [PATCH] Ref T506, style --- src/blackgui/components/enablefordockwidgetinfoarea.cpp | 4 ++-- src/blackgui/components/enablefordockwidgetinfoarea.h | 6 +++--- src/blackgui/components/textmessagecomponent.cpp | 4 ++-- src/blackgui/views/simulatedaircraftview.cpp | 2 +- src/blackgui/views/viewbase.cpp | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/blackgui/components/enablefordockwidgetinfoarea.cpp b/src/blackgui/components/enablefordockwidgetinfoarea.cpp index 6fbbb2256..6b9c518f1 100644 --- a/src/blackgui/components/enablefordockwidgetinfoarea.cpp +++ b/src/blackgui/components/enablefordockwidgetinfoarea.cpp @@ -91,9 +91,9 @@ namespace BlackGui if (this->isVisibleWidget()) { return; } // select myself - if (getParentInfoArea()) + if (this->getParentInfoArea()) { - getParentInfoArea()->selectArea(this->getDockWidgetInfoArea()); + this->getParentInfoArea()->selectArea(this->getDockWidgetInfoArea()); } } diff --git a/src/blackgui/components/enablefordockwidgetinfoarea.h b/src/blackgui/components/enablefordockwidgetinfoarea.h index e2efe0c3a..6191423a6 100644 --- a/src/blackgui/components/enablefordockwidgetinfoarea.h +++ b/src/blackgui/components/enablefordockwidgetinfoarea.h @@ -31,14 +31,14 @@ namespace BlackGui { public: //! Corresponding dockable widget in info area - BlackGui::CDockWidgetInfoArea *getDockWidgetInfoArea() const { return m_parentDockableInfoArea; } + CDockWidgetInfoArea *getDockWidgetInfoArea() const { return m_parentDockableInfoArea; } //! Has dock area? bool hasDockWidgetArea() const { return m_parentDockableInfoArea; } //! Corresponding dockable widget in info area //! \remarks Usually set from CDockWidgetInfoArea when it is fully initialized - virtual bool setParentDockWidgetInfoArea(BlackGui::CDockWidgetInfoArea *parentDockableWidget); + virtual bool setParentDockWidgetInfoArea(CDockWidgetInfoArea *parentDockableWidget); //! The parent info area CInfoArea *getParentInfoArea() const; @@ -67,7 +67,7 @@ namespace BlackGui virtual ~CEnableForDockWidgetInfoArea() {} private: - BlackGui::CDockWidgetInfoArea *m_parentDockableInfoArea = nullptr; //!< my parent dockable widget + CDockWidgetInfoArea *m_parentDockableInfoArea = nullptr; //!< my parent dockable widget BlackMisc::CConnectionGuard m_connections; }; } diff --git a/src/blackgui/components/textmessagecomponent.cpp b/src/blackgui/components/textmessagecomponent.cpp index dcc55eb9f..19cc80f63 100644 --- a/src/blackgui/components/textmessagecomponent.cpp +++ b/src/blackgui/components/textmessagecomponent.cpp @@ -643,12 +643,12 @@ namespace BlackGui { if (!callsign.isAtcCallsign() && sGui->getIContextNetwork()->isAircraftInRange(callsign)) { - // we assume a private message + // we assume a private message from a pilot w = this->addNewTextMessageTab(callsign); } else if (sGui->getIContextNetwork()->isOnlineStation(callsign)) { - // we assume a private message + // we assume a private message of ATC w = this->addNewTextMessageTab(callsign); } } diff --git a/src/blackgui/views/simulatedaircraftview.cpp b/src/blackgui/views/simulatedaircraftview.cpp index c67783b5a..a74ec4418 100644 --- a/src/blackgui/views/simulatedaircraftview.cpp +++ b/src/blackgui/views/simulatedaircraftview.cpp @@ -83,7 +83,7 @@ namespace BlackGui const bool hasContexts = sGui && sGui->supportsContexts(); if (hasContexts) { - CSimulatedAircraft aircraft(this->selectedObject()); + const CSimulatedAircraft aircraft(this->selectedObject()); Q_ASSERT(!aircraft.getCallsign().isEmpty()); menuActions.addMenuCom(); menuActions.addAction(CIcons::appTextMessages16(), "Show text messages", CMenuAction::pathClientCom(), { this, &CSimulatedAircraftView::requestTextMessage }); diff --git a/src/blackgui/views/viewbase.cpp b/src/blackgui/views/viewbase.cpp index 00709807d..07e9028a7 100644 --- a/src/blackgui/views/viewbase.cpp +++ b/src/blackgui/views/viewbase.cpp @@ -859,7 +859,7 @@ namespace BlackGui template bool CViewBase::filterDialogFinished(int status) { - QDialog::DialogCode statusCode = static_cast(status); + const QDialog::DialogCode statusCode = static_cast(status); return filterWidgetChangedFilter(statusCode == QDialog::Accepted); }