diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp index d5a68c1d81..54cf89d46e 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp @@ -91,9 +91,9 @@ RimEclipseCase::RimEclipseCase() m_filesContainingFaults_OBSOLETE.xmlCapability()->setIOWritable(false); m_filesContainingFaults_OBSOLETE.uiCapability()->setUiHidden(true); - CAF_PDM_InitField(&caseName, "CaseName", QString(), "Obsolete", "", "" ,""); - caseName.xmlCapability()->setIOWritable(false); - caseName.uiCapability()->setUiHidden(true); + CAF_PDM_InitField(&m_caseName_OBSOLETE, "CaseName", QString(), "Obsolete", "", "" ,""); + m_caseName_OBSOLETE.xmlCapability()->setIOWritable(false); + m_caseName_OBSOLETE.uiCapability()->setUiHidden(true); // Init @@ -210,9 +210,9 @@ void RimEclipseCase::initAfterRead() riv->setEclipseCase(this); } - if (caseUserDescription().isEmpty() && !caseName().isEmpty()) + if (caseUserDescription().isEmpty() && !m_caseName_OBSOLETE().isEmpty()) { - caseUserDescription = caseName; + caseUserDescription = m_caseName_OBSOLETE; } } diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCase.h b/ApplicationCode/ProjectDataModel/RimEclipseCase.h index 5e8710df62..8731b2b62c 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCase.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseCase.h @@ -135,7 +135,7 @@ private: // Obsolete fields protected: - caf::PdmField caseName; + caf::PdmField m_caseName_OBSOLETE; private: caf::PdmField > m_filesContainingFaults_OBSOLETE; diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp index 7ae7a860d9..cebd388f37 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp @@ -572,9 +572,9 @@ void RimEclipseResultCase::initAfterRead() // Convert from old (9.0.2) way of storing the case file if (caseFileName().isEmpty()) { - if (!this->caseName().isEmpty() && !caseDirectory().isEmpty()) + if (!this->m_caseName_OBSOLETE().isEmpty() && !caseDirectory().isEmpty()) { - caseFileName = QDir::fromNativeSeparators(caseDirectory()) + "/" + caseName() + ".EGRID"; + caseFileName = QDir::fromNativeSeparators(caseDirectory()) + "/" + m_caseName_OBSOLETE() + ".EGRID"; } } }