diff --git a/build_scripts/qt/compilers/clang-msvc.pri b/build_scripts/qt/compilers/clang-msvc.pri index a443dd0..28a5798 100644 --- a/build_scripts/qt/compilers/clang-msvc.pri +++ b/build_scripts/qt/compilers/clang-msvc.pri @@ -7,3 +7,5 @@ include(common-msvc.pri) #clang-msvc does not enable the c++17 flag with qmake's c++1z flag. QMAKE_CXXFLAGS += /std:c++17 + +QMAKE_CXXFLAGS += -Xclang -Wshadow diff --git a/build_scripts/qt/compilers/clang.pri b/build_scripts/qt/compilers/clang.pri index bcb6d19..66a4841 100644 --- a/build_scripts/qt/compilers/clang.pri +++ b/build_scripts/qt/compilers/clang.pri @@ -1,3 +1,5 @@ QMAKE_CXXFLAGS += -Werror #All includes from the third-party directory will not warn. QMAKE_CXXFLAGS += --system-header-prefix=third-party + +QMAKE_CXXFLAGS += -Wshadow diff --git a/build_scripts/qt/compilers/gcc.pri b/build_scripts/qt/compilers/gcc.pri index ed10788..96c9d59 100644 --- a/build_scripts/qt/compilers/gcc.pri +++ b/build_scripts/qt/compilers/gcc.pri @@ -1,3 +1,6 @@ #g++-7 is needed for C++17 features. travis does not supply this by default. QMAKE_CXX = g++-7 + QMAKE_CXXFLAGS += -Werror + +QMAKE_CXXFLAGS += -Wshadow diff --git a/src/tabcontrollers/UtilitiesTabController.cpp b/src/tabcontrollers/UtilitiesTabController.cpp index f4effb0..952d611 100644 --- a/src/tabcontrollers/UtilitiesTabController.cpp +++ b/src/tabcontrollers/UtilitiesTabController.cpp @@ -64,8 +64,8 @@ void UtilitiesTabController::initStage1() void UtilitiesTabController::initStage2( OverlayController* var_parent, QQuickWindow* var_widget ) { - this->parent = var_parent; - this->widget = var_widget; + this->m_parent = var_parent; + this->m_widget = var_widget; } void UtilitiesTabController::sendKeyboardInput( QString input ) @@ -467,7 +467,7 @@ void UtilitiesTabController::eventLoopTick() } */ auto nError = vrnotification->CreateNotification( - parent->overlayHandle(), + m_parent->overlayHandle(), 666, vr::EVRNotificationType_Transient, alarmMessageBuffer, diff --git a/src/tabcontrollers/UtilitiesTabController.h b/src/tabcontrollers/UtilitiesTabController.h index 286142f..10dc7ff 100644 --- a/src/tabcontrollers/UtilitiesTabController.h +++ b/src/tabcontrollers/UtilitiesTabController.h @@ -33,8 +33,8 @@ class UtilitiesTabController : public QObject setSteamDesktopOverlayWidth NOTIFY steamDesktopOverlayWidthChanged ) private: - OverlayController* parent; - QQuickWindow* widget; + OverlayController* m_parent; + QQuickWindow* m_widget; unsigned settingsUpdateCounter = 0;