SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix -Wsign-conversion warnings

Browse Source
This commit is contained in:
Vasily
2019-02-21 18:48:53 +01:00
committed by username223
parent bc8ab72363
commit cfefec59e3
6 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tabcontrollers/AudioTabController.cpp
+2 -2
View File
@@ -750,7 +750,7 @@ void AudioTabController::reloadAudioProfiles()
{
settings->setArrayIndex( i );
audioProfiles.emplace_back();
auto& entry = audioProfiles[i];
auto& entry = audioProfiles[static_cast<size_t>( 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<int>( i );
break;
}
}
src/tabcontrollers/ChaperoneTabController.cpp
+2 -2
View File
@@ -70,7 +70,7 @@ void ChaperoneTabController::reloadChaperoneProfiles()
{
settings->setArrayIndex( i );
chaperoneProfiles.emplace_back();
auto& entry = chaperoneProfiles[i];
auto& entry = chaperoneProfiles[static_cast<size_t>( 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<int>( i ) );
settings->setValue( "profileName",
QString::fromStdString( p.profileName ) );
settings->setValue( "includesChaperoneGeometry",
src/tabcontrollers/PttController.cpp
+4 -3
View File
@@ -65,7 +65,7 @@ void PttController::reloadPttProfiles()
{
settings->setArrayIndex( i );
pttProfiles.emplace_back();
auto& entry = pttProfiles[i];
auto& entry = pttProfiles[static_cast<size_t>( 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<int>( 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<unsigned long>(
m_pttControllerConfigs[controller].digitalButtonMask );
}
return 0;
}
src/tabcontrollers/ReviveTabController.cpp
+2 -2
View File
@@ -1207,7 +1207,7 @@ void ReviveTabController::reloadControllerProfiles()
{
settings->setArrayIndex( i );
controllerProfiles.emplace_back();
auto& entry = controllerProfiles[i];
auto& entry = controllerProfiles[static_cast<size_t>( 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<int>( i ) );
settings->setValue( "profileName",
QString::fromStdString( p.profileName ) );
settings->setValue( "gripButtonMode", p.gripButtonMode );
src/tabcontrollers/SteamVRTabController.cpp
+2 -2
View File
@@ -204,7 +204,7 @@ void SteamVRTabController::reloadSteamVRProfiles()
{
settings->setArrayIndex( i );
steamvrProfiles.emplace_back();
auto& entry = steamvrProfiles[i];
auto& entry = steamvrProfiles[static_cast<size_t>( 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<int>( i ) );
settings->setValue( "profileName",
QString::fromStdString( p.profileName ) );
settings->setValue( "includesSupersampling", p.includesSupersampling );