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

#2353 Empty function caseName() shadows base class field with same signature

Browse Source
This commit is contained in:
Magne Sjaastad
2018-01-09 09:16:06 +01:00
parent cd4b930d77
commit 09d776dd73
3 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp
View File

@@ -92,8 +92,6 @@ RimEclipseResultCase::RimEclipseResultCase()
m_activeCellInfoIsReadFromFile = false; m_activeCellInfoIsReadFromFile = false;
m_gridAndWellDataIsReadFromFile = false; m_gridAndWellDataIsReadFromFile = false;
m_caseName = "";
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

5
ApplicationCode/ProjectDataModel/RimEclipseResultCase.h
View File

@@ -65,8 +65,6 @@ public:
RifReaderEclipseRft* rftReader(); RifReaderEclipseRft* rftReader();
QString caseName() const { return m_caseName; }
protected: protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute); virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
@@ -90,12 +88,9 @@ private:
caf::PdmChildArrayField<RimFlowDiagSolution*> m_flowDiagSolutions; caf::PdmChildArrayField<RimFlowDiagSolution*> m_flowDiagSolutions;
caf::PdmField<QString> m_sourSimFileName; caf::PdmField<QString> m_sourSimFileName;
QString m_caseName;
// Obsolete field // Obsolete field
caf::PdmField<QString> caseDirectory; caf::PdmField<QString> caseDirectory;
bool m_gridAndWellDataIsReadFromFile; bool m_gridAndWellDataIsReadFromFile;
bool m_activeCellInfoIsReadFromFile; bool m_activeCellInfoIsReadFromFile;
}; };

2
ApplicationCode/ProjectDataModel/RimWellLogRftCurve.cpp
View File

@@ -258,7 +258,7 @@ QString RimWellLogRftCurve::createCurveAutoName()
if (m_eclipseResultCase) if (m_eclipseResultCase)
{ {
name.push_back(m_eclipseResultCase->caseName()); name.push_back(m_eclipseResultCase->caseUserDescription());
} }
if (wellLogChannelName() != caf::AppEnum<RifEclipseRftAddress::RftWellLogChannelType>::text(RifEclipseRftAddress::NONE)) if (wellLogChannelName() != caf::AppEnum<RifEclipseRftAddress::RftWellLogChannelType>::text(RifEclipseRftAddress::NONE))
{ {