flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-27 11:05:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #595 Forward declarations and move member initialization to constructor.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-02-08 18:48:57 +00:00
parent b4e1d42009
commit 0bf918cd28
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackgui/components/dbmappingcomponent.cpp
View File

@@ -9,6 +9,8 @@
#include "dbmappingcomponent.h" #include "dbmappingcomponent.h"
#include "ui_dbmappingcomponent.h" #include "ui_dbmappingcomponent.h"
#include "blackgui/components/dbautostashingcomponent.h"
#include "blackgui/components/dbmodelmappingmodifycomponent.h"
#include "blackgui/guiutility.h" #include "blackgui/guiutility.h"
#include "blackgui/shortcut.h" #include "blackgui/shortcut.h"
#include "blackmisc/simulation/fscommon/aircraftcfgparser.h" #include "blackmisc/simulation/fscommon/aircraftcfgparser.h"
@@ -34,7 +36,9 @@ namespace BlackGui
{ {
CDbMappingComponent::CDbMappingComponent(QWidget *parent) : CDbMappingComponent::CDbMappingComponent(QWidget *parent) :
COverlayMessagesFrame(parent), COverlayMessagesFrame(parent),
ui(new Ui::CDbMappingComponent) ui(new Ui::CDbMappingComponent),
m_autoStashDialog(new CDbAutoStashingComponent(this)),
m_modelModifyDialog(new CDbModelMappingModifyComponent(this))
{ {
ui->setupUi(this); ui->setupUi(this);
this->ui->comp_StashAircraft->setMappingComponent(this); this->ui->comp_StashAircraft->setMappingComponent(this);

9
src/blackgui/components/dbmappingcomponent.h
View File

@@ -19,8 +19,6 @@
#include "blackgui/menudelegate.h" #include "blackgui/menudelegate.h"
#include "blackgui/enableforviewbasedindicator.h" #include "blackgui/enableforviewbasedindicator.h"
#include "blackgui/components/enablefordockwidgetinfoarea.h" #include "blackgui/components/enablefordockwidgetinfoarea.h"
#include "blackgui/components/dbautostashingcomponent.h"
#include "blackgui/components/dbmodelmappingmodifycomponent.h"
#include "blackgui/views/aircraftmodelview.h" #include "blackgui/views/aircraftmodelview.h"
#include "blackmisc/simulation/aircraftmodelloader.h" #include "blackmisc/simulation/aircraftmodelloader.h"
#include "blackmisc/simulation/fscommon/vpilotrulesreader.h" #include "blackmisc/simulation/fscommon/vpilotrulesreader.h"
@@ -36,6 +34,9 @@ namespace BlackGui
{ {
namespace Components namespace Components
{ {
class CDbAutoStashingComponent;
class CDbModelMappingModifyComponent;
/*! /*!
* Mapping component * Mapping component
*/ */
@@ -217,8 +218,8 @@ namespace BlackGui
private: private:
QScopedPointer<Ui::CDbMappingComponent> ui; QScopedPointer<Ui::CDbMappingComponent> ui;
QScopedPointer<CDbAutoStashingComponent> m_autoStashDialog { new CDbAutoStashingComponent(this) }; QScopedPointer<CDbAutoStashingComponent> m_autoStashDialog;
QScopedPointer<CDbModelMappingModifyComponent> m_modelModifyDialog { new CDbModelMappingModifyComponent(this) }; QScopedPointer<CDbModelMappingModifyComponent> m_modelModifyDialog;
BlackMisc::Simulation::FsCommon::CVPilotRulesReader m_vPilotReader; //!< read vPilot rules 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 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 std::unique_ptr<BlackMisc::Simulation::IAircraftModelLoader> m_modelLoader; //!< read own aircraft models