Qt6: Port some uses of QApplication::desktop()->availableGeometry()

Task-number: QTCREATORBUG-24098
Change-Id: I3bf911402084fb26110a89992cb5f1d61c2f46e9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

src/libs/utils/execmenu.cpp

@@ -26,10 +26,10 @@
 #include "execmenu.h"
 
 #include <QApplication>
-#include <QDesktopWidget>
 #include <QMenu>
 #include <QPoint>
 #include <QRect>
+#include <QScreen>
 #include <QSize>
 #include <QWidget>
 
@@ -43,7 +43,7 @@ namespace Utils {
 QAction *execMenuAtWidget(QMenu *menu, QWidget *widget)
 {
     QPoint p;
-    QRect screen = QApplication::desktop()->availableGeometry(widget);
+    QRect screen = widget->screen()->availableGeometry();
     QSize sh = menu->sizeHint();
     QRect rect = widget->rect();
     if (widget->isRightToLeft()) {

src/plugins/coreplugin/locator/locatorwidget.cpp

@@ -48,21 +48,20 @@
 #include <utils/stylehelper.h>
 #include <utils/utilsicons.h>
 
-#include <QApplication>
-#include <QColor>
-#include <QDesktopWidget>
-#include <QFileInfo>
-#include <QTimer>
-#include <QEvent>
 #include <QAction>
 #include <QApplication>
+#include <QColor>
+#include <QEvent>
+#include <QFileInfo>
 #include <QHBoxLayout>
 #include <QHeaderView>
 #include <QKeyEvent>
 #include <QMenu>
+#include <QScreen>
 #include <QScrollBar>
-#include <QTreeView>
+#include <QTimer>
 #include <QToolTip>
+#include <QTreeView>
 
 Q_DECLARE_METATYPE(Core::LocatorFilterEntry)
 
@@ -325,7 +324,7 @@ void CenteredLocatorPopup::updateGeometry()
     QRect rect(pos, size);
     // invisible widget doesn't have the right screen set yet, so use the parent widget to
     // check for available geometry
-    const QRect available = QApplication::desktop()->availableGeometry(parentWidget());
+    const QRect available = parentWidget()->screen()->availableGeometry();
     if (rect.right() > available.right())
         rect.moveRight(available.right());
     if (rect.bottom() > available.bottom())

src/plugins/imageviewer/exportdialog.cpp

@@ -30,27 +30,19 @@
 
 #include <utils/pathchooser.h>
 
-#include <QApplication>
-#include <QDesktopWidget>
 #include <QDialogButtonBox>
-#include <QFileDialog>
-#include <QFormLayout>
-#include <QHBoxLayout>
-#include <QMessageBox>
-#include <QLabel>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QSpinBox>
-#include <QToolButton>
-#include <QVBoxLayout>
-
-#include <QImageWriter>
-
-#include <QDebug>
 #include <QDir>
 #include <QFileInfo>
+#include <QFormLayout>
+#include <QHBoxLayout>
+#include <QImageWriter>
+#include <QLabel>
+#include <QLineEdit>
+#include <QMessageBox>
 #include <QMimeDatabase>
-#include <QMimeType>
+#include <QScreen>
+#include <QSpinBox>
+#include <QToolButton>
 
 namespace ImageViewer {
 namespace Internal {
@@ -90,7 +82,7 @@ ExportDialog::ExportDialog(QWidget *parent)
 {
     auto formLayout = new QFormLayout(this);
 
-    m_pathChooser->setMinimumWidth(QApplication::desktop()->availableGeometry(this).width() / 5);
+    m_pathChooser->setMinimumWidth(screen()->availableGeometry().width() / 5);
     m_pathChooser->setExpectedKind(Utils::PathChooser::SaveFile);
     m_pathChooser->setPromptDialogFilter(imageNameFilterString());
     formLayout->addRow(tr("File:"), m_pathChooser);

src/plugins/imageviewer/multiexportdialog.cpp

@@ -34,26 +34,17 @@
 #include <utils/stringutils.h>
 #include <utils/utilsicons.h>
 
-#include <QApplication>
-#include <QDebug>
-#include <QDesktopWidget>
 #include <QDialogButtonBox>
 #include <QDir>
-#include <QFileDialog>
 #include <QFileInfo>
 #include <QFormLayout>
-#include <QHBoxLayout>
-#include <QImageWriter>
 #include <QLabel>
 #include <QLineEdit>
 #include <QMenu>
 #include <QMessageBox>
-#include <QPushButton>
+#include <QScreen>
 #include <QSettings>
-#include <QSpinBox>
-#include <QTextStream>
 #include <QToolButton>
-#include <QVBoxLayout>
 #include <QWidgetAction>
 
 namespace ImageViewer {
@@ -185,7 +176,7 @@ MultiExportDialog::MultiExportDialog(QWidget *parent)
 {
     auto formLayout = new QFormLayout(this);
 
-    m_pathChooser->setMinimumWidth(QApplication::desktop()->availableGeometry(this).width() / 5);
+    m_pathChooser->setMinimumWidth(screen()->availableGeometry().width() / 5);
     m_pathChooser->setExpectedKind(Utils::PathChooser::SaveFile);
     m_pathChooser->setPromptDialogFilter(ExportDialog::imageNameFilterString());
     const QString pathChooserToolTip =