diff options
Diffstat (limited to 'src/compositor/extensions')
14 files changed, 70 insertions, 16 deletions
diff --git a/src/compositor/extensions/qwaylandxdgshell.cpp b/src/compositor/extensions/qwaylandxdgshell.cpp index 1b8a3c2e2..6b7e86003 100644 --- a/src/compositor/extensions/qwaylandxdgshell.cpp +++ b/src/compositor/extensions/qwaylandxdgshell.cpp @@ -1725,7 +1725,7 @@ Qt::Orientations QWaylandXdgPopup::slideConstraints() const Q_D(const QWaylandXdgPopup); const uint flags = d->m_positionerData.constraintAdjustments; - Qt::Orientations constraints = 0; + Qt::Orientations constraints = {}; if (flags & XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_SLIDE_X) constraints |= Qt::Horizontal; @@ -1755,7 +1755,7 @@ Qt::Orientations QWaylandXdgPopup::flipConstraints() const Q_D(const QWaylandXdgPopup); const uint flags = d->m_positionerData.constraintAdjustments; - Qt::Orientations constraints = 0; + Qt::Orientations constraints = {}; if (flags & XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_FLIP_X) constraints |= Qt::Horizontal; @@ -1785,7 +1785,7 @@ Qt::Orientations QWaylandXdgPopup::resizeConstraints() const Q_D(const QWaylandXdgPopup); const uint flags = d->m_positionerData.constraintAdjustments; - Qt::Orientations constraints = 0; + Qt::Orientations constraints = {}; if (flags & XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_RESIZE_X) constraints |= Qt::Horizontal; diff --git a/src/compositor/extensions/qwaylandxdgshell.h b/src/compositor/extensions/qwaylandxdgshell.h index c79b22350..0535f8e4d 100644 --- a/src/compositor/extensions/qwaylandxdgshell.h +++ b/src/compositor/extensions/qwaylandxdgshell.h @@ -234,8 +234,8 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgPopup : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QWaylandXdgPopup) - Q_PROPERTY(QWaylandXdgSurface *xdgSurface READ xdgSurface) - Q_PROPERTY(QWaylandXdgSurface *parentXdgSurface READ parentXdgSurface) + Q_PROPERTY(QWaylandXdgSurface *xdgSurface READ xdgSurface CONSTANT) + Q_PROPERTY(QWaylandXdgSurface *parentXdgSurface READ parentXdgSurface CONSTANT) Q_PROPERTY(QRect configuredGeometry READ configuredGeometry NOTIFY configuredGeometryChanged) // Positioner properties diff --git a/src/compositor/extensions/qwaylandxdgshell_p.h b/src/compositor/extensions/qwaylandxdgshell_p.h index 3223abf3a..de48f481d 100644 --- a/src/compositor/extensions/qwaylandxdgshell_p.h +++ b/src/compositor/extensions/qwaylandxdgshell_p.h @@ -63,8 +63,8 @@ QT_BEGIN_NAMESPACE struct Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgPositionerData { QSize size; QRect anchorRect; - Qt::Edges anchorEdges = 0; - Qt::Edges gravityEdges = 0; + Qt::Edges anchorEdges = {}; + Qt::Edges gravityEdges = {}; uint constraintAdjustments = XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_NONE; QPoint offset; QWaylandXdgPositionerData(); diff --git a/src/compositor/extensions/qwaylandxdgshellv5.cpp b/src/compositor/extensions/qwaylandxdgshellv5.cpp index 337540fc3..c6ef34e7b 100644 --- a/src/compositor/extensions/qwaylandxdgshellv5.cpp +++ b/src/compositor/extensions/qwaylandxdgshellv5.cpp @@ -47,6 +47,8 @@ QT_BEGIN_NAMESPACE +#if QT_DEPRECATED_SINCE(5, 15) + QWaylandSurfaceRole QWaylandXdgSurfaceV5Private::s_role("xdg_surface"); QWaylandSurfaceRole QWaylandXdgPopupV5Private::s_role("xdg_popup"); @@ -493,6 +495,7 @@ void QWaylandXdgPopupV5Private::xdg_popup_destroy(Resource *resource) * \qmltype XdgShellV5 * \inqmlmodule QtWayland.Compositor * \since 5.8 + * \obsolete * \brief Provides an extension for desktop-style user interfaces. * * The XdgShellV5 extension provides a way to associate an XdgSurfaceV5 @@ -522,6 +525,7 @@ void QWaylandXdgPopupV5Private::xdg_popup_destroy(Resource *resource) * \class QWaylandXdgShellV5 * \inmodule QtWaylandCompositor * \since 5.8 + * \obsolete * \brief The QWaylandXdgShellV5 class is an extension for desktop-style user interfaces. * * The QWaylandXdgShellV5 extension provides a way to associate a QWaylandXdgSurfaceV5 with @@ -756,6 +760,7 @@ void QWaylandXdgShellV5::handleFocusChanged(QWaylandSurface *newSurface, QWaylan * \qmltype XdgSurfaceV5 * \inqmlmodule QtWayland.Compositor * \since 5.8 + * \obsolete * \brief Provides a \c xdg_surface that offers desktop-style compositor-specific features to a surface. * * This type is part of the \l{XdgShellV5} extension and provides a way to extend @@ -771,6 +776,7 @@ void QWaylandXdgShellV5::handleFocusChanged(QWaylandSurface *newSurface, QWaylan * \class QWaylandXdgSurfaceV5 * \inmodule QtWaylandCompositor * \since 5.8 + * \obsolete * \brief The QWaylandXdgSurfaceV5 class provides desktop-style compositor-specific features to an xdg surface. * * This class is part of the QWaylandXdgShellV5 extension and provides a way to @@ -1355,6 +1361,7 @@ QWaylandQuickShellIntegration *QWaylandXdgSurfaceV5::createIntegration(QWaylandQ * \qmltype XdgPopupV5 * \inqmlmodule QtWayland.Compositor * \since 5.8 + * \obsolete * \brief Provides a \c xdg_popup interface that implements popup features for the xdg-shell protocol. * * This type is part of the \l{XdgShellV5} extension and provides a way to extend @@ -1370,6 +1377,7 @@ QWaylandQuickShellIntegration *QWaylandXdgSurfaceV5::createIntegration(QWaylandQ * \class QWaylandXdgPopupV5 * \inmodule QtWaylandCompositor * \since 5.8 + * \obsolete * \brief The QWaylandXdgPopupV5 class provides menus for an xdg surface. * * This class is part of the QWaylandXdgShellV5 extension and provides a way to @@ -1551,4 +1559,6 @@ QWaylandQuickShellIntegration *QWaylandXdgPopupV5::createIntegration(QWaylandQui } #endif +#endif // QT_DEPRECATED_SINCE(5, 15) + QT_END_NAMESPACE diff --git a/src/compositor/extensions/qwaylandxdgshellv5.h b/src/compositor/extensions/qwaylandxdgshellv5.h index d0fba5f69..c0df767b1 100644 --- a/src/compositor/extensions/qwaylandxdgshellv5.h +++ b/src/compositor/extensions/qwaylandxdgshellv5.h @@ -42,6 +42,8 @@ struct wl_resource; QT_BEGIN_NAMESPACE +#if QT_DEPRECATED_SINCE(5, 15) + class QWaylandXdgShellV5Private; class QWaylandXdgSurfaceV5; class QWaylandXdgSurfaceV5Private; @@ -247,6 +249,8 @@ private: void initialize() override; }; +#endif // QT_DEPRECATED_SINCE(5, 15) + QT_END_NAMESPACE #endif /*QWAYLANDXDGSHELLV5_H*/ diff --git a/src/compositor/extensions/qwaylandxdgshellv5_p.h b/src/compositor/extensions/qwaylandxdgshellv5_p.h index 9aaad65b5..5356d979c 100644 --- a/src/compositor/extensions/qwaylandxdgshellv5_p.h +++ b/src/compositor/extensions/qwaylandxdgshellv5_p.h @@ -51,6 +51,8 @@ QT_BEGIN_NAMESPACE +#if QT_DEPRECATED_SINCE(5, 15) + class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgShellV5Private : public QWaylandShellPrivate , public QtWaylandServer::xdg_shell_v5 @@ -168,6 +170,8 @@ public: static QWaylandSurfaceRole s_role; }; +#endif // QT_DEPRECATED_SINCE(5, 15) + QT_END_NAMESPACE #endif // QWAYLANDXDGSHELLV5_P_H diff --git a/src/compositor/extensions/qwaylandxdgshellv5integration.cpp b/src/compositor/extensions/qwaylandxdgshellv5integration.cpp index cbb61d3bd..2f11130fe 100644 --- a/src/compositor/extensions/qwaylandxdgshellv5integration.cpp +++ b/src/compositor/extensions/qwaylandxdgshellv5integration.cpp @@ -38,6 +38,8 @@ QT_BEGIN_NAMESPACE +#if QT_DEPRECATED_SINCE(5, 15) + namespace QtWayland { static void handlePopupCreated(QWaylandQuickShellSurfaceItem *parentItem, QWaylandXdgPopupV5 *popup) @@ -246,4 +248,6 @@ void XdgPopupV5Integration::handlePopupDestroyed() } +#endif // QT_DEPRECATED_SINCE(5, 15) + QT_END_NAMESPACE diff --git a/src/compositor/extensions/qwaylandxdgshellv5integration_p.h b/src/compositor/extensions/qwaylandxdgshellv5integration_p.h index ea4477ba0..4a0c3d213 100644 --- a/src/compositor/extensions/qwaylandxdgshellv5integration_p.h +++ b/src/compositor/extensions/qwaylandxdgshellv5integration_p.h @@ -35,6 +35,8 @@ QT_BEGIN_NAMESPACE +#if QT_DEPRECATED_SINCE(5, 15) + // // W A R N I N G // ------------- @@ -122,6 +124,8 @@ private: } +#endif // QT_DEPRECATED_SINCE(5, 15) + QT_END_NAMESPACE #endif // QWAYLANDXDGSHELLV5INTEGRATION_H diff --git a/src/compositor/extensions/qwaylandxdgshellv6.cpp b/src/compositor/extensions/qwaylandxdgshellv6.cpp index 934dccb06..6a2431594 100644 --- a/src/compositor/extensions/qwaylandxdgshellv6.cpp +++ b/src/compositor/extensions/qwaylandxdgshellv6.cpp @@ -54,6 +54,8 @@ QT_BEGIN_NAMESPACE +#if QT_DEPRECATED_SINCE(5, 15) + QWaylandXdgShellV6Private::QWaylandXdgShellV6Private() { } @@ -148,6 +150,7 @@ void QWaylandXdgShellV6Private::zxdg_shell_v6_pong(Resource *resource, uint32_t * \qmltype XdgShellV6 * \inqmlmodule QtWayland.Compositor * \since 5.10 + * \obsolete * \brief Provides an extension for desktop-style user interfaces. * * The XdgShellV6 extension provides a way to associate a XdgToplevelV6 or XdgPopupV6 @@ -175,6 +178,7 @@ void QWaylandXdgShellV6Private::zxdg_shell_v6_pong(Resource *resource, uint32_t * \class QWaylandXdgShellV6 * \inmodule QtWaylandCompositor * \since 5.10 + * \obsolete * \brief The QWaylandXdgShellV6 class is an extension for desktop-style user interfaces. * * The QWaylandXdgShellV6 extension provides a way to associate a QWaylandXdgToplevelV6 or @@ -468,6 +472,7 @@ void QWaylandXdgSurfaceV6Private::zxdg_surface_v6_set_window_geometry(QtWaylandS * \qmltype XdgSurfaceV6 * \inqmlmodule QtWayland.Compositor * \since 5.10 + * \obsolete * \brief XdgSurfaceV6 provides desktop-style compositor-specific features to an xdg surface. * * This type is part of the \l{XdgShellV6} extension and provides a way to @@ -482,6 +487,7 @@ void QWaylandXdgSurfaceV6Private::zxdg_surface_v6_set_window_geometry(QtWaylandS * \class QWaylandXdgSurfaceV6 * \inmodule QtWaylandCompositor * \since 5.10 + * \obsolete * \brief The QWaylandXdgSurfaceV6 class provides desktop-style compositor-specific features to an xdg surface. * * This class is part of the QWaylandXdgShellV6 extension and provides a way to @@ -717,6 +723,7 @@ QWaylandQuickShellIntegration *QWaylandXdgSurfaceV6::createIntegration(QWaylandQ * \qmltype XdgToplevelV6 * \inqmlmodule QtWayland.Compositor * \since 5.10 + * \obsolete * \brief XdgToplevelV6 represents the toplevel window specific parts of an xdg surface. * * This type is part of the \l{XdgShellV6} extension and provides a way to @@ -730,6 +737,7 @@ QWaylandQuickShellIntegration *QWaylandXdgSurfaceV6::createIntegration(QWaylandQ * \class QWaylandXdgToplevelV6 * \inmodule QtWaylandCompositor * \since 5.10 + * \obsolete * \brief The QWaylandXdgToplevelV6 class represents the toplevel window specific parts of an xdg surface. * * This class is part of the QWaylandXdgShellV6 extension and provides a way to @@ -1480,6 +1488,7 @@ void QWaylandXdgToplevelV6Private::zxdg_toplevel_v6_set_minimized(QtWaylandServe * \qmltype XdgPopupV6 * \inqmlmodule QtWayland.Compositor * \since 5.10 + * \obsolete * \brief XdgPopupV6 represents the popup specific parts of and xdg surface. * * This type is part of the \l{XdgShellV6} extension and provides a way to extend @@ -1493,6 +1502,7 @@ void QWaylandXdgToplevelV6Private::zxdg_toplevel_v6_set_minimized(QtWaylandServe * \class QWaylandXdgPopupV6 * \inmodule QtWaylandCompositor * \since 5.10 + * \obsolete * \brief The QWaylandXdgPopupV6 class represents the popup specific parts of an xdg surface. * * This class is part of the QWaylandXdgShellV6 extension and provides a way to @@ -1656,7 +1666,7 @@ Qt::Orientations QWaylandXdgPopupV6::slideConstraints() const Q_D(const QWaylandXdgPopupV6); const uint flags = d->m_positionerData.constraintAdjustments; - Qt::Orientations constraints = 0; + Qt::Orientations constraints = {}; if (flags & ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_SLIDE_X) constraints |= Qt::Horizontal; @@ -1686,7 +1696,7 @@ Qt::Orientations QWaylandXdgPopupV6::flipConstraints() const Q_D(const QWaylandXdgPopupV6); const uint flags = d->m_positionerData.constraintAdjustments; - Qt::Orientations constraints = 0; + Qt::Orientations constraints = {}; if (flags & ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_FLIP_X) constraints |= Qt::Horizontal; @@ -1716,7 +1726,7 @@ Qt::Orientations QWaylandXdgPopupV6::resizeConstraints() const Q_D(const QWaylandXdgPopupV6); const uint flags = d->m_positionerData.constraintAdjustments; - Qt::Orientations constraints = 0; + Qt::Orientations constraints = {}; if (flags & ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_RESIZE_X) constraints |= Qt::Horizontal; @@ -2030,4 +2040,6 @@ QWaylandXdgPositionerV6 *QWaylandXdgPositionerV6::fromResource(wl_resource *reso return QtWayland::fromResource<QWaylandXdgPositionerV6 *>(resource); } +#endif // QT_DEPRECATED_SINCE(5, 15) + QT_END_NAMESPACE diff --git a/src/compositor/extensions/qwaylandxdgshellv6.h b/src/compositor/extensions/qwaylandxdgshellv6.h index 71f82521a..4231fa7f1 100644 --- a/src/compositor/extensions/qwaylandxdgshellv6.h +++ b/src/compositor/extensions/qwaylandxdgshellv6.h @@ -49,6 +49,8 @@ struct wl_resource; QT_BEGIN_NAMESPACE +#if QT_DEPRECATED_SINCE(5, 15) + class QWaylandClient; class QWaylandOutput; class QWaylandSeat; @@ -215,8 +217,8 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgPopupV6 : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QWaylandXdgPopupV6) - Q_PROPERTY(QWaylandXdgSurfaceV6 *xdgSurface READ xdgSurface) - Q_PROPERTY(QWaylandXdgSurfaceV6 *parentXdgSurface READ parentXdgSurface) + Q_PROPERTY(QWaylandXdgSurfaceV6 *xdgSurface READ xdgSurface CONSTANT) + Q_PROPERTY(QWaylandXdgSurfaceV6 *parentXdgSurface READ parentXdgSurface CONSTANT) Q_PROPERTY(QRect configuredGeometry READ configuredGeometry NOTIFY configuredGeometryChanged) // Positioner properties @@ -259,6 +261,8 @@ private: friend class QWaylandXdgSurfaceV6Private; }; +#endif // QT_DEPRECATED_SINCE(5, 15) + QT_END_NAMESPACE #endif // QWAYLANDXDGSHELLV6_H diff --git a/src/compositor/extensions/qwaylandxdgshellv6_p.h b/src/compositor/extensions/qwaylandxdgshellv6_p.h index 457bc2201..902224155 100644 --- a/src/compositor/extensions/qwaylandxdgshellv6_p.h +++ b/src/compositor/extensions/qwaylandxdgshellv6_p.h @@ -58,11 +58,13 @@ QT_BEGIN_NAMESPACE +#if QT_DEPRECATED_SINCE(5, 15) + struct Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgPositionerV6Data { QSize size; QRect anchorRect; - Qt::Edges anchorEdges = 0; - Qt::Edges gravityEdges = 0; + Qt::Edges anchorEdges = {}; + Qt::Edges gravityEdges = {}; uint constraintAdjustments = ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_NONE; QPoint offset; QWaylandXdgPositionerV6Data(); @@ -241,6 +243,8 @@ public: QWaylandXdgPositionerV6Data m_data; }; +#endif // QT_DEPRECATED_SINCE(5, 15) + QT_END_NAMESPACE #endif // QWAYLANDXDGSHELLV6_P_H diff --git a/src/compositor/extensions/qwaylandxdgshellv6integration.cpp b/src/compositor/extensions/qwaylandxdgshellv6integration.cpp index e424af193..98b748986 100644 --- a/src/compositor/extensions/qwaylandxdgshellv6integration.cpp +++ b/src/compositor/extensions/qwaylandxdgshellv6integration.cpp @@ -42,6 +42,8 @@ QT_BEGIN_NAMESPACE +#if QT_DEPRECATED_SINCE(5, 15) + namespace QtWayland { static void handlePopupCreated(QWaylandQuickShellSurfaceItem *parentItem, QWaylandXdgPopupV6 *popup) @@ -309,4 +311,6 @@ void XdgPopupV6Integration::handleGeometryChanged() } +#endif // QT_DEPRECATED_SINCE(5, 15) + QT_END_NAMESPACE diff --git a/src/compositor/extensions/qwaylandxdgshellv6integration_p.h b/src/compositor/extensions/qwaylandxdgshellv6integration_p.h index 9df2885f1..9513362f4 100644 --- a/src/compositor/extensions/qwaylandxdgshellv6integration_p.h +++ b/src/compositor/extensions/qwaylandxdgshellv6integration_p.h @@ -43,6 +43,8 @@ QT_BEGIN_NAMESPACE +#if QT_DEPRECATED_SINCE(5, 15) + // // W A R N I N G // ------------- @@ -143,6 +145,8 @@ private: } +#endif // QT_DEPRECATED_SINCE(5, 15) + QT_END_NAMESPACE #endif // QWAYLANDXDGSHELLV6INTEGRATION_H diff --git a/src/compositor/extensions/qwltexturesharingextension.cpp b/src/compositor/extensions/qwltexturesharingextension.cpp index 6f801e956..bbd18e1a5 100644 --- a/src/compositor/extensions/qwltexturesharingextension.cpp +++ b/src/compositor/extensions/qwltexturesharingextension.cpp @@ -301,13 +301,13 @@ QString QWaylandTextureSharingExtension::getExistingFilePath(const QString &key) if (key.contains(QLatin1String("../"))) return QString(); - for (auto dir : m_image_dirs) { + for (auto dir : qAsConst(m_image_dirs)) { QString path = dir + key; if (QFileInfo::exists(path)) return path; } - for (auto dir : m_image_dirs) { + for (auto dir : qAsConst(m_image_dirs)) { for (auto ext : m_image_suffixes) { QString fp = dir + key + ext; //qDebug() << "trying" << fp; |