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>

15 files changed, 40 insertions, 26 deletions

diff --git a/src/assistant/assistant/aboutdialog.cpp b/src/assistant/assistant/aboutdialog.cpp
index 95bbd2442..3682f1291 100644
--- a/src/assistant/assistant/aboutdialog.cpp
+++ b/src/assistant/assistant/aboutdialog.cpp
@@ -40,6 +40,7 @@
 #include <QtWidgets/QDesktopWidget>
 #include <QtWidgets/QMessageBox>
 #include <QtGui/QDesktopServices>
+#include <QtGui/QScreen>
 
 QT_BEGIN_NAMESPACE
 
@@ -141,8 +142,10 @@ QString AboutDialog::documentTitle() const
 void AboutDialog::updateSize()
 {
     TRACE_OBJ
-    QSize screenSize = QApplication::desktop()->availableGeometry(QCursor::pos())
-        .size();
+    auto screen = QGuiApplication::screenAt(QCursor::pos());
+    if (!screen)
+        screen = QGuiApplication::primaryScreen();
+    const QSize screenSize = screen->availableSize();
     int limit = qMin(screenSize.width()/2, 500);
 
 #ifdef Q_OS_MAC
@@ -156,7 +159,7 @@ void AboutDialog::updateSize()
         width = limit;
 
     QFontMetrics fm(qApp->font("QWorkspaceTitleBar"));
-    int windowTitleWidth = qMin(fm.width(windowTitle()) + 50, limit);
+    int windowTitleWidth = qMin(fm.horizontalAdvance(windowTitle()) + 50, limit);
     if (windowTitleWidth > width)
         width = windowTitleWidth;
 
diff --git a/src/assistant/assistant/mainwindow.cpp b/src/assistant/assistant/mainwindow.cpp
index 600cd9954..677968c49 100644
--- a/src/assistant/assistant/mainwindow.cpp
+++ b/src/assistant/assistant/mainwindow.cpp
@@ -64,6 +64,7 @@
 #include <QtWidgets/QDockWidget>
 #include <QtGui/QFontDatabase>
 #include <QtGui/QImageReader>
+#include <QtGui/QScreen>
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QLabel>
 #include <QtWidgets/QLayout>
@@ -216,7 +217,7 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent)
         tabifyDockWidget(indexDock, bookmarkDock);
         tabifyDockWidget(bookmarkDock, searchDock);
         contentDock->raise();
-        const QRect screen = QApplication::desktop()->screenGeometry();
+        const QRect screen = QGuiApplication::primaryScreen()->geometry();
         resize(4*screen.width()/5, 4*screen.height()/5);
 
         adjustSize();   // make sure we won't start outside of the screen
@@ -724,7 +725,7 @@ void MainWindow::setupFilterToolbar()
 
     m_filterCombo = new QComboBox(this);
     m_filterCombo->setMinimumWidth(QFontMetrics(QFont()).
-        width(QLatin1String("MakeTheComboBoxWidthEnough")));
+        horizontalAdvance(QLatin1String("MakeTheComboBoxWidthEnough")));
 
     QToolBar *filterToolBar = addToolBar(tr("Filter Toolbar"));
     filterToolBar->setObjectName(QLatin1String("FilterToolBar"));
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 {
diff --git a/src/assistant/assistant/qtdocinstaller.cpp b/src/assistant/assistant/qtdocinstaller.cpp
index 51b120136..b25aa2b72 100644
--- a/src/assistant/assistant/qtdocinstaller.cpp
+++ b/src/assistant/assistant/qtdocinstaller.cpp
@@ -63,7 +63,7 @@ void QtDocInstaller::installDocs()
 void QtDocInstaller::run()
 {
     TRACE_OBJ
-    m_qchDir = QLibraryInfo::location(QLibraryInfo::DocumentationPath);
+    m_qchDir.setPath(QLibraryInfo::location(QLibraryInfo::DocumentationPath));
     m_qchFiles = m_qchDir.entryList(QStringList() << QLatin1String("*.qch"));
 
     bool changes = false;
diff --git a/src/designer/src/designer/appfontdialog.cpp b/src/designer/src/designer/appfontdialog.cpp
index 58069b4fa..e5a76033f 100644
--- a/src/designer/src/designer/appfontdialog.cpp
+++ b/src/designer/src/designer/appfontdialog.cpp
@@ -50,6 +50,8 @@
 #include <QtCore/qvector.h>
 #include <QtCore/qdebug.h>
 
+#include <algorithm>
+
 QT_BEGIN_NAMESPACE
 
 enum {FileNameRole = Qt::UserRole + 1, IdRole =  Qt::UserRole + 2 };
@@ -352,7 +354,7 @@ static void removeFonts(const QModelIndexList &selectedIndexes, AppFontModel *mo
         }
     }
 
-    qStableSort(rows.begin(), rows.end());
+    std::stable_sort(rows.begin(), rows.end());
     for (int i = rows.size() - 1; i >= 0; i--)
         model->removeRow(rows[i]);
 }
diff --git a/src/designer/src/designer/mainwindow.cpp b/src/designer/src/designer/mainwindow.cpp
index 8127d8e44..2e6d8574e 100644
--- a/src/designer/src/designer/mainwindow.cpp
+++ b/src/designer/src/designer/mainwindow.cpp
@@ -50,6 +50,8 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qmimedata.h>
 
+#include <algorithm>
+
 static const char *uriListMimeFormatC = "text/uri-list";
 
 QT_BEGIN_NAMESPACE
@@ -260,7 +262,7 @@ bool toolBarTitleLessThan(const QToolBar *t1, const QToolBar *t2)
 void ToolBarManager::updateToolBarMenu()
 {
     // Sort tool bars alphabetically by title
-    qStableSort(m_toolbars.begin(), m_toolbars.end(), toolBarTitleLessThan);
+    std::stable_sort(m_toolbars.begin(), m_toolbars.end(), toolBarTitleLessThan);
     // add to menu
     m_toolBarMenu->clear();
     for (QToolBar *tb : qAsConst(m_toolbars))
diff --git a/src/designer/src/designer/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp
index b725248f6..623935380 100644
--- a/src/designer/src/designer/qdesigner_workbench.cpp
+++ b/src/designer/src/designer/qdesigner_workbench.cpp
@@ -57,6 +57,7 @@
 
 #include <QtWidgets/qactiongroup.h>
 #include <QtGui/qevent.h>
+#include <QtGui/qscreen.h>
 #include <QtWidgets/qdesktopwidget.h>
 #include <QtWidgets/qdockwidget.h>
 #include <QtWidgets/qmenu.h>
@@ -269,7 +270,7 @@ void QDesignerWorkbench::saveGeometriesForModeChange()
     case NeutralMode:
         break;
     case TopLevelMode: {
-        const QPoint desktopOffset = QApplication::desktop()->availableGeometry().topLeft();
+        const QPoint desktopOffset = QGuiApplication::primaryScreen()->availableGeometry().topLeft();
         for (QDesignerToolWindow *tw : qAsConst(m_toolWindows))
             m_Positions.insert(tw, Position(tw, desktopOffset));
         for (QDesignerFormWindow *fw : qAsConst(m_formWindows))
@@ -572,9 +573,9 @@ QRect QDesignerWorkbench::desktopGeometry() const
     case NeutralMode:
         break;
     }
-    const QDesktopWidget *desktop = qApp->desktop();
-    const int screenNumber = widget ? desktop->screenNumber(widget) : 0;
-    return desktop->availableGeometry(screenNumber);
+    const int screenNumber = widget ? QApplication::desktop()->screenNumber(widget) : 0;
+    auto screen = QGuiApplication::screens().value(screenNumber, QGuiApplication::primaryScreen());
+    return screen->availableGeometry();
 }
 
 QRect QDesignerWorkbench::availableGeometry() const
@@ -582,8 +583,9 @@ QRect QDesignerWorkbench::availableGeometry() const
     if (m_mode == DockedMode)
         return m_dockedMainWindow->mdiArea()->geometry();
 
-    const QDesktopWidget *desktop = qDesigner->desktop();
-    return desktop->availableGeometry(desktop->screenNumber(widgetBoxToolWindow()));
+    const int screenNumber = QApplication::desktop()->screenNumber(widgetBoxToolWindow());
+    auto screen = QGuiApplication::screens().value(screenNumber, QGuiApplication::primaryScreen());
+    return screen->availableGeometry();
 }
 
 int QDesignerWorkbench::marginHint() const
diff --git a/src/designer/src/lib/shared/actionrepository.cpp b/src/designer/src/lib/shared/actionrepository.cpp
index 960d078da..1d1c2cd8c 100644
--- a/src/designer/src/lib/shared/actionrepository.cpp
+++ b/src/designer/src/lib/shared/actionrepository.cpp
@@ -318,7 +318,7 @@ void startActionDrag(QWidget *dragParent, ActionModel *model, const QModelIndexL
     if (ActionRepositoryMimeData *actionMimeData = qobject_cast<ActionRepositoryMimeData *>(data))
         drag->setPixmap(ActionRepositoryMimeData::actionDragPixmap(actionMimeData->actionList().front()));
 
-    drag->start(supportedActions);
+    drag->exec(supportedActions);
 }
 
 // ---------------- ActionTreeView:
diff --git a/src/designer/src/lib/shared/qdesigner_menu.cpp b/src/designer/src/lib/shared/qdesigner_menu.cpp
index fffffeb38..e47a60913 100644
--- a/src/designer/src/lib/shared/qdesigner_menu.cpp
+++ b/src/designer/src/lib/shared/qdesigner_menu.cpp
@@ -172,7 +172,7 @@ void QDesignerMenu::startDrag(const QPoint &pos, Qt::KeyboardModifiers modifiers
     const int old_index = m_currentIndex;
     m_currentIndex = -1;
 
-    if (drag->start(dropAction) == Qt::IgnoreAction) {
+    if (drag->exec(dropAction) == Qt::IgnoreAction) {
         if (dropAction == Qt::MoveAction) {
             QAction *previous = safeActionAt(index);
             InsertActionIntoCommand *cmd = new InsertActionIntoCommand(fw);
diff --git a/src/designer/src/lib/shared/qdesigner_menubar.cpp b/src/designer/src/lib/shared/qdesigner_menubar.cpp
index ba0bda71e..aab029e91 100644
--- a/src/designer/src/lib/shared/qdesigner_menubar.cpp
+++ b/src/designer/src/lib/shared/qdesigner_menubar.cpp
@@ -313,7 +313,7 @@ void QDesignerMenuBar::startDrag(const QPoint &pos)
     const int old_index = m_currentIndex;
     m_currentIndex = -1;
 
-    if (drag->start(Qt::MoveAction) == Qt::IgnoreAction) {
+    if (drag->exec(Qt::MoveAction) == Qt::IgnoreAction) {
         InsertActionIntoCommand *cmd = new InsertActionIntoCommand(fw);
         cmd->init(this, action, safeActionAt(index));
         fw->commandHistory()->push(cmd);
diff --git a/src/designer/src/lib/shared/qdesigner_tabwidget.cpp b/src/designer/src/lib/shared/qdesigner_tabwidget.cpp
index 333827eba..ea4577e47 100644
--- a/src/designer/src/lib/shared/qdesigner_tabwidget.cpp
+++ b/src/designer/src/lib/shared/qdesigner_tabwidget.cpp
@@ -217,7 +217,7 @@ bool QTabWidgetEventFilter::eventFilter(QObject *o, QEvent *e)
 
             m_tabWidget->removeTab(m_dragIndex);
 
-            const Qt::DropActions dropAction = drg->start(Qt::MoveAction);
+            const Qt::DropActions dropAction = drg->exec(Qt::MoveAction);
 
             if (dropAction == Qt::IgnoreAction) {
                 // abort
diff --git a/src/designer/src/lib/shared/qdesigner_toolbar.cpp b/src/designer/src/lib/shared/qdesigner_toolbar.cpp
index 0c0d0378a..c686c8fb1 100644
--- a/src/designer/src/lib/shared/qdesigner_toolbar.cpp
+++ b/src/designer/src/lib/shared/qdesigner_toolbar.cpp
@@ -403,7 +403,7 @@ void ToolBarEventFilter::startDrag(const QPoint &pos, Qt::KeyboardModifiers modi
     drag->setPixmap(ActionRepositoryMimeData::actionDragPixmap( action));
     drag->setMimeData(new ActionRepositoryMimeData(action, dropAction));
 
-    if (drag->start(dropAction) == Qt::IgnoreAction) {
+    if (drag->exec(dropAction) == Qt::IgnoreAction) {
         hideDragIndicator();
         if (dropAction == Qt::MoveAction) {
             const ActionList currentActions = m_toolBar->actions();
diff --git a/src/qtpaths/qtpaths.cpp b/src/qtpaths/qtpaths.cpp
index 648e0cabb..3166d6a65 100644
--- a/src/qtpaths/qtpaths.cpp
+++ b/src/qtpaths/qtpaths.cpp
@@ -54,6 +54,8 @@
 #include <QHash>
 #include <QLibraryInfo>
 
+#include <algorithm>
+
 #include <stdio.h>
 
 QT_USE_NAMESPACE
@@ -111,7 +113,7 @@ static QStringList types()
     QStringList typelist;
     for (unsigned int i = 0; i < sizeof(lookupTableData)/sizeof(lookupTableData[0]); i++)
         typelist << QString::fromLatin1(lookupTableData[i].stringvalue);
-    qSort(typelist);
+    std::sort(typelist.begin(), typelist.end());
     return typelist;
 }
 
@@ -215,7 +217,7 @@ int main(int argc, char **argv)
 
     parser.process(app);
 
-    QStandardPaths::enableTestMode(parser.isSet(testmode));
+    QStandardPaths::setTestModeEnabled(parser.isSet(testmode));
 
     QStringList results;
     if (parser.isSet(qtversion)) {
diff --git a/src/shared/qtgradienteditor/qtcolorbutton.cpp b/src/shared/qtgradienteditor/qtcolorbutton.cpp
index e3d28bce1..33b084781 100644
--- a/src/shared/qtgradienteditor/qtcolorbutton.cpp
+++ b/src/shared/qtgradienteditor/qtcolorbutton.cpp
@@ -228,7 +228,7 @@ void QtColorButton::mouseMoveEvent(QMouseEvent *event)
         drg->setPixmap(d_ptr->generatePixmap());
         setDown(false);
         event->accept();
-        drg->start();
+        drg->exec(Qt::CopyAction);
         return;
     }
 #endif
diff --git a/src/shared/qttoolbardialog/qttoolbardialog.cpp b/src/shared/qttoolbardialog/qttoolbardialog.cpp
index cedef9bf5..edad7215a 100644
--- a/src/shared/qttoolbardialog/qttoolbardialog.cpp
+++ b/src/shared/qttoolbardialog/qttoolbardialog.cpp
@@ -1611,7 +1611,7 @@ void QtToolBarListWidget::startDrag(Qt::DropActions supportedActions)
             QMimeData *data = new QMimeData;
             data->setData("action", actionName.toLocal8Bit().constData());
             drag->setMimeData(data);
-            drag->start(supportedActions);
+            drag->exec(supportedActions);
         }
     }
 }