From 1975192bb14ffda3ff302274e4338874dd09c2b3 Mon Sep 17 00:00:00 2001 From: Vasily Date: Sat, 20 Jul 2019 10:41:26 +0200 Subject: [PATCH] Remove widget pointer from MoveCenterTabController The pointer is not needed and is an anti pattern. --- src/overlaycontroller.cpp | 2 +- src/tabcontrollers/MoveCenterTabController.cpp | 4 +--- src/tabcontrollers/MoveCenterTabController.h | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/overlaycontroller.cpp b/src/overlaycontroller.cpp index a2d191c..0099824 100644 --- a/src/overlaycontroller.cpp +++ b/src/overlaycontroller.cpp @@ -492,7 +492,7 @@ void OverlayController::SetWidget( QQuickItem* quickItem, m_settingsTabController.initStage2( this ); m_reviveTabController.initStage2( this ); m_utilitiesTabController.initStage2( this ); - m_moveCenterTabController.initStage2( this, m_pWindow.get() ); + m_moveCenterTabController.initStage2( this ); } void OverlayController::OnRenderRequest() diff --git a/src/tabcontrollers/MoveCenterTabController.cpp b/src/tabcontrollers/MoveCenterTabController.cpp index bec208d..b009ec8 100644 --- a/src/tabcontrollers/MoveCenterTabController.cpp +++ b/src/tabcontrollers/MoveCenterTabController.cpp @@ -159,11 +159,9 @@ void MoveCenterTabController::initStage1() m_lastGravityUpdateTimePoint = std::chrono::steady_clock::now(); } -void MoveCenterTabController::initStage2( OverlayController* var_parent, - QQuickWindow* var_widget ) +void MoveCenterTabController::initStage2( OverlayController* var_parent ) { this->parent = var_parent; - this->widget = var_widget; zeroOffsets(); outputLogSettings(); } diff --git a/src/tabcontrollers/MoveCenterTabController.h b/src/tabcontrollers/MoveCenterTabController.h index 884a060..0f7a54d 100644 --- a/src/tabcontrollers/MoveCenterTabController.h +++ b/src/tabcontrollers/MoveCenterTabController.h @@ -87,7 +87,6 @@ class MoveCenterTabController : public QObject private: OverlayController* parent; - QQuickWindow* widget; int m_trackingUniverse = static_cast( vr::TrackingUniverseStanding ); float m_offsetX = 0.0f; @@ -192,7 +191,7 @@ private: public: void initStage1(); - void initStage2( OverlayController* parent, QQuickWindow* widget ); + void initStage2( OverlayController* parent ); void eventLoopTick( vr::ETrackingUniverseOrigin universe, vr::TrackedDevicePose_t* devicePoses );