Fix deprecation warnings

qtpaths.cpp:114:19: warning: ‘void qSort(Container&) [with Container = QStringList]’ is deprecated: Use std::sort [-Wdeprecated-declarations]
qtpaths.cpp:218:21: warning: ‘static void QStandardPaths::enableTestMode(bool)’ is deprecated [-Wdeprecated-declarations]
aboutdialog.cpp:144:81: warning: ‘const QRect QDesktopWidget::availableGeometry(const QPoint&) const’ is deprecated: Use QGuiApplication::screenAt() [-Wdeprecated-declarations]

qtdocinstaller.cpp:66:70: warning: ‘QDir& QDir::operator=(const QString&)’ is deprecated: Use QDir::setPath() instead [-Wdeprecated-declarations]
optionswidget.cpp:187:32: warning: ‘void qSort(Container&) [with Container = QStringList]’ is deprecated: Use std::sort [-Wdeprecated-declarations]
optionswidget.cpp:116:25: warning: ‘void qSort(Container&) [with Container = QStringList]’ is deprecated: Use std::sort [-Wdeprecated-declarations]
mainwindow.cpp:219:70: warning: ‘const QRect QDesktopWidget::screenGeometry(int) const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations]
mainwindow.cpp:727:58: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations]
qdesigner_workbench.cpp:272:81: warning: ‘const QRect QDesktopWidget::availableGeometry(int) const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations]
qdesigner_workbench.cpp:577:51: warning: ‘const QRect QDesktopWidget::availableGeometry(int) const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations]
qdesigner_workbench.cpp:586:83: warning: ‘const QRect QDesktopWidget::availableGeometry(int) const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations]
appfontdialog.cpp:355:41: warning: ‘void qStableSort(RandomAccessIterator, RandomAccessIterator) [with RandomAccessIterator = int*]’ is deprecated: Use std::stable_sort [-Wdeprecated-declarations]
mainwindow.cpp:263:75: warning: ‘void qStableSort(RandomAccessIterator, RandomAccessIterator, LessThan) [with RandomAccessIterator = QToolBar**; LessThan = bool (*)(const QToolBar*, const QToolBar*)]’ is deprecated: Use std::stable_sort [-Wdeprecated-declarations]
shared/qdesigner_menu.cpp:175:31: warning: ‘Qt::DropAction QDrag::start(Qt::DropActions)’ is deprecated: Use QDrag::exec() instead [-Wdeprecated-declarations]
shared/qdesigner_toolbar.cpp:406:31: warning: ‘Qt::DropAction QDrag::start(Qt::DropActions)’ is deprecated: Use QDrag::exec() instead [-Wdeprecated-declarations]
shared/actionrepository.cpp:321:33: warning: ‘Qt::DropAction QDrag::start(Qt::DropActions)’ is deprecated: Use QDrag::exec() instead [-Wdeprecated-declarations]
shared/qdesigner_menubar.cpp:316:35: warning: ‘Qt::DropAction QDrag::start(Qt::DropActions)’ is deprecated: Use QDrag::exec() instead [-Wdeprecated-declarations]
shared/qdesigner_tabwidget.cpp:220:73: warning: ‘Qt::DropAction QDrag::start(Qt::DropActions)’ is deprecated: Use QDrag::exec() instead [-Wdeprecated-declarations]

Change-Id: I78d288be2e061dba03cbe72a77ca3b9742f79111
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

1 files changed, 5 insertions, 3 deletions

diff --git a/src/assistant/assistant/optionswidget.cpp b/src/assistant/assistant/optionswidget.cpp
index 55dae7f6c..93ea42ee3 100644
--- a/src/assistant/assistant/optionswidget.cpp
+++ b/src/assistant/assistant/optionswidget.cpp
@@ -33,6 +33,8 @@
 #include <QtWidgets/QListWidget>
 #include <QtWidgets/QVBoxLayout>
 
+#include <algorithm>
+
 QT_BEGIN_NAMESPACE
 
 class ListWidgetDelegate : public QItemDelegate
@@ -113,11 +115,11 @@ void OptionsWidget::setOptions(const QStringList &validOptions,
 
     m_validOptions = validOptions;
     m_validOptions.removeDuplicates();
-    qSort(m_validOptions);
+    std::sort(m_validOptions.begin(), m_validOptions.end());
 
     m_selectedOptions = selectedOptions;
     m_selectedOptions.removeDuplicates();
-    qSort(m_selectedOptions);
+    std::sort(m_selectedOptions.begin(), m_selectedOptions.end());
 
     m_invalidOptions = subtract(m_selectedOptions, m_validOptions);
     const QStringList validSelectedOptions = subtract(m_selectedOptions, m_invalidOptions);
@@ -184,7 +186,7 @@ void OptionsWidget::itemChanged(QListWidgetItem *item)
 
     if (item->checkState() == Qt::Checked && !m_selectedOptions.contains(option)) {
         m_selectedOptions.append(option);
-        qSort(m_selectedOptions);
+        std::sort(m_selectedOptions.begin(), m_selectedOptions.end());
     } else if (item->checkState() == Qt::Unchecked && m_selectedOptions.contains(option)) {
         m_selectedOptions.removeOne(option);
     } else {