Prefix desktopMode and noSound member vars with m_
This keeps consistency with the rest of the class and reduces possible confusion, especially when member vars and parameters have the same name.
This commit is contained in:
@@ -31,7 +31,7 @@ QSettings* OverlayController::_appSettings = nullptr;
|
|||||||
OverlayController::OverlayController( bool desktopMode,
|
OverlayController::OverlayController( bool desktopMode,
|
||||||
bool noSound,
|
bool noSound,
|
||||||
QQmlEngine& qmlEngine )
|
QQmlEngine& qmlEngine )
|
||||||
: QObject(), desktopMode( desktopMode ), noSound( noSound )
|
: QObject(), m_desktopMode( desktopMode ), m_noSound( noSound )
|
||||||
{
|
{
|
||||||
// Loading the OpenVR Runtime
|
// Loading the OpenVR Runtime
|
||||||
auto initError = vr::VRInitError_None;
|
auto initError = vr::VRInitError_None;
|
||||||
@@ -405,7 +405,7 @@ void OverlayController::SetWidget( QQuickItem* quickItem,
|
|||||||
const std::string& name,
|
const std::string& name,
|
||||||
const std::string& key )
|
const std::string& key )
|
||||||
{
|
{
|
||||||
if ( !desktopMode )
|
if ( !m_desktopMode )
|
||||||
{
|
{
|
||||||
vr::VROverlayError overlayError
|
vr::VROverlayError overlayError
|
||||||
= vr::VROverlay()->CreateDashboardOverlay(
|
= vr::VROverlay()->CreateDashboardOverlay(
|
||||||
@@ -514,7 +514,7 @@ void OverlayController::OnRenderRequest()
|
|||||||
|
|
||||||
void OverlayController::renderOverlay()
|
void OverlayController::renderOverlay()
|
||||||
{
|
{
|
||||||
if ( !desktopMode )
|
if ( !m_desktopMode )
|
||||||
{
|
{
|
||||||
// skip rendering if the overlay isn't visible
|
// skip rendering if the overlay isn't visible
|
||||||
if ( !vr::VROverlay()
|
if ( !vr::VROverlay()
|
||||||
@@ -1021,7 +1021,7 @@ QUrl OverlayController::getVRRuntimePathUrl()
|
|||||||
|
|
||||||
bool OverlayController::soundDisabled()
|
bool OverlayController::soundDisabled()
|
||||||
{
|
{
|
||||||
return noSound;
|
return m_noSound;
|
||||||
}
|
}
|
||||||
|
|
||||||
const vr::VROverlayHandle_t& OverlayController::overlayHandle()
|
const vr::VROverlayHandle_t& OverlayController::overlayHandle()
|
||||||
@@ -1050,7 +1050,7 @@ void OverlayController::showKeyboard( QString existingText,
|
|||||||
|
|
||||||
void OverlayController::playActivationSound()
|
void OverlayController::playActivationSound()
|
||||||
{
|
{
|
||||||
if ( !noSound )
|
if ( !m_noSound )
|
||||||
{
|
{
|
||||||
activationSoundEffect.play();
|
activationSoundEffect.play();
|
||||||
}
|
}
|
||||||
@@ -1058,7 +1058,7 @@ void OverlayController::playActivationSound()
|
|||||||
|
|
||||||
void OverlayController::playFocusChangedSound()
|
void OverlayController::playFocusChangedSound()
|
||||||
{
|
{
|
||||||
if ( !noSound )
|
if ( !m_noSound )
|
||||||
{
|
{
|
||||||
focusChangedSoundEffect.play();
|
focusChangedSoundEffect.play();
|
||||||
}
|
}
|
||||||
@@ -1066,7 +1066,7 @@ void OverlayController::playFocusChangedSound()
|
|||||||
|
|
||||||
void OverlayController::playAlarm01Sound( bool loop )
|
void OverlayController::playAlarm01Sound( bool loop )
|
||||||
{
|
{
|
||||||
if ( !noSound && !alarm01SoundEffect.isPlaying() )
|
if ( !m_noSound && !alarm01SoundEffect.isPlaying() )
|
||||||
{
|
{
|
||||||
if ( loop )
|
if ( loop )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ namespace advsettings
|
|||||||
class OverlayController : public QObject
|
class OverlayController : public QObject
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_PROPERTY( bool desktopMode READ isDesktopMode )
|
Q_PROPERTY( bool m_desktopMode READ isDesktopMode )
|
||||||
|
|
||||||
public:
|
public:
|
||||||
static constexpr auto applicationOrganizationName = "matzman666";
|
static constexpr auto applicationOrganizationName = "matzman666";
|
||||||
@@ -69,8 +69,8 @@ private:
|
|||||||
QPoint m_ptLastMouse;
|
QPoint m_ptLastMouse;
|
||||||
Qt::MouseButtons m_lastMouseButtons = 0;
|
Qt::MouseButtons m_lastMouseButtons = 0;
|
||||||
|
|
||||||
bool desktopMode;
|
bool m_desktopMode;
|
||||||
bool noSound;
|
bool m_noSound;
|
||||||
|
|
||||||
QUrl m_runtimePathUrl;
|
QUrl m_runtimePathUrl;
|
||||||
|
|
||||||
@@ -133,7 +133,7 @@ public:
|
|||||||
|
|
||||||
bool isDesktopMode()
|
bool isDesktopMode()
|
||||||
{
|
{
|
||||||
return desktopMode;
|
return m_desktopMode;
|
||||||
};
|
};
|
||||||
|
|
||||||
utils::ChaperoneUtils& chaperoneUtils() noexcept
|
utils::ChaperoneUtils& chaperoneUtils() noexcept
|
||||||
|
|||||||
Reference in New Issue
Block a user