diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-02-06 09:13:45 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-02-09 17:28:13 +0000 |
| commit | 91be55e4fcf26be3f39a34b8659c1035d72c9c62 (patch) | |
| tree | e69cf2cd5c7fdb126ba75baed0e03bf99bb9a208 | |
| parent | 4d2903ce81b5e1cdfb18b108838f44bc8e8603de (diff) | |
| download | qttools-91be55e4fcf26be3f39a34b8659c1035d72c9c62.tar.gz | |
Pixeltool: Fix deprecation warnings about QDesktopWidget
qpixeltool.cpp:60:64: warning: ‘const QRect QDesktopWidget::availableGeometry(int) const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations]
qpixeltool.cpp:63:65: warning: ‘int QDesktopWidget::screenNumber(const QPoint&) const’ is deprecated: Use QGuiApplication::screenAt() [-Wdeprecated-declarations]
qpixeltool.cpp:65:56: warning: ‘const QRect QDesktopWidget::availableGeometry(int) const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations]
qpixeltool.cpp:506:75: warning: ‘int QDesktopWidget::screenNumber(const QPoint&) const’ is deprecated: Use QGuiApplication::screenAt() [-Wdeprecated-declarations]
qpixeltool.cpp:552:51: warning: ‘int QDesktopWidget::numScreens() const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations]
qpixeltool.cpp:553:54: warning: ‘const QRect QDesktopWidget::screenGeometry(int) const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations]
Change-Id: I717ee36c214c0fc3dd76550316068c76e849950f
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
| -rw-r--r-- | src/pixeltool/qpixeltool.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/pixeltool/qpixeltool.cpp b/src/pixeltool/qpixeltool.cpp index cb8ad6f02..7a73e3655 100644 --- a/src/pixeltool/qpixeltool.cpp +++ b/src/pixeltool/qpixeltool.cpp @@ -56,13 +56,12 @@ QT_BEGIN_NAMESPACE static QPoint initialPos(const QSettings &settings, const QSize &initialSize) { - const QDesktopWidget *desktopWidget = QApplication::desktop(); - const QPoint defaultPos = desktopWidget->availableGeometry().topLeft(); + const QPoint defaultPos = QGuiApplication::primaryScreen()->availableGeometry().topLeft(); const QPoint savedPos = settings.value(QLatin1String("position"), QVariant(defaultPos)).toPoint(); - const int savedScreen = desktopWidget->screenNumber(savedPos); - return savedScreen >= 0 - && desktopWidget->availableGeometry(savedScreen).intersects(QRect(savedPos, initialSize)) + auto savedScreen = QGuiApplication::screenAt(savedPos); + return savedScreen != nullptr + && savedScreen->availableGeometry().intersects(QRect(savedPos, initialSize)) ? savedPos : defaultPos; } @@ -503,8 +502,8 @@ QSize QPixelTool::sizeHint() const static inline QString pixelToolTitle(QPoint pos) { if (QHighDpiScaling::isActive()) { - const int screenNumber = QApplication::desktop()->screenNumber(pos); - pos = QHighDpi::toNativePixels(pos, QGuiApplication::screens().at(screenNumber)); + if (auto screen = QGuiApplication::screenAt(pos)) + pos = QHighDpi::toNativePixels(pos, screen); } return QCoreApplication::applicationName() + QLatin1String(" [") + QString::number(pos.x()) @@ -549,8 +548,9 @@ void QPixelTool::grabScreen() } QRegion geom(x, y, w, h); QRect screenRect; - for (int i = 0; i < desktopWidget->numScreens(); ++i) - screenRect |= desktopWidget->screenGeometry(i); + const auto screens = QGuiApplication::screens(); + for (auto screen : screens) + screenRect |= screen->geometry(); geom -= screenRect; const auto rectsInRegion = geom.rectCount(); if (rectsInRegion > 0) { |