summaryrefslogtreecommitdiffstats
path: root/desktop-widgets
diff options
context:
space:
mode:
authorGravatar Rolf Eike Beer <eike@sf-mail.de>2019-04-03 20:21:53 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-04-12 12:59:17 +0300
commite3d43b5696d9aede430594fd4304d54d80bd7fac (patch)
tree48e04f247bb9e148c92075d584b1a86899af2713 /desktop-widgets
parentd19cfec457da8c286a321dd17297237ad8fa8435 (diff)
downloadsubsurface-e3d43b5696d9aede430594fd4304d54d80bd7fac.tar.gz
replace deprecated qSort() with std::sort()
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
Diffstat (limited to 'desktop-widgets')
-rw-r--r--desktop-widgets/divelistview.cpp2
-rw-r--r--desktop-widgets/preferences/preferencesdialog.cpp2
-rw-r--r--desktop-widgets/printoptions.cpp2
3 files changed, 3 insertions, 3 deletions
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<int> &newDiveSelection)
// select the dives, highest index first - this way the oldest of the dives
// becomes the selected_dive that we scroll to
QList<int> 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) {