diff options
author | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-09-09 16:11:48 +0200 |
---|---|---|
committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-10-15 20:09:29 +0200 |
commit | 9cc040a806fd2e6f1458e801a99311168d594c77 (patch) | |
tree | 828ca4008a50f44b7b98f7e50f67d01951b4d9ba /examples/widgets/widgets | |
parent | 92b9dcfe2ba602fc396a4806597b9440ed63bded (diff) |
Prepare for deprecating the QDesktopWidget
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ø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'examples/widgets/widgets')
-rw-r--r-- | examples/widgets/widgets/charactermap/mainwindow.cpp | 3 | ||||
-rw-r--r-- | examples/widgets/widgets/icons/main.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/examples/widgets/widgets/charactermap/mainwindow.cpp b/examples/widgets/widgets/charactermap/mainwindow.cpp index 25c4503ddb..b0f9705c21 100644 --- a/examples/widgets/widgets/charactermap/mainwindow.cpp +++ b/examples/widgets/widgets/charactermap/mainwindow.cpp @@ -64,6 +64,7 @@ #include <QMenuBar> #include <QPlainTextEdit> #include <QPushButton> +#include <QScreen> #include <QScrollArea> #include <QStatusBar> #include <QTextStream> @@ -302,7 +303,7 @@ QString FontInfoDialog::text() const void MainWindow::showInfo() { - const QRect screenGeometry = QApplication::desktop()->screenGeometry(this); + const QRect screenGeometry = screen()->geometry(); FontInfoDialog *dialog = new FontInfoDialog(this); dialog->setWindowTitle(tr("Fonts")); dialog->setAttribute(Qt::WA_DeleteOnClose); diff --git a/examples/widgets/widgets/icons/main.cpp b/examples/widgets/widgets/icons/main.cpp index a045ea765a..632795c18c 100644 --- a/examples/widgets/widgets/icons/main.cpp +++ b/examples/widgets/widgets/icons/main.cpp @@ -50,7 +50,7 @@ #include <QApplication> #include <QCommandLineParser> -#include <QDesktopWidget> +#include <QScreen> #include "mainwindow.h" @@ -77,7 +77,7 @@ int main(int argc, char *argv[]) if (!commandLineParser.positionalArguments().isEmpty()) mainWin.loadImages(commandLineParser.positionalArguments()); - const QRect availableGeometry = QApplication::desktop()->availableGeometry(&mainWin); + const QRect availableGeometry = mainWin.screen()->availableGeometry(); mainWin.resize(availableGeometry.width() / 2, availableGeometry.height() * 2 / 3); mainWin.move((availableGeometry.width() - mainWin.width()) / 2, (availableGeometry.height() - mainWin.height()) / 2); |