From 9cc040a806fd2e6f1458e801a99311168d594c77 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Mon, 9 Sep 2019 16:11:48 +0200 Subject: Prepare for deprecating the QDesktopWidget MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QDesktopWidget is marked as obsolete in docs, but it is not yet completely deprecated, some of its methods are still in use. Replace uses of the following methods marked as obsolete: - QDesktopWidget::screenNumber(QWidget*) -> QWidget::screen() - QDesktopWidget::screenGeometry(QWidget*) -> QWidget::screen()->geometry() - QDesktopWidget::availableGeometry(QWidget*) -> QWidget::screen()->availableGeometry() Task-number: QTBUG-76491 Change-Id: I2cca30f2b4caa6e6848e8190e09f959d2c272f33 Reviewed-by: Tor Arne Vestbø --- examples/widgets/desktop/screenshot/main.cpp | 5 +++-- examples/widgets/desktop/screenshot/screenshot.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'examples/widgets/desktop') diff --git a/examples/widgets/desktop/screenshot/main.cpp b/examples/widgets/desktop/screenshot/main.cpp index 825c40b236..96b0d57daa 100644 --- a/examples/widgets/desktop/screenshot/main.cpp +++ b/examples/widgets/desktop/screenshot/main.cpp @@ -49,7 +49,7 @@ ****************************************************************************/ #include -#include +#include #include "screenshot.h" @@ -58,7 +58,8 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); Screenshot screenshot; - screenshot.move(QApplication::desktop()->availableGeometry(&screenshot).topLeft() + QPoint(20, 20)); + screenshot.move(screenshot.screen()->availableGeometry().topLeft() + QPoint(20, 20)); screenshot.show(); + return app.exec(); } diff --git a/examples/widgets/desktop/screenshot/screenshot.cpp b/examples/widgets/desktop/screenshot/screenshot.cpp index 715e6c780e..ce5597bbdd 100644 --- a/examples/widgets/desktop/screenshot/screenshot.cpp +++ b/examples/widgets/desktop/screenshot/screenshot.cpp @@ -59,7 +59,7 @@ Screenshot::Screenshot() screenshotLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); screenshotLabel->setAlignment(Qt::AlignCenter); - const QRect screenGeometry = QApplication::desktop()->screenGeometry(this); + const QRect screenGeometry = screen()->geometry(); screenshotLabel->setMinimumSize(screenGeometry.width() / 8, screenGeometry.height() / 8); QVBoxLayout *mainLayout = new QVBoxLayout(this); -- cgit v1.2.3