From e6255beec9114afd1fad9e7d62ebec433a627d54 Mon Sep 17 00:00:00 2001 From: Giulio Camuffo Date: Thu, 29 Jan 2015 14:35:44 +0200 Subject: Namespace the platform plugins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There currently is a QWaylandInputDevice class both in the wayland QPA plugin and in the QtCompositor API. This causes the qwindow-compositor example to crash when running nested in a wayland session due to a mismatch between the two classes. By namespacing all the plugin code we make sure that name clashes will not happen anymore. Change-Id: I17497cff697599200bea68bf01dfde474526390f Reviewed-by: Jørgen Lind --- src/client/qwaylanddatadevice_p.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/client/qwaylanddatadevice_p.h') diff --git a/src/client/qwaylanddatadevice_p.h b/src/client/qwaylanddatadevice_p.h index ef82d84dd..a80312c94 100644 --- a/src/client/qwaylanddatadevice_p.h +++ b/src/client/qwaylanddatadevice_p.h @@ -48,12 +48,15 @@ QT_BEGIN_NAMESPACE -class QWaylandDisplay; class QMimeData; +class QWindow; + +namespace QtWaylandClient { + +class QWaylandDisplay; class QWaylandDataDeviceManager; class QWaylandDataOffer; class QWaylandDataSource; -class QWindow; class QWaylandInputDevice; class QWaylandWindow; @@ -99,6 +102,8 @@ private: QScopedPointer m_dragSource; }; +} + QT_END_NAMESPACE #endif // QWAYLANDDATADEVICE_H -- cgit v1.2.3