From b46124efd7d86bcf70eb4ea222e9b807516f3e99 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Sun, 3 Nov 2019 12:19:24 +0100 Subject: [PATCH] Janitor : Use const ref when possible --- .../Application/Tools/RiaImageFileCompare.cpp | 4 ++- .../Application/Tools/RiaImageFileCompare.h | 2 +- .../RicfCommandFileExecutor.cpp | 2 +- .../RicfCommandFileExecutor.h | 2 +- ...sTransmissibilityCalculationFeatureImp.cpp | 2 +- .../RicWellPathFractureReportItem.cpp | 14 ++++---- .../RicWellPathFractureReportItem.h | 14 ++++---- .../ExportCommands/RicExportLgrFeature.cpp | 36 +++++++++---------- .../ExportCommands/RicExportLgrFeature.h | 2 +- .../Commands/RicImportSummaryCasesFeature.cpp | 4 +-- .../Commands/RicImportSummaryCasesFeature.h | 4 +-- .../Commands/RicSummaryCaseRestartDialog.h | 4 +-- .../FileInterface/RifReaderEclipseRft.cpp | 2 +- .../FileInterface/RifReaderEclipseRft.h | 4 +-- .../RifReaderEnsembleStatisticsRft.cpp | 10 +++--- .../RifReaderEnsembleStatisticsRft.h | 4 +-- .../FileInterface/RifReaderFmuRft.cpp | 8 ++--- .../FileInterface/RifReaderFmuRft.h | 4 +-- .../FileInterface/RifReaderRftInterface.h | 4 +-- 19 files changed, 64 insertions(+), 62 deletions(-) diff --git a/ApplicationCode/Application/Tools/RiaImageFileCompare.cpp b/ApplicationCode/Application/Tools/RiaImageFileCompare.cpp index 48384f539c..dcd88b1b6b 100644 --- a/ApplicationCode/Application/Tools/RiaImageFileCompare.cpp +++ b/ApplicationCode/Application/Tools/RiaImageFileCompare.cpp @@ -53,7 +53,9 @@ void RiaImageFileCompare::reset() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RiaImageFileCompare::runComparison( QString imgFileName, QString refFileName, QString diffFileName ) +bool RiaImageFileCompare::runComparison( const QString& imgFileName, + const QString& refFileName, + const QString& diffFileName ) { reset(); diff --git a/ApplicationCode/Application/Tools/RiaImageFileCompare.h b/ApplicationCode/Application/Tools/RiaImageFileCompare.h index 4ca9d9c038..4e9d538e67 100644 --- a/ApplicationCode/Application/Tools/RiaImageFileCompare.h +++ b/ApplicationCode/Application/Tools/RiaImageFileCompare.h @@ -39,7 +39,7 @@ public: explicit RiaImageFileCompare( QString compareExecutable ); ~RiaImageFileCompare(); - bool runComparison( QString imgFileName, QString refFileName, QString diffFileName ); + bool runComparison( const QString& imgFileName, const QString& refFileName, const QString& diffFileName ); bool imagesEqual() const; ErrorType error() const; QString errorMessage() const; diff --git a/ApplicationCode/CommandFileInterface/RicfCommandFileExecutor.cpp b/ApplicationCode/CommandFileInterface/RicfCommandFileExecutor.cpp index 774db091a6..08cb2ad1e5 100644 --- a/ApplicationCode/CommandFileInterface/RicfCommandFileExecutor.cpp +++ b/ApplicationCode/CommandFileInterface/RicfCommandFileExecutor.cpp @@ -110,7 +110,7 @@ void RicfCommandFileExecutor::executeCommands( QTextStream& stream ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicfCommandFileExecutor::setExportPath( ExportType type, QString path ) +void RicfCommandFileExecutor::setExportPath( ExportType type, const QString& path ) { m_exportPaths[type] = path; } diff --git a/ApplicationCode/CommandFileInterface/RicfCommandFileExecutor.h b/ApplicationCode/CommandFileInterface/RicfCommandFileExecutor.h index 8a62902675..17a5cbc3bd 100644 --- a/ApplicationCode/CommandFileInterface/RicfCommandFileExecutor.h +++ b/ApplicationCode/CommandFileInterface/RicfCommandFileExecutor.h @@ -53,7 +53,7 @@ public: ~RicfCommandFileExecutor(); void executeCommands( QTextStream& stream ); - void setExportPath( ExportType type, QString path ); + void setExportPath( ExportType type, const QString& path ); QString getExportPath( ExportType type ) const; void setLastProjectPath( const QString& path ); QString getLastProjectPath() const; diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp b/ApplicationCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp index ae023f2dc4..a79fd61b8f 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp +++ b/ApplicationCode/Commands/CompletionExportCommands/RicFishbonesTransmissibilityCalculationFeatureImp.cpp @@ -47,7 +47,7 @@ struct WellBorePartForTransCalc { WellBorePartForTransCalc( - cvf::Vec3d lengthsInCell, double wellRadius, double skinFactor, bool isMainBore, QString metaData ) + cvf::Vec3d lengthsInCell, double wellRadius, double skinFactor, bool isMainBore, const QString& metaData ) : lengthsInCell( lengthsInCell ) , wellRadius( wellRadius ) , skinFactor( skinFactor ) diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathFractureReportItem.cpp b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathFractureReportItem.cpp index cf918dc390..ce719be989 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathFractureReportItem.cpp +++ b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathFractureReportItem.cpp @@ -125,13 +125,13 @@ void RicWellPathFractureReportItem::setUnitSystem( RiaEclipseUnitTools::UnitSyst //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicWellPathFractureReportItem::setPressureDepletionParameters( bool performPDDScaling, - QString timeStepString, - QString wbhpString, - double userWBHP, - double actualWBHP, - double minPressureDrop, - double maxPressureDrop ) +void RicWellPathFractureReportItem::setPressureDepletionParameters( bool performPDDScaling, + const QString& timeStepString, + const QString& wbhpString, + double userWBHP, + double actualWBHP, + double minPressureDrop, + double maxPressureDrop ) { m_performPressureDepletionScaling = performPDDScaling; m_pressureDepletionTimeStepString = timeStepString; diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathFractureReportItem.h b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathFractureReportItem.h index d3a78c6b30..bdbeb2b75c 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathFractureReportItem.h +++ b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathFractureReportItem.h @@ -38,13 +38,13 @@ public: void setHeightAndHalfLength( double height, double halfLength ); void setAreaWeightedPermeability( double permeability ); void setUnitSystem( RiaEclipseUnitTools::UnitSystem unitSystem ); - void setPressureDepletionParameters( bool performPressureDepletionScaling, - QString timeStepString, - QString wbhpString, - double userWBHP, - double actualWBHP, - double minPressureDrop, - double maxPressureDrop ); + void setPressureDepletionParameters( bool performPressureDepletionScaling, + const QString& timeStepString, + const QString& wbhpString, + double userWBHP, + double actualWBHP, + double minPressureDrop, + double maxPressureDrop ); QString wellPathNameForExport() const; QString fractureName() const; diff --git a/ApplicationCode/Commands/ExportCommands/RicExportLgrFeature.cpp b/ApplicationCode/Commands/ExportCommands/RicExportLgrFeature.cpp index ed86fe6e1a..443afa37f1 100644 --- a/ApplicationCode/Commands/ExportCommands/RicExportLgrFeature.cpp +++ b/ApplicationCode/Commands/ExportCommands/RicExportLgrFeature.cpp @@ -136,8 +136,8 @@ class IjkBoundingBox public: IjkBoundingBox() - : m_min( {MAX_SIZE_T, MAX_SIZE_T, MAX_SIZE_T} ) - , m_max( {MAX_SIZE_T, MAX_SIZE_T, MAX_SIZE_T} ) + : m_min( { MAX_SIZE_T, MAX_SIZE_T, MAX_SIZE_T } ) + , m_max( { MAX_SIZE_T, MAX_SIZE_T, MAX_SIZE_T } ) { } @@ -172,7 +172,7 @@ public: { if ( !isValid() ) { - m_min = m_max = {i, j, k}; + m_min = m_max = { i, j, k }; } else { @@ -370,16 +370,16 @@ void RicExportLgrFeature::writeLgrs( QTextStream& stream, const std::vector for ( const auto& intersectionCell : intersectingCells ) { auto lgrName = lgrNameFactory.newName( "", lgrId ); - lgrs.push_back( buildLgr( lgrId++, lgrName, eclipseCase, wellPath->name(), {intersectionCell}, lgrSizes ) ); + lgrs.push_back( buildLgr( lgrId++, lgrName, eclipseCase, wellPath->name(), { intersectionCell }, lgrSizes ) ); } return lgrs; } @@ -724,7 +724,7 @@ std::vector std::map> RicExportLgrFeature::cellsIntersectingCompletions_PerCompletion( RimEclipseCase* eclipseCase, - const std::vector wellPaths, + const std::vector& wellPaths, size_t timeStep, const std::set& completionTypes, QStringList* wellsIntersectingOtherLgrs ) @@ -944,9 +944,9 @@ const RigGridBase* RicExportLgrFeature::hostGrid( const RigMainGrid* mainGrid, s //-------------------------------------------------------------------------------------------------- LgrNameFactory::LgrNameFactory() { - m_counters = {{RigCompletionData::FRACTURE, {"FRAC", 1}}, - {RigCompletionData::FISHBONES, {"FB", 1}}, - {RigCompletionData::PERFORATION, {"PERF", 1}}}; + m_counters = { { RigCompletionData::FRACTURE, { "FRAC", 1 } }, + { RigCompletionData::FISHBONES, { "FB", 1 } }, + { RigCompletionData::PERFORATION, { "PERF", 1 } } }; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/ExportCommands/RicExportLgrFeature.h b/ApplicationCode/Commands/ExportCommands/RicExportLgrFeature.h index cd46f4bb4a..5d87f3782a 100644 --- a/ApplicationCode/Commands/ExportCommands/RicExportLgrFeature.h +++ b/ApplicationCode/Commands/ExportCommands/RicExportLgrFeature.h @@ -232,7 +232,7 @@ private: static std::map> cellsIntersectingCompletions_PerCompletion( RimEclipseCase* eclipseCase, - const std::vector wellPaths, + const std::vector& wellPaths, size_t timeStep, const std::set& completionTypes, QStringList* wellsIntersectingOtherLgrs ); diff --git a/ApplicationCode/Commands/RicImportSummaryCasesFeature.cpp b/ApplicationCode/Commands/RicImportSummaryCasesFeature.cpp index 0cef7094f1..4567b68573 100644 --- a/ApplicationCode/Commands/RicImportSummaryCasesFeature.cpp +++ b/ApplicationCode/Commands/RicImportSummaryCasesFeature.cpp @@ -208,7 +208,7 @@ bool RicImportSummaryCasesFeature::createSummaryCasesFromFiles( const QStringLis //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicImportSummaryCasesFeature::addSummaryCases( const std::vector cases ) +void RicImportSummaryCasesFeature::addSummaryCases( const std::vector& cases ) { RiaApplication* app = RiaApplication::instance(); RimProject* proj = app->project(); @@ -223,7 +223,7 @@ void RicImportSummaryCasesFeature::addSummaryCases( const std::vector cases ) +void RicImportSummaryCasesFeature::addCasesToGroupIfRelevant( const std::vector& cases ) { std::vector selectedColl = caf::selectedObjectsByTypeStrict(); diff --git a/ApplicationCode/Commands/RicImportSummaryCasesFeature.h b/ApplicationCode/Commands/RicImportSummaryCasesFeature.h index 68b78ca47d..2a1511e188 100644 --- a/ApplicationCode/Commands/RicImportSummaryCasesFeature.h +++ b/ApplicationCode/Commands/RicImportSummaryCasesFeature.h @@ -44,8 +44,8 @@ public: static bool createSummaryCasesFromFiles( const QStringList& fileName, std::vector* newCases, bool ensembleOrGroup = false ); - static void addSummaryCases( const std::vector cases ); - static void addCasesToGroupIfRelevant( const std::vector cases ); + static void addSummaryCases( const std::vector& cases ); + static void addCasesToGroupIfRelevant( const std::vector& cases ); static QStringList runRecursiveSummaryCaseFileSearchDialog( const QString& dialogTitle, const QString& pathCacheName ); diff --git a/ApplicationCode/Commands/RicSummaryCaseRestartDialog.h b/ApplicationCode/Commands/RicSummaryCaseRestartDialog.h index 63d242c474..9dff199d14 100644 --- a/ApplicationCode/Commands/RicSummaryCaseRestartDialog.h +++ b/ApplicationCode/Commands/RicSummaryCaseRestartDialog.h @@ -145,8 +145,8 @@ public: RicSummaryCaseRestartDialogResult( Status _status, RicSummaryCaseRestartDialog::ImportOptions _summaryImportOption, RicSummaryCaseRestartDialog::ImportOptions _gridImportOption, - QStringList _summaryFiles, - QStringList _gridFiles, + const QStringList& _summaryFiles, + const QStringList& _gridFiles, bool _applyToAll ) : status( _status ) , summaryImportOption( _summaryImportOption ) diff --git a/ApplicationCode/FileInterface/RifReaderEclipseRft.cpp b/ApplicationCode/FileInterface/RifReaderEclipseRft.cpp index bacc8791ff..f238835959 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseRft.cpp +++ b/ApplicationCode/FileInterface/RifReaderEclipseRft.cpp @@ -286,7 +286,7 @@ std::set /// //-------------------------------------------------------------------------------------------------- std::set RifReaderEclipseRft::availableTimeSteps( - const QString& wellName, const std::set relevantChannels ) + const QString& wellName, const std::set& relevantChannels ) { if ( !m_ecl_rft_file ) { diff --git a/ApplicationCode/FileInterface/RifReaderEclipseRft.h b/ApplicationCode/FileInterface/RifReaderEclipseRft.h index 88435d095a..11352f874b 100644 --- a/ApplicationCode/FileInterface/RifReaderEclipseRft.h +++ b/ApplicationCode/FileInterface/RifReaderEclipseRft.h @@ -49,8 +49,8 @@ public: std::set availableTimeSteps( const QString& wellName ) override; std::set - availableTimeSteps( const QString& wellName, - const std::set relevantChannels ) override; + availableTimeSteps( const QString& wellName, + const std::set& relevantChannels ) override; std::set availableTimeSteps( const QString& wellName, const RifEclipseRftAddress::RftWellLogChannelType& wellLogChannelName ) override; diff --git a/ApplicationCode/FileInterface/RifReaderEnsembleStatisticsRft.cpp b/ApplicationCode/FileInterface/RifReaderEnsembleStatisticsRft.cpp index e5eca145ba..a8070107d1 100644 --- a/ApplicationCode/FileInterface/RifReaderEnsembleStatisticsRft.cpp +++ b/ApplicationCode/FileInterface/RifReaderEnsembleStatisticsRft.cpp @@ -59,10 +59,10 @@ std::set RifReaderEnsembleStatisticsRft::eclipseRftAddress } else if ( regularAddress.wellLogChannel() == RifEclipseRftAddress::PRESSURE ) { - std::set statChannels = {RifEclipseRftAddress::PRESSURE_P10, - RifEclipseRftAddress::PRESSURE_P50, - RifEclipseRftAddress::PRESSURE_P90, - RifEclipseRftAddress::PRESSURE_MEAN}; + std::set statChannels = { RifEclipseRftAddress::PRESSURE_P10, + RifEclipseRftAddress::PRESSURE_P50, + RifEclipseRftAddress::PRESSURE_P90, + RifEclipseRftAddress::PRESSURE_MEAN }; for ( auto channel : statChannels ) { statisticsAddresses.insert( @@ -132,7 +132,7 @@ std::set RifReaderEnsembleStatisticsRft::availableTimeSteps( /// //-------------------------------------------------------------------------------------------------- std::set RifReaderEnsembleStatisticsRft::availableTimeSteps( - const QString& wellName, const std::set relevantChannels ) + const QString& wellName, const std::set& relevantChannels ) { std::set allTimeSteps; for ( auto summaryCase : m_summaryCaseCollection->allSummaryCases() ) diff --git a/ApplicationCode/FileInterface/RifReaderEnsembleStatisticsRft.h b/ApplicationCode/FileInterface/RifReaderEnsembleStatisticsRft.h index 0688069953..2d33d0f9d4 100644 --- a/ApplicationCode/FileInterface/RifReaderEnsembleStatisticsRft.h +++ b/ApplicationCode/FileInterface/RifReaderEnsembleStatisticsRft.h @@ -36,8 +36,8 @@ public: std::set availableTimeSteps( const QString& wellName, const RifEclipseRftAddress::RftWellLogChannelType& wellLogChannelName ) override; std::set - availableTimeSteps( const QString& wellName, - const std::set relevantChannels ) override; + availableTimeSteps( const QString& wellName, + const std::set& relevantChannels ) override; std::set availableWellLogChannels( const QString& wellName ) override; std::set wellNames() override; diff --git a/ApplicationCode/FileInterface/RifReaderFmuRft.cpp b/ApplicationCode/FileInterface/RifReaderFmuRft.cpp index cc9ccac30b..dfc9bc6314 100644 --- a/ApplicationCode/FileInterface/RifReaderFmuRft.cpp +++ b/ApplicationCode/FileInterface/RifReaderFmuRft.cpp @@ -330,7 +330,7 @@ std::set RifReaderFmuRft::availableTimeSteps( const QString& wellName auto it = m_allWellObservations.find( wellName ); if ( it != m_allWellObservations.end() ) { - return {it->second.dateTime}; + return { it->second.dateTime }; } return {}; } @@ -339,8 +339,8 @@ std::set RifReaderFmuRft::availableTimeSteps( const QString& wellName /// //-------------------------------------------------------------------------------------------------- std::set - RifReaderFmuRft::availableTimeSteps( const QString& wellName, - const std::set relevantChannels ) + RifReaderFmuRft::availableTimeSteps( const QString& wellName, + const std::set& relevantChannels ) { if ( relevantChannels.count( RifEclipseRftAddress::TVD ) || relevantChannels.count( RifEclipseRftAddress::MD ) || relevantChannels.count( RifEclipseRftAddress::PRESSURE ) ) @@ -362,7 +362,7 @@ std::set RifReaderFmuRft::available if ( !m_allWellObservations.empty() ) { - return {RifEclipseRftAddress::TVD, RifEclipseRftAddress::MD, RifEclipseRftAddress::PRESSURE}; + return { RifEclipseRftAddress::TVD, RifEclipseRftAddress::MD, RifEclipseRftAddress::PRESSURE }; } return {}; } diff --git a/ApplicationCode/FileInterface/RifReaderFmuRft.h b/ApplicationCode/FileInterface/RifReaderFmuRft.h index 1c4b8ed68c..df50b53566 100644 --- a/ApplicationCode/FileInterface/RifReaderFmuRft.h +++ b/ApplicationCode/FileInterface/RifReaderFmuRft.h @@ -75,8 +75,8 @@ public: void values( const RifEclipseRftAddress& rftAddress, std::vector* values ) override; std::set - availableTimeSteps( const QString& wellName, - const std::set relevantChannels ) override; + availableTimeSteps( const QString& wellName, + const std::set& relevantChannels ) override; std::set availableTimeSteps( const QString& wellName ) override; std::set availableTimeSteps( const QString& wellName, const RifEclipseRftAddress::RftWellLogChannelType& wellLogChannelName ) override; diff --git a/ApplicationCode/FileInterface/RifReaderRftInterface.h b/ApplicationCode/FileInterface/RifReaderRftInterface.h index 53ff08e73c..3fe405fb1e 100644 --- a/ApplicationCode/FileInterface/RifReaderRftInterface.h +++ b/ApplicationCode/FileInterface/RifReaderRftInterface.h @@ -34,8 +34,8 @@ public: virtual void values( const RifEclipseRftAddress& rftAddress, std::vector* values ) = 0; virtual std::set - availableTimeSteps( const QString& wellName, - const std::set relevantChannels ) = 0; + availableTimeSteps( const QString& wellName, + const std::set& relevantChannels ) = 0; virtual std::set availableTimeSteps( const QString& wellName ) = 0; virtual std::set availableTimeSteps( const QString& wellName,