Always use smart pointers

p4#: 20513
This commit is contained in:
Magne Sjaastad
2013-02-14 10:02:49 +01:00
parent b4a6cccfb0
commit f344466037
2 changed files with 5 additions and 8 deletions

View File

@@ -82,8 +82,7 @@ void RimInputReservoir::openDataFileSet(const QStringList& filenames)
if (m_rigReservoir.isNull())
{
RigEclipseCase* eclipseCase = new RigEclipseCase;
m_rigReservoir = eclipseCase;
m_rigReservoir = new RigEclipseCase;
}
// First find and read the grid data
@@ -168,11 +167,10 @@ bool RimInputReservoir::openEclipseGridFile()
}
else
{
RigEclipseCase* eclipseCase = new RigEclipseCase;
cvf::ref<RigEclipseCase> eclipseCase = new RigEclipseCase;
readerInterface = new RifReaderEclipseInput;
if (!readerInterface->open(m_gridFileName, eclipseCase))
if (!readerInterface->open(m_gridFileName, eclipseCase.p()))
{
delete eclipseCase;
return false;
}

View File

@@ -69,11 +69,10 @@ bool RimResultReservoir::openEclipseGridFile()
return false;
}
RigEclipseCase* eclipseCase = new RigEclipseCase;
cvf::ref<RigEclipseCase> eclipseCase = new RigEclipseCase;
readerInterface = new RifReaderEclipseOutput;
if (!readerInterface->open(fname, eclipseCase))
if (!readerInterface->open(fname, eclipseCase.p()))
{
delete eclipseCase;
return false;
}