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

12
ApplicationLibCode/ProjectDataModel/WellPath/RimFileWellPath.cpp
View File

@@ -144,11 +144,11 @@ void RimFileWellPath::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering
//--------------------------------------------------------------------------------------------------
bool RimFileWellPath::readWellPathFile( QString* errorMessage, RifWellPathImporter* wellPathImporter, bool setWellNameForExport )
{
if ( caf::Utils::fileExists( this->filePath() ) )
if ( caf::Utils::fileExists( filePath() ) )
{
RifWellPathImporter::WellData wellData = wellPathImporter->readWellData( this->filePath(), m_wellPathIndexInFile() );
RifWellPathImporter::WellData wellData = wellPathImporter->readWellData( filePath(), m_wellPathIndexInFile() );
RifWellPathImporter::WellMetaData wellMetaData = RifWellPathImporter::readWellMetaData( this->filePath(), m_wellPathIndexInFile() );
RifWellPathImporter::WellMetaData wellMetaData = RifWellPathImporter::readWellMetaData( filePath(), m_wellPathIndexInFile() );
// General well info
if ( setWellNameForExport )
@@ -188,7 +188,7 @@ bool RimFileWellPath::readWellPathFile( QString* errorMessage, RifWellPathImport
}
else
{
if ( errorMessage ) ( *errorMessage ) = "Could not find the well path file: " + this->filePath();
if ( errorMessage ) ( *errorMessage ) = "Could not find the well path file: " + filePath();
return false;
}
}
@@ -308,9 +308,9 @@ void RimFileWellPath::ensureWellPathStartAtSeaLevel( RigWellPath* wellPath )
{
mdAtSeaLevel = wellPath->datumElevation();
}
else if ( this->airGap() != std::numeric_limits<double>::infinity() && this->airGap() > 0.0 )
else if ( airGap() != std::numeric_limits<double>::infinity() && airGap() > 0.0 )
{
mdAtSeaLevel = this->airGap();
mdAtSeaLevel = airGap();
}
std::vector<double> newMeasuredDepths = { mdAtSeaLevel };

4
ApplicationLibCode/ProjectDataModel/WellPath/RimModeledWellPath.cpp
View File

@@ -72,7 +72,7 @@ RimModeledWellPath::~RimModeledWellPath()
//--------------------------------------------------------------------------------------------------
void RimModeledWellPath::createWellPathGeometry()
{
this->setWellPathGeometry( m_geometryDefinition->createWellPathGeometry().p() );
setWellPathGeometry( m_geometryDefinition->createWellPathGeometry().p() );
}
//--------------------------------------------------------------------------------------------------
@@ -295,7 +295,7 @@ void RimModeledWellPath::updateReferencePoint()
RimWellPathTieIn* tieIn = wellPathTieIn();
if ( !tieIn ) return;
auto topLevelModelledWell = dynamic_cast<RimModeledWellPath*>( this->topLevelWellPath() );
auto topLevelModelledWell = dynamic_cast<RimModeledWellPath*>( topLevelWellPath() );
if ( !topLevelModelledWell ) return;
auto refPoint = topLevelModelledWell->geometryDefinition()->anchorPointXyz();

4
ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettings.cpp
View File

@@ -94,7 +94,7 @@ RimWellIASettings::RimWellIASettings()
CAF_PDM_InitField( &m_boxValid, "boxValid", false, "Model box is valid" );
m_boxValid.uiCapability()->setUiHidden( true );
this->setDeletable( true );
setDeletable( true );
}
//--------------------------------------------------------------------------------------------------
@@ -145,7 +145,7 @@ void RimWellIASettings::fieldChangedByUi( const caf::PdmFieldHandle* changedFiel
updateVisualization();
}
this->updateConnectedEditors();
updateConnectedEditors();
}
//--------------------------------------------------------------------------------------------------

6
ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp
View File

@@ -152,7 +152,7 @@ RimWellPath::RimWellPath()
CAF_PDM_InitFieldNoDefault( &m_wellIASettingsCollection, "WellIASettings", "Integrity Analysis Settings" );
m_wellIASettingsCollection = new RimWellIASettingsCollection();
this->setDeletable( true );
setDeletable( true );
}
//--------------------------------------------------------------------------------------------------
@@ -826,7 +826,7 @@ double RimWellPath::combinedScaleFactor() const
{
RimWellPathCollection* wellPathColl = firstAncestorOrThisOfTypeAsserted<RimWellPathCollection>();
return this->m_wellPathRadiusScaleFactor() * wellPathColl->wellPathRadiusScaleFactor();
return m_wellPathRadiusScaleFactor() * wellPathColl->wellPathRadiusScaleFactor();
}
//--------------------------------------------------------------------------------------------------
@@ -1169,7 +1169,7 @@ std::vector<RimWellPath*> RimWellPath::allWellPathLaterals() const
{
std::vector<RimWellPath*> laterals;
this->wellPathLateralsRecursively( laterals );
wellPathLateralsRecursively( laterals );
return laterals;
}

14
ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathAttributeCollection.cpp
View File

@@ -38,7 +38,7 @@ RimWellPathAttributeCollection::RimWellPathAttributeCollection()
m_attributes.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() );
m_attributes.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
m_attributes.uiCapability()->setCustomContextMenuEnabled( true );
this->setName( "Casing Design" );
setName( "Casing Design" );
}
//--------------------------------------------------------------------------------------------------
@@ -58,7 +58,7 @@ void RimWellPathAttributeCollection::updateAllReferringTracks()
{
track->loadDataAndUpdate();
}
this->updateConnectedEditors();
updateConnectedEditors();
}
//--------------------------------------------------------------------------------------------------
@@ -86,7 +86,7 @@ void RimWellPathAttributeCollection::insertAttribute( RimWellPathAttribute* inse
else
m_attributes.push_back( attribute );
this->updateAllReferringTracks();
updateAllReferringTracks();
}
//--------------------------------------------------------------------------------------------------
@@ -97,7 +97,7 @@ void RimWellPathAttributeCollection::deleteAttribute( RimWellPathAttribute* attr
m_attributes.removeChild( attributeToDelete );
delete attributeToDelete;
this->updateAllReferringTracks();
updateAllReferringTracks();
}
//--------------------------------------------------------------------------------------------------
@@ -106,7 +106,7 @@ void RimWellPathAttributeCollection::deleteAttribute( RimWellPathAttribute* attr
void RimWellPathAttributeCollection::deleteAllAttributes()
{
m_attributes.deleteChildren();
this->updateAllReferringTracks();
updateAllReferringTracks();
}
//--------------------------------------------------------------------------------------------------
@@ -163,10 +163,10 @@ void RimWellPathAttributeCollection::defineUiTreeOrdering( caf::PdmUiTreeOrderin
//--------------------------------------------------------------------------------------------------
void RimWellPathAttributeCollection::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue )
{
if ( changedField == this->objectToggleField() )
if ( changedField == objectToggleField() )
{
RimProject* proj = RimProject::current();
proj->scheduleCreateDisplayModelAndRedrawAllViews();
this->updateAllReferringTracks();
updateAllReferringTracks();
}
}

6
ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathCollection.cpp
View File

@@ -195,7 +195,7 @@ void RimWellPathCollection::loadDataAndUpdate()
rebuildWellPathNodes();
this->sortWellsByName();
sortWellsByName();
}
//--------------------------------------------------------------------------------------------------
@@ -380,7 +380,7 @@ std::vector<RimWellLogFile*> RimWellPathCollection::addWellLogs( const QStringLi
}
}
this->sortWellsByName();
sortWellsByName();
updateAllRequiredEditors();
return logFileInfos;
@@ -432,7 +432,7 @@ void RimWellPathCollection::addWellPathFormations( const QStringList& filePaths
RiaLogging::errorInMessageBox( Riu3DMainWindowTools::mainWindowWidget(), "Well Picks Import", outputMessage );
}
this->sortWellsByName();
sortWellsByName();
updateAllRequiredEditors();
}

6
ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGeometryDef.cpp
View File

@@ -63,7 +63,7 @@ RimWellPathGeometryDef::RimWellPathGeometryDef()
"WellPathGeometry",
"Class containing the geometry of a modeled Well Path" );
this->setUi3dEditorTypeName( RicWellPathGeometry3dEditor::uiEditorTypeName() );
setUi3dEditorTypeName( RicWellPathGeometry3dEditor::uiEditorTypeName() );
CAF_PDM_InitScriptableFieldWithScriptKeyword( &m_referencePointUtmXyd,
"ReferencePosUtmXyd",
"ReferencePoint",
@@ -477,7 +477,7 @@ const RimWellPathTarget* RimWellPathGeometryDef::lastActiveTarget() const
void RimWellPathGeometryDef::enableTargetPointPicking( bool isEnabling )
{
m_pickPointsEnabled = isEnabling;
this->updateConnectedEditors();
updateConnectedEditors();
}
//--------------------------------------------------------------------------------------------------
@@ -505,7 +505,7 @@ void RimWellPathGeometryDef::fieldChangedByUi( const caf::PdmFieldHandle* change
{
if ( changedField == &m_pickPointsEnabled )
{
this->updateConnectedEditors();
updateConnectedEditors();
}
else if ( changedField == &m_referencePointUtmXyd )
{

4
ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGroup.cpp
View File

@@ -76,7 +76,7 @@ void RimWellPathGroup::addChildWellPath( RimWellPath* wellPath )
RimWellPath::copyCompletionSettings( wellPath, this );
}
if ( !this->wellPathGeometry()->wellPathPoints().empty() )
if ( !wellPathGeometry()->wellPathPoints().empty() )
{
m_childWellPaths.push_back( wellPath );
createWellPathGeometry();
@@ -360,7 +360,7 @@ void RimWellPathGroup::makeMoreLevelsIfNecessary()
{
if ( m_childWellPaths.size() <= 1u ) return;
auto wellPathPoints = this->wellPathGeometry()->wellPathPoints();
auto wellPathPoints = wellPathGeometry()->wellPathPoints();
auto comp = []( const cvf::Vec3d& lhs, const cvf::Vec3d& rhs )
{