From bb8b515c872b195a79a82a8900186b333b8ede2d Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 10 Oct 2014 03:09:59 +0200 Subject: [PATCH] refs #335, changed ui to QScopedPointer --- src/blackgui/components/aircraftcomponent.cpp | 4 +--- src/blackgui/components/aircraftcomponent.h | 4 +++- src/blackgui/components/atcstationcomponent.cpp | 4 +--- src/blackgui/components/atcstationcomponent.h | 3 ++- src/blackgui/components/flightplancomponent.cpp | 4 +--- src/blackgui/components/flightplancomponent.h | 2 +- src/blackgui/components/logcomponent.cpp | 6 ++---- src/blackgui/components/logcomponent.h | 4 +++- src/blackgui/components/settingscomponent.cpp | 4 +--- src/blackgui/components/settingscomponent.h | 7 ++++--- src/blackgui/components/simulatorcomponent.cpp | 6 ++---- src/blackgui/components/simulatorcomponent.h | 10 ++++++---- src/blackgui/components/usercomponent.cpp | 4 +--- src/blackgui/components/usercomponent.h | 3 ++- 14 files changed, 30 insertions(+), 35 deletions(-) diff --git a/src/blackgui/components/aircraftcomponent.cpp b/src/blackgui/components/aircraftcomponent.cpp index 6e3025761..c5cd9b0ee 100644 --- a/src/blackgui/components/aircraftcomponent.cpp +++ b/src/blackgui/components/aircraftcomponent.cpp @@ -38,9 +38,7 @@ namespace BlackGui } CAircraftComponent::~CAircraftComponent() - { - delete ui; - } + { } int CAircraftComponent::countAircrafts() const { diff --git a/src/blackgui/components/aircraftcomponent.h b/src/blackgui/components/aircraftcomponent.h index effec40d5..ccde6b12f 100644 --- a/src/blackgui/components/aircraftcomponent.h +++ b/src/blackgui/components/aircraftcomponent.h @@ -16,7 +16,9 @@ #include "blackgui/components/timerbasedcomponent.h" #include "blackgui/components/dockwidgetinfoareacomponent.h" #include "blackmisc/avaircraft.h" + #include +#include namespace Ui { class CAircraftComponent; } namespace BlackGui @@ -72,7 +74,7 @@ namespace BlackGui void ps_countChanged(int count); private: - Ui::CAircraftComponent *ui; + QScopedPointer ui; CTimerBasedComponent *m_timerComponent; }; } diff --git a/src/blackgui/components/atcstationcomponent.cpp b/src/blackgui/components/atcstationcomponent.cpp index f993ba26a..bca92fa7e 100644 --- a/src/blackgui/components/atcstationcomponent.cpp +++ b/src/blackgui/components/atcstationcomponent.cpp @@ -67,9 +67,7 @@ namespace BlackGui } CAtcStationComponent::~CAtcStationComponent() - { - delete ui; - } + { } int CAtcStationComponent::countBookedStations() const { diff --git a/src/blackgui/components/atcstationcomponent.h b/src/blackgui/components/atcstationcomponent.h index 98587d170..9c1530669 100644 --- a/src/blackgui/components/atcstationcomponent.h +++ b/src/blackgui/components/atcstationcomponent.h @@ -20,6 +20,7 @@ #include #include +#include namespace Ui { class CAtcStationComponent; } @@ -111,7 +112,7 @@ namespace BlackGui void ps_countChanged(int count); private: - Ui::CAtcStationComponent *ui; + QScopedPointer ui; CTimerBasedComponent *m_timerComponent; QDateTime m_timestampLastReadOnlineStations = CTimerBasedComponent::epoch(); //!< stations read QDateTime m_timestampOnlineStationsChanged = CTimerBasedComponent::epoch(); //!< stations marked as changed diff --git a/src/blackgui/components/flightplancomponent.cpp b/src/blackgui/components/flightplancomponent.cpp index 79a007a8c..76cd38769 100644 --- a/src/blackgui/components/flightplancomponent.cpp +++ b/src/blackgui/components/flightplancomponent.cpp @@ -69,9 +69,7 @@ namespace BlackGui } CFlightPlanComponent::~CFlightPlanComponent() - { - delete ui; - } + { } void CFlightPlanComponent::prefillWithAircraftData(const BlackMisc::Aviation::CAircraft &ownAircraft) { diff --git a/src/blackgui/components/flightplancomponent.h b/src/blackgui/components/flightplancomponent.h index e3ed8bdfe..30619aa4d 100644 --- a/src/blackgui/components/flightplancomponent.h +++ b/src/blackgui/components/flightplancomponent.h @@ -49,7 +49,7 @@ namespace BlackGui BlackMisc::Aviation::CFlightPlan getFlightPlan() const; private: - Ui::CFlightPlanComponent *ui; + QScopedPointer ui; //! My flight plan BlackMisc::Aviation::CFlightPlan m_flightPlan; diff --git a/src/blackgui/components/logcomponent.cpp b/src/blackgui/components/logcomponent.cpp index 0179d6ec4..657c34c9a 100644 --- a/src/blackgui/components/logcomponent.cpp +++ b/src/blackgui/components/logcomponent.cpp @@ -26,9 +26,7 @@ namespace BlackGui } CLogComponent::~CLogComponent() - { - delete ui; - } + { } void CLogComponent::appendStatusMessageToConsole(const CStatusMessage &statusMessage) { @@ -47,4 +45,4 @@ namespace BlackGui this->ui->tvp_StatusMessages->insert(statusMessage); } } -} +} // namespace diff --git a/src/blackgui/components/logcomponent.h b/src/blackgui/components/logcomponent.h index 784fe31c8..ed38c7faa 100644 --- a/src/blackgui/components/logcomponent.h +++ b/src/blackgui/components/logcomponent.h @@ -14,7 +14,9 @@ #include "runtimebasedcomponent.h" #include "blackmisc/statusmessagelist.h" + #include +#include namespace Ui { class CLogComponent; } @@ -49,7 +51,7 @@ namespace BlackGui private: - Ui::CLogComponent *ui; + QScopedPointer ui; }; } } diff --git a/src/blackgui/components/settingscomponent.cpp b/src/blackgui/components/settingscomponent.cpp index 641a4afe6..ef41ba2c1 100644 --- a/src/blackgui/components/settingscomponent.cpp +++ b/src/blackgui/components/settingscomponent.cpp @@ -56,9 +56,7 @@ namespace BlackGui * Destructor */ CSettingsComponent::~CSettingsComponent() - { - delete ui; - } + { } /* * Update own ICAO data from GUI diff --git a/src/blackgui/components/settingscomponent.h b/src/blackgui/components/settingscomponent.h index 72912e011..a15c9df76 100644 --- a/src/blackgui/components/settingscomponent.h +++ b/src/blackgui/components/settingscomponent.h @@ -18,6 +18,7 @@ #include #include #include +#include namespace Ui { class CSettingsComponent; } @@ -156,10 +157,10 @@ namespace BlackGui MicrophoneTest }; - Ui::CSettingsComponent *ui; - QTimer *m_timerAudioTests; //!< audio tests: progress bar, disable/enable buttons + QScopedPointer ui; + QTimer *m_timerAudioTests; //!< audio tests: progress bar, disable/enable buttons AudioTest m_audioTestRunning; - QColor m_fontColor; + QColor m_fontColor; //! Audio device lists from settings void initAudioDeviceLists(); diff --git a/src/blackgui/components/simulatorcomponent.cpp b/src/blackgui/components/simulatorcomponent.cpp index 7d46af5ae..c6265f7c1 100644 --- a/src/blackgui/components/simulatorcomponent.cpp +++ b/src/blackgui/components/simulatorcomponent.cpp @@ -27,9 +27,7 @@ namespace BlackGui } CSimulatorComponent::~CSimulatorComponent() - { - delete ui; - } + { } void CSimulatorComponent::addOrUpdateByName(const QString &name, const QString &value, const CIcon &icon) { @@ -52,4 +50,4 @@ namespace BlackGui this->ui->tvp_LiveData->clear(); } } -} +} // namespace diff --git a/src/blackgui/components/simulatorcomponent.h b/src/blackgui/components/simulatorcomponent.h index 8c57804d4..68d28b64a 100644 --- a/src/blackgui/components/simulatorcomponent.h +++ b/src/blackgui/components/simulatorcomponent.h @@ -15,7 +15,9 @@ #include "runtimebasedcomponent.h" #include "blackmisc/icon.h" #include "blackgui/components/dockwidgetinfoareacomponent.h" + #include +#include namespace Ui { class CSimulatorComponent; } namespace BlackGui @@ -25,9 +27,9 @@ namespace BlackGui //! Simulator component class CSimulatorComponent : - public QTabWidget, - public CDockWidgetInfoAreaComponent, - public CRuntimeBasedComponent + public QTabWidget, + public CDockWidgetInfoAreaComponent, + public CRuntimeBasedComponent { Q_OBJECT @@ -52,7 +54,7 @@ namespace BlackGui void clear(); private: - Ui::CSimulatorComponent *ui; + QScopedPointer ui; }; } } diff --git a/src/blackgui/components/usercomponent.cpp b/src/blackgui/components/usercomponent.cpp index 8b80928a4..02662b353 100644 --- a/src/blackgui/components/usercomponent.cpp +++ b/src/blackgui/components/usercomponent.cpp @@ -35,9 +35,7 @@ namespace BlackGui } CUserComponent::~CUserComponent() - { - delete ui; - } + { } int CUserComponent::countClients() const { diff --git a/src/blackgui/components/usercomponent.h b/src/blackgui/components/usercomponent.h index b962f0cad..4c2643789 100644 --- a/src/blackgui/components/usercomponent.h +++ b/src/blackgui/components/usercomponent.h @@ -18,6 +18,7 @@ #include #include +#include namespace Ui { class CUserComponent; } @@ -67,7 +68,7 @@ namespace BlackGui void ps_countChanged(int count); private: - Ui::CUserComponent *ui; + QScopedPointer ui; CTimerBasedComponent *m_timerComponent; }; }