OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8985 from OPM/8926-remove-useoptionsonly

Browse Source 
AppFwk : Remove obsolete useOptionsOnly
This commit is contained in:
Magne Sjaastad
2022-05-29 13:01:27 +02:00
committed by GitHub
parent 2a57adf222
commit f0ce04597d
276 changed files with 333 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationLibCode/ProjectDataModel/Intersections/RimExtrudedCurveIntersection.cpp
+2 -3
View File
@@ -592,8 +592,7 @@ void RimExtrudedCurveIntersection::defineUiOrdering( QString uiConfigName, caf::
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo>
RimExtrudedCurveIntersection::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly )
RimExtrudedCurveIntersection::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions )
{
QList<caf::PdmOptionItemInfo> options;
@@ -640,7 +639,7 @@ QList<caf::PdmOptionItemInfo>
}
else
{
options = RimIntersection::calculateValueOptions( fieldNeedingOptions, useOptionsOnly );
options = RimIntersection::calculateValueOptions( fieldNeedingOptions );
}
return options;
ApplicationLibCode/ProjectDataModel/Intersections/RimExtrudedCurveIntersection.h
+1 -2
View File
@@ -135,8 +135,7 @@ protected:
void defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute ) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions ) override;
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
ApplicationLibCode/ProjectDataModel/Intersections/RimIntersection.cpp
+1 -2
View File
@@ -106,8 +106,7 @@ RimIntersectionResultDefinition* RimIntersection::activeSeparateResultDefinition
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimIntersection::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly )
QList<caf::PdmOptionItemInfo> RimIntersection::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions )
{
QList<caf::PdmOptionItemInfo> options;
ApplicationLibCode/ProjectDataModel/Intersections/RimIntersection.h
+1 -2
View File
@@ -52,8 +52,7 @@ protected:
virtual RimIntersectionResultsDefinitionCollection* findSeparateResultsCollection();
caf::PdmFieldHandle* objectToggleField() final;
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions ) override;
void defineSeparateDataSourceUi( QString uiConfigName, caf::PdmUiOrdering& uiOrdering );
void updateDefaultSeparateDataSource();
ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultDefinition.cpp
+1 -2
View File
@@ -409,8 +409,7 @@ void RimIntersectionResultDefinition::setDefaultEclipseLegendConfig()
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo>
RimIntersectionResultDefinition::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly )
RimIntersectionResultDefinition::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions )
{
QList<caf::PdmOptionItemInfo> options;
ApplicationLibCode/ProjectDataModel/Intersections/RimIntersectionResultDefinition.h
+1 -2
View File
@@ -67,8 +67,7 @@ protected:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
void initAfterRead() override;