From 860e6d54a95424259864541b555e6a105817d353 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 5 Aug 2020 14:46:27 +0200 Subject: [PATCH] Make Linux happy Use correct type Remove unused variable Fix placement of local variable --- ApplicationCode/Commands/RicImportFormationNamesFeature.cpp | 3 ++- ApplicationCode/FileInterface/RifSurfaceExporter.cpp | 2 +- .../ProjectDataModel/RimFormationNamesCollection.cpp | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ApplicationCode/Commands/RicImportFormationNamesFeature.cpp b/ApplicationCode/Commands/RicImportFormationNamesFeature.cpp index ad55cc30b9..1570b78728 100644 --- a/ApplicationCode/Commands/RicImportFormationNamesFeature.cpp +++ b/ApplicationCode/Commands/RicImportFormationNamesFeature.cpp @@ -80,7 +80,8 @@ RimFormationNames* RicImportFormationNamesFeature::importFormationFiles( const Q if ( anyValidColor ) { - RicImportFormationNamesFeature::addCustomColorLegend( QFileInfo( fileNames[i] ).baseName(), formationNames[i] ); + QString baseName = QFileInfo( fileNames[i] ).baseName(); + RicImportFormationNamesFeature::addCustomColorLegend( baseName, formationNames[i] ); } } diff --git a/ApplicationCode/FileInterface/RifSurfaceExporter.cpp b/ApplicationCode/FileInterface/RifSurfaceExporter.cpp index e8293892d4..82e0281756 100644 --- a/ApplicationCode/FileInterface/RifSurfaceExporter.cpp +++ b/ApplicationCode/FileInterface/RifSurfaceExporter.cpp @@ -112,7 +112,7 @@ bool RifSurfaceExporter::writePetrellPtlFile( const QString& out << "#History: No history \n"; out << "#Z_units: meters \n"; - for ( int i = 0; i < vertices.size(); i++ ) + for ( size_t i = 0; i < vertices.size(); i++ ) { out << vertices[i].x() << " "; out << vertices[i].y() << " "; diff --git a/ApplicationCode/ProjectDataModel/RimFormationNamesCollection.cpp b/ApplicationCode/ProjectDataModel/RimFormationNamesCollection.cpp index bcc9df08c8..f8af547099 100644 --- a/ApplicationCode/ProjectDataModel/RimFormationNamesCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimFormationNamesCollection.cpp @@ -64,7 +64,6 @@ std::vector RimFormationNamesCollection::importFiles( const { QStringList newFileNames; std::vector formNamesObjsToReload; - size_t formationListBeforeImportCount = m_formationNamesList.size(); for ( const QString& newFileName : fileNames ) {