From 8c10237dce7fbfa40d7c8bc6b1e921cd032765e4 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sun, 9 Sep 2018 02:36:16 +0200
Subject: [PATCH] Ref T343, style

---
 src/blackgui/models/userlistmodel.cpp | 36 +++++++++++----------------
 src/blackgui/models/userlistmodel.h   |  5 +---
 src/blackgui/views/userview.cpp       |  8 +++---
 src/blackgui/views/userview.h         |  7 ++----
 4 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/src/blackgui/models/userlistmodel.cpp b/src/blackgui/models/userlistmodel.cpp
index 139758f9e..9d279e5fc 100644
--- a/src/blackgui/models/userlistmodel.cpp
+++ b/src/blackgui/models/userlistmodel.cpp
@@ -24,9 +24,6 @@ namespace BlackGui
 {
     namespace Models
     {
-        /*
-         * Constructor
-         */
         CUserListModel::CUserListModel(UserMode userMode, QObject *parent) :
             CListModelBase("ModelUserList", parent), m_userMode(NotSet)
         {
@@ -40,37 +37,34 @@ namespace BlackGui
             (void)QT_TRANSLATE_NOOP("ModelUserList", "email");
         }
 
-        /*
-         * Mode
-         */
         void CUserListModel::setUserMode(CUserListModel::UserMode userMode)
         {
-            if (this->m_userMode == userMode) return;
-            this->m_userMode = userMode;
-            this->m_columns.clear();
+            if (m_userMode == userMode) return;
+            m_userMode = userMode;
+            m_columns.clear();
             switch (userMode)
             {
             case NotSet:
             case UserDetailed:
-                this->m_columns.addColumn(CColumn(CUser::IndexIcon));
-                this->m_columns.addColumn(CColumn::standardString("realname", CUser::IndexRealName));
-                this->m_columns.addColumn(CColumn::standardValueObject("callsign", { CUser::IndexCallsign, CCallsign::IndexCallsignString }));
-                this->m_columns.addColumn(CColumn::standardValueObject("hb.", "homebase", { CUser::IndexHomebase, CAirportIcaoCode::IndexString }));
-                this->m_columns.addColumn(CColumn::standardString("userid", CUser::IndexId));
+                m_columns.addColumn(CColumn(CUser::IndexIcon));
+                m_columns.addColumn(CColumn::standardString("realname", CUser::IndexRealName));
+                m_columns.addColumn(CColumn::standardValueObject("callsign", { CUser::IndexCallsign, CCallsign::IndexCallsignString }));
+                m_columns.addColumn(CColumn::standardValueObject("hb.", "homebase", { CUser::IndexHomebase, CAirportIcaoCode::IndexString }));
+                m_columns.addColumn(CColumn::standardString("userid", CUser::IndexId));
 
                 // default sort order
                 this->setSortColumnByPropertyIndex(CUser::IndexRealName);
-                this->m_sortOrder = Qt::AscendingOrder;
+                m_sortOrder = Qt::AscendingOrder;
                 break;
 
             case UserShort:
-                this->m_columns.addColumn(CColumn(CUser::IndexIcon));
-                this->m_columns.addColumn(CColumn::standardString("realname", CUser::IndexRealName));
-                this->m_columns.addColumn(CColumn::standardValueObject("callsign", CUser::IndexCallsign));
+                m_columns.addColumn(CColumn(CUser::IndexIcon));
+                m_columns.addColumn(CColumn::standardString("realname", CUser::IndexRealName));
+                m_columns.addColumn(CColumn::standardValueObject("callsign", CUser::IndexCallsign));
 
                 // default sort order
                 this->setSortColumnByPropertyIndex(CUser::IndexCallsign);
-                this->m_sortOrder = Qt::AscendingOrder;
+                m_sortOrder = Qt::AscendingOrder;
                 break;
 
             default:
@@ -78,5 +72,5 @@ namespace BlackGui
                 break;
             }
         }
-    }
-}
+    } // ns
+} // ns
diff --git a/src/blackgui/models/userlistmodel.h b/src/blackgui/models/userlistmodel.h
index 69829a60f..5e36e8546 100644
--- a/src/blackgui/models/userlistmodel.h
+++ b/src/blackgui/models/userlistmodel.h
@@ -14,11 +14,8 @@
 
 #include "blackgui/blackguiexport.h"
 #include "blackgui/models/listmodelbase.h"
-#include "blackmisc/network/user.h"
 #include "blackmisc/network/userlist.h"
 
-class QObject;
-
 namespace BlackGui
 {
     namespace Models
@@ -49,7 +46,7 @@ namespace BlackGui
             void setUserMode(UserMode userMode);
 
         private:
-            UserMode m_userMode;
+            UserMode m_userMode = NotSet;
         };
     }
 }
diff --git a/src/blackgui/views/userview.cpp b/src/blackgui/views/userview.cpp
index c7dd4a082..40d0f6832 100644
--- a/src/blackgui/views/userview.cpp
+++ b/src/blackgui/views/userview.cpp
@@ -26,8 +26,8 @@ namespace BlackGui
 
         void CUserView::setUserMode(CUserListModel::UserMode userMode)
         {
-            Q_ASSERT(this->m_model);
-            this->m_model->setUserMode(userMode);
+            Q_ASSERT(m_model);
+            m_model->setUserMode(userMode);
         }
-    }
-}
+    } // ns
+} // ns
diff --git a/src/blackgui/views/userview.h b/src/blackgui/views/userview.h
index 3a7bff5e6..9fc854f07 100644
--- a/src/blackgui/views/userview.h
+++ b/src/blackgui/views/userview.h
@@ -17,9 +17,7 @@
 #include "blackgui/views/viewbase.h"
 #include "blackmisc/network/userlist.h"
 
-class QWidget;
 namespace BlackMisc { namespace Network { class CUser; } }
-
 namespace BlackGui
 {
     namespace Views
@@ -27,15 +25,14 @@ namespace BlackGui
         //! User view
         class BLACKGUI_EXPORT CUserView : public CViewBase<Models::CUserListModel, BlackMisc::Network::CUserList, BlackMisc::Network::CUser>
         {
-
         public:
-
             //! Constructor
             explicit CUserView(QWidget *parent = nullptr);
 
-            //! Set station mode
+            //! Set user mode
             void setUserMode(Models::CUserListModel::UserMode userMode);
         };
     }
 }
+
 #endif // guard