From 70a98ab8fd95c788c17dac421285af90687f74d2 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 25 Jul 2014 03:07:27 -0700 Subject: [PATCH] Linux fix: No default cast from QString to QString& --- .../ReservoirDataModel/RigResultAccessObjectFactory.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ApplicationCode/ReservoirDataModel/RigResultAccessObjectFactory.cpp b/ApplicationCode/ReservoirDataModel/RigResultAccessObjectFactory.cpp index b2f724a114..bede69dffe 100644 --- a/ApplicationCode/ReservoirDataModel/RigResultAccessObjectFactory.cpp +++ b/ApplicationCode/ReservoirDataModel/RigResultAccessObjectFactory.cpp @@ -125,7 +125,8 @@ cvf::ref RigResultAccessObjectFactory::createResultAccess cvf::ref cellFaceAccessObject = new RigCombTransResultAccessObject(grid, uiResultName); { - cvf::ref nativeAccessObject = RigResultAccessObjectFactory::createNativeDataAccessObject(eclipseCase, gridIndex, porosityModel, timeStepIndex, QString("TRANX")); + QString resultName = "TRANX"; + cvf::ref nativeAccessObject = RigResultAccessObjectFactory::createNativeDataAccessObject(eclipseCase, gridIndex, porosityModel, timeStepIndex, resultName); if (nativeAccessObject.notNull()) { cellFaceAccessObject->setDataAccessObjectForFace(cvf::StructGridInterface::POS_I, nativeAccessObject.p()); @@ -133,7 +134,8 @@ cvf::ref RigResultAccessObjectFactory::createResultAccess } { - cvf::ref nativeAccessObject = RigResultAccessObjectFactory::createNativeDataAccessObject(eclipseCase, gridIndex, porosityModel, timeStepIndex, QString("TRANY")); + QString resultName = "TRANY"; + cvf::ref nativeAccessObject = RigResultAccessObjectFactory::createNativeDataAccessObject(eclipseCase, gridIndex, porosityModel, timeStepIndex, resultName); if (nativeAccessObject.notNull()) { cellFaceAccessObject->setDataAccessObjectForFace(cvf::StructGridInterface::POS_J, nativeAccessObject.p()); @@ -141,7 +143,8 @@ cvf::ref RigResultAccessObjectFactory::createResultAccess } { - cvf::ref nativeAccessObject = RigResultAccessObjectFactory::createNativeDataAccessObject(eclipseCase, gridIndex, porosityModel, timeStepIndex, QString("TRANZ")); + QString resultName = "TRANZ"; + cvf::ref nativeAccessObject = RigResultAccessObjectFactory::createNativeDataAccessObject(eclipseCase, gridIndex, porosityModel, timeStepIndex, resultName); if (nativeAccessObject.notNull()) { cellFaceAccessObject->setDataAccessObjectForFace(cvf::StructGridInterface::POS_K, nativeAccessObject.p());