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/wayland_wrapper/qwlsurface.cpp | |
parent | d1359f8b0c2b8fcffc2112d2e29d530ac1ab7c9a (diff) |
Rename QWaylandSurfaceView to QWaylandView
and rename QWaylandSurfaceItem to QWaylandQuickView
Change-Id: I989b482eb79df06e9f265bc2b0ef6b3dce7509d6
Diffstat (limited to 'src/compositor/wayland_wrapper/qwlsurface.cpp')
-rw-r--r-- | src/compositor/wayland_wrapper/qwlsurface.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/compositor/wayland_wrapper/qwlsurface.cpp b/src/compositor/wayland_wrapper/qwlsurface.cpp index dd2e8aafb..10400fa74 100644 --- a/src/compositor/wayland_wrapper/qwlsurface.cpp +++ b/src/compositor/wayland_wrapper/qwlsurface.cpp @@ -38,7 +38,8 @@ #include "qwaylandsurface.h" #include "qwaylandsurface_p.h" -#include "qwaylandsurfaceview_p.h" +#include "qwaylandview.h" +#include "qwaylandview_p.h" #include "qwaylandoutput.h" #include "qwlcompositor_p.h" #include "qwlinputdevice_p.h" @@ -46,9 +47,7 @@ #include "qwlregion_p.h" #include "qwlsubsurface_p.h" #include "qwlsurfacebuffer_p.h" -#include "qwaylandsurfaceview.h" #include "qwaylandoutput.h" - #include "qwaylandsurface_p.h" #include <QtCore/QDebug> @@ -350,8 +349,8 @@ Qt::ScreenOrientation Surface::contentOrientation() const void Surface::notifyViewsAboutDestruction() { - foreach (QWaylandSurfaceView *view, m_waylandSurface->views()) { - QWaylandSurfaceViewPrivate::get(view)->markSurfaceAsDestroyed(m_waylandSurface); + foreach (QWaylandView *view, m_waylandSurface->views()) { + QWaylandViewPrivate::get(view)->markSurfaceAsDestroyed(m_waylandSurface); } } |