From 0bf918cd285adb724cac08a035255dc0aa5ba62f Mon Sep 17 00:00:00 2001
From: Mathew Sutcliffe <oktal3700@gmail.com>
Date: Mon, 8 Feb 2016 18:48:57 +0000
Subject: [PATCH] refs #595 Forward declarations and move member initialization
 to constructor.

---
 src/blackgui/components/dbmappingcomponent.cpp | 6 +++++-
 src/blackgui/components/dbmappingcomponent.h   | 9 +++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/blackgui/components/dbmappingcomponent.cpp b/src/blackgui/components/dbmappingcomponent.cpp
index f48524778..fbe8657c4 100644
--- a/src/blackgui/components/dbmappingcomponent.cpp
+++ b/src/blackgui/components/dbmappingcomponent.cpp
@@ -9,6 +9,8 @@
 
 #include "dbmappingcomponent.h"
 #include "ui_dbmappingcomponent.h"
+#include "blackgui/components/dbautostashingcomponent.h"
+#include "blackgui/components/dbmodelmappingmodifycomponent.h"
 #include "blackgui/guiutility.h"
 #include "blackgui/shortcut.h"
 #include "blackmisc/simulation/fscommon/aircraftcfgparser.h"
@@ -34,7 +36,9 @@ namespace BlackGui
     {
         CDbMappingComponent::CDbMappingComponent(QWidget *parent) :
             COverlayMessagesFrame(parent),
-            ui(new Ui::CDbMappingComponent)
+            ui(new Ui::CDbMappingComponent),
+            m_autoStashDialog(new CDbAutoStashingComponent(this)),
+            m_modelModifyDialog(new CDbModelMappingModifyComponent(this))
         {
             ui->setupUi(this);
             this->ui->comp_StashAircraft->setMappingComponent(this);
diff --git a/src/blackgui/components/dbmappingcomponent.h b/src/blackgui/components/dbmappingcomponent.h
index 69ae16571..d917e1d7e 100644
--- a/src/blackgui/components/dbmappingcomponent.h
+++ b/src/blackgui/components/dbmappingcomponent.h
@@ -19,8 +19,6 @@
 #include "blackgui/menudelegate.h"
 #include "blackgui/enableforviewbasedindicator.h"
 #include "blackgui/components/enablefordockwidgetinfoarea.h"
-#include "blackgui/components/dbautostashingcomponent.h"
-#include "blackgui/components/dbmodelmappingmodifycomponent.h"
 #include "blackgui/views/aircraftmodelview.h"
 #include "blackmisc/simulation/aircraftmodelloader.h"
 #include "blackmisc/simulation/fscommon/vpilotrulesreader.h"
@@ -36,6 +34,9 @@ namespace BlackGui
 {
     namespace Components
     {
+        class CDbAutoStashingComponent;
+        class CDbModelMappingModifyComponent;
+
         /*!
          * Mapping component
          */
@@ -217,8 +218,8 @@ namespace BlackGui
 
         private:
             QScopedPointer<Ui::CDbMappingComponent> ui;
-            QScopedPointer<CDbAutoStashingComponent> m_autoStashDialog { new CDbAutoStashingComponent(this) };
-            QScopedPointer<CDbModelMappingModifyComponent> m_modelModifyDialog { new CDbModelMappingModifyComponent(this) };
+            QScopedPointer<CDbAutoStashingComponent> m_autoStashDialog;
+            QScopedPointer<CDbModelMappingModifyComponent> m_modelModifyDialog;
             BlackMisc::Simulation::FsCommon::CVPilotRulesReader           m_vPilotReader;                //!< read vPilot rules
             BlackMisc::CData<BlackCore::Data::VPilotAircraftModels>       m_cachedVPilotModels { this, &CDbMappingComponent::ps_onVPilotCacheChanged }; //!< cache for latest vPilot rules
             std::unique_ptr<BlackMisc::Simulation::IAircraftModelLoader>  m_modelLoader;                 //!< read own aircraft models