From 927343399c8c756720dc6b4b3694afdea89af49c Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Tue, 22 Nov 2016 03:51:25 +0100
Subject: [PATCH] refs #816, some formatting in message component

---
 src/blackgui/components/textmessagecomponent.cpp | 12 ++++++------
 src/blackgui/components/textmessagecomponent.h   | 14 ++++++--------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/blackgui/components/textmessagecomponent.cpp b/src/blackgui/components/textmessagecomponent.cpp
index 9a56ab0d2..6e2e849c6 100644
--- a/src/blackgui/components/textmessagecomponent.cpp
+++ b/src/blackgui/components/textmessagecomponent.cpp
@@ -117,7 +117,7 @@ namespace BlackGui
         void CTextMessageComponent::displayTextMessage(const CTextMessageList &messages)
         {
             if (messages.isEmpty()) return;
-            foreach (CTextMessage message, messages)
+            for (const CTextMessage &message : messages)
             {
                 bool relevantForMe = false;
 
@@ -281,14 +281,14 @@ namespace BlackGui
         void CTextMessageComponent::addPrivateChannelTextMessage(const CTextMessage &textMessage)
         {
             if (!textMessage.isPrivateMessage()) { return; }
-            CCallsign cs = textMessage.wasSent() ? textMessage.getRecipientCallsign() : textMessage.getSenderCallsign();
+            const CCallsign cs = textMessage.wasSent() ? textMessage.getRecipientCallsign() : textMessage.getSenderCallsign();
             if (cs.isEmpty()) { return; }
             QWidget *tab = this->findTextMessageTabByCallsign(cs);
-            if (tab == nullptr) { tab = this->addNewTextMessageTab(cs); }
-            Q_ASSERT(tab != nullptr);
+            if (!tab) { tab = this->addNewTextMessageTab(cs); }
+            Q_ASSERT_X(tab, Q_FUNC_INFO, "Missing tab");
             CTextMessageTextEdit *textEdit = tab->findChild<CTextMessageTextEdit *>();
-            Q_ASSERT(textEdit != nullptr);
-            if (textEdit == nullptr) { return; } // do not crash, though this situation could not happen
+            Q_ASSERT_X(textEdit, Q_FUNC_INFO, "Missing text edit");
+            if (!textEdit) { return; } // do not crash, though this situation could not happen
             textEdit->insertTextMessage(textMessage);
 
             // sound
diff --git a/src/blackgui/components/textmessagecomponent.h b/src/blackgui/components/textmessagecomponent.h
index 949099925..199de9e09 100644
--- a/src/blackgui/components/textmessagecomponent.h
+++ b/src/blackgui/components/textmessagecomponent.h
@@ -32,7 +32,6 @@ namespace BlackMisc
     namespace Network { class CTextMessage; }
 }
 namespace Ui { class CTextMessageComponent; }
-
 namespace BlackGui
 {
     class CDockWidgetInfoArea;
@@ -60,9 +59,9 @@ namespace BlackGui
             explicit CTextMessageComponent(QWidget *parent = nullptr);
 
             //! Destructor
-            ~CTextMessageComponent();
+            virtual ~CTextMessageComponent();
 
-            //! copydoc CEnableForDockWidgetInfoArea::setParentDockWidgetInfoArea
+            //! \copydoc CEnableForDockWidgetInfoArea::setParentDockWidgetInfoArea
             virtual bool setParentDockWidgetInfoArea(BlackGui::CDockWidgetInfoArea *parentDockableWidget) override;
 
         signals:
@@ -99,7 +98,7 @@ namespace BlackGui
             QWidget *addNewTextMessageTab(const BlackMisc::Aviation::CCallsign &callsign);
 
             //! Add new text message tab
-            //! \param tabName   name of the new tab, usually the channel name
+            //! \param tabName name of the new tab, usually the channel name
             QWidget *addNewTextMessageTab(const QString &tabName);
 
             //! Find text message tab by callsign
@@ -111,7 +110,7 @@ namespace BlackGui
             //! Private channel text message
             void addPrivateChannelTextMessage(const BlackMisc::Network::CTextMessage &textMessage);
 
-            //! own aircraft
+            //! Own aircraft
             const BlackMisc::Simulation::CSimulatedAircraft getOwnAircraft() const;
 
             //! For this text message's recepient, is the current tab selected?
@@ -136,7 +135,6 @@ namespace BlackGui
             void handleEnteredTextMessage(const QString &textMessage);
 
         private slots:
-
             //! Cockpit values changed, used to updated some components
             void ps_onChangedAircraftCockpit();
 
@@ -149,6 +147,6 @@ namespace BlackGui
             //! Command line entered
             void ps_textMessageEntered();
         };
-    }
-}
+    } // ns
+} // ns
 #endif // guard