diff --git a/build_scripts/qt/compilers/clang-msvc.pri b/build_scripts/qt/compilers/clang-msvc.pri index b7f3398..a554020 100644 --- a/build_scripts/qt/compilers/clang-msvc.pri +++ b/build_scripts/qt/compilers/clang-msvc.pri @@ -15,4 +15,4 @@ QMAKE_CXXFLAGS += -Wmost QMAKE_CXXFLAGS += -Weffc++ #QMAKE_CXXFLAGS += -Wconversion -#QMAKE_CXXFLAGS += -Wsign-conversion +QMAKE_CXXFLAGS += -Wsign-conversion diff --git a/src/tabcontrollers/AudioTabController.cpp b/src/tabcontrollers/AudioTabController.cpp index 9dcfedf..f1faebe 100644 --- a/src/tabcontrollers/AudioTabController.cpp +++ b/src/tabcontrollers/AudioTabController.cpp @@ -750,7 +750,7 @@ void AudioTabController::reloadAudioProfiles() { settings->setArrayIndex( i ); audioProfiles.emplace_back(); - auto& entry = audioProfiles[i]; + auto& entry = audioProfiles[static_cast( i )]; entry.profileName = settings->value( "profileName" ).toString().toStdString(); entry.playbackName @@ -1044,7 +1044,7 @@ void AudioTabController::applyDefaultProfile() if ( profile.defaultProfile ) { applyAudioProfile( i ); - m_defaultProfileIndex = i; + m_defaultProfileIndex = static_cast( i ); break; } } diff --git a/src/tabcontrollers/ChaperoneTabController.cpp b/src/tabcontrollers/ChaperoneTabController.cpp index 752c852..0fd5de3 100644 --- a/src/tabcontrollers/ChaperoneTabController.cpp +++ b/src/tabcontrollers/ChaperoneTabController.cpp @@ -70,7 +70,7 @@ void ChaperoneTabController::reloadChaperoneProfiles() { settings->setArrayIndex( i ); chaperoneProfiles.emplace_back(); - auto& entry = chaperoneProfiles[i]; + auto& entry = chaperoneProfiles[static_cast( i )]; entry.profileName = settings->value( "profileName" ).toString().toStdString(); entry.includesChaperoneGeometry @@ -229,7 +229,7 @@ void ChaperoneTabController::saveChaperoneProfiles() unsigned i = 0; for ( auto& p : chaperoneProfiles ) { - settings->setArrayIndex( i ); + settings->setArrayIndex( static_cast( i ) ); settings->setValue( "profileName", QString::fromStdString( p.profileName ) ); settings->setValue( "includesChaperoneGeometry", diff --git a/src/tabcontrollers/PttController.cpp b/src/tabcontrollers/PttController.cpp index 99412f6..5119cdf 100644 --- a/src/tabcontrollers/PttController.cpp +++ b/src/tabcontrollers/PttController.cpp @@ -65,7 +65,7 @@ void PttController::reloadPttProfiles() { settings->setArrayIndex( i ); pttProfiles.emplace_back(); - auto& entry = pttProfiles[i]; + auto& entry = pttProfiles[static_cast( i )]; entry.profileName = settings->value( "profileName" ).toString().toStdString(); entry.showNotification @@ -117,7 +117,7 @@ void PttController::savePttProfiles() unsigned i = 0; for ( auto& p : pttProfiles ) { - settings->setArrayIndex( i ); + settings->setArrayIndex( static_cast( i ) ); settings->setValue( "profileName", QString::fromStdString( p.profileName ) ); settings->setValue( "showNotification", p.showNotification ); @@ -359,7 +359,8 @@ unsigned long PttController::pttDigitalButtonMask( unsigned controller ) { if ( controller < 2 ) { - return m_pttControllerConfigs[controller].digitalButtonMask; + return static_cast( + m_pttControllerConfigs[controller].digitalButtonMask ); } return 0; } diff --git a/src/tabcontrollers/ReviveTabController.cpp b/src/tabcontrollers/ReviveTabController.cpp index 61b66d6..50a6f81 100644 --- a/src/tabcontrollers/ReviveTabController.cpp +++ b/src/tabcontrollers/ReviveTabController.cpp @@ -1207,7 +1207,7 @@ void ReviveTabController::reloadControllerProfiles() { settings->setArrayIndex( i ); controllerProfiles.emplace_back(); - auto& entry = controllerProfiles[i]; + auto& entry = controllerProfiles[static_cast( i )]; entry.profileName = settings->value( "profileName" ).toString().toStdString(); entry.gripButtonMode = settings->value( "gripButtonMode", 0 ).toInt(); @@ -1234,7 +1234,7 @@ void ReviveTabController::saveControllerProfiles() unsigned i = 0; for ( auto& p : controllerProfiles ) { - settings->setArrayIndex( i ); + settings->setArrayIndex( static_cast( i ) ); settings->setValue( "profileName", QString::fromStdString( p.profileName ) ); settings->setValue( "gripButtonMode", p.gripButtonMode ); diff --git a/src/tabcontrollers/SteamVRTabController.cpp b/src/tabcontrollers/SteamVRTabController.cpp index d94332d..d7912de 100644 --- a/src/tabcontrollers/SteamVRTabController.cpp +++ b/src/tabcontrollers/SteamVRTabController.cpp @@ -204,7 +204,7 @@ void SteamVRTabController::reloadSteamVRProfiles() { settings->setArrayIndex( i ); steamvrProfiles.emplace_back(); - auto& entry = steamvrProfiles[i]; + auto& entry = steamvrProfiles[static_cast( i )]; entry.profileName = settings->value( "profileName" ).toString().toStdString(); entry.includesSupersampling @@ -243,7 +243,7 @@ void SteamVRTabController::saveSteamVRProfiles() unsigned i = 0; for ( auto& p : steamvrProfiles ) { - settings->setArrayIndex( i ); + settings->setArrayIndex( static_cast( i ) ); settings->setValue( "profileName", QString::fromStdString( p.profileName ) ); settings->setValue( "includesSupersampling", p.includesSupersampling );