Remove widget and parent pointers from UtilitiesTabController
The pointers are not needed and are an anti pattern.
This commit is contained in:
@@ -491,8 +491,7 @@ void OverlayController::SetWidget( QQuickItem* quickItem,
|
||||
m_statisticsTabController.initStage2( this );
|
||||
m_settingsTabController.initStage2( this );
|
||||
m_reviveTabController.initStage2( this );
|
||||
m_utilitiesTabController.initStage2( this, m_pWindow.get() );
|
||||
m_videoTabController.initStage2( this, m_pWindow.get() );
|
||||
m_utilitiesTabController.initStage2( this );
|
||||
m_moveCenterTabController.initStage2( this, m_pWindow.get() );
|
||||
}
|
||||
|
||||
|
||||
@@ -22,11 +22,9 @@ void UtilitiesTabController::initStage1()
|
||||
m_alarmTime = QTime( qAlarmHour.toInt(), qAlarmMinute.toInt() );
|
||||
}
|
||||
|
||||
void UtilitiesTabController::initStage2( OverlayController* var_parent,
|
||||
QQuickWindow* var_widget )
|
||||
void UtilitiesTabController::initStage2( OverlayController* var_parent )
|
||||
{
|
||||
this->m_parent = var_parent;
|
||||
this->m_widget = var_widget;
|
||||
}
|
||||
|
||||
void UtilitiesTabController::sendKeyboardInput( QString input )
|
||||
|
||||
@@ -29,7 +29,6 @@ class UtilitiesTabController : public QObject
|
||||
|
||||
private:
|
||||
OverlayController* m_parent;
|
||||
QQuickWindow* m_widget;
|
||||
|
||||
unsigned settingsUpdateCounter = 0;
|
||||
|
||||
@@ -45,7 +44,7 @@ private:
|
||||
|
||||
public:
|
||||
void initStage1();
|
||||
void initStage2( OverlayController* var_parent, QQuickWindow* var_widget );
|
||||
void initStage2( OverlayController* var_parent );
|
||||
|
||||
void eventLoopTick();
|
||||
|
||||
|
||||
@@ -14,13 +14,6 @@ void VideoTabController::initStage1()
|
||||
reloadVideoConfig();
|
||||
}
|
||||
|
||||
void VideoTabController::initStage2( OverlayController* var_parent,
|
||||
QQuickWindow* var_widget )
|
||||
{
|
||||
this->parent = var_parent;
|
||||
this->widget = var_widget;
|
||||
}
|
||||
|
||||
void VideoTabController::initBrightnessOverlay()
|
||||
{
|
||||
std::string notifKey = std::string( application_strings::applicationKey )
|
||||
|
||||
@@ -45,8 +45,6 @@ private:
|
||||
// how wide overlay is, Increase this value if edges of view are not
|
||||
// dimmed.
|
||||
const float k_overlayWidth = 1.0f;
|
||||
OverlayController* parent;
|
||||
QQuickWindow* widget;
|
||||
|
||||
vr::VROverlayHandle_t m_brightnessOverlayHandle
|
||||
= vr::k_ulOverlayHandleInvalid;
|
||||
@@ -105,7 +103,6 @@ public:
|
||||
float colorOpacityPerc() const;
|
||||
|
||||
void initStage1();
|
||||
void initStage2( OverlayController* var_parent, QQuickWindow* var_widget );
|
||||
void eventLoopTick();
|
||||
|
||||
public slots:
|
||||
|
||||
Reference in New Issue
Block a user