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: Allow short functions on a single line

Browse Source 
Use AllowShortFunctionsOnASingleLine: InlineOnly
This commit is contained in:
Magne Sjaastad 2020-02-12 11:13:38 +01:00
parent ab9d46ee75
commit 10f0abc9b5
428 changed files with 1519 additions and 1990 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/.clang-format
View File

@ -12,7 +12,7 @@ AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortIfStatementsOnASingleLine: true
AllowShortFunctionsOnASingleLine: Empty
AllowShortFunctionsOnASingleLine: InlineOnly
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None

8
ApplicationCode/Application/RiaFeatureCommandContext.cpp
View File

@ -23,12 +23,16 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaFeatureCommandContext::RiaFeatureCommandContext() {}
RiaFeatureCommandContext::RiaFeatureCommandContext()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaFeatureCommandContext::~RiaFeatureCommandContext() {}
RiaFeatureCommandContext::~RiaFeatureCommandContext()
{
}
//--------------------------------------------------------------------------------------------------
///

45
ApplicationCode/Application/Tools/RiaEclipseUnitTools.h
View File

@ -34,43 +34,16 @@ public:
typedef caf::AppEnum<RiaEclipseUnitTools::UnitSystem> UnitSystemType;
static double feetPerMeter()
{
return 3.2808399;
}
static double meterPerFeet()
{
return 0.3048000;
}
static double feetPerMeter() { return 3.2808399; }
static double meterPerFeet() { return 0.3048000; }
static double meterToFeet( double meter )
{
return meter * feetPerMeter();
}
static double feetToMeter( double feet )
{
return feet * meterPerFeet();
}
static double meterToInch( double meter )
{
return meter * feetPerMeter() * 12.0;
}
static double inchToMeter( double inch )
{
return ( inch / 12.0 ) * meterPerFeet();
}
static double inchToFeet( double inch )
{
return ( inch / 12.0 );
}
static double mmToMeter( double mm )
{
return mm / 1000.0;
}
static double meterToMm( double meter )
{
return 1000.0 * meter;
}
static double meterToFeet( double meter ) { return meter * feetPerMeter(); }
static double feetToMeter( double feet ) { return feet * meterPerFeet(); }
static double meterToInch( double meter ) { return meter * feetPerMeter() * 12.0; }
static double inchToMeter( double inch ) { return ( inch / 12.0 ) * meterPerFeet(); }
static double inchToFeet( double inch ) { return ( inch / 12.0 ); }
static double mmToMeter( double mm ) { return mm / 1000.0; }
static double meterToMm( double meter ) { return 1000.0 * meter; }
static double darcysConstant( UnitSystem unitSystem );

4
ApplicationCode/Application/Tools/RiaGitDiff.cpp
View File

@ -35,7 +35,9 @@ RiaGitDiff::RiaGitDiff( const QString& pathToDiffTool )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaGitDiff::~RiaGitDiff() {}
RiaGitDiff::~RiaGitDiff()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Application/Tools/RiaImageCompareReporter.cpp
View File

@ -28,7 +28,9 @@ RiaImageCompareReporter::RiaImageCompareReporter( void )
m_showInteractiveDiff = false;
}
RiaImageCompareReporter::~RiaImageCompareReporter( void ) {}
RiaImageCompareReporter::~RiaImageCompareReporter( void )
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Application/Tools/RiaImageFileCompare.cpp
View File

@ -37,7 +37,9 @@ RiaImageFileCompare::RiaImageFileCompare( QString compareExecutable )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaImageFileCompare::~RiaImageFileCompare() {}
RiaImageFileCompare::~RiaImageFileCompare()
{
}
//--------------------------------------------------------------------------------------------------
///

15
ApplicationCode/Application/Tools/RiaOffshoreSphericalCoords.h
View File

@ -66,18 +66,9 @@ public:
else
incAziR[0] = acos( -vec[2] / incAziR[2] );
}
double inc() const
{
return incAziR[0];
}
double azi() const
{
return incAziR[1];
}
double r() const
{
return incAziR[2];
}
double inc() const { return incAziR[0]; }
double azi() const { return incAziR[1]; }
double r() const { return incAziR[2]; }
// Note that this is a double function, while the rest of the class is float.
// Todo: Convert class to a template to enable float and double versions of everything

4
ApplicationCode/Application/Tools/RiaProjectModifier.cpp
View File

@ -34,7 +34,9 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaProjectModifier::RiaProjectModifier() {}
RiaProjectModifier::RiaProjectModifier()
{
}
//--------------------------------------------------------------------------------------------------
///

20
ApplicationCode/Application/Tools/RiaQDateTimeTools.h
View File

@ -159,23 +159,11 @@ public:
{
}
int years() const
{
return m_years;
}
int months() const
{
return m_months;
}
int days() const
{
return m_days;
}
int years() const { return m_years; }
int months() const { return m_months; }
int days() const { return m_days; }
bool isEmpty()
{
return m_years == 0 && m_months == 0 && m_days;
}
bool isEmpty() { return m_years == 0 && m_months == 0 && m_days; }
private:
int m_years;

4
ApplicationCode/Application/Tools/RiaRegressionTest.cpp
View File

@ -88,7 +88,9 @@ RiaRegressionTest::RiaRegressionTest( void )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaRegressionTest::~RiaRegressionTest( void ) {}
RiaRegressionTest::~RiaRegressionTest( void )
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Application/Tools/RiaSummaryCurveAnalyzer.cpp
View File

@ -29,7 +29,9 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaSummaryCurveAnalyzer::RiaSummaryCurveAnalyzer() {}
RiaSummaryCurveAnalyzer::RiaSummaryCurveAnalyzer()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Application/Tools/RiaTextFileCompare.cpp
View File

@ -34,7 +34,9 @@ RiaTextFileCompare::RiaTextFileCompare( const QString& pathToDiffTool )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaTextFileCompare::~RiaTextFileCompare() {}
RiaTextFileCompare::~RiaTextFileCompare()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Application/Tools/RiaTimeHistoryCurveResampler.cpp
View File

@ -44,7 +44,9 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaTimeHistoryCurveResampler::RiaTimeHistoryCurveResampler() {}
RiaTimeHistoryCurveResampler::RiaTimeHistoryCurveResampler()
{
}
//--------------------------------------------------------------------------------------------------
///

50
ApplicationCode/Application/Tools/WellPathTools/RiaArcCurveCalculator.h
View File

@ -41,48 +41,18 @@ public:
FAILED_INPUT_OVERLAP
};
CurveStatus curveStatus() const
{
return m_curveStatus;
}
CurveStatus curveStatus() const { return m_curveStatus; }
cvf::Mat4d arcCS() const
{
return m_arcCS;
}
double radius() const
{
return m_radius;
}
double arcAngle() const
{
return m_arcAngle;
}
double arcLength() const
{
return m_arcLength;
}
cvf::Vec3d center() const
{
return m_arcCS.translation();
}
cvf::Vec3d normal() const
{
return cvf::Vec3d( m_arcCS.col( 2 ) );
}
cvf::Mat4d arcCS() const { return m_arcCS; }
double radius() const { return m_radius; }
double arcAngle() const { return m_arcAngle; }
double arcLength() const { return m_arcLength; }
cvf::Vec3d center() const { return m_arcCS.translation(); }
cvf::Vec3d normal() const { return cvf::Vec3d( m_arcCS.col( 2 ) ); }
double endAzimuth() const
{
return m_endAzi;
}
double endInclination() const
{
return m_endInc;
}
cvf::Vec3d endTangent() const
{
return m_endTangent;
}
double endAzimuth() const { return m_endAzi; }
double endInclination() const { return m_endInc; }
cvf::Vec3d endTangent() const { return m_endTangent; }
private:
CurveStatus m_curveStatus;

35
ApplicationCode/Application/Tools/WellPathTools/RiaJCurveCalculator.h
View File

@ -42,37 +42,16 @@ public:
FAILED_RADIUS_TOO_LARGE
};
CurveStatus curveStatus() const
{
return m_curveStatus;
}
CurveStatus curveStatus() const { return m_curveStatus; }
cvf::Vec3d firstArcEndpoint() const
{
return m_firstArcEndpoint;
}
cvf::Vec3d firstArcEndpoint() const { return m_firstArcEndpoint; }
double radius() const
{
return m_radius;
}
cvf::Vec3d firstCenter() const
{
return m_c1;
}
cvf::Vec3d firstNormal() const
{
return m_n1;
}
double radius() const { return m_radius; }
cvf::Vec3d firstCenter() const { return m_c1; }
cvf::Vec3d firstNormal() const { return m_n1; }
double endAzimuth() const
{
return m_endAzi;
}
double endInclination() const
{
return m_endInc;
}
double endAzimuth() const { return m_endAzi; }
double endInclination() const { return m_endInc; }
private:
CurveStatus m_curveStatus;

15
ApplicationCode/Application/Tools/WellPathTools/RiaLineArcWellPathCalculator.h
View File

@ -54,18 +54,9 @@ public:
double resultRadius2;
};
cvf::Vec3d startTangent() const
{
return m_startTangent;
}
const std::vector<cvf::Vec3d>& lineArcEndpoints() const
{
return m_lineArcEndpoints;
}
const std::vector<WellTargetStatus>& targetStatuses() const
{
return m_targetStatuses;
}
cvf::Vec3d startTangent() const { return m_startTangent; }
const std::vector<cvf::Vec3d>& lineArcEndpoints() const { return m_lineArcEndpoints; }
const std::vector<WellTargetStatus>& targetStatuses() const { return m_targetStatuses; }
private:
cvf::Vec3d m_startTangent;

55
ApplicationCode/Application/Tools/WellPathTools/RiaSCurveCalculator.h
View File

@ -46,51 +46,18 @@ public:
FAILED_MAX_ITERATIONS_REACHED
};
bool isOk() const
{
return m_isCalculationOK;
}
CurveStatus curveStatus() const
{
return m_ctrlPpointCurveStatus;
}
SolveStatus solveStatus() const
{
return m_solveStatus;
}
bool isOk() const { return m_isCalculationOK; }
CurveStatus curveStatus() const { return m_ctrlPpointCurveStatus; }
SolveStatus solveStatus() const { return m_solveStatus; }
cvf::Vec3d firstArcEndpoint() const
{
return m_firstArcEndpoint;
}
cvf::Vec3d secondArcStartpoint() const
{
return m_secondArcStartpoint;
}
cvf::Vec3d firstCenter() const
{
return m_c1;
}
cvf::Vec3d secondCenter() const
{
return m_c2;
}
cvf::Vec3d firstNormal() const
{
return m_n1;
}
cvf::Vec3d secondNormal() const
{
return m_n2;
}
double firstRadius() const
{
return m_r1;
}
double secondRadius() const
{
return m_r2;
}
cvf::Vec3d firstArcEndpoint() const { return m_firstArcEndpoint; }
cvf::Vec3d secondArcStartpoint() const { return m_secondArcStartpoint; }
cvf::Vec3d firstCenter() const { return m_c1; }
cvf::Vec3d secondCenter() const { return m_c2; }
cvf::Vec3d firstNormal() const { return m_n1; }
cvf::Vec3d secondNormal() const { return m_n2; }
double firstRadius() const { return m_r1; }
double secondRadius() const { return m_r2; }
void dump() const;

5
ApplicationCode/Application/Tools/WellPathTools/RiaWellPlanCalculator.h
View File

@ -41,10 +41,7 @@ public:
double turn;
};
const std::vector<WellPlanSegment>& wellPlan() const
{
return m_wpResult;
}
const std::vector<WellPlanSegment>& wellPlan() const { return m_wpResult; }
private:
void addSegment( cvf::Vec3d t1, cvf::Vec3d p1, cvf::Vec3d p2, cvf::Vec3d* endTangent );

4
ApplicationCode/CommandFileInterface/Core/RicfCommandObject.cpp
View File

@ -29,4 +29,6 @@ RicfCommandObject::RicfCommandObject()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicfCommandObject::~RicfCommandObject() {}
RicfCommandObject::~RicfCommandObject()
{
}

4
ApplicationCode/CommandFileInterface/Core/RicfFieldHandle.cpp
View File

@ -32,4 +32,6 @@ RicfFieldHandle::RicfFieldHandle( caf::PdmFieldHandle* owner, bool giveOwnership
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicfFieldHandle::~RicfFieldHandle() {}
RicfFieldHandle::~RicfFieldHandle()
{
}

10
ApplicationCode/CommandFileInterface/Core/RicfFieldHandle.h
View File

@ -42,15 +42,9 @@ public:
RicfFieldHandle( caf::PdmFieldHandle* owner, bool giveOwnership );
~RicfFieldHandle() override;
bool isIOWriteable() const
{
return m_IOWriteable;
}
bool isIOWriteable() const { return m_IOWriteable; }
void setIOWriteable( bool writeable )
{
m_IOWriteable = writeable;
}
void setIOWriteable( bool writeable ) { m_IOWriteable = writeable; }
virtual void readFieldData( QTextStream& inputStream,
caf::PdmObjectFactory* objectFactory,

4
ApplicationCode/CommandFileInterface/Core/RicfObjectCapability.cpp
View File

@ -35,7 +35,9 @@ RicfObjectCapability::RicfObjectCapability( caf::PdmObjectHandle* owner, bool gi
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicfObjectCapability::~RicfObjectCapability() {}
RicfObjectCapability::~RicfObjectCapability()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/CommandFileInterface/RicfCloseProject.cpp
View File

@ -25,7 +25,9 @@ CAF_PDM_SOURCE_INIT( RicfCloseProject, "closeProject" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicfCloseProject::RicfCloseProject() {}
RicfCloseProject::RicfCloseProject()
{
}
//--------------------------------------------------------------------------------------------------
///

8
ApplicationCode/CommandFileInterface/RicfCommandFileExecutor.cpp
View File

@ -45,12 +45,16 @@ void RicfCommandFileExecutor::ExportTypeEnum::setUp()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicfCommandFileExecutor::RicfCommandFileExecutor() {}
RicfCommandFileExecutor::RicfCommandFileExecutor()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicfCommandFileExecutor::~RicfCommandFileExecutor() {}
RicfCommandFileExecutor::~RicfCommandFileExecutor()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/CommandFileInterface/RicfReplaceCase.cpp
View File

@ -104,7 +104,9 @@ CAF_PDM_SOURCE_INIT( RicfMultiCaseReplace, "replaceMultipleCases" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicfMultiCaseReplace::RicfMultiCaseReplace() {}
RicfMultiCaseReplace::RicfMultiCaseReplace()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/AnnotationCommands/RicTextAnnotation3dEditor.cpp
View File

@ -38,7 +38,9 @@ CAF_PDM_UI_3D_OBJECT_EDITOR_SOURCE_INIT( RicTextAnnotation3dEditor );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicTextAnnotation3dEditor::RicTextAnnotation3dEditor() {}
RicTextAnnotation3dEditor::RicTextAnnotation3dEditor()
{
}
//--------------------------------------------------------------------------------------------------
///

15
ApplicationCode/Commands/ApplicationCommands/RicShowPlotDataFeature.cpp
View File

@ -51,10 +51,7 @@ public:
{
}
bool isValid() const override
{
return m_summaryPlot.notNull();
}
bool isValid() const override { return m_summaryPlot.notNull(); }
QString description() const override
{
@ -95,10 +92,7 @@ public:
}
}
int tabCount() const override
{
return (int)tabs().size();
}
int tabCount() const override { return (int)tabs().size(); }
private:
static DateTimePeriod indexToPeriod( int tabIndex )
@ -132,10 +126,7 @@ public:
{
}
bool isValid() const override
{
return m_crossPlot.notNull();
}
bool isValid() const override { return m_crossPlot.notNull(); }
QString description() const override
{

5
ApplicationCode/Commands/CompletionExportCommands/RicMswCompletions.h
View File

@ -68,10 +68,7 @@ public:
{
}
RigCompletionData::CompletionType completionType() const override
{
return RigCompletionData::FISHBONES;
}
RigCompletionData::CompletionType completionType() const override { return RigCompletionData::FISHBONES; }
};
//==================================================================================================

25
ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.h
View File

@ -64,10 +64,7 @@ public:
{
}
bool isValid() const
{
return m_isValid;
}
bool isValid() const { return m_isValid; }
void setData( double effectiveH, double effectiveK, double connectionFactor, double kh )
{
@ -79,23 +76,11 @@ public:
m_kh = kh;
}
double effectiveH() const
{
return m_effectiveH;
}
double effectiveH() const { return m_effectiveH; }
double effectiveK() const
{
return m_effectiveK;
}
double connectionFactor() const
{
return m_connectionFactor;
}
double kh() const
{
return m_kh;
}
double effectiveK() const { return m_effectiveK; }
double connectionFactor() const { return m_connectionFactor; }
double kh() const { return m_kh; }
private:
bool m_isValid;

8
ApplicationCode/Commands/CrossSectionCommands/RicAppendIntersectionFeature.cpp
View File

@ -81,7 +81,9 @@ RicAppendIntersectionFeatureCmd::RicAppendIntersectionFeatureCmd( RimIntersectio
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicAppendIntersectionFeatureCmd::~RicAppendIntersectionFeatureCmd() {}
RicAppendIntersectionFeatureCmd::~RicAppendIntersectionFeatureCmd()
{
}
//--------------------------------------------------------------------------------------------------
///
@ -116,4 +118,6 @@ void RicAppendIntersectionFeatureCmd::redo()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicAppendIntersectionFeatureCmd::undo() {}
void RicAppendIntersectionFeatureCmd::undo()
{
}

8
ApplicationCode/Commands/CrossSectionCommands/RicAppendSeparateIntersectionResultFeature.cpp
View File

@ -81,7 +81,9 @@ RicAppendSeparateIntersectionResultFeatureCmd::RicAppendSeparateIntersectionResu
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicAppendSeparateIntersectionResultFeatureCmd::~RicAppendSeparateIntersectionResultFeatureCmd() {}
RicAppendSeparateIntersectionResultFeatureCmd::~RicAppendSeparateIntersectionResultFeatureCmd()
{
}
//--------------------------------------------------------------------------------------------------
///
@ -107,4 +109,6 @@ void RicAppendSeparateIntersectionResultFeatureCmd::redo()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicAppendSeparateIntersectionResultFeatureCmd::undo() {}
void RicAppendSeparateIntersectionResultFeatureCmd::undo()
{
}

12
ApplicationCode/Commands/CrossSectionCommands/RicNewAzimuthDipIntersectionFeature.cpp
View File

@ -43,7 +43,9 @@ CAF_CMD_SOURCE_INIT( RicNewAzimuthDipIntersectionFeature, "RicNewAzimuthDipInter
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicNewAzimuthDipIntersectionFeature::RicNewAzimuthDipIntersectionFeature() {}
RicNewAzimuthDipIntersectionFeature::RicNewAzimuthDipIntersectionFeature()
{
}
//--------------------------------------------------------------------------------------------------
///
@ -88,7 +90,9 @@ RicNewAzimuthDipIntersectionFeatureCmd::RicNewAzimuthDipIntersectionFeatureCmd(
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicNewAzimuthDipIntersectionFeatureCmd::~RicNewAzimuthDipIntersectionFeatureCmd() {}
RicNewAzimuthDipIntersectionFeatureCmd::~RicNewAzimuthDipIntersectionFeatureCmd()
{
}
//--------------------------------------------------------------------------------------------------
///
@ -128,4 +132,6 @@ void RicNewAzimuthDipIntersectionFeatureCmd::redo()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicNewAzimuthDipIntersectionFeatureCmd::undo() {}
void RicNewAzimuthDipIntersectionFeatureCmd::undo()
{
}

12
ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineIntersectionFeature.cpp
View File

@ -42,7 +42,9 @@ CAF_CMD_SOURCE_INIT( RicNewPolylineIntersectionFeature, "RicNewPolylineIntersect
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicNewPolylineIntersectionFeature::RicNewPolylineIntersectionFeature() {}
RicNewPolylineIntersectionFeature::RicNewPolylineIntersectionFeature()
{
}
//--------------------------------------------------------------------------------------------------
///
@ -86,7 +88,9 @@ RicNewPolylineIntersectionFeatureCmd::RicNewPolylineIntersectionFeatureCmd( RimI
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicNewPolylineIntersectionFeatureCmd::~RicNewPolylineIntersectionFeatureCmd() {}
RicNewPolylineIntersectionFeatureCmd::~RicNewPolylineIntersectionFeatureCmd()
{
}
//--------------------------------------------------------------------------------------------------
///
@ -118,4 +122,6 @@ void RicNewPolylineIntersectionFeatureCmd::redo()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicNewPolylineIntersectionFeatureCmd::undo() {}
void RicNewPolylineIntersectionFeatureCmd::undo()
{
}

8
ApplicationCode/Commands/CrossSectionCommands/RicNewSimWellIntersectionFeature.cpp
View File

@ -83,7 +83,9 @@ RicNewSimWellIntersectionCmd::RicNewSimWellIntersectionCmd( RimIntersectionColle
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicNewSimWellIntersectionCmd::~RicNewSimWellIntersectionCmd() {}
RicNewSimWellIntersectionCmd::~RicNewSimWellIntersectionCmd()
{
}
//--------------------------------------------------------------------------------------------------
///
@ -112,4 +114,6 @@ void RicNewSimWellIntersectionCmd::redo()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicNewSimWellIntersectionCmd::undo() {}
void RicNewSimWellIntersectionCmd::undo()
{
}

12
ApplicationCode/Commands/CrossSectionCommands/RicNewWellPathIntersectionFeature.cpp
View File

@ -38,7 +38,9 @@ CAF_CMD_SOURCE_INIT( RicNewWellPathIntersectionFeature, "RicNewWellPathIntersect
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicNewWellPathIntersectionFeature::RicNewWellPathIntersectionFeature() {}
RicNewWellPathIntersectionFeature::RicNewWellPathIntersectionFeature()
{
}
//--------------------------------------------------------------------------------------------------
///
@ -90,7 +92,9 @@ RicNewWellPathIntersectionFeatureCmd::RicNewWellPathIntersectionFeatureCmd( RimI
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicNewWellPathIntersectionFeatureCmd::~RicNewWellPathIntersectionFeatureCmd() {}
RicNewWellPathIntersectionFeatureCmd::~RicNewWellPathIntersectionFeatureCmd()
{
}
//--------------------------------------------------------------------------------------------------
///
@ -119,4 +123,6 @@ void RicNewWellPathIntersectionFeatureCmd::redo()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicNewWellPathIntersectionFeatureCmd::undo() {}
void RicNewWellPathIntersectionFeatureCmd::undo()
{
}

4
ApplicationCode/Commands/EclipseCommands/RicEclipseCaseNewGroupExec.cpp
View File

@ -40,7 +40,9 @@ RicEclipseCaseNewGroupExec::RicEclipseCaseNewGroupExec()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicEclipseCaseNewGroupExec::~RicEclipseCaseNewGroupExec() {}
RicEclipseCaseNewGroupExec::~RicEclipseCaseNewGroupExec()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/EclipseCommands/RicEclipsePropertyFilterInsertExec.cpp
View File

@ -39,7 +39,9 @@ RicEclipsePropertyFilterInsertExec::RicEclipsePropertyFilterInsertExec( RimEclip
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicEclipsePropertyFilterInsertExec::~RicEclipsePropertyFilterInsertExec() {}
RicEclipsePropertyFilterInsertExec::~RicEclipsePropertyFilterInsertExec()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/EclipseCommands/RicEclipsePropertyFilterNewExec.cpp
View File

@ -38,7 +38,9 @@ RicEclipsePropertyFilterNewExec::RicEclipsePropertyFilterNewExec( RimEclipseProp
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicEclipsePropertyFilterNewExec::~RicEclipsePropertyFilterNewExec() {}
RicEclipsePropertyFilterNewExec::~RicEclipsePropertyFilterNewExec()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp
View File

@ -132,7 +132,9 @@ RicExportEclipseSectorModelUi::RicExportEclipseSectorModelUi()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicExportEclipseSectorModelUi::~RicExportEclipseSectorModelUi() {}
RicExportEclipseSectorModelUi::~RicExportEclipseSectorModelUi()
{
}
//--------------------------------------------------------------------------------------------------
///

15
ApplicationCode/Commands/ExportCommands/RicExportLgrFeature.cpp
View File

@ -101,10 +101,7 @@ public:
double startMd;
double endMd;
bool operator<( const CellInfo& other ) const
{
return startMd < other.startMd;
}
bool operator<( const CellInfo& other ) const { return startMd < other.startMd; }
};
//--------------------------------------------------------------------------------------------------
@ -200,14 +197,8 @@ public:
return true;
}
caf::VecIjk min() const
{
return caf::VecIjk( m_min[I], m_min[J], m_min[K] );
}
caf::VecIjk max() const
{
return caf::VecIjk( m_max[I], m_max[J], m_max[K] );
}
caf::VecIjk min() const { return caf::VecIjk( m_min[I], m_min[J], m_min[K] ); }
caf::VecIjk max() const { return caf::VecIjk( m_max[I], m_max[J], m_max[K] ); }
private:
std::array<size_t, 3> m_min;

15
ApplicationCode/Commands/ExportCommands/RicExportLgrFeature.h
View File

@ -71,10 +71,7 @@ public:
sizes.k() / ( mainGridEndCell.k() - mainGridStartCell.k() + 1 ) );
}
size_t cellCount() const
{
return sizes.i() * sizes.j() * sizes.k();
}
size_t cellCount() const { return sizes.i() * sizes.j() * sizes.k(); }
int id;
QString name;
@ -141,10 +138,7 @@ public:
return type == other.type && name == other.name && wellPathName == other.wellPathName;
}
bool operator!=( const CompletionInfo& other ) const
{
return !operator==( other );
}
bool operator!=( const CompletionInfo& other ) const { return !operator==( other ); }
};
//==================================================================================================
@ -155,10 +149,7 @@ class RicExportLgrFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT;
using Range = std::pair<size_t, size_t>;
static Range initRange()
{
return std::make_pair( std::numeric_limits<size_t>::max(), 0 );
}
static Range initRange() { return std::make_pair( std::numeric_limits<size_t>::max(), 0 ); }
static RicExportLgrUi* openDialog( const QString& dialogTitle,
RimEclipseCase* defaultCase = nullptr,

4
ApplicationCode/Commands/ExportCommands/RicSaveEclipseInputVisibleCellsUi.cpp
View File

@ -59,7 +59,9 @@ RicSaveEclipseInputVisibleCellsUi::RicSaveEclipseInputVisibleCellsUi( void )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicSaveEclipseInputVisibleCellsUi::~RicSaveEclipseInputVisibleCellsUi() {}
RicSaveEclipseInputVisibleCellsUi::~RicSaveEclipseInputVisibleCellsUi()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/ExportCommands/RicSaveEclipseResultAsInputPropertyExec.cpp
View File

@ -50,7 +50,9 @@ RicSaveEclipseResultAsInputPropertyExec::RicSaveEclipseResultAsInputPropertyExec
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicSaveEclipseResultAsInputPropertyExec::~RicSaveEclipseResultAsInputPropertyExec() {}
RicSaveEclipseResultAsInputPropertyExec::~RicSaveEclipseResultAsInputPropertyExec()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/FractureCommands/RicCreateMultipleFracturesFeature.cpp
View File

@ -152,7 +152,9 @@ void RicCreateMultipleFracturesFeature::slotAppendFractures()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicCreateMultipleFracturesFeature::slotClose() {}
void RicCreateMultipleFracturesFeature::slotClose()
{
}
//--------------------------------------------------------------------------------------------------
///

5
ApplicationCode/Commands/FractureCommands/RicCreateMultipleFracturesUi.h
View File

@ -49,10 +49,7 @@ public:
{
}
bool operator<( const LocationForNewFracture& loc ) const
{
return measuredDepth < loc.measuredDepth;
}
bool operator<( const LocationForNewFracture& loc ) const { return measuredDepth < loc.measuredDepth; }
RimFractureTemplate* fractureTemplate;
RimWellPath* wellPath;

4
ApplicationCode/Commands/HoloLensCommands/RicHoloLensSessionManager.cpp
View File

@ -32,7 +32,9 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicHoloLensSessionManager::RicHoloLensSessionManager() {}
RicHoloLensSessionManager::RicHoloLensSessionManager()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/HoloLensCommands/VdePacketDirectory.cpp
View File

@ -29,7 +29,9 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
VdePacketDirectory::VdePacketDirectory() {}
VdePacketDirectory::VdePacketDirectory()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/MeasurementCommands/RicMeasurementPickEventHandler.cpp
View File

@ -131,4 +131,6 @@ bool RicMeasurementPickEventHandler::handle3dPickEvent( const Ric3dPickEvent& ev
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicMeasurementPickEventHandler::notifyUnregistered() {}
void RicMeasurementPickEventHandler::notifyUnregistered()
{
}

4
ApplicationCode/Commands/RicGeoMechPropertyFilterInsertExec.cpp
View File

@ -39,7 +39,9 @@ RicGeoMechPropertyFilterInsertExec::RicGeoMechPropertyFilterInsertExec( RimGeoMe
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicGeoMechPropertyFilterInsertExec::~RicGeoMechPropertyFilterInsertExec() {}
RicGeoMechPropertyFilterInsertExec::~RicGeoMechPropertyFilterInsertExec()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/RicGeoMechPropertyFilterNewExec.cpp
View File

@ -37,7 +37,9 @@ RicGeoMechPropertyFilterNewExec::RicGeoMechPropertyFilterNewExec( RimGeoMechProp
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicGeoMechPropertyFilterNewExec::~RicGeoMechPropertyFilterNewExec() {}
RicGeoMechPropertyFilterNewExec::~RicGeoMechPropertyFilterNewExec()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/RicGridStatisticsDialog.cpp
View File

@ -101,7 +101,9 @@ RicGridStatisticsDialog::RicGridStatisticsDialog( QWidget* parent )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicGridStatisticsDialog::~RicGridStatisticsDialog() {}
RicGridStatisticsDialog::~RicGridStatisticsDialog()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/RicImportObservedDataInMenuFeature.cpp
View File

@ -35,7 +35,9 @@ CAF_CMD_SOURCE_INIT( RicImportObservedDataInMenuFeature, "RicImportObservedDataI
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicImportObservedDataInMenuFeature::RicImportObservedDataInMenuFeature() {}
RicImportObservedDataInMenuFeature::RicImportObservedDataInMenuFeature()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/RicImportObservedFmuDataInMenuFeature.cpp
View File

@ -35,7 +35,9 @@ CAF_CMD_SOURCE_INIT( RicImportObservedFmuDataInMenuFeature, "RicImportObservedFm
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicImportObservedFmuDataInMenuFeature::RicImportObservedFmuDataInMenuFeature() {}
RicImportObservedFmuDataInMenuFeature::RicImportObservedFmuDataInMenuFeature()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/RicNewAnnotationFeature.cpp
View File

@ -50,7 +50,9 @@ bool RicNewAnnotationFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicNewAnnotationFeature::onActionTriggered( bool isChecked ) {}
void RicNewAnnotationFeature::onActionTriggered( bool isChecked )
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/RicRangeFilterExecImpl.cpp
View File

@ -49,7 +49,9 @@ RicRangeFilterExecImpl::RicRangeFilterExecImpl( RimCellRangeFilterCollection* ra
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicRangeFilterExecImpl::~RicRangeFilterExecImpl() {}
RicRangeFilterExecImpl::~RicRangeFilterExecImpl()
{
}
//--------------------------------------------------------------------------------------------------
///

8
ApplicationCode/Commands/RicRangeFilterInsertExec.cpp
View File

@ -36,7 +36,9 @@ RicRangeFilterInsertExec::RicRangeFilterInsertExec( RimCellRangeFilterCollection
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicRangeFilterInsertExec::~RicRangeFilterInsertExec() {}
RicRangeFilterInsertExec::~RicRangeFilterInsertExec()
{
}
//--------------------------------------------------------------------------------------------------
///
@ -73,4 +75,6 @@ void RicRangeFilterInsertExec::redo()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicRangeFilterInsertExec::undo() {}
void RicRangeFilterInsertExec::undo()
{
}

4
ApplicationCode/Commands/RicRangeFilterNewExec.cpp
View File

@ -39,7 +39,9 @@ RicRangeFilterNewExec::RicRangeFilterNewExec( RimCellRangeFilterCollection* rang
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicRangeFilterNewExec::~RicRangeFilterNewExec() {}
RicRangeFilterNewExec::~RicRangeFilterNewExec()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/RicRecursiveFileSearchDialog.cpp
View File

@ -212,7 +212,9 @@ RicRecursiveFileSearchDialog::RicRecursiveFileSearchDialog( QWidget* parent )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicRecursiveFileSearchDialog::~RicRecursiveFileSearchDialog() {}
RicRecursiveFileSearchDialog::~RicRecursiveFileSearchDialog()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/RicResampleDialog.cpp
View File

@ -77,7 +77,9 @@ RicResampleDialog::RicResampleDialog( QWidget* parent )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicResampleDialog::~RicResampleDialog() {}
RicResampleDialog::~RicResampleDialog()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/RicSummaryCaseRestartDialog.cpp
View File

@ -203,7 +203,9 @@ RicSummaryCaseRestartDialog::RicSummaryCaseRestartDialog( QWidget* parent )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicSummaryCaseRestartDialog::~RicSummaryCaseRestartDialog() {}
RicSummaryCaseRestartDialog::~RicSummaryCaseRestartDialog()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/SsiHubImportCommands/RiuWellImportWizard.cpp
View File

@ -91,7 +91,9 @@ RiuWellImportWizard::RiuWellImportWizard( const QString& webServiceAddress,
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuWellImportWizard::~RiuWellImportWizard() {}
RiuWellImportWizard::~RiuWellImportWizard()
{
}
//--------------------------------------------------------------------------------------------------
///

5
ApplicationCode/Commands/SsiHubImportCommands/RiuWellImportWizard.h
View File

@ -98,10 +98,7 @@ public:
caf::PdmChildArrayField<PdmObjectHandle*> objects;
protected:
caf::PdmFieldHandle* objectToggleField() override
{
return &m_isChecked;
}
caf::PdmFieldHandle* objectToggleField() override { return &m_isChecked; }
protected:
caf::PdmField<bool> m_isChecked;

4
ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCrossPlotFeature.cpp
View File

@ -36,7 +36,9 @@ CAF_CMD_SOURCE_INIT( RicEditSummaryCrossPlotFeature, "RicEditSummaryCrossPlotFea
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicEditSummaryCrossPlotFeature::RicEditSummaryCrossPlotFeature() {}
RicEditSummaryCrossPlotFeature::RicEditSummaryCrossPlotFeature()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.cpp
View File

@ -42,7 +42,9 @@ CAF_CMD_SOURCE_INIT( RicEditSummaryPlotFeature, "RicEditSummaryPlotFeature" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicEditSummaryPlotFeature::RicEditSummaryPlotFeature() {}
RicEditSummaryPlotFeature::RicEditSummaryPlotFeature()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorDialog.cpp
View File

@ -45,7 +45,9 @@ RicSummaryCurveCalculatorDialog::RicSummaryCurveCalculatorDialog( QWidget* paren
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicSummaryCurveCalculatorDialog::~RicSummaryCurveCalculatorDialog() {}
RicSummaryCurveCalculatorDialog::~RicSummaryCurveCalculatorDialog()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp
View File

@ -136,7 +136,9 @@ RicSummaryCurveCreator::RicSummaryCurveCreator()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicSummaryCurveCreator::~RicSummaryCurveCreator() {}
RicSummaryCurveCreator::~RicSummaryCurveCreator()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorSplitterUi.cpp
View File

@ -54,7 +54,9 @@ RicSummaryCurveCreatorSplitterUi::RicSummaryCurveCreatorSplitterUi( QWidget* par
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicSummaryCurveCreatorSplitterUi::~RicSummaryCurveCreatorSplitterUi() {}
RicSummaryCurveCreatorSplitterUi::~RicSummaryCurveCreatorSplitterUi()
{
}
//--------------------------------------------------------------------------------------------------
///

10
ApplicationCode/Commands/ViewLink/RicLinkViewFeature.cpp
View File

@ -98,15 +98,9 @@ public:
return false;
}
void execute()
{
RicLinkVisibleViewsFeature::linkViews( m_viewsToLink );
}
void execute() { RicLinkVisibleViewsFeature::linkViews( m_viewsToLink ); }
const std::vector<RimGridView*>& viewsToLink()
{
return m_viewsToLink;
}
const std::vector<RimGridView*>& viewsToLink() { return m_viewsToLink; }
private:
std::vector<RimGridView*> m_viewsToLink;

4
ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicPointTangentManipulatorPartMgr.cpp
View File

@ -55,7 +55,9 @@ RicPointTangentManipulatorPartMgr::RicPointTangentManipulatorPartMgr()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicPointTangentManipulatorPartMgr::~RicPointTangentManipulatorPartMgr() {}
RicPointTangentManipulatorPartMgr::~RicPointTangentManipulatorPartMgr()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicPolyline3dEditor.cpp
View File

@ -30,7 +30,9 @@ CAF_PDM_UI_3D_OBJECT_EDITOR_SOURCE_INIT( RicPolyline3dEditor );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicPolyline3dEditor::RicPolyline3dEditor() {}
RicPolyline3dEditor::RicPolyline3dEditor()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicPolylineTarget3dEditor.cpp
View File

@ -40,7 +40,9 @@ CAF_PDM_UI_3D_OBJECT_EDITOR_SOURCE_INIT( RicPolylineTarget3dEditor );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicPolylineTarget3dEditor::RicPolylineTarget3dEditor() {}
RicPolylineTarget3dEditor::RicPolylineTarget3dEditor()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicWellPathGeometry3dEditor.cpp
View File

@ -31,7 +31,9 @@ CAF_PDM_UI_3D_OBJECT_EDITOR_SOURCE_INIT( RicWellPathGeometry3dEditor );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicWellPathGeometry3dEditor::RicWellPathGeometry3dEditor() {}
RicWellPathGeometry3dEditor::RicWellPathGeometry3dEditor()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicWellTarget3dEditor.cpp
View File

@ -40,7 +40,9 @@ CAF_PDM_UI_3D_OBJECT_EDITOR_SOURCE_INIT( RicWellTarget3dEditor );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicWellTarget3dEditor::RicWellTarget3dEditor() {}
RicWellTarget3dEditor::RicWellTarget3dEditor()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/WellPathCommands/RicCreateWellTargetsPickEventHandler.cpp
View File

@ -63,7 +63,9 @@ RicCreateWellTargetsPickEventHandler::RicCreateWellTargetsPickEventHandler( RimW
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicCreateWellTargetsPickEventHandler::~RicCreateWellTargetsPickEventHandler() {}
RicCreateWellTargetsPickEventHandler::~RicCreateWellTargetsPickEventHandler()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/Commands/WellPathCommands/RicPolylineTargetsPickEventHandler.cpp
View File

@ -49,7 +49,9 @@ RicPolylineTargetsPickEventHandler::RicPolylineTargetsPickEventHandler( RimUserD
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicPolylineTargetsPickEventHandler::~RicPolylineTargetsPickEventHandler() {}
RicPolylineTargetsPickEventHandler::~RicPolylineTargetsPickEventHandler()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/FileInterface/RifCaseRealizationParametersReader.cpp
View File

@ -235,7 +235,9 @@ RifCaseRealizationRunspecificationReader::RifCaseRealizationRunspecificationRead
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifCaseRealizationRunspecificationReader::~RifCaseRealizationRunspecificationReader() {}
RifCaseRealizationRunspecificationReader::~RifCaseRealizationRunspecificationReader()
{
}
//--------------------------------------------------------------------------------------------------
///

8
ApplicationCode/FileInterface/RifColumnBasedUserData.cpp
View File

@ -35,12 +35,16 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifColumnBasedUserData::RifColumnBasedUserData() {}
RifColumnBasedUserData::RifColumnBasedUserData()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifColumnBasedUserData::~RifColumnBasedUserData() {}
RifColumnBasedUserData::~RifColumnBasedUserData()
{
}
//--------------------------------------------------------------------------------------------------
///

8
ApplicationCode/FileInterface/RifCsvUserData.cpp
View File

@ -35,12 +35,16 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifCsvUserData::RifCsvUserData() {}
RifCsvUserData::RifCsvUserData()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifCsvUserData::~RifCsvUserData() {}
RifCsvUserData::~RifCsvUserData()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/FileInterface/RifCsvUserDataParser.cpp
View File

@ -76,7 +76,9 @@ RifCsvUserDataParser::RifCsvUserDataParser( QString* errorText )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifCsvUserDataParser::~RifCsvUserDataParser() {}
RifCsvUserDataParser::~RifCsvUserDataParser()
{
}
//--------------------------------------------------------------------------------------------------
///

8
ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp
View File

@ -58,12 +58,16 @@ QString pathsKeyword( "PATHS" );
//--------------------------------------------------------------------------------------------------
/// Constructor
//--------------------------------------------------------------------------------------------------
RifEclipseInputFileTools::RifEclipseInputFileTools() {}
RifEclipseInputFileTools::RifEclipseInputFileTools()
{
}
//--------------------------------------------------------------------------------------------------
/// Destructor
//--------------------------------------------------------------------------------------------------
RifEclipseInputFileTools::~RifEclipseInputFileTools() {}
RifEclipseInputFileTools::~RifEclipseInputFileTools()
{
}
//--------------------------------------------------------------------------------------------------
///

13
ApplicationCode/FileInterface/RifEclipseOutputFileTools.cpp
View File

@ -45,12 +45,16 @@
//--------------------------------------------------------------------------------------------------
/// Constructor
//--------------------------------------------------------------------------------------------------
RifEclipseOutputFileTools::RifEclipseOutputFileTools() {}
RifEclipseOutputFileTools::RifEclipseOutputFileTools()
{
}
//--------------------------------------------------------------------------------------------------
/// Destructor
//--------------------------------------------------------------------------------------------------
RifEclipseOutputFileTools::~RifEclipseOutputFileTools() {}
RifEclipseOutputFileTools::~RifEclipseOutputFileTools()
{
}
struct KeywordItemCounter
{
@ -61,10 +65,7 @@ struct KeywordItemCounter
{
}
bool operator==( const std::string& rhs ) const
{
return this->m_keyword == rhs;
}
bool operator==( const std::string& rhs ) const { return this->m_keyword == rhs; }
std::string m_keyword;
size_t m_aggregatedItemCount;

12
ApplicationCode/FileInterface/RifEclipseRestartDataAccess.cpp
View File

@ -21,17 +21,23 @@
//--------------------------------------------------------------------------------------------------
/// Constructor
//--------------------------------------------------------------------------------------------------
RifEclipseRestartDataAccess::RifEclipseRestartDataAccess() {}
RifEclipseRestartDataAccess::RifEclipseRestartDataAccess()
{
}
//--------------------------------------------------------------------------------------------------
/// Destructor
//--------------------------------------------------------------------------------------------------
RifEclipseRestartDataAccess::~RifEclipseRestartDataAccess() {}
RifEclipseRestartDataAccess::~RifEclipseRestartDataAccess()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifRestartReportKeywords::RifRestartReportKeywords() {}
RifRestartReportKeywords::RifRestartReportKeywords()
{
}
//--------------------------------------------------------------------------------------------------
///

15
ApplicationCode/FileInterface/RifEclipseRestartDataAccess.h
View File

@ -41,18 +41,9 @@ public:
{
}
std::string keyword() const
{
return m_keyword;
}
size_t itemCount() const
{
return m_itemCount;
}
int indexWithinReportStep() const
{
return m_indexWithinReportStep;
}
std::string keyword() const { return m_keyword; }
size_t itemCount() const { return m_itemCount; }
int indexWithinReportStep() const { return m_indexWithinReportStep; }
private:
std::string m_keyword;

4
ApplicationCode/FileInterface/RifEclipseRestartFilesetAccess.cpp
View File

@ -97,7 +97,9 @@ void RifEclipseRestartFilesetAccess::setRestartFiles( const QStringList& fileSet
//--------------------------------------------------------------------------------------------------
/// Close files
//--------------------------------------------------------------------------------------------------
void RifEclipseRestartFilesetAccess::close() {}
void RifEclipseRestartFilesetAccess::close()
{
}
//--------------------------------------------------------------------------------------------------
///

15
ApplicationCode/FileInterface/RifEclipseRftAddress.h
View File

@ -53,18 +53,9 @@ public:
public:
RifEclipseRftAddress( QString wellName, QDateTime timeStep, RftWellLogChannelType wellLogChannel );
const QString& wellName() const
{
return m_wellName;
}
QDateTime timeStep() const
{
return m_timeStep;
}
const RftWellLogChannelType& wellLogChannel() const
{
return m_wellLogChannel;
}
const QString& wellName() const { return m_wellName; }
QDateTime timeStep() const { return m_timeStep; }
const RftWellLogChannelType& wellLogChannel() const { return m_wellLogChannel; }
static std::set<RftWellLogChannelType> rftPlotChannelTypes()
{

114
ApplicationCode/FileInterface/RifEclipseSummaryAddress.h
View File

@ -160,62 +160,23 @@ public:
// Access methods
SummaryVarCategory category() const
{
return m_variableCategory;
}
const std::string& quantityName() const
{
return m_quantityName;
}
bool isHistoryQuantity() const;
SummaryVarCategory category() const { return m_variableCategory; }
const std::string& quantityName() const { return m_quantityName; }
bool isHistoryQuantity() const;
int regionNumber() const
{
return m_regionNumber;
}
int regionNumber2() const
{
return m_regionNumber2;
}
int regionNumber() const { return m_regionNumber; }
int regionNumber2() const { return m_regionNumber2; }
const std::string& wellGroupName() const
{
return m_wellGroupName;
}
const std::string& wellName() const
{
return m_wellName;
}
int wellSegmentNumber() const
{
return m_wellSegmentNumber;
}
const std::string& lgrName() const
{
return m_lgrName;
}
int cellI() const
{
return m_cellI;
}
int cellJ() const
{
return m_cellJ;
}
int cellK() const
{
return m_cellK;
}
int aquiferNumber() const
{
return m_aquiferNumber;
}
int id() const
{
return m_id;
}
std::string blockAsString() const;
const std::string& wellGroupName() const { return m_wellGroupName; }
const std::string& wellName() const { return m_wellName; }
int wellSegmentNumber() const { return m_wellSegmentNumber; }
const std::string& lgrName() const { return m_lgrName; }
int cellI() const { return m_cellI; }
int cellJ() const { return m_cellJ; }
int cellK() const { return m_cellK; }
int aquiferNumber() const { return m_aquiferNumber; }
int id() const { return m_id; }
std::string blockAsString() const;
const std::string ensembleStatisticsQuantityName() const;
@ -226,45 +187,18 @@ public:
bool isUiTextMatchingFilterText( const QString& filterString ) const;
bool isValid() const;
void setQuantityName( const std::string& quantity )
{
m_quantityName = quantity;
}
void setWellName( const std::string& wellName )
{
m_wellName = wellName;
}
void setWellGroupName( const std::string& wellGroupName )
{
m_wellGroupName = wellGroupName;
}
void setRegion( int region )
{
m_regionNumber = (int16_t)region;
}
void setAquiferNumber( int aquiferNumber )
{
m_aquiferNumber = (int16_t)aquiferNumber;
}
void setQuantityName( const std::string& quantity ) { m_quantityName = quantity; }
void setWellName( const std::string& wellName ) { m_wellName = wellName; }
void setWellGroupName( const std::string& wellGroupName ) { m_wellGroupName = wellGroupName; }
void setRegion( int region ) { m_regionNumber = (int16_t)region; }
void setAquiferNumber( int aquiferNumber ) { m_aquiferNumber = (int16_t)aquiferNumber; }
void setCellIjk( const std::string& uiText );
void setWellSegmentNumber( int segment )
{
m_wellSegmentNumber = (int16_t)segment;
}
void setWellSegmentNumber( int segment ) { m_wellSegmentNumber = (int16_t)segment; }
void setAsErrorResult()
{
m_isErrorResult = true;
}
bool isErrorResult() const
{
return m_isErrorResult;
}
void setAsErrorResult() { m_isErrorResult = true; }
bool isErrorResult() const { return m_isErrorResult; }
void setId( int id )
{
m_id = id;
}
void setId( int id ) { m_id = id; }
bool hasAccumulatedData() const;

20
ApplicationCode/FileInterface/RifEclipseUserDataParserTools.h
View File

@ -103,25 +103,13 @@ public:
}
}
std::string origin() const
{
return m_origin;
}
std::string origin() const { return m_origin; }
std::string startDate() const
{
return m_startDate;
}
std::string startDate() const { return m_startDate; }
std::vector<Column>& columnInfos()
{
return m_columnInfos;
}
std::vector<Column>& columnInfos() { return m_columnInfos; }
const std::vector<Column>& columnInfos() const
{
return m_columnInfos;
}
const std::vector<Column>& columnInfos() const { return m_columnInfos; }
int dateTimeColumnIndex() const;
QDateTime findFirstDate() const;

4
ApplicationCode/FileInterface/RifElementPropertyReader.cpp
View File

@ -36,7 +36,9 @@ RifElementPropertyReader::RifElementPropertyReader( const std::vector<int>& elem
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifElementPropertyReader::~RifElementPropertyReader() {}
RifElementPropertyReader::~RifElementPropertyReader()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/FileInterface/RifHdf5Reader.cpp
View File

@ -64,7 +64,9 @@ RifHdf5Reader::RifHdf5Reader( const QString& fileName )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifHdf5Reader::~RifHdf5Reader() {}
RifHdf5Reader::~RifHdf5Reader()
{
}
//--------------------------------------------------------------------------------------------------
///

8
ApplicationCode/FileInterface/RifKeywordVectorUserData.cpp
View File

@ -35,12 +35,16 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifKeywordVectorUserData::RifKeywordVectorUserData() {}
RifKeywordVectorUserData::RifKeywordVectorUserData()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifKeywordVectorUserData::~RifKeywordVectorUserData() {}
RifKeywordVectorUserData::~RifKeywordVectorUserData()
{
}
//--------------------------------------------------------------------------------------------------
///

8
ApplicationCode/FileInterface/RifReaderEclipseInput.cpp
View File

@ -35,12 +35,16 @@
//--------------------------------------------------------------------------------------------------
/// Constructor
//--------------------------------------------------------------------------------------------------
RifReaderEclipseInput::RifReaderEclipseInput() {}
RifReaderEclipseInput::RifReaderEclipseInput()
{
}
//--------------------------------------------------------------------------------------------------
/// Destructor
//--------------------------------------------------------------------------------------------------
RifReaderEclipseInput::~RifReaderEclipseInput() {}
RifReaderEclipseInput::~RifReaderEclipseInput()
{
}
//--------------------------------------------------------------------------------------------------
/// Open file and read geometry into given reservoir object

8
ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp
View File

@ -604,12 +604,16 @@ const std::vector<double> RifReaderEclipseSummary::ValuesCache::EMPTY_VECTOR;
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifReaderEclipseSummary::ValuesCache::ValuesCache() {}
RifReaderEclipseSummary::ValuesCache::ValuesCache()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifReaderEclipseSummary::ValuesCache::~ValuesCache() {}
RifReaderEclipseSummary::ValuesCache::~ValuesCache()
{
}
//--------------------------------------------------------------------------------------------------
///

10
ApplicationCode/FileInterface/RifReaderEclipseSummary.h
View File

@ -49,10 +49,7 @@ public:
, endDate( _endDate )
{
}
bool valid()
{
return !fileName.isEmpty();
}
bool valid() { return !fileName.isEmpty(); }
QString fileName;
time_t startDate;
@ -79,10 +76,7 @@ public:
bool values( const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values ) const override;
std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override;
RiaEclipseUnitTools::UnitSystem unitSystem() const override;
QStringList warnings() const
{
return m_warnings;
}
QStringList warnings() const { return m_warnings; }
void markForCachePurge( const RifEclipseSummaryAddress& address ) override;

10
ApplicationCode/FileInterface/RifReaderInterface.h
View File

@ -62,14 +62,8 @@ public:
size_t stepIndex,
std::vector<double>* values ) = 0;
void setFilenamesWithFaults( const std::vector<QString>& filenames )
{
m_filenamesWithFaults = filenames;
}
std::vector<QString> filenamesWithFaults()
{
return m_filenamesWithFaults;
}
void setFilenamesWithFaults( const std::vector<QString>& filenames ) { m_filenamesWithFaults = filenames; }
std::vector<QString> filenamesWithFaults() { return m_filenamesWithFaults; }
void setTimeStepFilter( const std::vector<size_t>& fileTimeStepIndices );

4
ApplicationCode/FileInterface/RifReaderMockModel.cpp
View File

@ -141,7 +141,9 @@ RifReaderMockModel::RifReaderMockModel()
*/
}
RifReaderMockModel::~RifReaderMockModel() {}
RifReaderMockModel::~RifReaderMockModel()
{
}
//--------------------------------------------------------------------------------------------------
///

8
ApplicationCode/FileInterface/RifReaderObservedData.cpp
View File

@ -29,12 +29,16 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifReaderObservedData::RifReaderObservedData() {}
RifReaderObservedData::RifReaderObservedData()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifReaderObservedData::~RifReaderObservedData() {}
RifReaderObservedData::~RifReaderObservedData()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/FileInterface/RifSummaryCaseRestartSelector.cpp
View File

@ -78,7 +78,9 @@ RifSummaryCaseRestartSelector::RifSummaryCaseRestartSelector()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifSummaryCaseRestartSelector::~RifSummaryCaseRestartSelector() {}
RifSummaryCaseRestartSelector::~RifSummaryCaseRestartSelector()
{
}
//--------------------------------------------------------------------------------------------------
///

4
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPart.cpp
View File

@ -35,7 +35,9 @@ RigFemPart::RigFemPart()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigFemPart::~RigFemPart() {}
RigFemPart::~RigFemPart()
{
}
//--------------------------------------------------------------------------------------------------
///

47
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPart.h
View File

@ -49,32 +49,17 @@ public:
RigFemPart();
~RigFemPart() override;
int elementPartId() const
{
return m_elementPartId;
}
void setElementPartId( int partId )
{
m_elementPartId = partId;
}
int elementPartId() const { return m_elementPartId; }
void setElementPartId( int partId ) { m_elementPartId = partId; }
void preAllocateElementStorage( int elementCount );
void appendElement( RigElementType elmType, int elementId, const int* connectivities );
int elementCount() const
{
return static_cast<int>( m_elementId.size() );
}
int elementCount() const { return static_cast<int>( m_elementId.size() ); }
int elmId( size_t elementIdx ) const
{
return m_elementId[elementIdx];
}
RigElementType elementType( size_t elementIdx ) const
{
return m_elementTypes[elementIdx];
}
const int* connectivities( size_t elementIdx ) const
int elmId( size_t elementIdx ) const { return m_elementId[elementIdx]; }
RigElementType elementType( size_t elementIdx ) const { return m_elementTypes[elementIdx]; }
const int* connectivities( size_t elementIdx ) const
{
return &m_allElementConnectivities[m_elementConnectivityStartIndices[elementIdx]];
}
@ -89,14 +74,8 @@ public:
return m_allElementConnectivities[elmNodeResultIdx];
}
size_t resultValueIdxFromResultPosType( RigFemResultPosEnum resultPosType, int elementIdx, int elmLocalNodeIdx ) const;
RigFemPartNodes& nodes()
{
return m_nodes;
}
const RigFemPartNodes& nodes() const
{
return m_nodes;
}
RigFemPartNodes& nodes() { return m_nodes; }
const RigFemPartNodes& nodes() const { return m_nodes; }
void assertNodeToElmIndicesIsCalculated();
const std::vector<int>& elementsUsingNode( int nodeIndex ) const;
@ -114,10 +93,7 @@ public:
cvf::BoundingBox boundingBox() const;
float characteristicElementSize() const;
const std::vector<int>& possibleGridCornerElements() const
{
return m_possibleGridCornerElements;
}
const std::vector<int>& possibleGridCornerElements() const { return m_possibleGridCornerElements; }
void findIntersectingCells( const cvf::BoundingBox& inputBB, std::vector<size_t>* elementIndices ) const;
void findIntersectingCellsWithExistingSearchTree( const cvf::BoundingBox& inputBB,
std::vector<size_t>* elementIndices ) const;
@ -127,10 +103,7 @@ public:
cvf::Vec3f faceNormal( int elmentIndex, int faceIndex ) const;
const RigFemPartGrid* getOrCreateStructGrid() const;
const std::vector<int>& elementIdxToId() const
{
return m_elementId;
}
const std::vector<int>& elementIdxToId() const { return m_elementId; }
private:
int m_elementPartId;

8
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartCollection.cpp
View File

@ -23,12 +23,16 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigFemPartCollection::RigFemPartCollection() {}
RigFemPartCollection::RigFemPartCollection()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigFemPartCollection::~RigFemPartCollection() {}
RigFemPartCollection::~RigFemPartCollection()
{
}
//--------------------------------------------------------------------------------------------------
///

Some files were not shown because too many files have changed in this diff Show More