OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#5101 clang-format: Adjusted penalties

Browse Source 
Use lower absolute values to improve control of behavior
This commit is contained in:
Magne Sjaastad
2020-02-12 11:43:15 +01:00
parent 10f0abc9b5
commit c82df63e10
710 changed files with 3167 additions and 4721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/ProjectDataModel/RimTools.cpp
View File

@@ -61,7 +61,8 @@ QString RimTools::getCacheRootDirectoryPathFromProject()
//--------------------------------------------------------------------------------------------------
/// Relocate the supplied file name, based on the search path as follows:
/// fileName, newProjectPath/fileNameWoPath, relocatedPath/fileNameWoPath
/// If the file is not found in any of the positions, the fileName is returned but converted to Qt Style path separators: "/"
/// If the file is not found in any of the positions, the fileName is returned but converted to Qt Style path
/// separators: "/"
///
/// The relocatedPath is found in this way:
/// use the start of newProjectPath
@@ -88,9 +89,9 @@ QString RimTools::relocateFile( const QString& originalFileName,
bool isWindowsPath = false;
if ( originalFileName.count( "/" ) )
isWindowsPath = false; // "/" are not allowed in a windows path
else if ( originalFileName.count( "\\" ) &&
!caf::Utils::fileExists(
originalFileName ) ) // To make sure we do not convert single linux files containing "\"
else if ( originalFileName.count( "\\" ) && !caf::Utils::fileExists( originalFileName ) ) // To make sure we do not
// convert single linux
// files containing "\"
{
isWindowsPath = true;
}
@@ -164,7 +165,8 @@ QString RimTools::relocateFile( const QString& originalFileName,
pathEndsDiffer = true;
}
// If the path starts are equal, try to substitute it in the referenced file, with the corresponding new project path start
// If the path starts are equal, try to substitute it in the referenced file, with the corresponding new project
// path start
if ( pathStartsAreEqual )
{