diff options
11 files changed, 12 insertions, 12 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h index f22468239..a7026f3d0 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.h +++ b/src/compositor/compositor_api/qwaylandcompositor.h @@ -159,7 +159,7 @@ public: QWaylandInputDevice *inputDeviceFor(QInputEvent *inputEvent); -signals: +Q_SIGNALS: void surfaceCreated(QWaylandSurface *surface); void surfaceAboutToBeDestroyed(QWaylandSurface *surface); diff --git a/src/compositor/compositor_api/qwaylandoutput.h b/src/compositor/compositor_api/qwaylandoutput.h index 910507ab2..acc09897c 100644 --- a/src/compositor/compositor_api/qwaylandoutput.h +++ b/src/compositor/compositor_api/qwaylandoutput.h @@ -182,7 +182,7 @@ Q_SIGNALS: protected: QScopedPointer<QtWayland::Output> d_ptr; -private slots: +private Q_SLOTS: void windowDestroyed(); }; diff --git a/src/compositor/compositor_api/qwaylandoutputspace.h b/src/compositor/compositor_api/qwaylandoutputspace.h index c06ba3681..8b1046bf1 100644 --- a/src/compositor/compositor_api/qwaylandoutputspace.h +++ b/src/compositor/compositor_api/qwaylandoutputspace.h @@ -89,7 +89,7 @@ public: Q_INVOKABLE QPointF mapToView(QWaylandSurfaceView *view, const QPointF &spacePoint) const; Q_INVOKABLE QPointF mapToSpace(QWaylandSurfaceView *view, const QPointF &local) const; -signals: +Q_SIGNALS: void surfaceRequestedPositionChanged(QWaylandSurface *surface, const QPointF &point); void geometryConstraintChanged(); diff --git a/src/compositor/extensions/qwaylandwindowmanagerextension.h b/src/compositor/extensions/qwaylandwindowmanagerextension.h index 6c17c3961..80f71dd51 100644 --- a/src/compositor/extensions/qwaylandwindowmanagerextension.h +++ b/src/compositor/extensions/qwaylandwindowmanagerextension.h @@ -63,7 +63,7 @@ public: void sendQuitMessage(wl_client *client); static QWaylandWindowManagerExtension *get(QWaylandExtensionContainer *container); -signals: +Q_SIGNALS: void openUrl(QWaylandClient *client, const QUrl &url); }; diff --git a/src/compositor/extensions/qwlextendedsurface_p.h b/src/compositor/extensions/qwlextendedsurface_p.h index f0953b499..09dee0246 100644 --- a/src/compositor/extensions/qwlextendedsurface_p.h +++ b/src/compositor/extensions/qwlextendedsurface_p.h @@ -111,7 +111,7 @@ public: const wl_interface *interface() const Q_DECL_OVERRIDE { return QtWaylandServer::qt_extended_surface::interface(); } -signals: +Q_SIGNALS: void contentOrientationMaskChanged(); void windowFlagsChanged(); void windowPropertyChanged(const QString &name, const QVariant &value); diff --git a/src/compositor/extensions/qwlqttouch_p.h b/src/compositor/extensions/qwlqttouch_p.h index 2c108f069..94c90949b 100644 --- a/src/compositor/extensions/qwlqttouch_p.h +++ b/src/compositor/extensions/qwlqttouch_p.h @@ -73,7 +73,7 @@ public: const struct wl_interface *interface() const Q_DECL_OVERRIDE { return QtWaylandServer::qt_touch_extension::interface(); } static TouchExtensionGlobal *get(QWaylandExtensionContainer *container); -signals: +Q_SIGNALS: void behaviorFlagsChanged(); protected: diff --git a/src/compositor/extensions/qwlshellsurface_p.h b/src/compositor/extensions/qwlshellsurface_p.h index ddb373d80..e0bc8a888 100644 --- a/src/compositor/extensions/qwlshellsurface_p.h +++ b/src/compositor/extensions/qwlshellsurface_p.h @@ -116,7 +116,7 @@ public: void setSurfaceType(SurfaceType type); SurfaceType surfaceType() const; -signals: +Q_SIGNALS: void surfaceTypeChanged(); private Q_SLOTS: diff --git a/src/compositor/extensions/qwlsubsurface_p.h b/src/compositor/extensions/qwlsubsurface_p.h index 66eff6dc9..255544f74 100644 --- a/src/compositor/extensions/qwlsubsurface_p.h +++ b/src/compositor/extensions/qwlsubsurface_p.h @@ -83,7 +83,7 @@ public: const struct wl_interface *interface() const { return qt_sub_surface::interface(); } -signals: +Q_SIGNALS: void parentChanged(SubSurface *newParent, SubSurface *oldParent); protected: diff --git a/src/compositor/wayland_wrapper/qwlcompositor_p.h b/src/compositor/wayland_wrapper/qwlcompositor_p.h index 750807449..13ae861be 100644 --- a/src/compositor/wayland_wrapper/qwlcompositor_p.h +++ b/src/compositor/wayland_wrapper/qwlcompositor_p.h @@ -143,13 +143,13 @@ public: void unregisterSurface(QWaylandSurface *surface); -public slots: +public Q_SLOTS: void cleanupGraphicsResources(); protected: void compositor_create_surface(Resource *resource, uint32_t id) Q_DECL_OVERRIDE; void compositor_create_region(Resource *resource, uint32_t id) Q_DECL_OVERRIDE; -private slots: +private Q_SLOTS: void processWaylandEvents(); protected: diff --git a/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h b/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h index 76d80a56a..5fbd45f6f 100644 --- a/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h +++ b/src/compositor/wayland_wrapper/qwldatadevicemanager_p.h @@ -79,7 +79,7 @@ protected: void data_device_manager_create_data_source(Resource *resource, uint32_t id) Q_DECL_OVERRIDE; void data_device_manager_get_data_device(Resource *resource, uint32_t id, struct ::wl_resource *seat) Q_DECL_OVERRIDE; -private slots: +private Q_SLOTS: void readFromClient(int fd); private: diff --git a/src/compositor/wayland_wrapper/qwlinputmethod_p.h b/src/compositor/wayland_wrapper/qwlinputmethod_p.h index 4d857c045..ee43b7ebc 100644 --- a/src/compositor/wayland_wrapper/qwlinputmethod_p.h +++ b/src/compositor/wayland_wrapper/qwlinputmethod_p.h @@ -73,7 +73,7 @@ protected: void input_method_bind_resource(Resource *resource); void input_method_destroy_resource(Resource *resource); -private slots: +private Q_SLOTS: void focusChanged(Surface *surface); private: |