From d3fc5e79421871bc0c2fd756996ceb727d59e928 Mon Sep 17 00:00:00 2001 From: Gaute Lindkvist Date: Mon, 7 Sep 2020 09:22:33 +0200 Subject: [PATCH] Remove use of QStringList::toStdVector and fromStdVector --- ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp | 3 ++- .../ProjectDataModel/RimWellMeasurementInView.cpp | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp index 0ee2a0e66a..6fa40bffe4 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp @@ -249,7 +249,8 @@ bool RimEclipseResultCase::importAsciiInputProperties( const QStringList& fileNa return RifEclipseInputPropertyLoader::readInputPropertiesFromFiles( m_inputPropertyCollection, this->eclipseCaseData(), importFaults, - fileNames.toVector().toStdVector() ); + std::vector( fileNames.begin(), + fileNames.end() ) ); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimWellMeasurementInView.cpp b/ApplicationCode/ProjectDataModel/RimWellMeasurementInView.cpp index f201bce69f..e8cd8344f4 100644 --- a/ApplicationCode/ProjectDataModel/RimWellMeasurementInView.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellMeasurementInView.cpp @@ -460,7 +460,11 @@ void RimWellMeasurementInView::setAllQualitiesSelected() //-------------------------------------------------------------------------------------------------- QString RimWellMeasurementInView::convertToSerializableString( const std::vector& strings ) { - QStringList stringList = QVector::fromStdVector( strings ).toList(); + QStringList stringList; + for ( const auto& string : strings ) + { + stringList.push_back( string ); + } return stringList.join( '|' ); } @@ -470,7 +474,7 @@ QString RimWellMeasurementInView::convertToSerializableString( const std::vector std::vector RimWellMeasurementInView::convertFromSerializableString( const QString& string ) { QStringList stringList = string.split( '|' ); - return stringList.toVector().toStdVector(); + return std::vector( stringList.begin(), stringList.end() ); } //--------------------------------------------------------------------------------------------------