From 36644dc9f7540886801bda6131dff36241d9e879 Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Wed, 3 Apr 2019 23:05:44 +0200 Subject: optimize selectedDivesGasUsed() -return the result instead of storing in a parameter, we now know that the list contains only those results that are generated in the function -allocate the result with the correct length right from the start -do not iterate over keys of a map and then do a map lookup to get the value but use an iterator that gives us both right from the start -remove one call alltogether as the results were not used there Signed-off-by: Rolf Eike Beer --- core/qthelper.cpp | 11 +++++++---- core/qthelper.h | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'core') diff --git a/core/qthelper.cpp b/core/qthelper.cpp index 35965208c..9483d9ab5 100644 --- a/core/qthelper.cpp +++ b/core/qthelper.cpp @@ -375,7 +375,7 @@ static bool lessThan(const QPair &a, const QPair &b) return a.second < b.second; } -void selectedDivesGasUsed(QVector > &gasUsedOrdered) +QVector> selectedDivesGasUsed() { int i, j; struct dive *d; @@ -391,10 +391,13 @@ void selectedDivesGasUsed(QVector > &gasUsedOrdered) gasUsed[gasName] += diveGases[j].mliter; } } - Q_FOREACH(const QString& gas, gasUsed.keys()) { - gasUsedOrdered.append(qMakePair(gas, gasUsed[gas])); - } + QVector> gasUsedOrdered; + gasUsedOrdered.reserve(gasUsed.size()); + for (auto it = gasUsed.cbegin(); it != gasUsed.cend(); ++it) + gasUsedOrdered.append(qMakePair(it.key(), it.value())); std::sort(gasUsedOrdered.begin(), gasUsedOrdered.end(), lessThan); + + return gasUsedOrdered; } QString getUserAgent() diff --git a/core/qthelper.h b/core/qthelper.h index cbe2b77f0..3b7ff2c59 100644 --- a/core/qthelper.h +++ b/core/qthelper.h @@ -80,7 +80,7 @@ QString get_short_dive_date_string(timestamp_t when); QString get_trip_date_string(timestamp_t when, int nr, bool getday); QString uiLanguage(QLocale *callerLoc); QLocale getLocale(); -void selectedDivesGasUsed(QVector > &gasUsed); +QVector> selectedDivesGasUsed(); QString getUserAgent(); QString printGPSCoords(const location_t *loc); -- cgit v1.2.3-70-g09d2