Make classes in client private

Change-Id: Ibf400b32f78a6a0fcf0991914d2d9ad684483979
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

src/plugins/platforms/wayland/client.pro

@@ -67,32 +67,32 @@ SOURCES +=  qwaylandintegration.cpp \
             qwaylandinputcontext.cpp \
             qwaylanddatadevice.cpp \
 
-HEADERS +=  qwaylandintegration.h \
-            qwaylandnativeinterface.h \
-            qwaylandcursor.h \
-            qwaylanddisplay.h \
-            qwaylandwindow.h \
-            qwaylandscreen.h \
-            qwaylandshmbackingstore.h \
-            qwaylandinputdevice.h \
-            qwaylandbuffer.h \
-            qwaylandshmwindow.h \
-            qwaylandclipboard.h \
-            qwaylanddnd.h \
-            qwaylanddataoffer.h \
-            qwaylanddatadevicemanager.h \
-            qwaylanddatasource.h \
-            qwaylandshellsurface.h \
-            qwaylandextendedoutput.h \
-            qwaylandextendedsurface.h \
-            qwaylandsubsurface.h \
-            qwaylandtouch.h \
-            qwaylandqtkey.h \
+HEADERS +=  qwaylandintegration_p.h \
+            qwaylandnativeinterface_p.h \
+            qwaylandcursor_p.h \
+            qwaylanddisplay_p.h \
+            qwaylandwindow_p.h \
+            qwaylandscreen_p.h \
+            qwaylandshmbackingstore_p.h \
+            qwaylandinputdevice_p.h \
+            qwaylandbuffer_p.h \
+            qwaylandshmwindow_p.h \
+            qwaylandclipboard_p.h \
+            qwaylanddnd_p.h \
+            qwaylanddataoffer_p.h \
+            qwaylanddatadevicemanager_p.h \
+            qwaylanddatasource_p.h \
+            qwaylandshellsurface_p.h \
+            qwaylandextendedoutput_p.h \
+            qwaylandextendedsurface_p.h \
+            qwaylandsubsurface_p.h \
+            qwaylandtouch_p.h \
+            qwaylandqtkey_p.h \
             ../shared/qwaylandmimehelper.h \
-            qwaylanddecoration.h \
-            qwaylandeventthread.h \
-            qwaylandwindowmanagerintegration.h \
-            qwaylandinputcontext.h \
-            qwaylanddatadevice.h \
+            qwaylanddecoration_p.h \
+            qwaylandeventthread_p.h \
+            qwaylandwindowmanagerintegration_p.h \
+            qwaylandinputcontext_p.h \
+            qwaylanddatadevice_p.h \
 
 include(hardwareintegration/hardwareintegration.pri)

src/plugins/platforms/wayland/hardwareintegration/hardwareintegration.pri

@@ -2,6 +2,8 @@ WAYLANDCLIENTSOURCES += \
             $$PWD/../../extensions/server-buffer-extension.xml \
             $$PWD/../../extensions/hardware-integration.xml
 
+INCLUDEPATH += $$PWD
+
 SOURCES += \
            $$PWD/qwaylandclientbufferintegration.cpp \
            $$PWD/qwaylandclientbufferintegrationplugin.cpp \
@@ -12,11 +14,11 @@ SOURCES += \
            $$PWD/qwaylandhardwareintegration.cpp
 
 HEADERS += \
-           $$PWD/qwaylandclientbufferintegration.h \
-           $$PWD/qwaylandclientbufferintegrationplugin.h \
-           $$PWD/qwaylandclientbufferintegrationfactory.h \
-           $$PWD/qwaylandserverbufferintegration.h \
-           $$PWD/qwaylandserverbufferintegrationplugin.h \
-           $$PWD/qwaylandserverbufferintegrationfactory.h \
-           $$PWD/qwaylandhardwareintegration.h
+           $$PWD/qwaylandclientbufferintegration_p.h \
+           $$PWD/qwaylandclientbufferintegrationplugin_p.h \
+           $$PWD/qwaylandclientbufferintegrationfactory_p.h \
+           $$PWD/qwaylandserverbufferintegration_p.h \
+           $$PWD/qwaylandserverbufferintegrationplugin_p.h \
+           $$PWD/qwaylandserverbufferintegrationfactory_p.h \
+           $$PWD/qwaylandhardwareintegration_p.h
 

src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qwaylandclientbufferintegration.h"
+#include "qwaylandclientbufferintegration_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h

@@ -43,7 +43,7 @@
 #define QWAYLANDCLIENTBUFFERINTEGRATION_H
 
 #include <QtCore/qglobal.h>
-#include <QtWaylandClient/qwaylandclientexport.h>
+#include <QtWaylandClient/private/qwaylandclientexport_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory.cpp

@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qwaylandclientbufferintegrationfactory.h"
-#include "qwaylandclientbufferintegrationplugin.h"
-#include "qwaylandclientbufferintegration.h"
+#include "qwaylandclientbufferintegrationfactory_p.h"
+#include "qwaylandclientbufferintegrationplugin_p.h"
+#include "qwaylandclientbufferintegration_p.h"
 #include <QtCore/private/qfactoryloader_p.h>
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDir>

src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h

@@ -42,7 +42,7 @@
 #ifndef QWAYLANDCLIENTBUFFERINTEGRATIONFACTORY_H
 #define QWAYLANDCLIENTBUFFERINTEGRATIONFACTORY_H
 
-#include <QtWaylandClient/qwaylandclientexport.h>
+#include <QtWaylandClient/private/qwaylandclientexport_p.h>
 #include <QtCore/QStringList>
 
 QT_BEGIN_NAMESPACE

src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qwaylandclientbufferintegrationplugin.h"
+#include "qwaylandclientbufferintegrationplugin_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h

@@ -42,7 +42,7 @@
 #ifndef QWAYLANDCLIENTBUFFERINTEGRATIONPLUGIN_H
 #define QWAYLANDCLIENTBUFFERINTEGRATIONPLUGIN_H
 
-#include <QtWaylandClient/qwaylandclientexport.h>
+#include <QtWaylandClient/private/qwaylandclientexport_p.h>
 
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>

src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration.cpp

@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qwaylandhardwareintegration.h"
+#include "qwaylandhardwareintegration_p.h"
 
-#include "qwaylanddisplay.h"
+#include "qwaylanddisplay_p.h"
 QT_BEGIN_NAMESPACE
 
 QWaylandHardwareIntegration::QWaylandHardwareIntegration(struct ::wl_registry *registry, int id)

src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration_p.h

@@ -43,7 +43,7 @@
 #define QWAYLANDHARDWAREINTEGRATION_H
 
 #include <QtWaylandClient/private/qwayland-hardware-integration.h>
-#include <QtWaylandClient/qwaylandclientexport.h>
+#include <QtWaylandClient/private/qwaylandclientexport_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration.cpp

@@ -1,4 +1,4 @@
-#include "qwaylandserverbufferintegration.h"
+#include "qwaylandserverbufferintegration_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration_p.h

@@ -45,7 +45,7 @@
 #include <QtGui/qopengl.h>
 
 #include <QtWaylandClient/private/qwayland-server-buffer-extension.h>
-#include <QtWaylandClient/qwaylandclientexport.h>
+#include <QtWaylandClient/private/qwaylandclientexport_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory.cpp

@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qwaylandserverbufferintegrationfactory.h"
-#include "qwaylandserverbufferintegrationplugin.h"
+#include "qwaylandserverbufferintegrationfactory_p.h"
+#include "qwaylandserverbufferintegrationplugin_p.h"
 
 #include <QtCore/private/qfactoryloader_p.h>
 #include <QtCore/QCoreApplication>

src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h

@@ -42,7 +42,7 @@
 #ifndef QWAYLANDSERVERBUFFERINTEGRATIONFACTORY_H
 #define QWAYLANDSERVERBUFFERINTEGRATIONFACTORY_H
 
-#include <QtWaylandClient/qwaylandclientexport.h>
+#include <QtWaylandClient/private/qwaylandclientexport_p.h>
 #include <QtCore/QStringList>
 
 QT_BEGIN_NAMESPACE

src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationplugin.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qwaylandserverbufferintegrationplugin.h"
+#include "qwaylandserverbufferintegrationplugin_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h

@@ -42,7 +42,7 @@
 #ifndef QWAYLANDSERVERBUFFERINTEGRATIONPLUGIN_H
 #define QWAYLANDSERVERBUFFERINTEGRATIONPLUGIN_H
 
-#include <QtWaylandClient/qwaylandclientexport.h>
+#include <QtWaylandClient/private/qwaylandclientexport_p.h>
 
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>

src/plugins/platforms/wayland/plugins/hardwareintegration/drm-egl-server/main.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtWaylandClient/qwaylandserverbufferintegrationplugin.h>
+#include <QtWaylandClient/private/qwaylandserverbufferintegrationplugin_p.h>
 #include "drmeglserverbufferintegration.h"
 
 QT_BEGIN_NAMESPACE

src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/main.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtWaylandClient/qwaylandclientbufferintegrationplugin.h>
+#include <QtWaylandClient/private/qwaylandclientbufferintegrationplugin_p.h>
 #include "qwaylandeglclientbufferintegration.h"
 
 QT_BEGIN_NAMESPACE

src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-egl/main.cpp

@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtWaylandClient/qwaylandclientbufferintegrationplugin.h>
+#include <QtWaylandClient/private/qwaylandclientbufferintegrationplugin_p.h>
 #include "qwaylandxcompositeeglclientbufferintegration.h"
 
 QT_BEGIN_NAMESPACE

src/plugins/platforms/wayland/qwaylandbuffer_p.h

@@ -42,7 +42,7 @@
 #ifndef QWAYLANDBUFFER_H
 #define QWAYLANDBUFFER_H
 
-#include <QtWaylandClient/qwaylandclientexport.h>
+#include <QtWaylandClient/private/qwaylandclientexport_p.h>
 
 #include <QtCore/QSize>
 #include <QtCore/QRect>

src/plugins/platforms/wayland/qwaylandclipboard.cpp

@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#include "qwaylandclipboard.h"
-#include "qwaylanddisplay.h"
-#include "qwaylandinputdevice.h"
-#include "qwaylanddataoffer.h"
-#include "qwaylanddatasource.h"
-#include "qwaylanddatadevice.h"
+#include "qwaylandclipboard_p.h"
+#include "qwaylanddisplay_p.h"
+#include "qwaylandinputdevice_p.h"
+#include "qwaylanddataoffer_p.h"
+#include "qwaylanddatasource_p.h"
+#include "qwaylanddatadevice_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/plugins/platforms/wayland/qwaylandclipboard_p.h

@@ -45,7 +45,7 @@
 #include <qpa/qplatformclipboard.h>
 #include <QtCore/QVariant>
 
-#include <QtWaylandClient/qwaylandclientexport.h>
+#include <QtWaylandClient/private/qwaylandclientexport_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/plugins/platforms/wayland/qwaylandcursor.cpp

@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#include "qwaylandcursor.h"
+#include "qwaylandcursor_p.h"
 
-#include "qwaylanddisplay.h"
-#include "qwaylandinputdevice.h"
-#include "qwaylandscreen.h"
-#include "qwaylandshmbackingstore.h"
+#include "qwaylanddisplay_p.h"
+#include "qwaylandinputdevice_p.h"
+#include "qwaylandscreen_p.h"
+#include "qwaylandshmbackingstore_p.h"
 
 #include <QtGui/QImageReader>
 #include <QDebug>

src/plugins/platforms/wayland/qwaylandcursor_p.h

@@ -44,7 +44,7 @@
 
 #include <qpa/qplatformcursor.h>
 #include <QtCore/QMap>
-#include <QtWaylandClient/qwaylandclientexport.h>
+#include <QtWaylandClient/private/qwaylandclientexport_p.h>
 
 struct wl_cursor;
 struct wl_cursor_image;

src/plugins/platforms/wayland/qwaylanddatadevice.cpp

@@ -38,13 +38,13 @@
 **
 ****************************************************************************/
 
-#include "qwaylanddatadevice.h"
+#include "qwaylanddatadevice_p.h"
 
-#include "qwaylanddatadevicemanager.h"
-#include "qwaylanddataoffer.h"
-#include "qwaylanddatasource.h"
-#include "qwaylanddnd.h"
-#include "qwaylandinputdevice.h"
+#include "qwaylanddatadevicemanager_p.h"
+#include "qwaylanddataoffer_p.h"
+#include "qwaylanddatasource_p.h"
+#include "qwaylanddnd_p.h"
+#include "qwaylandinputdevice_p.h"
 
 #include <QtCore/QMimeData>
 #include <QtGui/QGuiApplication>

src/plugins/platforms/wayland/qwaylanddatadevice_p.h

@@ -41,7 +41,7 @@
 #ifndef QWAYLANDDATADEVICE_H
 #define QWAYLANDDATADEVICE_H
 
-#include "qwaylanddisplay.h"
+#include "qwaylanddisplay_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/plugins/platforms/wayland/qwaylanddatadevicemanager.cpp

@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include "qwaylanddatadevicemanager.h"
+#include "qwaylanddatadevicemanager_p.h"
 
-#include "qwaylandinputdevice.h"
-#include "qwaylanddatadevice.h"
-#include "qwaylanddataoffer.h"
+#include "qwaylandinputdevice_p.h"
+#include "qwaylanddatadevice_p.h"
+#include "qwaylanddataoffer_p.h"
 
 #include <QtCore/QDebug>
 

src/plugins/platforms/wayland/qwaylanddatadevicemanager_p.h

@@ -42,7 +42,7 @@
 #ifndef QWAYLANDDATADEVICEMANAGER_H
 #define QWAYLANDDATADEVICEMANAGER_H
 
-#include <QtWaylandClient/qwaylanddisplay.h>
+#include <QtWaylandClient/private/qwaylanddisplay_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/plugins/platforms/wayland/qwaylanddataoffer.cpp

@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qwaylanddataoffer.h"
-#include "qwaylanddatadevicemanager.h"
+#include "qwaylanddataoffer_p.h"
+#include "qwaylanddatadevicemanager_p.h"
 
 #include <QtCore/private/qcore_unix_p.h>
 #include <QtGui/private/qguiapplication_p.h>

src/plugins/platforms/wayland/qwaylanddataoffer_p.h

@@ -42,7 +42,7 @@
 #ifndef QWAYLANDDATAOFFER_H
 #define QWAYLANDDATAOFFER_H
 
-#include "qwaylanddisplay.h"
+#include "qwaylanddisplay_p.h"
 
 #include <QtGui/private/qdnd_p.h>
 

src/plugins/platforms/wayland/qwaylanddatasource.cpp

@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "qwaylanddatasource.h"
-#include "qwaylanddataoffer.h"
-#include "qwaylanddatadevicemanager.h"
-#include "qwaylandinputdevice.h"
+#include "qwaylanddatasource_p.h"
+#include "qwaylanddataoffer_p.h"
+#include "qwaylanddatadevicemanager_p.h"
+#include "qwaylandinputdevice_p.h"
 #include "qwaylandmimehelper.h"
 
 #include <QtCore/QFile>

src/plugins/platforms/wayland/qwaylanddatasource_p.h

@@ -42,7 +42,7 @@
 #ifndef QWAYLANDDATASOURCE_H
 #define QWAYLANDDATASOURCE_H
 
-#include <QtWaylandClient/qwaylanddatadevicemanager.h>
+#include <QtWaylandClient/private/qwaylanddatadevicemanager_p.h>
 
 #include <QtWaylandClient/private/wayland-wayland-client-protocol.h>
 

src/plugins/platforms/wayland/qwaylanddecoration.cpp

@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#include "qwaylanddecoration.h"
+#include "qwaylanddecoration_p.h"
 
-#include "qwaylandwindow.h"
-#include "qwaylandshellsurface.h"
-#include "qwaylandinputdevice.h"
-#include "qwaylandscreen.h"
+#include "qwaylandwindow_p.h"
+#include "qwaylandshellsurface_p.h"
+#include "qwaylandinputdevice_p.h"
+#include "qwaylandscreen_p.h"
 
 #include <QtGui/QGuiApplication>
 #include <QtGui/QImage>

src/plugins/platforms/wayland/qwaylanddecoration_p.h

@@ -49,7 +49,7 @@
 #include <QtGui/QColor>
 #include <QtGui/QStaticText>
 #include <QtGui/QImage>
-#include <QtWaylandClient/qwaylandclientexport.h>
+#include <QtWaylandClient/private/qwaylandclientexport_p.h>
 
 #include <wayland-client.h>
 

src/plugins/platforms/wayland/qwaylanddisplay.cpp

@@ -39,26 +39,26 @@
 **
 ****************************************************************************/
 
-#include "qwaylanddisplay.h"
+#include "qwaylanddisplay_p.h"
 
-#include "qwaylandeventthread.h"
-#include "qwaylandintegration.h"
-#include "qwaylandwindow.h"
-#include "qwaylandscreen.h"
-#include "qwaylandcursor.h"
-#include "qwaylandinputdevice.h"
-#include "qwaylandclipboard.h"
-#include "qwaylanddatadevicemanager.h"
-#include "qwaylandhardwareintegration.h"
+#include "qwaylandeventthread_p.h"
+#include "qwaylandintegration_p.h"
+#include "qwaylandwindow_p.h"
+#include "qwaylandscreen_p.h"
+#include "qwaylandcursor_p.h"
+#include "qwaylandinputdevice_p.h"
+#include "qwaylandclipboard_p.h"
+#include "qwaylanddatadevicemanager_p.h"
+#include "qwaylandhardwareintegration_p.h"
 
 
-#include "qwaylandwindowmanagerintegration.h"
+#include "qwaylandwindowmanagerintegration_p.h"
 
-#include "qwaylandextendedoutput.h"
-#include "qwaylandextendedsurface.h"
-#include "qwaylandsubsurface.h"
-#include "qwaylandtouch.h"
-#include "qwaylandqtkey.h"
+#include "qwaylandextendedoutput_p.h"
+#include "qwaylandextendedsurface_p.h"
+#include "qwaylandsubsurface_p.h"
+#include "qwaylandtouch_p.h"
+#include "qwaylandqtkey_p.h"
 
 #include <QtWaylandClient/private/qwayland-text.h>
 

src/plugins/platforms/wayland/qwaylanddisplay_p.h

@@ -50,7 +50,7 @@
 #include <wayland-client.h>
 
 #include <QtWaylandClient/private/qwayland-wayland.h>
-#include <QtWaylandClient/qwaylandclientexport.h>
+#include <QtWaylandClient/private/qwaylandclientexport_p.h>
 
 struct wl_cursor_image;
 

src/plugins/platforms/wayland/qwaylanddnd.cpp

@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#include "qwaylanddnd.h"
+#include "qwaylanddnd_p.h"
 
-#include "qwaylanddatadevice.h"
-#include "qwaylanddatadevicemanager.h"
-#include "qwaylanddataoffer.h"
-#include "qwaylandinputdevice.h"
+#include "qwaylanddatadevice_p.h"
+#include "qwaylanddatadevicemanager_p.h"
+#include "qwaylanddataoffer_p.h"
+#include "qwaylandinputdevice_p.h"
 
 #include <QtGui/private/qshapedpixmapdndwindow_p.h>
 

src/plugins/platforms/wayland/qwaylanddnd_p.h

@@ -47,7 +47,7 @@
 
 #include <QtGui/QDrag>
 #include <QtCore/QMimeData>
-#include <QtWaylandClient/qwaylanddisplay.h>
+#include <QtWaylandClient/private/qwaylanddisplay_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/plugins/platforms/wayland/qwaylandeventthread.cpp

@@ -1,4 +1,4 @@
-#include "qwaylandeventthread.h"
+#include "qwaylandeventthread_p.h"
 #include <QtCore/QSocketNotifier>
 #include <QCoreApplication>
 

src/plugins/platforms/wayland/qwaylandeventthread_p.h

@@ -5,7 +5,7 @@
 #include <QMutex>
 #include <wayland-client.h>
 
-#include <QtWaylandClient/qwaylandclientexport.h>
+#include <QtWaylandClient/private/qwaylandclientexport_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/plugins/platforms/wayland/qwaylandextendedoutput.cpp

@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qwaylandextendedoutput.h"
+#include "qwaylandextendedoutput_p.h"
 
-#include "qwaylandscreen.h"
+#include "qwaylandscreen_p.h"
 
 #include <qpa/qwindowsysteminterface.h>
 

src/plugins/platforms/wayland/qwaylandextendedoutput_p.h

@@ -42,7 +42,7 @@
 #ifndef QWAYLANDEXTENDEDOUTPUT_H
 #define QWAYLANDEXTENDEDOUTPUT_H
 
-#include <QtWaylandClient/qwaylanddisplay.h>
+#include <QtWaylandClient/private/qwaylanddisplay_p.h>
 #include <QtWaylandClient/private/qwayland-output-extension.h>
 
 QT_BEGIN_NAMESPACE

src/plugins/platforms/wayland/qwaylandextendedsurface.cpp

@@ -39,15 +39,15 @@
 **
 ****************************************************************************/
 
-#include "qwaylandextendedsurface.h"
+#include "qwaylandextendedsurface_p.h"
 
-#include "qwaylandwindow.h"
+#include "qwaylandwindow_p.h"
 
 #include "wayland-client.h"
 
-#include "qwaylanddisplay.h"
+#include "qwaylanddisplay_p.h"
 
-#include "qwaylandnativeinterface.h"
+#include "qwaylandnativeinterface_p.h"
 
 #include <QtGui/QGuiApplication>
 #include <qpa/qplatformnativeinterface.h>

src/plugins/platforms/wayland/qwaylandextendedsurface_p.h

@@ -45,7 +45,7 @@
 #include <QtCore/QString>
 #include <QtCore/QVariant>
 
-#include <QtWaylandClient/qwaylandclientexport.h>
+#include <QtWaylandClient/private/qwaylandclientexport_p.h>
 
 #include <wayland-client.h>
 #include <QtWaylandClient/private/qwayland-surface-extension.h>

src/plugins/platforms/wayland/qwaylandinputcontext.cpp

@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include "qwaylandinputcontext.h"
+#include "qwaylandinputcontext_p.h"
 
 #include <QGuiApplication>
 #include <QWindow>
@@ -46,9 +46,9 @@
 #include <xkbcommon/xkbcommon.h>
 #endif
 
-#include "qwaylanddisplay.h"
-#include "qwaylandinputdevice.h"
-#include "qwaylandwindow.h"
+#include "qwaylanddisplay_p.h"
+#include "qwaylandinputdevice_p.h"
+#include "qwaylandwindow_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/plugins/platforms/wayland/qwaylandinputdevice.cpp

@@ -39,16 +39,16 @@
 **
 ****************************************************************************/
 
-#include "qwaylandinputdevice.h"
+#include "qwaylandinputdevice_p.h"
 
-#include "qwaylandintegration.h"
-#include "qwaylandwindow.h"
-#include "qwaylandbuffer.h"
-#include "qwaylanddatadevice.h"
-#include "qwaylanddatadevicemanager.h"
-#include "qwaylandtouch.h"
-#include "qwaylandscreen.h"
-#include "qwaylandcursor.h"
+#include "qwaylandintegration_p.h"
+#include "qwaylandwindow_p.h"
+#include "qwaylandbuffer_p.h"
+#include "qwaylanddatadevice_p.h"
+#include "qwaylanddatadevicemanager_p.h"
+#include "qwaylandtouch_p.h"
+#include "qwaylandscreen_p.h"
+#include "qwaylandcursor_p.h"
 
 #include <QtGui/private/qpixmap_raster_p.h>
 #include <qpa/qplatformwindow.h>

src/plugins/platforms/wayland/qwaylandinputdevice_p.h

@@ -42,7 +42,7 @@
 #ifndef QWAYLANDINPUTDEVICE_H
 #define QWAYLANDINPUTDEVICE_H
 
-#include <QtWaylandClient/qwaylandwindow.h>
+#include <QtWaylandClient/private/qwaylandwindow_p.h>
 
 #include <QSocketNotifier>
 #include <QObject>

src/plugins/platforms/wayland/qwaylandintegration.cpp

@@ -39,16 +39,16 @@
 **
 ****************************************************************************/
 
-#include "qwaylandintegration.h"
+#include "qwaylandintegration_p.h"
 
-#include "qwaylanddisplay.h"
-#include "qwaylandinputcontext.h"
-#include "qwaylandshmbackingstore.h"
-#include "qwaylandshmwindow.h"
-#include "qwaylandnativeinterface.h"
-#include "qwaylandclipboard.h"
-#include "qwaylanddnd.h"
-#include "qwaylandwindowmanagerintegration.h"
+#include "qwaylanddisplay_p.h"
+#include "qwaylandinputcontext_p.h"
+#include "qwaylandshmbackingstore_p.h"
+#include "qwaylandshmwindow_p.h"
+#include "qwaylandnativeinterface_p.h"
+#include "qwaylandclipboard_p.h"
+#include "qwaylanddnd_p.h"
+#include "qwaylandwindowmanagerintegration_p.h"
 
 #include "QtPlatformSupport/private/qgenericunixfontdatabase_p.h"
 #include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
@@ -65,12 +65,12 @@
 #include <qpa/qplatformaccessibility.h>
 #include <qpa/qplatforminputcontext.h>
 
-#include "qwaylandhardwareintegration.h"
-#include "qwaylandclientbufferintegration.h"
-#include "qwaylandclientbufferintegrationfactory.h"
+#include "qwaylandhardwareintegration_p.h"
+#include "qwaylandclientbufferintegration_p.h"
+#include "qwaylandclientbufferintegrationfactory_p.h"
 
-#include "qwaylandserverbufferintegration.h"
-#include "qwaylandserverbufferintegrationfactory.h"
+#include "qwaylandserverbufferintegration_p.h"
+#include "qwaylandserverbufferintegrationfactory_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/plugins/platforms/wayland/qwaylandintegration_p.h

@@ -44,7 +44,7 @@
 
 #include <qpa/qplatformintegration.h>
 
-#include <QtWaylandClient/qwaylandclientexport.h>
+#include <QtWaylandClient/private/qwaylandclientexport_p.h>
 QT_BEGIN_NAMESPACE
 
 class QWaylandBuffer;

src/plugins/platforms/wayland/qwaylandnativeinterface.cpp

@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 
-#include "qwaylandnativeinterface.h"
-#include "qwaylanddisplay.h"
-#include "qwaylandwindow.h"
-#include "qwaylandextendedsurface.h"
-#include "qwaylandintegration.h"
-#include "qwaylanddisplay.h"
-#include "qwaylandwindowmanagerintegration.h"
+#include "qwaylandnativeinterface_p.h"
+#include "qwaylanddisplay_p.h"
+#include "qwaylandwindow_p.h"
+#include "qwaylandextendedsurface_p.h"
+#include "qwaylandintegration_p.h"
+#include "qwaylanddisplay_p.h"
+#include "qwaylandwindowmanagerintegration_p.h"
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtGui/QScreen>
 

src/plugins/platforms/wayland/qwaylandnativeinterface_p.h

@@ -42,7 +42,7 @@
 #ifndef QWAYLANDNATIVEINTERFACE_H
 #define QWAYLANDNATIVEINTERFACE_H
 
-#include <QtWaylandClient/qwaylandscreen.h>
+#include <QtWaylandClient/private/qwaylandscreen_p.h>
 #include <QVariantMap>
 #include <qpa/qplatformnativeinterface.h>
 

src/plugins/platforms/wayland/qwaylandqtkey.cpp

@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qwaylandqtkey.h"
-#include "qwaylandinputdevice.h"
+#include "qwaylandqtkey_p.h"
+#include "qwaylandinputdevice_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/plugins/platforms/wayland/qwaylandqtkey_p.h

@@ -42,7 +42,7 @@
 #ifndef QWAYLANDQTKEY_H
 #define QWAYLANDQTKEY_H
 
-#include <QtWaylandClient/qwaylanddisplay.h>
+#include <QtWaylandClient/private/qwaylanddisplay_p.h>
 #include <qpa/qwindowsysteminterface.h>
 
 #include <QtWaylandClient/private/qwayland-qtkey-extension.h>

src/plugins/platforms/wayland/qwaylandscreen.cpp

@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include "qwaylandscreen.h"
+#include "qwaylandscreen_p.h"
 
-#include "qwaylanddisplay.h"
-#include "qwaylandcursor.h"
-#include "qwaylandextendedoutput.h"
+#include "qwaylanddisplay_p.h"
+#include "qwaylandcursor_p.h"
+#include "qwaylandextendedoutput_p.h"
 
 #include <qpa/qwindowsysteminterface.h>
 

src/plugins/platforms/wayland/qwaylandscreen_p.h

@@ -43,7 +43,7 @@
 #define QWAYLANDSCREEN_H
 
 #include <qpa/qplatformscreen.h>
-#include <QtWaylandClient/qwaylandclientexport.h>
+#include <QtWaylandClient/private/qwaylandclientexport_p.h>
 
 #include <QtWaylandClient/private/qwayland-wayland.h>
 

src/plugins/platforms/wayland/qwaylandshellsurface.cpp

@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 
-#include "qwaylandshellsurface.h"
+#include "qwaylandshellsurface_p.h"
 
-#include "qwaylanddisplay.h"
-#include "qwaylandwindow.h"
-#include "qwaylandinputdevice.h"
-#include "qwaylanddecoration.h"
-#include "qwaylandscreen.h"
+#include "qwaylanddisplay_p.h"
+#include "qwaylandwindow_p.h"
+#include "qwaylandinputdevice_p.h"
+#include "qwaylanddecoration_p.h"
+#include "qwaylandscreen_p.h"
 
 #include <QtCore/QDebug>
 

src/plugins/platforms/wayland/qwaylandshellsurface_p.h

@@ -47,7 +47,7 @@
 #include <wayland-client.h>
 
 #include <QtWaylandClient/private/qwayland-wayland.h>
-#include <QtWaylandClient/qwaylandclientexport.h>
+#include <QtWaylandClient/private/qwaylandclientexport_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp

@@ -38,14 +38,14 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "qwaylandshmbackingstore.h"
+#include "qwaylandshmbackingstore_p.h"
 
 #include <QtCore/qdebug.h>
 
-#include "qwaylanddisplay.h"
-#include "qwaylandshmwindow.h"
-#include "qwaylandscreen.h"
-#include "qwaylanddecoration.h"
+#include "qwaylanddisplay_p.h"
+#include "qwaylandshmwindow_p.h"
+#include "qwaylandscreen_p.h"
+#include "qwaylanddecoration_p.h"
 
 #include <QtGui/QPainter>
 

src/plugins/platforms/wayland/qwaylandshmbackingstore_p.h

@@ -42,10 +42,10 @@
 #ifndef QWAYLANDSHMBACKINGSTORE_H
 #define QWAYLANDSHMBACKINGSTORE_H
 
-#include <QtWaylandClient/qwaylandbuffer.h>
+#include <QtWaylandClient/private/qwaylandbuffer_p.h>
 
-#include <QtWaylandClient/qwaylanddecoration.h>
-#include <QtWaylandClient/qwaylandshmwindow.h>
+#include <QtWaylandClient/private/qwaylanddecoration_p.h>
+#include <QtWaylandClient/private/qwaylandshmwindow_p.h>
 
 #include <qpa/qplatformbackingstore.h>
 #include <QtGui/QImage>

src/plugins/platforms/wayland/qwaylandshmwindow.cpp

@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qwaylandshmwindow.h"
+#include "qwaylandshmwindow_p.h"
 
-#include "qwaylandbuffer.h"
+#include "qwaylandbuffer_p.h"
 
 #include <QtCore/QVector>
 

src/plugins/platforms/wayland/qwaylandshmwindow_p.h

@@ -42,7 +42,7 @@
 #ifndef QWAYLANDSHMWINDOW_H
 #define QWAYLANDSHMWINDOW_H
 
-#include <QtWaylandClient/qwaylandwindow.h>
+#include <QtWaylandClient/private/qwaylandwindow_p.h>
 #include <QtGui/QRegion>
 
 QT_BEGIN_NAMESPACE

src/plugins/platforms/wayland/qwaylandsubsurface.cpp

@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qwaylandsubsurface.h"
+#include "qwaylandsubsurface_p.h"
 
-#include "qwaylandwindow.h"
+#include "qwaylandwindow_p.h"
 
 #include <QtCore/QDebug>
 

src/plugins/platforms/wayland/qwaylandsubsurface_p.h

@@ -46,7 +46,7 @@
 
 #include <QtCore/qglobal.h>
 
-#include <QtWaylandClient/qwaylandclientexport.h>
+#include <QtWaylandClient/private/qwaylandclientexport_p.h>
 
 #include <QtWaylandClient/private/qwayland-sub-surface-extension.h>
 

src/plugins/platforms/wayland/qwaylandtouch.cpp

@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qwaylandtouch.h"
-#include "qwaylandinputdevice.h"
+#include "qwaylandtouch_p.h"
+#include "qwaylandinputdevice_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/plugins/platforms/wayland/qwaylandtouch_p.h

@@ -42,7 +42,7 @@
 #ifndef QWAYLANDTOUCh_H
 #define QWAYLANDTOUCH_H
 
-#include <QtWaylandClient/qwaylanddisplay.h>
+#include <QtWaylandClient/private/qwaylanddisplay_p.h>
 #include <qpa/qwindowsysteminterface.h>
 
 #include <QtWaylandClient/private/qwayland-touch-extension.h>

src/plugins/platforms/wayland/qwaylandwindow.cpp

@@ -39,17 +39,17 @@
 **
 ****************************************************************************/
 
-#include "qwaylandwindow.h"
+#include "qwaylandwindow_p.h"
 
-#include "qwaylandbuffer.h"
-#include "qwaylanddisplay.h"
-#include "qwaylandinputdevice.h"
-#include "qwaylandscreen.h"
-#include "qwaylandshellsurface.h"
-#include "qwaylandextendedsurface.h"
-#include "qwaylandsubsurface.h"
-#include "qwaylanddecoration.h"
-#include "qwaylandwindowmanagerintegration.h"
+#include "qwaylandbuffer_p.h"
+#include "qwaylanddisplay_p.h"
+#include "qwaylandinputdevice_p.h"
+#include "qwaylandscreen_p.h"
+#include "qwaylandshellsurface_p.h"
+#include "qwaylandextendedsurface_p.h"
+#include "qwaylandsubsurface_p.h"
+#include "qwaylanddecoration_p.h"
+#include "qwaylandwindowmanagerintegration_p.h"
 
 #include <QtCore/QFileInfo>
 #include <QtGui/QWindow>

src/plugins/platforms/wayland/qwaylandwindow_p.h

@@ -48,7 +48,7 @@
 
 #include <qpa/qplatformwindow.h>
 
-#include <QtWaylandClient/qwaylanddisplay.h>
+#include <QtWaylandClient/private/qwaylanddisplay_p.h>
 
 #include <QtWaylandClient/private/qwayland-wayland.h>
 

src/plugins/platforms/wayland/qwaylandwindowmanagerintegration.cpp

@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qwaylandwindowmanagerintegration.h"
-#include "qwaylandscreen.h"
-#include "qwaylandwindow.h"
+#include "qwaylandwindowmanagerintegration_p.h"
+#include "qwaylandscreen_p.h"
+#include "qwaylandwindow_p.h"
 
 #include <stdint.h>
 #include <QtCore/QEvent>

src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h

@@ -46,7 +46,7 @@
 #include <QtCore/QScopedPointer>
 
 #include "wayland-client.h"
-#include <QtWaylandClient/qwaylanddisplay.h>
+#include <QtWaylandClient/private/qwaylanddisplay_p.h>
 #include <qpa/qplatformservices.h>
 
 #include <QtWaylandClient/private/qwayland-windowmanager.h>