diff options
Diffstat (limited to 'src/compositor/compositor_api')
25 files changed, 26 insertions, 26 deletions
diff --git a/src/compositor/compositor_api/qwaylandbufferref.h b/src/compositor/compositor_api/qwaylandbufferref.h index 5683a0b31..a4a5df5e0 100644 --- a/src/compositor/compositor_api/qwaylandbufferref.h +++ b/src/compositor/compositor_api/qwaylandbufferref.h @@ -55,7 +55,7 @@ namespace QtWayland class SurfaceBuffer; } -class Q_COMPOSITOR_EXPORT QWaylandBufferRef +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandBufferRef { public: QWaylandBufferRef(); diff --git a/src/compositor/compositor_api/qwaylandclient.h b/src/compositor/compositor_api/qwaylandclient.h index 800013d3d..26e7b95e5 100644 --- a/src/compositor/compositor_api/qwaylandclient.h +++ b/src/compositor/compositor_api/qwaylandclient.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE class QWaylandClientPrivate; class QWaylandCompositor; -class Q_COMPOSITOR_EXPORT QWaylandClient : public QObject +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandClient : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QWaylandClient) diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h index 789832762..d8a5d9ca3 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.h +++ b/src/compositor/compositor_api/qwaylandcompositor.h @@ -64,7 +64,7 @@ class QWaylandPointer; class QWaylandKeyboard; class QWaylandTouch; -class Q_COMPOSITOR_EXPORT QWaylandCompositor : public QWaylandObject +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandCompositor : public QWaylandObject { Q_OBJECT Q_DECLARE_PRIVATE(QWaylandCompositor) diff --git a/src/compositor/compositor_api/qwaylandcompositor_p.h b/src/compositor/compositor_api/qwaylandcompositor_p.h index 942634af5..5a7f7e802 100644 --- a/src/compositor/compositor_api/qwaylandcompositor_p.h +++ b/src/compositor/compositor_api/qwaylandcompositor_p.h @@ -69,7 +69,7 @@ namespace QtWayland { class QWindowSystemEventHandler; class QWaylandSurface; -class Q_COMPOSITOR_EXPORT QWaylandCompositorPrivate : public QObjectPrivate, public QtWaylandServer::wl_compositor, public QtWaylandServer::wl_subcompositor +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandCompositorPrivate : public QObjectPrivate, public QtWaylandServer::wl_compositor, public QtWaylandServer::wl_subcompositor { public: static QWaylandCompositorPrivate *get(QWaylandCompositor *compositor) { return compositor->d_func(); } diff --git a/src/compositor/compositor_api/qwaylanddestroylistener.h b/src/compositor/compositor_api/qwaylanddestroylistener.h index 04e0546af..db172ae0b 100644 --- a/src/compositor/compositor_api/qwaylanddestroylistener.h +++ b/src/compositor/compositor_api/qwaylanddestroylistener.h @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE class QWaylandDestroyListenerPrivate; -class Q_COMPOSITOR_EXPORT QWaylandDestroyListener : public QObject +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandDestroyListener : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QWaylandDestroyListener) diff --git a/src/compositor/compositor_api/qwaylanddrag.h b/src/compositor/compositor_api/qwaylanddrag.h index e7fcaad8e..00a2bee8e 100644 --- a/src/compositor/compositor_api/qwaylanddrag.h +++ b/src/compositor/compositor_api/qwaylanddrag.h @@ -53,7 +53,7 @@ namespace QtWayland { class DataDevice; } -class Q_COMPOSITOR_EXPORT QWaylandDrag : public QObject +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandDrag : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QWaylandDrag) diff --git a/src/compositor/compositor_api/qwaylandinput.h b/src/compositor/compositor_api/qwaylandinput.h index e4b6e1275..794585009 100644 --- a/src/compositor/compositor_api/qwaylandinput.h +++ b/src/compositor/compositor_api/qwaylandinput.h @@ -63,7 +63,7 @@ namespace QtWayland { class InputDevice; } -class Q_COMPOSITOR_EXPORT QWaylandInputDevice : public QWaylandObject +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandInputDevice : public QWaylandObject { Q_OBJECT Q_DECLARE_PRIVATE(QWaylandInputDevice) diff --git a/src/compositor/compositor_api/qwaylandinput_p.h b/src/compositor/compositor_api/qwaylandinput_p.h index 4ae741d05..ec8742d15 100644 --- a/src/compositor/compositor_api/qwaylandinput_p.h +++ b/src/compositor/compositor_api/qwaylandinput_p.h @@ -85,7 +85,7 @@ class InputMethod; } -class Q_COMPOSITOR_EXPORT QWaylandInputDevicePrivate : public QObjectPrivate, public QtWaylandServer::wl_seat +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandInputDevicePrivate : public QObjectPrivate, public QtWaylandServer::wl_seat { public: Q_DECLARE_PUBLIC(QWaylandInputDevice) diff --git a/src/compositor/compositor_api/qwaylandinputpanel.h b/src/compositor/compositor_api/qwaylandinputpanel.h index cce1f4583..d29743140 100644 --- a/src/compositor/compositor_api/qwaylandinputpanel.h +++ b/src/compositor/compositor_api/qwaylandinputpanel.h @@ -49,7 +49,7 @@ class QWaylandCompositor; class QWaylandInputPanelPrivate; class QWaylandSurface; -class Q_COMPOSITOR_EXPORT QWaylandInputPanel : public QWaylandExtensionTemplate<QWaylandInputPanel> +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandInputPanel : public QWaylandExtensionTemplate<QWaylandInputPanel> { Q_OBJECT Q_DECLARE_PRIVATE(QWaylandInputPanel) diff --git a/src/compositor/compositor_api/qwaylandkeyboard.h b/src/compositor/compositor_api/qwaylandkeyboard.h index 3b2282ae7..89b13eeaf 100644 --- a/src/compositor/compositor_api/qwaylandkeyboard.h +++ b/src/compositor/compositor_api/qwaylandkeyboard.h @@ -49,7 +49,7 @@ class QWaylandKeyboard; class QWaylandKeyboardPrivate; class QWaylandInputDevice; -class Q_COMPOSITOR_EXPORT QWaylandKeymap +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandKeymap { public: QWaylandKeymap(const QString &layout = QString(), const QString &variant = QString(), const QString &options = QString(), @@ -69,7 +69,7 @@ private: QString m_model; }; -class Q_COMPOSITOR_EXPORT QWaylandKeyboard : public QWaylandObject +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandKeyboard : public QWaylandObject { Q_OBJECT Q_DECLARE_PRIVATE(QWaylandKeyboard) diff --git a/src/compositor/compositor_api/qwaylandkeyboard_p.h b/src/compositor/compositor_api/qwaylandkeyboard_p.h index 86e3e365f..8c61a5bf7 100644 --- a/src/compositor/compositor_api/qwaylandkeyboard_p.h +++ b/src/compositor/compositor_api/qwaylandkeyboard_p.h @@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE -class Q_COMPOSITOR_EXPORT QWaylandKeyboardPrivate : public QObjectPrivate +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandKeyboardPrivate : public QObjectPrivate , public QtWaylandServer::wl_keyboard { public: diff --git a/src/compositor/compositor_api/qwaylandoutput.h b/src/compositor/compositor_api/qwaylandoutput.h index fba9df24f..46c5ff97f 100644 --- a/src/compositor/compositor_api/qwaylandoutput.h +++ b/src/compositor/compositor_api/qwaylandoutput.h @@ -57,7 +57,7 @@ class QWaylandView; class QWaylandClient; class QWaylandOutputSpace; -class Q_COMPOSITOR_EXPORT QWaylandOutput : public QWaylandObject +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandOutput : public QWaylandObject { Q_OBJECT Q_DECLARE_PRIVATE(QWaylandOutput) diff --git a/src/compositor/compositor_api/qwaylandoutput_p.h b/src/compositor/compositor_api/qwaylandoutput_p.h index c67e45a7f..9b6ba9076 100644 --- a/src/compositor/compositor_api/qwaylandoutput_p.h +++ b/src/compositor/compositor_api/qwaylandoutput_p.h @@ -92,7 +92,7 @@ struct QWaylandSurfaceViewMapper bool has_entered; }; -class Q_COMPOSITOR_EXPORT QWaylandOutputPrivate : public QObjectPrivate, public QtWaylandServer::wl_output +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandOutputPrivate : public QObjectPrivate, public QtWaylandServer::wl_output { public: QWaylandOutputPrivate(); diff --git a/src/compositor/compositor_api/qwaylandpointer.h b/src/compositor/compositor_api/qwaylandpointer.h index 78e2b527e..6aa31bd51 100644 --- a/src/compositor/compositor_api/qwaylandpointer.h +++ b/src/compositor/compositor_api/qwaylandpointer.h @@ -48,7 +48,7 @@ class QWaylandView; class QWaylandOutput; class QWaylandClient; -class Q_COMPOSITOR_EXPORT QWaylandPointer : public QWaylandObject +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandPointer : public QWaylandObject { Q_OBJECT Q_DECLARE_PRIVATE(QWaylandPointer) diff --git a/src/compositor/compositor_api/qwaylandpointer_p.h b/src/compositor/compositor_api/qwaylandpointer_p.h index 7748f98df..5ac030029 100644 --- a/src/compositor/compositor_api/qwaylandpointer_p.h +++ b/src/compositor/compositor_api/qwaylandpointer_p.h @@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE class QWaylandView; -class Q_COMPOSITOR_EXPORT QWaylandPointerPrivate : public QObjectPrivate +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandPointerPrivate : public QObjectPrivate , public QtWaylandServer::wl_pointer { Q_DECLARE_PUBLIC(QWaylandPointer) diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.h b/src/compositor/compositor_api/qwaylandquickcompositor.h index 876508109..bf25adfbb 100644 --- a/src/compositor/compositor_api/qwaylandquickcompositor.h +++ b/src/compositor/compositor_api/qwaylandquickcompositor.h @@ -46,7 +46,7 @@ class QQuickWindow; class QWaylandQuickCompositorPrivate; class QWaylandView; -class Q_COMPOSITOR_EXPORT QWaylandQuickCompositor : public QWaylandCompositor, public QQmlParserStatus +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickCompositor : public QWaylandCompositor, public QQmlParserStatus { Q_INTERFACES(QQmlParserStatus) Q_OBJECT diff --git a/src/compositor/compositor_api/qwaylandquickitem.h b/src/compositor/compositor_api/qwaylandquickitem.h index 41f1d533e..7140a5340 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.h +++ b/src/compositor/compositor_api/qwaylandquickitem.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QWaylandInputDevice; class QWaylandQuickItemPrivate; -class Q_COMPOSITOR_EXPORT QWaylandQuickItem : public QQuickItem +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickItem : public QQuickItem { Q_OBJECT Q_DECLARE_PRIVATE(QWaylandQuickItem) diff --git a/src/compositor/compositor_api/qwaylandquickoutput.h b/src/compositor/compositor_api/qwaylandquickoutput.h index 48f478456..83091e4c7 100644 --- a/src/compositor/compositor_api/qwaylandquickoutput.h +++ b/src/compositor/compositor_api/qwaylandquickoutput.h @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE class QWaylandQuickCompositor; class QQuickWindow; -class Q_COMPOSITOR_EXPORT QWaylandQuickOutput : public QWaylandOutput +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickOutput : public QWaylandOutput { Q_OBJECT Q_PROPERTY(bool automaticFrameCallback READ automaticFrameCallback WRITE setAutomaticFrameCallback NOTIFY automaticFrameCallbackChanged) diff --git a/src/compositor/compositor_api/qwaylandquicksurface.h b/src/compositor/compositor_api/qwaylandquicksurface.h index ba53c82ff..cb423da36 100644 --- a/src/compositor/compositor_api/qwaylandquicksurface.h +++ b/src/compositor/compositor_api/qwaylandquicksurface.h @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE class QWaylandQuickSurfacePrivate; class QWaylandQuickCompositor; -class Q_COMPOSITOR_EXPORT QWaylandQuickSurface : public QWaylandSurface +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickSurface : public QWaylandSurface { Q_OBJECT Q_DECLARE_PRIVATE(QWaylandQuickSurface) diff --git a/src/compositor/compositor_api/qwaylandresource.h b/src/compositor/compositor_api/qwaylandresource.h index 1987c1106..bfb4b0969 100644 --- a/src/compositor/compositor_api/qwaylandresource.h +++ b/src/compositor/compositor_api/qwaylandresource.h @@ -44,7 +44,7 @@ struct wl_resource; QT_BEGIN_NAMESPACE -class Q_COMPOSITOR_EXPORT QWaylandResource +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandResource { Q_GADGET public: diff --git a/src/compositor/compositor_api/qwaylandsurface.h b/src/compositor/compositor_api/qwaylandsurface.h index 1ca689c6c..ccafd1dd3 100644 --- a/src/compositor/compositor_api/qwaylandsurface.h +++ b/src/compositor/compositor_api/qwaylandsurface.h @@ -71,7 +71,7 @@ private: QByteArray m_name; }; -class Q_COMPOSITOR_EXPORT QWaylandSurface : public QWaylandObject +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandSurface : public QWaylandObject { Q_OBJECT Q_DECLARE_PRIVATE(QWaylandSurface) diff --git a/src/compositor/compositor_api/qwaylandsurface_p.h b/src/compositor/compositor_api/qwaylandsurface_p.h index 32b5c181f..73057c54e 100644 --- a/src/compositor/compositor_api/qwaylandsurface_p.h +++ b/src/compositor/compositor_api/qwaylandsurface_p.h @@ -83,7 +83,7 @@ namespace QtWayland { class FrameCallback; } -class Q_COMPOSITOR_EXPORT QWaylandSurfacePrivate : public QObjectPrivate, public QtWaylandServer::wl_surface +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandSurfacePrivate : public QObjectPrivate, public QtWaylandServer::wl_surface { public: static QWaylandSurfacePrivate *get(QWaylandSurface *surface); diff --git a/src/compositor/compositor_api/qwaylandtouch.h b/src/compositor/compositor_api/qwaylandtouch.h index aa9ee34cb..9c235e4cd 100644 --- a/src/compositor/compositor_api/qwaylandtouch.h +++ b/src/compositor/compositor_api/qwaylandtouch.h @@ -50,7 +50,7 @@ class QWaylandInputDevice; class QWaylandView; class QWaylandClient; -class Q_COMPOSITOR_EXPORT QWaylandTouch : public QWaylandObject +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandTouch : public QWaylandObject { Q_OBJECT Q_DECLARE_PRIVATE(QWaylandTouch) diff --git a/src/compositor/compositor_api/qwaylandtouch_p.h b/src/compositor/compositor_api/qwaylandtouch_p.h index fe36cd6e8..3c9e0ec93 100644 --- a/src/compositor/compositor_api/qwaylandtouch_p.h +++ b/src/compositor/compositor_api/qwaylandtouch_p.h @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE -class Q_COMPOSITOR_EXPORT QWaylandTouchPrivate : public QObjectPrivate, public QtWaylandServer::wl_touch +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandTouchPrivate : public QObjectPrivate, public QtWaylandServer::wl_touch { Q_DECLARE_PUBLIC(QWaylandTouch) public: diff --git a/src/compositor/compositor_api/qwaylandview.h b/src/compositor/compositor_api/qwaylandview.h index 5a820fb50..010bace42 100644 --- a/src/compositor/compositor_api/qwaylandview.h +++ b/src/compositor/compositor_api/qwaylandview.h @@ -49,7 +49,7 @@ class QWaylandSurface; class QWaylandViewPrivate; class QWaylandOutput; -class Q_COMPOSITOR_EXPORT QWaylandView : public QObject +class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandView : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QWaylandView) |