Convert m_pPumpEventsTimer into object

Having an extra layer of indirection was unnecessary.

The if statement guard to check if the pointer is null is now
unnecessary.
This commit is contained in:
Vasily
2019-11-30 18:14:49 +01:00
committed by username223
parent 96e80ec3ce
commit 8300f5395e
2 changed files with 10 additions and 14 deletions
+9 -13
View File
@@ -389,15 +389,12 @@ OverlayController::~OverlayController()
void OverlayController::Shutdown()
{
if ( m_pPumpEventsTimer )
{
disconnect( m_pPumpEventsTimer.get(),
SIGNAL( timeout() ),
this,
SLOT( OnTimeoutPumpEvents() ) );
m_pPumpEventsTimer->stop();
m_pPumpEventsTimer.reset();
}
disconnect( &m_pumpEventsTimer,
SIGNAL( timeout() ),
this,
SLOT( OnTimeoutPumpEvents() ) );
m_pumpEventsTimer.stop();
if ( m_pRenderTimer )
{
disconnect( &m_renderControl,
@@ -511,16 +508,15 @@ void OverlayController::SetWidget( QQuickItem* quickItem,
SLOT( OnRenderRequest() ) );
}
m_pPumpEventsTimer.reset( new QTimer() );
connect( m_pPumpEventsTimer.get(),
connect( &m_pumpEventsTimer,
SIGNAL( timeout() ),
this,
SLOT( OnTimeoutPumpEvents() ) );
// Every 1ms we check if the current frame has advanced (for vsync)
m_pPumpEventsTimer->setInterval( 1 );
m_pumpEventsTimer.setInterval( 1 );
m_pPumpEventsTimer->start();
m_pumpEventsTimer.start();
m_steamVRTabController.initStage2( this );
m_chaperoneTabController.initStage2( this );