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

#10367 Janitor: Remove unneccessary 'this' pointers

Browse Source
This commit is contained in:
Kristian Bendiksen
2023-08-04 09:04:14 +02:00
parent 2614cf3d62
commit 5bf2c2a89d
292 changed files with 1625 additions and 1664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechCase.cpp
View File

@@ -170,15 +170,15 @@ RimGeoMechCase::~RimGeoMechCase()
RimWellLogPlotCollection* plotCollection = project->mainPlotCollection()->wellLogPlotCollection();
if ( plotCollection )
{
plotCollection->removeExtractors( this->geoMechData() );
plotCollection->removeExtractors( geoMechData() );
}
}
}
if ( this->geoMechData() )
if ( geoMechData() )
{
// At this point, we assume that memory should be released
CVF_ASSERT( this->geoMechData()->refCount() == 1 );
CVF_ASSERT( geoMechData()->refCount() == 1 );
}
}
@@ -203,11 +203,11 @@ const RigGeoMechCaseData* RimGeoMechCase::geoMechData() const
//--------------------------------------------------------------------------------------------------
void RimGeoMechCase::reloadDataAndUpdate()
{
if ( this->geoMechData() )
if ( geoMechData() )
{
m_geoMechCaseData = nullptr;
std::string errMsg;
if ( this->openGeoMechCase( &errMsg ) == CASE_OPEN_ERROR )
if ( openGeoMechCase( &errMsg ) == CASE_OPEN_ERROR )
{
RiaLogging::error( QString::fromStdString( errMsg ) );
}
@@ -268,7 +268,7 @@ RimGeoMechCase* RimGeoMechCase::createCopy( const QString& newInputFileName )
RimProject* project = RimProject::current();
RimGeoMechCase* copycase =
dynamic_cast<RimGeoMechCase*>( this->xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) );
dynamic_cast<RimGeoMechCase*>( xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) );
CVF_ASSERT( copycase );
QFileInfo filenameInfo( newInputFileName );
@@ -288,7 +288,7 @@ RimGeoMechCase* RimGeoMechCase::createCopy( const QString& newInputFileName )
RimGeoMechCase::CaseOpenStatus RimGeoMechCase::openGeoMechCase( std::string* errorMessage )
{
// If read already, return
if ( this->m_geoMechCaseData.notNull() ) return CASE_OPEN_OK;
if ( m_geoMechCaseData.notNull() ) return CASE_OPEN_OK;
if ( !caf::Utils::fileExists( m_caseFileName().path() ) )
{
@@ -495,7 +495,7 @@ cvf::BoundingBox RimGeoMechCase::reservoirBoundingBox()
{
cvf::BoundingBox boundingBox;
RigGeoMechCaseData* rigCaseData = this->geoMechData();
RigGeoMechCaseData* rigCaseData = geoMechData();
if ( rigCaseData && rigCaseData->femPartResults() && rigCaseData->femParts() )
{
for ( int p = 0; p < rigCaseData->femParts()->partCount(); p++ )
@@ -592,7 +592,7 @@ void RimGeoMechCase::addElementPropertyFiles( const std::vector<caf::FilePath>&
}
}
this->updateConnectedEditors();
updateConnectedEditors();
if ( m_geoMechCaseData.notNull() )
{
@@ -686,10 +686,10 @@ void RimGeoMechCase::setApplyTimeFilter( bool applyTimeFilter )
//--------------------------------------------------------------------------------------------------
cvf::Vec3d RimGeoMechCase::displayModelOffset() const
{
auto bb = this->allCellsBoundingBox();
auto bb = allCellsBoundingBox();
if ( bb.isValid() )
{
return this->allCellsBoundingBox().min();
return allCellsBoundingBox().min();
}
return cvf::Vec3d::ZERO;