diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/qthelper.cpp | 11 | ||||
| -rw-r--r-- | core/qthelper.h | 2 |
2 files changed, 8 insertions, 5 deletions
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<QString, int> &a, const QPair<QString, int> &b) return a.second < b.second; } -void selectedDivesGasUsed(QVector<QPair<QString, int> > &gasUsedOrdered) +QVector<QPair<QString, int>> selectedDivesGasUsed() { int i, j; struct dive *d; @@ -391,10 +391,13 @@ void selectedDivesGasUsed(QVector<QPair<QString, int> > &gasUsedOrdered) gasUsed[gasName] += diveGases[j].mliter; } } - Q_FOREACH(const QString& gas, gasUsed.keys()) { - gasUsedOrdered.append(qMakePair(gas, gasUsed[gas])); - } + QVector<QPair<QString, int>> 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<QPair<QString, int> > &gasUsed); +QVector<QPair<QString, int>> selectedDivesGasUsed(); QString getUserAgent(); QString printGPSCoords(const location_t *loc); |