From 678cc2e0cc33dd3c9e408d091f4e77c04dd1ec71 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Thu, 9 Oct 2014 23:40:07 +0200
Subject: [PATCH] refs #335, adjusted member init in main window

---
 src/swiftgui_standard/mainwindow.cpp | 15 +-------------
 src/swiftgui_standard/mainwindow.h   | 30 ++++++++++++++--------------
 2 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/src/swiftgui_standard/mainwindow.cpp b/src/swiftgui_standard/mainwindow.cpp
index 8cd97a15d..4c0ebb735 100644
--- a/src/swiftgui_standard/mainwindow.cpp
+++ b/src/swiftgui_standard/mainwindow.cpp
@@ -39,20 +39,7 @@ using namespace BlackMisc::Hardware;
 MainWindow::MainWindow(GuiModes::WindowMode windowMode, QWidget *parent) :
     QMainWindow(parent, windowMode == GuiModes::WindowFrameless ? (Qt::Window | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint) : (Qt::Tool | Qt::WindowStaysOnTopHint)),
     ui(new Ui::MainWindow),
-    m_compInfoWindow(nullptr),
-    m_init(false), m_windowMode(windowMode), m_keyboard(nullptr),
-    // contexts and runtime
-    m_coreAvailable(false), m_contextNetworkAvailable(false), m_contextAudioAvailable(false),
-
-    // timers
-    m_timerContextWatchdog(nullptr),
-    m_timerStatusBar(nullptr), m_timerSimulator(nullptr),
-    // context menus
-    m_contextMenuStatusMessageList(nullptr),
-    // cockpit
-    m_inputFocusedWidget(nullptr),
-    // status bar
-    m_statusBarIcon(nullptr), m_statusBarLabel(nullptr)
+    m_windowMode(windowMode)
 {
     if (windowMode == GuiModes::WindowFrameless)
     {
diff --git a/src/swiftgui_standard/mainwindow.h b/src/swiftgui_standard/mainwindow.h
index 6ade8a1cb..72ae1b29e 100644
--- a/src/swiftgui_standard/mainwindow.h
+++ b/src/swiftgui_standard/mainwindow.h
@@ -84,35 +84,35 @@ protected:
 
 private:
     QScopedPointer<Ui::MainWindow> ui;
-    BlackGui::Components::CInfoWindowComponent *m_compInfoWindow;
-    bool m_init;
+    BlackGui::Components::CInfoWindowComponent *m_compInfoWindow = nullptr; //!< the info window (popup
+    bool m_init = false;
     GuiModes::WindowMode m_windowMode;
-    BlackInput::IKeyboard *m_keyboard; //!< hotkeys
+    BlackInput::IKeyboard *m_keyboard = nullptr; //!< hotkeys
 
     BlackMisc::CLogSubscriber m_logSubscriber { this, &MainWindow::ps_displayStatusMessageInGui };
 
     // contexts
-    bool m_coreAvailable;
-    bool m_contextNetworkAvailable;
-    bool m_contextAudioAvailable;
-    BlackMisc::Aviation::CAircraft m_ownAircraft; /*!< own aircraft's state */
-    QTimer *m_timerContextWatchdog; /*!< core available? */
-    QTimer *m_timerStatusBar; /*!< cleaning up status bar */
-    QTimer *m_timerSimulator; /*!< update simulator data */
+    bool m_coreAvailable           = false;
+    bool m_contextNetworkAvailable = false;
+    bool m_contextAudioAvailable   = false;
+    BlackMisc::Aviation::CAircraft m_ownAircraft; //!< own aircraft's state
+    QTimer *m_timerContextWatchdog = nullptr;     //!< core available?
+    QTimer *m_timerStatusBar       = nullptr;     //!< cleaning up status bar
+    QTimer *m_timerSimulator       = nullptr;     //!< update simulator data
 
     // frameless window
     QPoint m_dragPosition; /*!< position, if moving is handled with frameless window */
 
     // context menus
-    QMenu *m_contextMenuStatusMessageList; /*!< context menu for status message list */
+    QMenu *m_contextMenuStatusMessageList = nullptr; /*!< context menu for status message list */
 
     // cockpit
-    QString m_transponderResetValue; /*!< Temp. storage of XPdr mode to reset, req. until timer allows singleShoot with Lambdas */
-    QWidget *m_inputFocusedWidget; /*!< currently used widget for input, mainly used with cockpit */
+    QString m_transponderResetValue;         //!< Temp. storage of XPdr mode to reset, req. until timer allows singleShoot with Lambdas
+    QWidget *m_inputFocusedWidget = nullptr; //!< currently used widget for input, mainly used with cockpit
 
     // status bar
-    QLabel *m_statusBarIcon; /*!< status bar icon */
-    QLabel *m_statusBarLabel; /*!< status bar label */
+    QLabel *m_statusBarIcon  = nullptr; //!< status bar icon
+    QLabel *m_statusBarLabel = nullptr; //!< status bar label
 
     //! GUI status update
     void updateGuiStatusInformation();