OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-26 07:00:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

#5101 clang-format: Allow short functions on a single line

Browse Source 
Use AllowShortFunctionsOnASingleLine: InlineOnly
This commit is contained in:
Magne Sjaastad committed 2020-02-12 13:35:31 +01:00
1 parent ab9d46ee75
commit 10f0abc9b5
428 files changed
+1519 -1990
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartGeometryGenerator.cpp
+3 -1
View File
@@ -51,7 +51,9 @@ RivFemPartGeometryGenerator::RivFemPartGeometryGenerator( const RigFemPart* part
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivFemPartGeometryGenerator::~RivFemPartGeometryGenerator() {}
RivFemPartGeometryGenerator::~RivFemPartGeometryGenerator()
{
}
//--------------------------------------------------------------------------------------------------
/// Generate surface drawable geo from the specified region
ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartGeometryGenerator.h
+10 -40
View File
@@ -42,29 +42,14 @@ class RigFemPartScalarDataAccess;
class RivFemPartTriangleToElmMapper : public cvf::Object
{
public:
size_t triangleCount() const
{
return m_trianglesToElementIndex.size();
}
size_t triangleCount() const { return m_trianglesToElementIndex.size(); }
int elementIndex( size_t triangleIdx ) const
{
return m_trianglesToElementIndex[triangleIdx];
}
char elementFace( size_t triangleIdx ) const
{
return m_trianglesToElmFace[triangleIdx];
}
int elementIndex( size_t triangleIdx ) const { return m_trianglesToElementIndex[triangleIdx]; }
char elementFace( size_t triangleIdx ) const { return m_trianglesToElmFace[triangleIdx]; }
// Interface for building the mappings
std::vector<int>& triangleToElmIndexMap()
{
return m_trianglesToElementIndex;
}
std::vector<char>& triangleToElmFaceMap()
{
return m_trianglesToElmFace;
}
std::vector<int>& triangleToElmIndexMap() { return m_trianglesToElementIndex; }
std::vector<char>& triangleToElmFaceMap() { return m_trianglesToElmFace; }
private:
std::vector<int> m_trianglesToElementIndex;
@@ -88,10 +73,7 @@ public:
// Access, valid after generation is done
const RigFemPart* activePart()
{
return m_part.p();
}
const RigFemPart* activePart() { return m_part.p(); }
// Generated geometry
@@ -99,27 +81,15 @@ public:
cvf::ref<cvf::DrawableGeo> createMeshDrawable();
cvf::ref<cvf::DrawableGeo> createOutlineMeshDrawable( double creaseAngle );
const std::vector<size_t>& quadVerticesToNodeIdxMapping() const
{
return m_quadVerticesToNodeIdx;
}
const std::vector<size_t>& quadVerticesToGlobalElmNodeIdx() const
{
return m_quadVerticesToGlobalElmNodeIdx;
}
const std::vector<size_t>& quadVerticesToNodeIdxMapping() const { return m_quadVerticesToNodeIdx; }
const std::vector<size_t>& quadVerticesToGlobalElmNodeIdx() const { return m_quadVerticesToGlobalElmNodeIdx; }
const std::vector<size_t>& quadVerticesToGlobalElmFaceNodeIdx() const
{
return m_quadVerticesToGlobalElmFaceNodeIdx;
}
const std::vector<size_t>& quadVerticesToGlobalElmIdx() const
{
return m_quadVerticesToGlobalElmIdx;
}
const std::vector<size_t>& quadVerticesToGlobalElmIdx() const { return m_quadVerticesToGlobalElmIdx; }
RivFemPartTriangleToElmMapper* triangleToElementMapper()
{
return m_triangleMapper.p();
}
RivFemPartTriangleToElmMapper* triangleToElementMapper() { return m_triangleMapper.p(); }
static cvf::ref<cvf::DrawableGeo> createMeshDrawableFromSingleElement( const RigFemPart* grid,
size_t elementIndex,
ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartPartMgr.cpp
+3 -1
View File
@@ -338,4 +338,6 @@ void RivFemPartPartMgr::updateCellResultColor( size_t timeStepIndex, RimGeoMechC
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivFemPartPartMgr::~RivFemPartPartMgr() {}
RivFemPartPartMgr::~RivFemPartPartMgr()
{
}
ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartPartMgr.h
+1 -4
View File
@@ -50,10 +50,7 @@ public:
~RivFemPartPartMgr() override;
void setTransform( cvf::Transform* scaleTransform );
void setCellVisibility( cvf::UByteArray* cellVisibilities );
cvf::ref<cvf::UByteArray> cellVisibility()
{
return m_cellVisibility;
}
cvf::ref<cvf::UByteArray> cellVisibility() { return m_cellVisibility; }
void updateCellColor( cvf::Color4f color );
void updateCellResultColor( size_t timeStepIndex, RimGeoMechCellColors* cellResultColors );
ApplicationCode/GeoMech/GeoMechVisualization/RivFemPickSourceInfo.cpp
+3 -1
View File
@@ -33,4 +33,6 @@ RivFemPickSourceInfo::RivFemPickSourceInfo( int partIndex, RivFemPartTriangleToE
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivFemPickSourceInfo::~RivFemPickSourceInfo() {}
RivFemPickSourceInfo::~RivFemPickSourceInfo()
{
}
ApplicationCode/GeoMech/GeoMechVisualization/RivFemPickSourceInfo.h
+2 -8
View File
@@ -29,14 +29,8 @@ public:
RivFemPickSourceInfo( int partIndex, RivFemPartTriangleToElmMapper* triangleToElmMapper );
~RivFemPickSourceInfo() override;
int femPartIndex() const
{
return m_fempartIndex;
}
const RivFemPartTriangleToElmMapper* triangleToElmMapper() const
{
return m_triangleToElmMapper.p();
}
int femPartIndex() const { return m_fempartIndex; }
const RivFemPartTriangleToElmMapper* triangleToElmMapper() const { return m_triangleToElmMapper.p(); }
private:
int m_fempartIndex;
ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechPartMgr.cpp
+6 -2
View File
@@ -28,12 +28,16 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivGeoMechPartMgr::RivGeoMechPartMgr() {}
RivGeoMechPartMgr::RivGeoMechPartMgr()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivGeoMechPartMgr::~RivGeoMechPartMgr() {}
RivGeoMechPartMgr::~RivGeoMechPartMgr()
{
}
//--------------------------------------------------------------------------------------------------
///
ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechPartMgr.h
+1 -4
View File
@@ -47,10 +47,7 @@ public:
RivGeoMechPartMgr();
~RivGeoMechPartMgr() override;
int initializedFemPartCount()
{
return static_cast<int>( m_femPartPartMgrs.size() );
}
int initializedFemPartCount() { return static_cast<int>( m_femPartPartMgrs.size() ); }
void clearAndSetReservoir( const RigGeoMechCaseData* geoMechCase );
void setTransform( cvf::Transform* scaleTransform );
void setCellVisibility( size_t partIndex, cvf::UByteArray* cellVisibilities );
ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechPartMgrCache.cpp
+6 -2
View File
@@ -23,12 +23,16 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivGeoMechPartMgrCache::RivGeoMechPartMgrCache() {}
RivGeoMechPartMgrCache::RivGeoMechPartMgrCache()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivGeoMechPartMgrCache::~RivGeoMechPartMgrCache() {}
RivGeoMechPartMgrCache::~RivGeoMechPartMgrCache()
{
}
//--------------------------------------------------------------------------------------------------
///
ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechPartMgrCache.h
+2 -8
View File
@@ -48,14 +48,8 @@ public:
void set( RivCellSetEnum aGeometryType, int aFrameIndex );
int frameIndex() const
{
return m_frameIndex;
}
unsigned short geometryType() const
{
return m_geometryType;
}
int frameIndex() const { return m_frameIndex; }
unsigned short geometryType() const { return m_geometryType; }
bool operator<( const Key& other ) const;
ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechVizLogic.cpp
+3 -1
View File
@@ -53,7 +53,9 @@ RivGeoMechVizLogic::RivGeoMechVizLogic( RimGeoMechView* geomView )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivGeoMechVizLogic::~RivGeoMechVizLogic() {}
RivGeoMechVizLogic::~RivGeoMechVizLogic()
{
}
//--------------------------------------------------------------------------------------------------
///