From 1684d3122b7263787f2167668fd2b16a3738bf94 Mon Sep 17 00:00:00 2001
From: Sona Kurazyan <sona.kurazyan@qt.io>
Date: Wed, 11 Sep 2019 10:54:58 +0200
Subject: Remove usages of deprecated APIs of QDesktopWidget

Replaced:
QDesktopWidget::availableGeometry(QWidget*) -> QWidget::screen()->availableGeometry()

Task-number: QTBUG-76491
Change-Id: Icfda5c8f046652f30eb123be3a377da2e8ecc11c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 examples/svg/svgviewer/exportdialog.cpp | 4 ++--
 examples/svg/svgviewer/mainwindow.cpp   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'examples')

diff --git a/examples/svg/svgviewer/exportdialog.cpp b/examples/svg/svgviewer/exportdialog.cpp
index f6c7b90..f0d388d 100644
--- a/examples/svg/svgviewer/exportdialog.cpp
+++ b/examples/svg/svgviewer/exportdialog.cpp
@@ -51,7 +51,6 @@
 #include "exportdialog.h"
 
 #include <QApplication>
-#include <QDesktopWidget>
 #include <QDialogButtonBox>
 #include <QFileDialog>
 #include <QFormLayout>
@@ -60,6 +59,7 @@
 #include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>
+#include <QScreen>
 #include <QSpinBox>
 #include <QToolButton>
 #include <QVBoxLayout>
@@ -89,7 +89,7 @@ ExportDialog::ExportDialog(QWidget *parent)
 
     QHBoxLayout *fileLayout = new QHBoxLayout;
     fileLayout->addWidget(m_fileNameLineEdit);
-    m_fileNameLineEdit->setMinimumWidth(QApplication::desktop()->availableGeometry(this).width() / 6);
+    m_fileNameLineEdit->setMinimumWidth(this->screen()->availableGeometry() .width() / 6);
     QPushButton *browseButton = new QPushButton(tr("Browse..."), this);
     fileLayout->addWidget(browseButton);
     connect(browseButton, &QAbstractButton::clicked, this, &ExportDialog::browse);
diff --git a/examples/svg/svgviewer/mainwindow.cpp b/examples/svg/svgviewer/mainwindow.cpp
index d095416..f67837e 100644
--- a/examples/svg/svgviewer/mainwindow.cpp
+++ b/examples/svg/svgviewer/mainwindow.cpp
@@ -179,7 +179,7 @@ bool MainWindow::loadFile(const QString &fileName)
     m_outlineAction->setEnabled(true);
     m_backgroundAction->setEnabled(true);
 
-    const QSize availableSize = QApplication::desktop()->availableGeometry(this).size();
+    const QSize availableSize = this->screen()->availableGeometry().size();
     resize(m_view->sizeHint().expandedTo(availableSize / 4) + QSize(80, 80 + menuBar()->height()));
 
     return true;
-- 
cgit v1.2.1