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

Fix indentation with clang-format 8

Browse Source 
AppVeyor automatically updated to LLVM 8 while everything else was on 7.
It is not possible to downgrade to LLVM 7 on AppVeyor, so we'll update
everything else to LLVM 8.
This commit is contained in:
Vasily
2019-04-19 15:29:18 +02:00
committed by username223
parent 14e2a1a3d8
commit 387ae30899
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/openvr/openvr_init.cpp
+2 -2
View File
@@ -32,8 +32,8 @@ void initializeProperly( const OpenVrInitializationType initType )
} }
LOG( ERROR ) << "Failed to initialize OpenVR: " LOG( ERROR ) << "Failed to initialize OpenVR: "
+ std::string( + std::string(
vr::VR_GetVRInitErrorAsEnglishDescription( vr::VR_GetVRInitErrorAsEnglishDescription(
initError ) ); initError ) );
exit( EXIT_FAILURE ); exit( EXIT_FAILURE );
} }
else else
src/overlaycontroller.cpp
+2 -2
View File
@@ -338,7 +338,7 @@ void OverlayController::SetWidget( QQuickItem* quickItem,
throw std::runtime_error( std::string( throw std::runtime_error( std::string(
"Failed to create Overlay: " "Failed to create Overlay: "
+ std::string( vr::VROverlay()->GetOverlayErrorNameFromEnum( + std::string( vr::VROverlay()->GetOverlayErrorNameFromEnum(
overlayError ) ) ) ); overlayError ) ) ) );
} }
vr::VROverlay()->SetOverlayWidthInMeters( m_ulOverlayHandle, 2.5f ); vr::VROverlay()->SetOverlayWidthInMeters( m_ulOverlayHandle, 2.5f );
vr::VROverlay()->SetOverlayInputMethod( vr::VROverlay()->SetOverlayInputMethod(
@@ -446,7 +446,7 @@ void OverlayController::renderOverlay()
if ( !vr::VROverlay() if ( !vr::VROverlay()
|| ( !vr::VROverlay()->IsOverlayVisible( m_ulOverlayHandle ) || ( !vr::VROverlay()->IsOverlayVisible( m_ulOverlayHandle )
&& !vr::VROverlay()->IsOverlayVisible( && !vr::VROverlay()->IsOverlayVisible(
m_ulOverlayThumbnailHandle ) ) ) m_ulOverlayThumbnailHandle ) ) )
return; return;
m_pRenderControl->polishItems(); m_pRenderControl->polishItems();
m_pRenderControl->sync(); m_pRenderControl->sync();
src/tabcontrollers/UtilitiesTabController.cpp
+4 -3
View File
@@ -337,8 +337,8 @@ void UtilitiesTabController::eventLoopTick()
parent->setAlarmEnabled( true ); parent->setAlarmEnabled( true );
} }
else if ( else if (
res res >= vr::
>= vr::VRMessageOverlayResponse_CouldntFindSystemOverlay ) VRMessageOverlayResponse_CouldntFindSystemOverlay )
{ {
static const char* errorMessages[] static const char* errorMessages[]
= { "CouldntFindSystemOverlay", = { "CouldntFindSystemOverlay",
@@ -346,7 +346,8 @@ void UtilitiesTabController::eventLoopTick()
"ApplicationQuit" }; "ApplicationQuit" };
int errorCode int errorCode
= res = res
- vr::VRMessageOverlayResponse_CouldntFindSystemOverlay; - vr::
VRMessageOverlayResponse_CouldntFindSystemOverlay;
if ( res < 3 ) if ( res < 3 )
{ {
LOG( ERROR ) LOG( ERROR )
src/utils/setup.cpp
+6 -6
View File
@@ -107,8 +107,8 @@ void enableApplicationAutostart()
throw std::runtime_error( throw std::runtime_error(
std::string( "Could not set auto start: " ) std::string( "Could not set auto start: " )
+ std::string( + std::string(
vr::VRApplications()->GetApplicationsErrorNameFromEnum( vr::VRApplications()->GetApplicationsErrorNameFromEnum(
app_error ) ) ); app_error ) ) );
} }
} }
@@ -124,8 +124,8 @@ void installApplicationManifest( const std::string manifestPath )
throw std::runtime_error( throw std::runtime_error(
std::string( "Could not add application manifest: " ) std::string( "Could not add application manifest: " )
+ std::string( + std::string(
vr::VRApplications()->GetApplicationsErrorNameFromEnum( vr::VRApplications()->GetApplicationsErrorNameFromEnum(
app_error ) ) ); app_error ) ) );
} }
} }
@@ -163,8 +163,8 @@ void reinstallApplicationManifest( const std::string manifestPath )
"Could not find working directory of already " "Could not find working directory of already "
"installed application: " "installed application: "
+ std::string( + std::string(
vr::VRApplications()->GetApplicationsErrorNameFromEnum( vr::VRApplications()->GetApplicationsErrorNameFromEnum(
app_error ) ) ); app_error ) ) );
} }
const auto oldManifestPath const auto oldManifestPath