Remove widget and parent pointer from AudioTabController
The pointers are not needed and are an anti pattern.
This commit is contained in:
@@ -487,7 +487,7 @@ void OverlayController::SetWidget( QQuickItem* quickItem,
|
|||||||
m_steamVRTabController.initStage2( this );
|
m_steamVRTabController.initStage2( this );
|
||||||
m_chaperoneTabController.initStage2( this );
|
m_chaperoneTabController.initStage2( this );
|
||||||
m_fixFloorTabController.initStage2( this );
|
m_fixFloorTabController.initStage2( this );
|
||||||
m_audioTabController.initStage2( this, m_pWindow.get() );
|
m_audioTabController.initStage2();
|
||||||
m_statisticsTabController.initStage2( this, m_pWindow.get() );
|
m_statisticsTabController.initStage2( this, m_pWindow.get() );
|
||||||
m_settingsTabController.initStage2( this, m_pWindow.get() );
|
m_settingsTabController.initStage2( this, m_pWindow.get() );
|
||||||
m_reviveTabController.initStage2( this, m_pWindow.get() );
|
m_reviveTabController.initStage2( this, m_pWindow.get() );
|
||||||
|
|||||||
@@ -56,12 +56,8 @@ void AudioTabController::initStage1()
|
|||||||
eventLoopTick();
|
eventLoopTick();
|
||||||
}
|
}
|
||||||
|
|
||||||
void AudioTabController::initStage2( OverlayController* var_parent,
|
void AudioTabController::initStage2()
|
||||||
QQuickWindow* var_widget )
|
|
||||||
{
|
{
|
||||||
this->parent = var_parent;
|
|
||||||
this->widget = var_widget;
|
|
||||||
|
|
||||||
std::string notifKey = std::string( application_strings::applicationKey )
|
std::string notifKey = std::string( application_strings::applicationKey )
|
||||||
+ ".pptnotification";
|
+ ".pptnotification";
|
||||||
|
|
||||||
|
|||||||
@@ -54,9 +54,6 @@ class AudioTabController : public PttController
|
|||||||
setAudioProfileDefault NOTIFY audioProfileDefaultChanged )
|
setAudioProfileDefault NOTIFY audioProfileDefaultChanged )
|
||||||
|
|
||||||
private:
|
private:
|
||||||
OverlayController* parent;
|
|
||||||
QQuickWindow* widget;
|
|
||||||
|
|
||||||
vr::VROverlayHandle_t m_ulNotificationOverlayHandle
|
vr::VROverlayHandle_t m_ulNotificationOverlayHandle
|
||||||
= vr::k_ulOverlayHandleInvalid;
|
= vr::k_ulOverlayHandleInvalid;
|
||||||
|
|
||||||
@@ -118,7 +115,7 @@ private:
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
void initStage1();
|
void initStage1();
|
||||||
void initStage2( OverlayController* var_parent, QQuickWindow* var_widget );
|
void initStage2();
|
||||||
|
|
||||||
void reloadAudioSettings();
|
void reloadAudioSettings();
|
||||||
void saveAudioSettings();
|
void saveAudioSettings();
|
||||||
|
|||||||
Reference in New Issue
Block a user