diff options
Diffstat (limited to 'src/widgets/kernel/qdesktopwidget.h')
-rw-r--r-- | src/widgets/kernel/qdesktopwidget.h | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/src/widgets/kernel/qdesktopwidget.h b/src/widgets/kernel/qdesktopwidget.h index e5c587984f..265f320b1f 100644 --- a/src/widgets/kernel/qdesktopwidget.h +++ b/src/widgets/kernel/qdesktopwidget.h @@ -52,78 +52,21 @@ class QDesktopWidgetPrivate; class Q_WIDGETS_EXPORT QDesktopWidget : public QWidget { Q_OBJECT -#if QT_DEPRECATED_SINCE(5, 11) - Q_PROPERTY(bool virtualDesktop READ isVirtualDesktop) - Q_PROPERTY(int screenCount READ screenCount NOTIFY screenCountChanged) - Q_PROPERTY(int primaryScreen READ primaryScreen NOTIFY primaryScreenChanged) -#endif public: QDesktopWidget(); ~QDesktopWidget(); - int screenNumber(const QWidget *widget = nullptr) const; - const QRect screenGeometry(const QWidget *widget) const; - const QRect availableGeometry(const QWidget *widget) const; - -#if QT_DEPRECATED_SINCE(5, 11) - QT_DEPRECATED_X("Use QScreen::virtualSiblings() of primary screen") bool isVirtualDesktop() const; - - QT_DEPRECATED_X("Use QGuiApplication::screens()") int numScreens() const; - QT_DEPRECATED_X("Use QGuiApplication::screens()") int screenCount() const; - QT_DEPRECATED_X("Use QGuiApplication::primaryScreen()") int primaryScreen() const; - - QT_DEPRECATED_X("Use QGuiApplication::screenAt()") int screenNumber(const QPoint &) const; - QT_DEPRECATED_X("Use QScreen") QWidget *screen(int screen = -1); - QT_DEPRECATED_X("Use QGuiApplication::screens()") const QRect screenGeometry(int screen = -1) const; - QT_DEPRECATED_X("Use QGuiApplication::screenAt()") const QRect screenGeometry(const QPoint &point) const - { -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - return screenGeometry(screenNumber(point)); -QT_WARNING_POP - } - - QT_DEPRECATED_X("Use QGuiApplication::screens()") const QRect availableGeometry(int screen = -1) const; - QT_DEPRECATED_X("Use QGuiApplication::screenAt()") const QRect availableGeometry(const QPoint &point) const - { -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - return availableGeometry(screenNumber(point)); -QT_WARNING_POP - } - -Q_SIGNALS: - QT_DEPRECATED_X("Use QScreen::geometryChanged()") void resized(int); - QT_DEPRECATED_X("Use QScreen::availableGeometryChanged()") void workAreaResized(int); - QT_DEPRECATED_X("Use QGuiApplication::screenAdded/Removed()") void screenCountChanged(int); - QT_DEPRECATED_X("Use QGuiApplication::primaryScreenChanged()") void primaryScreenChanged(); -#endif - -protected: - void resizeEvent(QResizeEvent *e) override; - private: Q_DISABLE_COPY(QDesktopWidget) Q_DECLARE_PRIVATE(QDesktopWidget) Q_PRIVATE_SLOT(d_func(), void _q_updateScreens()) - Q_PRIVATE_SLOT(d_func(), void _q_availableGeometryChanged()) friend class QApplication; friend class QApplicationPrivate; }; -#if QT_DEPRECATED_SINCE(5, 11) -inline int QDesktopWidget::screenCount() const -{ -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - return numScreens(); -QT_WARNING_POP -} -#endif - QT_END_NAMESPACE #endif // QDESKTOPWIDGET_H |