diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-07-30 15:17:24 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:09:42 +0200 |
| commit | 1317bbb4fade31be698d89dc3d0a229f66af89fa (patch) | |
| tree | d83ef9369a0213f29c6c8395ee77a403bea83ab1 /src/compositor/compositor_api | |
| parent | ac6786f5f56dfdaed07633764a5002a3e7da84c7 (diff) | |
Use Q_SIGNALS and Q_SLOTS instead of signals: slots:
in the compositor apis
Change-Id: I0b90843647cbea3e3db22386bfba769db5602d86
Diffstat (limited to 'src/compositor/compositor_api')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.h | 2 | ||||
| -rw-r--r-- | src/compositor/compositor_api/qwaylandoutput.h | 2 | ||||
| -rw-r--r-- | src/compositor/compositor_api/qwaylandoutputspace.h | 2 |
3 files changed, 3 insertions, 3 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(); |