Remove widget and parent pointers from UtilitiesTabController

The pointers are not needed and are an anti pattern.
This commit is contained in:
Vasily
2019-07-20 21:24:03 +02:00
committed by username223
parent 27b148ae12
commit 0c6ed9a68d
5 changed files with 3 additions and 17 deletions
+1 -2
View File
@@ -491,8 +491,7 @@ void OverlayController::SetWidget( QQuickItem* quickItem,
m_statisticsTabController.initStage2( this ); m_statisticsTabController.initStage2( this );
m_settingsTabController.initStage2( this ); m_settingsTabController.initStage2( this );
m_reviveTabController.initStage2( this ); m_reviveTabController.initStage2( this );
m_utilitiesTabController.initStage2( this, m_pWindow.get() ); m_utilitiesTabController.initStage2( this );
m_videoTabController.initStage2( this, m_pWindow.get() );
m_moveCenterTabController.initStage2( this, m_pWindow.get() ); m_moveCenterTabController.initStage2( this, m_pWindow.get() );
} }
@@ -22,11 +22,9 @@ void UtilitiesTabController::initStage1()
m_alarmTime = QTime( qAlarmHour.toInt(), qAlarmMinute.toInt() ); m_alarmTime = QTime( qAlarmHour.toInt(), qAlarmMinute.toInt() );
} }
void UtilitiesTabController::initStage2( OverlayController* var_parent, void UtilitiesTabController::initStage2( OverlayController* var_parent )
QQuickWindow* var_widget )
{ {
this->m_parent = var_parent; this->m_parent = var_parent;
this->m_widget = var_widget;
} }
void UtilitiesTabController::sendKeyboardInput( QString input ) void UtilitiesTabController::sendKeyboardInput( QString input )
+1 -2
View File
@@ -29,7 +29,6 @@ class UtilitiesTabController : public QObject
private: private:
OverlayController* m_parent; OverlayController* m_parent;
QQuickWindow* m_widget;
unsigned settingsUpdateCounter = 0; unsigned settingsUpdateCounter = 0;
@@ -45,7 +44,7 @@ private:
public: public:
void initStage1(); void initStage1();
void initStage2( OverlayController* var_parent, QQuickWindow* var_widget ); void initStage2( OverlayController* var_parent );
void eventLoopTick(); void eventLoopTick();
@@ -14,13 +14,6 @@ void VideoTabController::initStage1()
reloadVideoConfig(); reloadVideoConfig();
} }
void VideoTabController::initStage2( OverlayController* var_parent,
QQuickWindow* var_widget )
{
this->parent = var_parent;
this->widget = var_widget;
}
void VideoTabController::initBrightnessOverlay() void VideoTabController::initBrightnessOverlay()
{ {
std::string notifKey = std::string( application_strings::applicationKey ) std::string notifKey = std::string( application_strings::applicationKey )
-3
View File
@@ -45,8 +45,6 @@ private:
// how wide overlay is, Increase this value if edges of view are not // how wide overlay is, Increase this value if edges of view are not
// dimmed. // dimmed.
const float k_overlayWidth = 1.0f; const float k_overlayWidth = 1.0f;
OverlayController* parent;
QQuickWindow* widget;
vr::VROverlayHandle_t m_brightnessOverlayHandle vr::VROverlayHandle_t m_brightnessOverlayHandle
= vr::k_ulOverlayHandleInvalid; = vr::k_ulOverlayHandleInvalid;
@@ -105,7 +103,6 @@ public:
float colorOpacityPerc() const; float colorOpacityPerc() const;
void initStage1(); void initStage1();
void initStage2( OverlayController* var_parent, QQuickWindow* var_widget );
void eventLoopTick(); void eventLoopTick();
public slots: public slots: