diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-07-30 15:21:17 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:09:42 +0200 |
| commit | 0f3c1a1669aa133efd8701f25b8b8093517b81a7 (patch) | |
| tree | 964e3be6ecd36c0c4eeafbab0f65e74eac9ee80b /src/compositor/compositor_api/qwaylandoutput.cpp | |
| parent | d1359f8b0c2b8fcffc2112d2e29d530ac1ab7c9a (diff) | |
Rename QWaylandSurfaceView to QWaylandView
and rename QWaylandSurfaceItem to QWaylandQuickView
Change-Id: I989b482eb79df06e9f265bc2b0ef6b3dce7509d6
Diffstat (limited to 'src/compositor/compositor_api/qwaylandoutput.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandoutput.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compositor/compositor_api/qwaylandoutput.cpp b/src/compositor/compositor_api/qwaylandoutput.cpp index 6cc7efbce..9b8b252ba 100644 --- a/src/compositor/compositor_api/qwaylandoutput.cpp +++ b/src/compositor/compositor_api/qwaylandoutput.cpp @@ -38,7 +38,7 @@ #include "qwaylandoutput.h" #include "qwaylandcompositor.h" -#include "qwaylandsurfaceview.h" +#include "qwaylandview.h" #include <QtCore/QCoreApplication> #include <QtCore/QtMath> @@ -277,12 +277,12 @@ QtWayland::Output *QWaylandOutput::handle() const return d_ptr.data(); } -QWaylandSurfaceView *QWaylandOutput::pickView(const QPointF &outputPosition) const +QWaylandView *QWaylandOutput::pickView(const QPointF &outputPosition) const { const QVector<QtWayland::SurfaceViewMapper> surfaceViewMappers = d_ptr->surfaceMappers(); for (int nSurface = 0; surfaceViewMappers.size(); nSurface++) { const QWaylandSurface *surface = surfaceViewMappers.at(nSurface).surface; - const QVector<QWaylandSurfaceView *> views = surfaceViewMappers.at(nSurface).views; + const QVector<QWaylandView *> views = surfaceViewMappers.at(nSurface).views; for (int nView = 0; views.size(); nView++) { if (QRectF(views.at(nView)->requestedPosition(), surface->size()).contains(outputPosition)) return views.at(nView); @@ -291,7 +291,7 @@ QWaylandSurfaceView *QWaylandOutput::pickView(const QPointF &outputPosition) con return Q_NULLPTR; } -QPointF QWaylandOutput::mapToView(QWaylandSurfaceView *view, const QPointF &outputPosition) const +QPointF QWaylandOutput::mapToView(QWaylandView *view, const QPointF &outputPosition) const { return outputPosition - view->requestedPosition(); } |