From 4edf4eec322475f2ae1e639d8561cb27b34e15be Mon Sep 17 00:00:00 2001 From: Jorgen Lind Date: Wed, 18 Dec 2013 07:59:53 +0100 Subject: [PATCH] Make classes in client private Change-Id: Ibf400b32f78a6a0fcf0991914d2d9ad684483979 Reviewed-by: Andy Nichols --- src/plugins/platforms/wayland/client.pro | 52 +++++++++---------- .../hardwareintegration.pri | 16 +++--- .../qwaylandclientbufferintegration.cpp | 2 +- ....h => qwaylandclientbufferintegration_p.h} | 2 +- ...qwaylandclientbufferintegrationfactory.cpp | 6 +-- ...waylandclientbufferintegrationfactory_p.h} | 2 +- .../qwaylandclientbufferintegrationplugin.cpp | 2 +- ...qwaylandclientbufferintegrationplugin_p.h} | 2 +- .../qwaylandhardwareintegration.cpp | 4 +- ...tion.h => qwaylandhardwareintegration_p.h} | 2 +- .../qwaylandserverbufferintegration.cpp | 2 +- ....h => qwaylandserverbufferintegration_p.h} | 2 +- ...qwaylandserverbufferintegrationfactory.cpp | 4 +- ...waylandserverbufferintegrationfactory_p.h} | 2 +- .../qwaylandserverbufferintegrationplugin.cpp | 2 +- ...qwaylandserverbufferintegrationplugin_p.h} | 2 +- .../drm-egl-server/main.cpp | 2 +- .../hardwareintegration/wayland-egl/main.cpp | 2 +- .../xcomposite-egl/main.cpp | 2 +- .../{qwaylandbuffer.h => qwaylandbuffer_p.h} | 2 +- ...lientexport.h => qwaylandclientexport_p.h} | 0 .../platforms/wayland/qwaylandclipboard.cpp | 12 ++--- ...ylandclipboard.h => qwaylandclipboard_p.h} | 2 +- .../platforms/wayland/qwaylandcursor.cpp | 10 ++-- .../{qwaylandcursor.h => qwaylandcursor_p.h} | 2 +- .../platforms/wayland/qwaylanddatadevice.cpp | 12 ++--- ...anddatadevice.h => qwaylanddatadevice_p.h} | 2 +- .../wayland/qwaylanddatadevicemanager.cpp | 8 +-- ...anager.h => qwaylanddatadevicemanager_p.h} | 2 +- .../platforms/wayland/qwaylanddataoffer.cpp | 4 +- ...ylanddataoffer.h => qwaylanddataoffer_p.h} | 2 +- .../platforms/wayland/qwaylanddatasource.cpp | 8 +-- ...anddatasource.h => qwaylanddatasource_p.h} | 2 +- .../platforms/wayland/qwaylanddecoration.cpp | 10 ++-- ...anddecoration.h => qwaylanddecoration_p.h} | 2 +- .../platforms/wayland/qwaylanddisplay.cpp | 32 ++++++------ ...{qwaylanddisplay.h => qwaylanddisplay_p.h} | 2 +- src/plugins/platforms/wayland/qwaylanddnd.cpp | 10 ++-- .../{qwaylanddnd.h => qwaylanddnd_p.h} | 2 +- .../platforms/wayland/qwaylandeventthread.cpp | 2 +- ...deventthread.h => qwaylandeventthread_p.h} | 2 +- .../wayland/qwaylandextendedoutput.cpp | 4 +- ...dedoutput.h => qwaylandextendedoutput_p.h} | 2 +- .../wayland/qwaylandextendedsurface.cpp | 8 +-- ...dsurface.h => qwaylandextendedsurface_p.h} | 2 +- .../wayland/qwaylandinputcontext.cpp | 8 +-- ...nputcontext.h => qwaylandinputcontext_p.h} | 0 .../platforms/wayland/qwaylandinputdevice.cpp | 18 +++---- ...dinputdevice.h => qwaylandinputdevice_p.h} | 2 +- .../platforms/wayland/qwaylandintegration.cpp | 28 +++++----- ...dintegration.h => qwaylandintegration_p.h} | 2 +- .../wayland/qwaylandnativeinterface.cpp | 14 ++--- ...nterface.h => qwaylandnativeinterface_p.h} | 2 +- .../platforms/wayland/qwaylandqtkey.cpp | 4 +- .../{qwaylandqtkey.h => qwaylandqtkey_p.h} | 2 +- .../platforms/wayland/qwaylandscreen.cpp | 8 +-- .../{qwaylandscreen.h => qwaylandscreen_p.h} | 2 +- .../wayland/qwaylandshellsurface.cpp | 12 ++--- ...hellsurface.h => qwaylandshellsurface_p.h} | 2 +- .../wayland/qwaylandshmbackingstore.cpp | 10 ++-- ...ingstore.h => qwaylandshmbackingstore_p.h} | 6 +-- .../platforms/wayland/qwaylandshmwindow.cpp | 4 +- ...ylandshmwindow.h => qwaylandshmwindow_p.h} | 2 +- .../platforms/wayland/qwaylandsubsurface.cpp | 4 +- ...andsubsurface.h => qwaylandsubsurface_p.h} | 2 +- .../platforms/wayland/qwaylandtouch.cpp | 4 +- .../{qwaylandtouch.h => qwaylandtouch_p.h} | 2 +- .../platforms/wayland/qwaylandwindow.cpp | 20 +++---- .../{qwaylandwindow.h => qwaylandwindow_p.h} | 2 +- .../qwaylandwindowmanagerintegration.cpp | 6 +-- ...h => qwaylandwindowmanagerintegration_p.h} | 2 +- 71 files changed, 213 insertions(+), 211 deletions(-) rename src/plugins/platforms/wayland/hardwareintegration/{qwaylandclientbufferintegration.h => qwaylandclientbufferintegration_p.h} (97%) rename src/plugins/platforms/wayland/hardwareintegration/{qwaylandclientbufferintegrationfactory.h => qwaylandclientbufferintegrationfactory_p.h} (97%) rename src/plugins/platforms/wayland/hardwareintegration/{qwaylandclientbufferintegrationplugin.h => qwaylandclientbufferintegrationplugin_p.h} (97%) rename src/plugins/platforms/wayland/hardwareintegration/{qwaylandhardwareintegration.h => qwaylandhardwareintegration_p.h} (97%) rename src/plugins/platforms/wayland/hardwareintegration/{qwaylandserverbufferintegration.h => qwaylandserverbufferintegration_p.h} (98%) rename src/plugins/platforms/wayland/hardwareintegration/{qwaylandserverbufferintegrationfactory.h => qwaylandserverbufferintegrationfactory_p.h} (97%) rename src/plugins/platforms/wayland/hardwareintegration/{qwaylandserverbufferintegrationplugin.h => qwaylandserverbufferintegrationplugin_p.h} (97%) rename src/plugins/platforms/wayland/{qwaylandbuffer.h => qwaylandbuffer_p.h} (97%) rename src/plugins/platforms/wayland/{qwaylandclientexport.h => qwaylandclientexport_p.h} (100%) rename src/plugins/platforms/wayland/{qwaylandclipboard.h => qwaylandclipboard_p.h} (97%) rename src/plugins/platforms/wayland/{qwaylandcursor.h => qwaylandcursor_p.h} (98%) rename src/plugins/platforms/wayland/{qwaylanddatadevice.h => qwaylanddatadevice_p.h} (99%) rename src/plugins/platforms/wayland/{qwaylanddatadevicemanager.h => qwaylanddatadevicemanager_p.h} (97%) rename src/plugins/platforms/wayland/{qwaylanddataoffer.h => qwaylanddataoffer_p.h} (99%) rename src/plugins/platforms/wayland/{qwaylanddatasource.h => qwaylanddatasource_p.h} (97%) rename src/plugins/platforms/wayland/{qwaylanddecoration.h => qwaylanddecoration_p.h} (98%) rename src/plugins/platforms/wayland/{qwaylanddisplay.h => qwaylanddisplay_p.h} (99%) rename src/plugins/platforms/wayland/{qwaylanddnd.h => qwaylanddnd_p.h} (98%) rename src/plugins/platforms/wayland/{qwaylandeventthread.h => qwaylandeventthread_p.h} (92%) rename src/plugins/platforms/wayland/{qwaylandextendedoutput.h => qwaylandextendedoutput_p.h} (97%) rename src/plugins/platforms/wayland/{qwaylandextendedsurface.h => qwaylandextendedsurface_p.h} (98%) rename src/plugins/platforms/wayland/{qwaylandinputcontext.h => qwaylandinputcontext_p.h} (100%) rename src/plugins/platforms/wayland/{qwaylandinputdevice.h => qwaylandinputdevice_p.h} (99%) rename src/plugins/platforms/wayland/{qwaylandintegration.h => qwaylandintegration_p.h} (98%) rename src/plugins/platforms/wayland/{qwaylandnativeinterface.h => qwaylandnativeinterface_p.h} (98%) rename src/plugins/platforms/wayland/{qwaylandqtkey.h => qwaylandqtkey_p.h} (98%) rename src/plugins/platforms/wayland/{qwaylandscreen.h => qwaylandscreen_p.h} (98%) rename src/plugins/platforms/wayland/{qwaylandshellsurface.h => qwaylandshellsurface_p.h} (98%) rename src/plugins/platforms/wayland/{qwaylandshmbackingstore.h => qwaylandshmbackingstore_p.h} (96%) rename src/plugins/platforms/wayland/{qwaylandshmwindow.h => qwaylandshmwindow_p.h} (98%) rename src/plugins/platforms/wayland/{qwaylandsubsurface.h => qwaylandsubsurface_p.h} (97%) rename src/plugins/platforms/wayland/{qwaylandtouch.h => qwaylandtouch_p.h} (98%) rename src/plugins/platforms/wayland/{qwaylandwindow.h => qwaylandwindow_p.h} (99%) rename src/plugins/platforms/wayland/{qwaylandwindowmanagerintegration.h => qwaylandwindowmanagerintegration_p.h} (98%) diff --git a/src/plugins/platforms/wayland/client.pro b/src/plugins/platforms/wayland/client.pro index 152370c0bec..01d704a9463 100644 --- a/src/plugins/platforms/wayland/client.pro +++ b/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) diff --git a/src/plugins/platforms/wayland/hardwareintegration/hardwareintegration.pri b/src/plugins/platforms/wayland/hardwareintegration/hardwareintegration.pri index 1588ca9775b..bb4fe76d6b0 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/hardwareintegration.pri +++ b/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 diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration.cpp b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration.cpp index c04ee177204..2c4d8ff1bf6 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration.cpp +++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qwaylandclientbufferintegration.h" +#include "qwaylandclientbufferintegration_p.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration.h b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h similarity index 97% rename from src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration.h rename to src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h index 608a8cb226c..153b3f591c2 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration.h +++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h @@ -43,7 +43,7 @@ #define QWAYLANDCLIENTBUFFERINTEGRATION_H #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory.cpp b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory.cpp index c87c016f5df..e168f612f97 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory.cpp +++ b/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 #include #include diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory.h b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h similarity index 97% rename from src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory.h rename to src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h index 12b2e8dbbda..4a1c4128694 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory.h +++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationfactory_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDCLIENTBUFFERINTEGRATIONFACTORY_H #define QWAYLANDCLIENTBUFFERINTEGRATIONFACTORY_H -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin.cpp b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin.cpp index 58bb26d192f..afc1051067d 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin.cpp +++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qwaylandclientbufferintegrationplugin.h" +#include "qwaylandclientbufferintegrationplugin_p.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin.h b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h similarity index 97% rename from src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin.h rename to src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h index 6858440613f..476e31a781a 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin.h +++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegrationplugin_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDCLIENTBUFFERINTEGRATIONPLUGIN_H #define QWAYLANDCLIENTBUFFERINTEGRATIONPLUGIN_H -#include +#include #include #include diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration.cpp b/src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration.cpp index 67c951eac62..a7269ce9e54 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration.cpp +++ b/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) diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration.h b/src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration_p.h similarity index 97% rename from src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration.h rename to src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration_p.h index faa57856724..84aa18ace70 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration.h +++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandhardwareintegration_p.h @@ -43,7 +43,7 @@ #define QWAYLANDHARDWAREINTEGRATION_H #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration.cpp b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration.cpp index 9b4174d3191..ee64624ada7 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration.cpp +++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration.cpp @@ -1,4 +1,4 @@ -#include "qwaylandserverbufferintegration.h" +#include "qwaylandserverbufferintegration_p.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration.h b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration_p.h similarity index 98% rename from src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration.h rename to src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration_p.h index fcb92aecde4..7241aec1f91 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration.h +++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration_p.h @@ -45,7 +45,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory.cpp b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory.cpp index e36de7e729b..bd7661c2fee 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory.cpp +++ b/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 #include diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory.h b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h similarity index 97% rename from src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory.h rename to src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h index 5e48e7b51f5..48e5e13d9ba 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory.h +++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationfactory_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDSERVERBUFFERINTEGRATIONFACTORY_H #define QWAYLANDSERVERBUFFERINTEGRATIONFACTORY_H -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationplugin.cpp b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationplugin.cpp index 2bb3eb2164f..8fc31a883d6 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationplugin.cpp +++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationplugin.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qwaylandserverbufferintegrationplugin.h" +#include "qwaylandserverbufferintegrationplugin_p.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationplugin.h b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h similarity index 97% rename from src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationplugin.h rename to src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h index c3605dc7022..39d9a8ba6f4 100644 --- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationplugin.h +++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegrationplugin_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDSERVERBUFFERINTEGRATIONPLUGIN_H #define QWAYLANDSERVERBUFFERINTEGRATIONPLUGIN_H -#include +#include #include #include diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/drm-egl-server/main.cpp b/src/plugins/platforms/wayland/plugins/hardwareintegration/drm-egl-server/main.cpp index 33f48428776..460ccb7a10a 100644 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/drm-egl-server/main.cpp +++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/drm-egl-server/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include #include "drmeglserverbufferintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/main.cpp b/src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/main.cpp index a6b7bbb6917..44ce6019d86 100644 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/main.cpp +++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include #include "qwaylandeglclientbufferintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-egl/main.cpp b/src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-egl/main.cpp index 161657c8fe2..7c6135ccc58 100644 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-egl/main.cpp +++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/xcomposite-egl/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include +#include #include "qwaylandxcompositeeglclientbufferintegration.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/wayland/qwaylandbuffer.h b/src/plugins/platforms/wayland/qwaylandbuffer_p.h similarity index 97% rename from src/plugins/platforms/wayland/qwaylandbuffer.h rename to src/plugins/platforms/wayland/qwaylandbuffer_p.h index 9548eadf873..2bb9990f3dd 100644 --- a/src/plugins/platforms/wayland/qwaylandbuffer.h +++ b/src/plugins/platforms/wayland/qwaylandbuffer_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDBUFFER_H #define QWAYLANDBUFFER_H -#include +#include #include #include diff --git a/src/plugins/platforms/wayland/qwaylandclientexport.h b/src/plugins/platforms/wayland/qwaylandclientexport_p.h similarity index 100% rename from src/plugins/platforms/wayland/qwaylandclientexport.h rename to src/plugins/platforms/wayland/qwaylandclientexport_p.h diff --git a/src/plugins/platforms/wayland/qwaylandclipboard.cpp b/src/plugins/platforms/wayland/qwaylandclipboard.cpp index 838f6d23195..c40f023b55a 100644 --- a/src/plugins/platforms/wayland/qwaylandclipboard.cpp +++ b/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 diff --git a/src/plugins/platforms/wayland/qwaylandclipboard.h b/src/plugins/platforms/wayland/qwaylandclipboard_p.h similarity index 97% rename from src/plugins/platforms/wayland/qwaylandclipboard.h rename to src/plugins/platforms/wayland/qwaylandclipboard_p.h index 692a31255b2..0dea3371ae9 100644 --- a/src/plugins/platforms/wayland/qwaylandclipboard.h +++ b/src/plugins/platforms/wayland/qwaylandclipboard_p.h @@ -45,7 +45,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/wayland/qwaylandcursor.cpp b/src/plugins/platforms/wayland/qwaylandcursor.cpp index 05ab6d496a8..90789b0dfc7 100644 --- a/src/plugins/platforms/wayland/qwaylandcursor.cpp +++ b/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 #include diff --git a/src/plugins/platforms/wayland/qwaylandcursor.h b/src/plugins/platforms/wayland/qwaylandcursor_p.h similarity index 98% rename from src/plugins/platforms/wayland/qwaylandcursor.h rename to src/plugins/platforms/wayland/qwaylandcursor_p.h index 894d322a616..282ac685f5c 100644 --- a/src/plugins/platforms/wayland/qwaylandcursor.h +++ b/src/plugins/platforms/wayland/qwaylandcursor_p.h @@ -44,7 +44,7 @@ #include #include -#include +#include struct wl_cursor; struct wl_cursor_image; diff --git a/src/plugins/platforms/wayland/qwaylanddatadevice.cpp b/src/plugins/platforms/wayland/qwaylanddatadevice.cpp index faa04c3db7a..2d6a6f4b6cf 100644 --- a/src/plugins/platforms/wayland/qwaylanddatadevice.cpp +++ b/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 #include diff --git a/src/plugins/platforms/wayland/qwaylanddatadevice.h b/src/plugins/platforms/wayland/qwaylanddatadevice_p.h similarity index 99% rename from src/plugins/platforms/wayland/qwaylanddatadevice.h rename to src/plugins/platforms/wayland/qwaylanddatadevice_p.h index e258d87766e..4e98424e501 100644 --- a/src/plugins/platforms/wayland/qwaylanddatadevice.h +++ b/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 diff --git a/src/plugins/platforms/wayland/qwaylanddatadevicemanager.cpp b/src/plugins/platforms/wayland/qwaylanddatadevicemanager.cpp index 4a96dbce3da..5de28c00158 100644 --- a/src/plugins/platforms/wayland/qwaylanddatadevicemanager.cpp +++ b/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 diff --git a/src/plugins/platforms/wayland/qwaylanddatadevicemanager.h b/src/plugins/platforms/wayland/qwaylanddatadevicemanager_p.h similarity index 97% rename from src/plugins/platforms/wayland/qwaylanddatadevicemanager.h rename to src/plugins/platforms/wayland/qwaylanddatadevicemanager_p.h index c51e12e7823..6e2beafbe3e 100644 --- a/src/plugins/platforms/wayland/qwaylanddatadevicemanager.h +++ b/src/plugins/platforms/wayland/qwaylanddatadevicemanager_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDDATADEVICEMANAGER_H #define QWAYLANDDATADEVICEMANAGER_H -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/wayland/qwaylanddataoffer.cpp b/src/plugins/platforms/wayland/qwaylanddataoffer.cpp index e237d0b9a98..adaeb521465 100644 --- a/src/plugins/platforms/wayland/qwaylanddataoffer.cpp +++ b/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 #include diff --git a/src/plugins/platforms/wayland/qwaylanddataoffer.h b/src/plugins/platforms/wayland/qwaylanddataoffer_p.h similarity index 99% rename from src/plugins/platforms/wayland/qwaylanddataoffer.h rename to src/plugins/platforms/wayland/qwaylanddataoffer_p.h index 7dc3baa38af..ab34e177f1a 100644 --- a/src/plugins/platforms/wayland/qwaylanddataoffer.h +++ b/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 diff --git a/src/plugins/platforms/wayland/qwaylanddatasource.cpp b/src/plugins/platforms/wayland/qwaylanddatasource.cpp index ba4b68110ed..3376db56748 100644 --- a/src/plugins/platforms/wayland/qwaylanddatasource.cpp +++ b/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 diff --git a/src/plugins/platforms/wayland/qwaylanddatasource.h b/src/plugins/platforms/wayland/qwaylanddatasource_p.h similarity index 97% rename from src/plugins/platforms/wayland/qwaylanddatasource.h rename to src/plugins/platforms/wayland/qwaylanddatasource_p.h index 63a2150f802..9568f507c47 100644 --- a/src/plugins/platforms/wayland/qwaylanddatasource.h +++ b/src/plugins/platforms/wayland/qwaylanddatasource_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDDATASOURCE_H #define QWAYLANDDATASOURCE_H -#include +#include #include diff --git a/src/plugins/platforms/wayland/qwaylanddecoration.cpp b/src/plugins/platforms/wayland/qwaylanddecoration.cpp index 74c01f93a83..8e7d03143a1 100644 --- a/src/plugins/platforms/wayland/qwaylanddecoration.cpp +++ b/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 #include diff --git a/src/plugins/platforms/wayland/qwaylanddecoration.h b/src/plugins/platforms/wayland/qwaylanddecoration_p.h similarity index 98% rename from src/plugins/platforms/wayland/qwaylanddecoration.h rename to src/plugins/platforms/wayland/qwaylanddecoration_p.h index f99723588f0..3f53721f75d 100644 --- a/src/plugins/platforms/wayland/qwaylanddecoration.h +++ b/src/plugins/platforms/wayland/qwaylanddecoration_p.h @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.cpp b/src/plugins/platforms/wayland/qwaylanddisplay.cpp index 922c4bcb809..ec439b5d2cf 100644 --- a/src/plugins/platforms/wayland/qwaylanddisplay.cpp +++ b/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 diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.h b/src/plugins/platforms/wayland/qwaylanddisplay_p.h similarity index 99% rename from src/plugins/platforms/wayland/qwaylanddisplay.h rename to src/plugins/platforms/wayland/qwaylanddisplay_p.h index 4f9dacf42ba..5ba4f51beab 100644 --- a/src/plugins/platforms/wayland/qwaylanddisplay.h +++ b/src/plugins/platforms/wayland/qwaylanddisplay_p.h @@ -50,7 +50,7 @@ #include #include -#include +#include struct wl_cursor_image; diff --git a/src/plugins/platforms/wayland/qwaylanddnd.cpp b/src/plugins/platforms/wayland/qwaylanddnd.cpp index 635fd9678c6..0d5eddf5bbf 100644 --- a/src/plugins/platforms/wayland/qwaylanddnd.cpp +++ b/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 diff --git a/src/plugins/platforms/wayland/qwaylanddnd.h b/src/plugins/platforms/wayland/qwaylanddnd_p.h similarity index 98% rename from src/plugins/platforms/wayland/qwaylanddnd.h rename to src/plugins/platforms/wayland/qwaylanddnd_p.h index 8879a1d4ea9..22b004712b8 100644 --- a/src/plugins/platforms/wayland/qwaylanddnd.h +++ b/src/plugins/platforms/wayland/qwaylanddnd_p.h @@ -47,7 +47,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/wayland/qwaylandeventthread.cpp b/src/plugins/platforms/wayland/qwaylandeventthread.cpp index 3392d36c667..b94110c25ef 100644 --- a/src/plugins/platforms/wayland/qwaylandeventthread.cpp +++ b/src/plugins/platforms/wayland/qwaylandeventthread.cpp @@ -1,4 +1,4 @@ -#include "qwaylandeventthread.h" +#include "qwaylandeventthread_p.h" #include #include diff --git a/src/plugins/platforms/wayland/qwaylandeventthread.h b/src/plugins/platforms/wayland/qwaylandeventthread_p.h similarity index 92% rename from src/plugins/platforms/wayland/qwaylandeventthread.h rename to src/plugins/platforms/wayland/qwaylandeventthread_p.h index ba7e33e0998..4174c96cfab 100644 --- a/src/plugins/platforms/wayland/qwaylandeventthread.h +++ b/src/plugins/platforms/wayland/qwaylandeventthread_p.h @@ -5,7 +5,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/wayland/qwaylandextendedoutput.cpp b/src/plugins/platforms/wayland/qwaylandextendedoutput.cpp index d7c684be958..c79685af43b 100644 --- a/src/plugins/platforms/wayland/qwaylandextendedoutput.cpp +++ b/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 diff --git a/src/plugins/platforms/wayland/qwaylandextendedoutput.h b/src/plugins/platforms/wayland/qwaylandextendedoutput_p.h similarity index 97% rename from src/plugins/platforms/wayland/qwaylandextendedoutput.h rename to src/plugins/platforms/wayland/qwaylandextendedoutput_p.h index d1ef3397f85..f18fb8e57bf 100644 --- a/src/plugins/platforms/wayland/qwaylandextendedoutput.h +++ b/src/plugins/platforms/wayland/qwaylandextendedoutput_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDEXTENDEDOUTPUT_H #define QWAYLANDEXTENDEDOUTPUT_H -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/wayland/qwaylandextendedsurface.cpp b/src/plugins/platforms/wayland/qwaylandextendedsurface.cpp index bfd2a1d0b8d..9d5a497087c 100644 --- a/src/plugins/platforms/wayland/qwaylandextendedsurface.cpp +++ b/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 #include diff --git a/src/plugins/platforms/wayland/qwaylandextendedsurface.h b/src/plugins/platforms/wayland/qwaylandextendedsurface_p.h similarity index 98% rename from src/plugins/platforms/wayland/qwaylandextendedsurface.h rename to src/plugins/platforms/wayland/qwaylandextendedsurface_p.h index 8c0546473a8..00b961d3816 100644 --- a/src/plugins/platforms/wayland/qwaylandextendedsurface.h +++ b/src/plugins/platforms/wayland/qwaylandextendedsurface_p.h @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include diff --git a/src/plugins/platforms/wayland/qwaylandinputcontext.cpp b/src/plugins/platforms/wayland/qwaylandinputcontext.cpp index e9fb87179cd..8a711955e49 100644 --- a/src/plugins/platforms/wayland/qwaylandinputcontext.cpp +++ b/src/plugins/platforms/wayland/qwaylandinputcontext.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include "qwaylandinputcontext.h" +#include "qwaylandinputcontext_p.h" #include #include @@ -46,9 +46,9 @@ #include #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 diff --git a/src/plugins/platforms/wayland/qwaylandinputcontext.h b/src/plugins/platforms/wayland/qwaylandinputcontext_p.h similarity index 100% rename from src/plugins/platforms/wayland/qwaylandinputcontext.h rename to src/plugins/platforms/wayland/qwaylandinputcontext_p.h diff --git a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp index b9338b4c371..81bb0703ae8 100644 --- a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp +++ b/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 #include diff --git a/src/plugins/platforms/wayland/qwaylandinputdevice.h b/src/plugins/platforms/wayland/qwaylandinputdevice_p.h similarity index 99% rename from src/plugins/platforms/wayland/qwaylandinputdevice.h rename to src/plugins/platforms/wayland/qwaylandinputdevice_p.h index 641c8b84026..9e955f5d2b1 100644 --- a/src/plugins/platforms/wayland/qwaylandinputdevice.h +++ b/src/plugins/platforms/wayland/qwaylandinputdevice_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDINPUTDEVICE_H #define QWAYLANDINPUTDEVICE_H -#include +#include #include #include diff --git a/src/plugins/platforms/wayland/qwaylandintegration.cpp b/src/plugins/platforms/wayland/qwaylandintegration.cpp index 9acda2107f1..2e36a16da79 100644 --- a/src/plugins/platforms/wayland/qwaylandintegration.cpp +++ b/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 @@ -65,12 +65,12 @@ #include #include -#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 diff --git a/src/plugins/platforms/wayland/qwaylandintegration.h b/src/plugins/platforms/wayland/qwaylandintegration_p.h similarity index 98% rename from src/plugins/platforms/wayland/qwaylandintegration.h rename to src/plugins/platforms/wayland/qwaylandintegration_p.h index bc51c23bb50..7c062c0eedf 100644 --- a/src/plugins/platforms/wayland/qwaylandintegration.h +++ b/src/plugins/platforms/wayland/qwaylandintegration_p.h @@ -44,7 +44,7 @@ #include -#include +#include QT_BEGIN_NAMESPACE class QWaylandBuffer; diff --git a/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp b/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp index 291f1711fb4..f8d95bb2550 100644 --- a/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp +++ b/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 #include diff --git a/src/plugins/platforms/wayland/qwaylandnativeinterface.h b/src/plugins/platforms/wayland/qwaylandnativeinterface_p.h similarity index 98% rename from src/plugins/platforms/wayland/qwaylandnativeinterface.h rename to src/plugins/platforms/wayland/qwaylandnativeinterface_p.h index bc080769397..b9ee2d0e87b 100644 --- a/src/plugins/platforms/wayland/qwaylandnativeinterface.h +++ b/src/plugins/platforms/wayland/qwaylandnativeinterface_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDNATIVEINTERFACE_H #define QWAYLANDNATIVEINTERFACE_H -#include +#include #include #include diff --git a/src/plugins/platforms/wayland/qwaylandqtkey.cpp b/src/plugins/platforms/wayland/qwaylandqtkey.cpp index 6cc4597d9ee..a6b99cb42cb 100644 --- a/src/plugins/platforms/wayland/qwaylandqtkey.cpp +++ b/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 diff --git a/src/plugins/platforms/wayland/qwaylandqtkey.h b/src/plugins/platforms/wayland/qwaylandqtkey_p.h similarity index 98% rename from src/plugins/platforms/wayland/qwaylandqtkey.h rename to src/plugins/platforms/wayland/qwaylandqtkey_p.h index 49563b78e01..a9c4e99fa75 100644 --- a/src/plugins/platforms/wayland/qwaylandqtkey.h +++ b/src/plugins/platforms/wayland/qwaylandqtkey_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDQTKEY_H #define QWAYLANDQTKEY_H -#include +#include #include #include diff --git a/src/plugins/platforms/wayland/qwaylandscreen.cpp b/src/plugins/platforms/wayland/qwaylandscreen.cpp index cda94a7e162..416b320aa6a 100644 --- a/src/plugins/platforms/wayland/qwaylandscreen.cpp +++ b/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 diff --git a/src/plugins/platforms/wayland/qwaylandscreen.h b/src/plugins/platforms/wayland/qwaylandscreen_p.h similarity index 98% rename from src/plugins/platforms/wayland/qwaylandscreen.h rename to src/plugins/platforms/wayland/qwaylandscreen_p.h index 15ae5189a02..42408acf468 100644 --- a/src/plugins/platforms/wayland/qwaylandscreen.h +++ b/src/plugins/platforms/wayland/qwaylandscreen_p.h @@ -43,7 +43,7 @@ #define QWAYLANDSCREEN_H #include -#include +#include #include diff --git a/src/plugins/platforms/wayland/qwaylandshellsurface.cpp b/src/plugins/platforms/wayland/qwaylandshellsurface.cpp index 4c8ff1bc411..b7a819fd303 100644 --- a/src/plugins/platforms/wayland/qwaylandshellsurface.cpp +++ b/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 diff --git a/src/plugins/platforms/wayland/qwaylandshellsurface.h b/src/plugins/platforms/wayland/qwaylandshellsurface_p.h similarity index 98% rename from src/plugins/platforms/wayland/qwaylandshellsurface.h rename to src/plugins/platforms/wayland/qwaylandshellsurface_p.h index 25f70333434..2477c3f0889 100644 --- a/src/plugins/platforms/wayland/qwaylandshellsurface.h +++ b/src/plugins/platforms/wayland/qwaylandshellsurface_p.h @@ -47,7 +47,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp b/src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp index 00a4b13a239..41f7da20093 100644 --- a/src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp +++ b/src/plugins/platforms/wayland/qwaylandshmbackingstore.cpp @@ -38,14 +38,14 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "qwaylandshmbackingstore.h" +#include "qwaylandshmbackingstore_p.h" #include -#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 diff --git a/src/plugins/platforms/wayland/qwaylandshmbackingstore.h b/src/plugins/platforms/wayland/qwaylandshmbackingstore_p.h similarity index 96% rename from src/plugins/platforms/wayland/qwaylandshmbackingstore.h rename to src/plugins/platforms/wayland/qwaylandshmbackingstore_p.h index b5ee3a38cb3..1affafabc2e 100644 --- a/src/plugins/platforms/wayland/qwaylandshmbackingstore.h +++ b/src/plugins/platforms/wayland/qwaylandshmbackingstore_p.h @@ -42,10 +42,10 @@ #ifndef QWAYLANDSHMBACKINGSTORE_H #define QWAYLANDSHMBACKINGSTORE_H -#include +#include -#include -#include +#include +#include #include #include diff --git a/src/plugins/platforms/wayland/qwaylandshmwindow.cpp b/src/plugins/platforms/wayland/qwaylandshmwindow.cpp index 48a1bfd533e..de87682ce70 100644 --- a/src/plugins/platforms/wayland/qwaylandshmwindow.cpp +++ b/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 diff --git a/src/plugins/platforms/wayland/qwaylandshmwindow.h b/src/plugins/platforms/wayland/qwaylandshmwindow_p.h similarity index 98% rename from src/plugins/platforms/wayland/qwaylandshmwindow.h rename to src/plugins/platforms/wayland/qwaylandshmwindow_p.h index f915c545f0e..83479f31303 100644 --- a/src/plugins/platforms/wayland/qwaylandshmwindow.h +++ b/src/plugins/platforms/wayland/qwaylandshmwindow_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDSHMWINDOW_H #define QWAYLANDSHMWINDOW_H -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/wayland/qwaylandsubsurface.cpp b/src/plugins/platforms/wayland/qwaylandsubsurface.cpp index 0e9d575a9d5..6db59fa206c 100644 --- a/src/plugins/platforms/wayland/qwaylandsubsurface.cpp +++ b/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 diff --git a/src/plugins/platforms/wayland/qwaylandsubsurface.h b/src/plugins/platforms/wayland/qwaylandsubsurface_p.h similarity index 97% rename from src/plugins/platforms/wayland/qwaylandsubsurface.h rename to src/plugins/platforms/wayland/qwaylandsubsurface_p.h index 97158b6aa37..bd0da96d214 100644 --- a/src/plugins/platforms/wayland/qwaylandsubsurface.h +++ b/src/plugins/platforms/wayland/qwaylandsubsurface_p.h @@ -46,7 +46,7 @@ #include -#include +#include #include diff --git a/src/plugins/platforms/wayland/qwaylandtouch.cpp b/src/plugins/platforms/wayland/qwaylandtouch.cpp index 5835d9d3cdc..db6d4b92d15 100644 --- a/src/plugins/platforms/wayland/qwaylandtouch.cpp +++ b/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 diff --git a/src/plugins/platforms/wayland/qwaylandtouch.h b/src/plugins/platforms/wayland/qwaylandtouch_p.h similarity index 98% rename from src/plugins/platforms/wayland/qwaylandtouch.h rename to src/plugins/platforms/wayland/qwaylandtouch_p.h index e6f57ab575c..c00c7c0d362 100644 --- a/src/plugins/platforms/wayland/qwaylandtouch.h +++ b/src/plugins/platforms/wayland/qwaylandtouch_p.h @@ -42,7 +42,7 @@ #ifndef QWAYLANDTOUCh_H #define QWAYLANDTOUCH_H -#include +#include #include #include diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp index b64d3e6abeb..810239a7b7a 100644 --- a/src/plugins/platforms/wayland/qwaylandwindow.cpp +++ b/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 #include diff --git a/src/plugins/platforms/wayland/qwaylandwindow.h b/src/plugins/platforms/wayland/qwaylandwindow_p.h similarity index 99% rename from src/plugins/platforms/wayland/qwaylandwindow.h rename to src/plugins/platforms/wayland/qwaylandwindow_p.h index 1f7344dc267..6078dab7f6e 100644 --- a/src/plugins/platforms/wayland/qwaylandwindow.h +++ b/src/plugins/platforms/wayland/qwaylandwindow_p.h @@ -48,7 +48,7 @@ #include -#include +#include #include diff --git a/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration.cpp b/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration.cpp index d396f14526b..9e8ce88c642 100644 --- a/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration.cpp +++ b/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 #include diff --git a/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration.h b/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h similarity index 98% rename from src/plugins/platforms/wayland/qwaylandwindowmanagerintegration.h rename to src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h index 2164f4c8da4..8c8f3c32a0f 100644 --- a/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration.h +++ b/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h @@ -46,7 +46,7 @@ #include #include "wayland-client.h" -#include +#include #include #include