From 0de9a2afc2fb2c3512dad57d86696d87d1ecbf83 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Tue, 7 Nov 2017 04:29:20 +0100
Subject: [PATCH] Ref T182, mapping / overlay component formatting

---
 src/blackgui/components/mappingcomponent.cpp | 14 +++++++-------
 src/blackgui/overlaymessagesframe.cpp        | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/blackgui/components/mappingcomponent.cpp b/src/blackgui/components/mappingcomponent.cpp
index 9b50d498a..0a6c8cb0b 100644
--- a/src/blackgui/components/mappingcomponent.cpp
+++ b/src/blackgui/components/mappingcomponent.cpp
@@ -88,8 +88,8 @@ namespace BlackGui
             connect(ui->pb_ResetAircraft, &QPushButton::clicked, this, &CMappingComponent::ps_onResetAircraft);
             connect(ui->pb_LoadModels, &QPushButton::clicked, this, &CMappingComponent::ps_onModelsUpdateRequested);
 
-            this->m_currentMappingsViewDelegate = new CCheckBoxDelegate(":/diagona/icons/diagona/icons/tick.png", ":/diagona/icons/diagona/icons/cross.png", this);
-            ui->tvp_RenderedAircraft->setItemDelegateForColumn(0, this->m_currentMappingsViewDelegate);
+            m_currentMappingsViewDelegate = new CCheckBoxDelegate(":/diagona/icons/diagona/icons/tick.png", ":/diagona/icons/diagona/icons/cross.png", this);
+            ui->tvp_RenderedAircraft->setItemDelegateForColumn(0, m_currentMappingsViewDelegate);
 
             // Aircraft previews
             connect(ui->cb_AircraftIconDisplayed, &QCheckBox::stateChanged, this, &CMappingComponent::ps_onModelPreviewChanged);
@@ -439,15 +439,15 @@ namespace BlackGui
 
         void CMappingComponent::ps_tokenBucketUpdate()
         {
-            if (!this->m_bucket.tryConsume()) { return; }
+            if (!m_bucket.tryConsume()) { return; }
             this->updateRenderedAircraftView(true); // forced update
         }
 
         void CMappingComponent::ps_settingsChanged()
         {
-            const CViewUpdateSettings settings = this->m_settings.get();
+            const CViewUpdateSettings settings = m_settings.get();
             const int ms = settings.getRenderingUpdateTime().toMs();
-            this->m_updateTimer.setInterval(ms);
+            m_updateTimer.setInterval(ms);
         }
 
         void CMappingComponent::ps_connectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to)
@@ -456,11 +456,11 @@ namespace BlackGui
             if (INetwork::isDisconnectedStatus(to))
             {
                 ui->tvp_RenderedAircraft->clear();
-                this->m_updateTimer.stop();
+                m_updateTimer.stop();
             }
             else if (INetwork::isConnectedStatus(to))
             {
-                this->m_updateTimer.start();
+                m_updateTimer.start();
             }
         }
     } // namespace
diff --git a/src/blackgui/overlaymessagesframe.cpp b/src/blackgui/overlaymessagesframe.cpp
index f478f59ff..c1f339a8d 100644
--- a/src/blackgui/overlaymessagesframe.cpp
+++ b/src/blackgui/overlaymessagesframe.cpp
@@ -47,7 +47,7 @@ namespace BlackGui
     }
 
     void COverlayMessagesFrame::showOverlayMessagesWithConfirmation(
-        const BlackMisc::CStatusMessageList &messages, bool appendOldMessages,
+        const CStatusMessageList &messages, bool appendOldMessages,
         const QString &confirmationMessage, std::function<void ()> okLambda,
         QMessageBox::StandardButton defaultButton, int timeOutMs)
     {
@@ -70,7 +70,7 @@ namespace BlackGui
         this->repaint();
     }
 
-    void COverlayMessagesFrame::showOverlayMessages(const BlackMisc::CStatusMessageList &messages, bool appendOldMessages, int timeOutMs)
+    void COverlayMessagesFrame::showOverlayMessages(const CStatusMessageList &messages, bool appendOldMessages, int timeOutMs)
     {
         if (messages.isEmpty()) { return; }
         this->initInnerFrame();
@@ -78,7 +78,7 @@ namespace BlackGui
         this->repaint();
     }
 
-    void COverlayMessagesFrame::showOverlayTextMessage(const BlackMisc::Network::CTextMessage &textMessage, int timeOutMs)
+    void COverlayMessagesFrame::showOverlayTextMessage(const Network::CTextMessage &textMessage, int timeOutMs)
     {
         if (textMessage.isEmpty()) { return; }
         this->initInnerFrame();
@@ -86,14 +86,14 @@ namespace BlackGui
         this->repaint();
     }
 
-    void COverlayMessagesFrame::showOverlayVariant(const BlackMisc::CVariant &variant, int timeOutMs)
+    void COverlayMessagesFrame::showOverlayVariant(const CVariant &variant, int timeOutMs)
     {
         this->initInnerFrame();
         m_overlayMessages->showOverlayVariant(variant, timeOutMs);
         this->repaint();
     }
 
-    void COverlayMessagesFrame::showOverlayImage(const BlackMisc::CPixmap &pixmap, int timeOutMs)
+    void COverlayMessagesFrame::showOverlayImage(const CPixmap &pixmap, int timeOutMs)
     {
         this->initInnerFrame();
         m_overlayMessages->showOverlayImage(pixmap, timeOutMs);
@@ -130,8 +130,8 @@ namespace BlackGui
 
         int wInner = m_widthFactor * w;
         int hInner = m_heightFactor * h;
-        if (wInner > this->maximumWidth()) wInner = this->maximumWidth();
-        if (hInner > this->maximumHeight()) hInner = this->maximumHeight();
+        if (wInner > this->maximumWidth())  { wInner = this->maximumWidth();  }
+        if (hInner > this->maximumHeight()) { hInner = this->maximumHeight(); }
         return QSize(wInner, hInner);
     }