cppcheck : Avoid mix of signed/unsigned and remove unused code

This commit is contained in:
Magne Sjaastad
2019-09-06 12:42:19 +02:00
parent b1988d4cb5
commit ee11932546

View File

@@ -114,10 +114,8 @@ RimSummaryCurve* RicSummaryPlotFeatureImpl::addDefaultCurveToPlot( RimSummaryPlo
std::vector<RimSummaryCurve*> RicSummaryPlotFeatureImpl::addDefaultCurvesToPlot( RimSummaryPlot* plot,
RimSummaryCase* summaryCase )
{
std::vector<RimSummaryCurve*> defaultCurves;
QString curvesTextFilter = RiaApplication::instance()->preferences()->defaultSummaryCurvesTextFilter;
QStringList curveFilters = curvesTextFilter.split( ";", QString::SkipEmptyParts );
QString curvesTextFilter = RiaApplication::instance()->preferences()->defaultSummaryCurvesTextFilter;
QStringList curveFilters = curvesTextFilter.split(";", QString::SkipEmptyParts);
return addCurvesFromAddressFiltersToPlot( curveFilters, plot, summaryCase, false );
}
@@ -762,12 +760,11 @@ std::set<RifEclipseSummaryAddress>
filteredSummaryAdressesFromCase( summaryAddressFilters, addrs, &filteredAdressesFromCases, &usedFilters );
for ( int cfIdx = 0; cfIdx < usedFilters.size(); ++cfIdx )
for ( size_t cfIdx = 0 ; cfIdx < usedFilters.size() ; ++cfIdx )
{
if ( !usedFilters[cfIdx] )
{
RiaLogging::warning( "Vector filter \"" + summaryAddressFilters[cfIdx] +
"\" did not match anything in case: \"" + sumCase->caseName() + "\"" );
RiaLogging::warning("Vector filter \"" + summaryAddressFilters[static_cast<int>(cfIdx)] + "\" did not match anything in case: \"" + sumCase->caseName() + "\"");
}
}
}
@@ -789,12 +786,11 @@ std::vector<RimSummaryCurve*> RicSummaryPlotFeatureImpl::addCurvesFromAddressFil
filteredSummaryAdressesFromCase( curveFilters, addrs, &curveAddressesToUse, &usedFilters );
for ( int cfIdx = 0; cfIdx < usedFilters.size(); ++cfIdx )
for (size_t cfIdx = 0 ; cfIdx < usedFilters.size() ; ++cfIdx)
{
if ( !usedFilters[cfIdx] )
{
RiaLogging::warning( "Vector filter \"" + curveFilters[cfIdx] + "\" did not match anything in case: \"" +
summaryCase->caseName() + "\"" );
RiaLogging::warning("Vector filter \"" + curveFilters[static_cast<int>(cfIdx)] + "\" did not match anything in case: \"" + summaryCase->caseName() + "\"");
}
}