From 8300f5395e9c77c68843b94ba1146b32e256c1fc Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Mon, 25 Nov 2019 13:46:23 +0100
Subject: [PATCH] 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.
---
 src/overlaycontroller.cpp | 22 +++++++++-------------
 src/overlaycontroller.h   |  2 +-
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/overlaycontroller.cpp b/src/overlaycontroller.cpp
index 1d88476..109dcf2 100644
--- a/src/overlaycontroller.cpp
+++ b/src/overlaycontroller.cpp
@@ -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 );
diff --git a/src/overlaycontroller.h b/src/overlaycontroller.h
index 83a980a..51b7609 100644
--- a/src/overlaycontroller.h
+++ b/src/overlaycontroller.h
@@ -112,7 +112,7 @@ private:
     QOpenGLContext m_openGLContext;
     QOffscreenSurface m_offscreenSurface;
 
-    std::unique_ptr<QTimer> m_pPumpEventsTimer;
+    QTimer m_pumpEventsTimer;
     std::unique_ptr<QTimer> m_pRenderTimer;
     bool m_dashboardVisible = false;