From e3d43b5696d9aede430594fd4304d54d80bd7fac Mon Sep 17 00:00:00 2001 From: Rolf Eike Beer Date: Wed, 3 Apr 2019 20:21:53 +0200 Subject: replace deprecated qSort() with std::sort() Signed-off-by: Rolf Eike Beer --- desktop-widgets/divelistview.cpp | 2 +- desktop-widgets/preferences/preferencesdialog.cpp | 2 +- desktop-widgets/printoptions.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/divelistview.cpp b/desktop-widgets/divelistview.cpp index 3ba9ba58f..086bc0a6d 100644 --- a/desktop-widgets/divelistview.cpp +++ b/desktop-widgets/divelistview.cpp @@ -402,7 +402,7 @@ void DiveListView::selectDives(const QList &newDiveSelection) // select the dives, highest index first - this way the oldest of the dives // becomes the selected_dive that we scroll to QList sortedSelection = newDiveSelection; - qSort(sortedSelection.begin(), sortedSelection.end()); + std::sort(sortedSelection.begin(), sortedSelection.end()); newSelection = firstInList = sortedSelection.first(); while (!sortedSelection.isEmpty()) diff --git a/desktop-widgets/preferences/preferencesdialog.cpp b/desktop-widgets/preferences/preferencesdialog.cpp index 59dbdf59b..fbf387cfa 100644 --- a/desktop-widgets/preferences/preferencesdialog.cpp +++ b/desktop-widgets/preferences/preferencesdialog.cpp @@ -97,7 +97,7 @@ bool abstractpreferenceswidget_lessthan(AbstractPreferencesWidget *p1, AbstractP void PreferencesDialog::addPreferencePage(AbstractPreferencesWidget *page) { pages.push_back(page); - qSort(pages.begin(), pages.end(), abstractpreferenceswidget_lessthan); + std::sort(pages.begin(), pages.end(), abstractpreferenceswidget_lessthan); } void PreferencesDialog::refreshPages() diff --git a/desktop-widgets/printoptions.cpp b/desktop-widgets/printoptions.cpp index 38a670cf8..0d9ae0a40 100644 --- a/desktop-widgets/printoptions.cpp +++ b/desktop-widgets/printoptions.cpp @@ -56,7 +56,7 @@ void PrintOptions::setupTemplates() // temp. store the template from options, as addItem() updates it via: // on_printTemplate_currentIndexChanged() QString storedTemplate = printOptions->p_template; - qSort(currList); + currList.sort(); int current_index = 0; ui.printTemplate->clear(); Q_FOREACH(const QString& theme, currList) { -- cgit v1.2.3-70-g09d2