From 7efc23b8fbd3890991108609d3f1190272a03012 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Fri, 13 May 2016 09:15:00 +0200 Subject: [PATCH] Rename private headers to _p.h Change-Id: I0f0d1bd8efabc39325eec7dba4166ae0bccbf6ff Reviewed-by: Johan Helsing Reviewed-by: Giulio Camuffo --- src/plugins/platforms/wayland/client.pro | 7 ++++--- src/plugins/platforms/wayland/qwaylanddatasource.cpp | 2 +- src/plugins/platforms/wayland/qwaylandinputcontext.cpp | 4 ++-- src/plugins/platforms/wayland/qwaylandinputcontext_p.h | 2 +- src/plugins/platforms/wayland/qwaylandinputdevice.cpp | 2 +- src/plugins/platforms/wayland/qwaylandshm.cpp | 2 +- .../wayland/shared/qwaylandinputmethodeventbuilder.cpp | 2 +- ...deventbuilder.h => qwaylandinputmethodeventbuilder_p.h} | 0 .../platforms/wayland/shared/qwaylandmimehelper.cpp | 2 +- .../{qwaylandmimehelper.h => qwaylandmimehelper_p.h} | 0 ...aylandshmformathelper.h => qwaylandshmformathelper_p.h} | 0 src/plugins/platforms/wayland/shared/qwaylandxkb.cpp | 2 +- .../wayland/shared/{qwaylandxkb.h => qwaylandxkb_p.h} | 0 13 files changed, 13 insertions(+), 12 deletions(-) rename src/plugins/platforms/wayland/shared/{qwaylandinputmethodeventbuilder.h => qwaylandinputmethodeventbuilder_p.h} (100%) rename src/plugins/platforms/wayland/shared/{qwaylandmimehelper.h => qwaylandmimehelper_p.h} (100%) rename src/plugins/platforms/wayland/shared/{qwaylandshmformathelper.h => qwaylandshmformathelper_p.h} (100%) rename src/plugins/platforms/wayland/shared/{qwaylandxkb.h => qwaylandxkb_p.h} (100%) diff --git a/src/plugins/platforms/wayland/client.pro b/src/plugins/platforms/wayland/client.pro index 61404eeb98c..500a757f92e 100644 --- a/src/plugins/platforms/wayland/client.pro +++ b/src/plugins/platforms/wayland/client.pro @@ -99,9 +99,6 @@ HEADERS += qwaylandintegration_p.h \ qwaylandsubsurface_p.h \ qwaylandtouch_p.h \ qwaylandqtkey_p.h \ - ../shared/qwaylandmimehelper.h \ - ../shared/qwaylandxkb.h \ - ../shared/qwaylandinputmethodeventbuilder.h \ qwaylandabstractdecoration_p.h \ qwaylanddecorationfactory_p.h \ qwaylanddecorationplugin_p.h \ @@ -109,6 +106,10 @@ HEADERS += qwaylandintegration_p.h \ qwaylandinputcontext_p.h \ qwaylanddatadevice_p.h \ qwaylandshm_p.h \ + ../shared/qwaylandinputmethodeventbuilder_p.h \ + ../shared/qwaylandmimehelper_p.h \ + ../shared/qwaylandxkb_p.h \ + ../shared/qwaylandshmformathelper_p.h include(hardwareintegration/hardwareintegration.pri) include(shellintegration/shellintegration.pri) diff --git a/src/plugins/platforms/wayland/qwaylanddatasource.cpp b/src/plugins/platforms/wayland/qwaylanddatasource.cpp index 32aab082390..40beea317cd 100644 --- a/src/plugins/platforms/wayland/qwaylanddatasource.cpp +++ b/src/plugins/platforms/wayland/qwaylanddatasource.cpp @@ -41,7 +41,7 @@ #include "qwaylanddataoffer_p.h" #include "qwaylanddatadevicemanager_p.h" #include "qwaylandinputdevice_p.h" -#include "qwaylandmimehelper.h" +#include "qwaylandmimehelper_p.h" #include diff --git a/src/plugins/platforms/wayland/qwaylandinputcontext.cpp b/src/plugins/platforms/wayland/qwaylandinputcontext.cpp index af8e6f81838..509965d2f1a 100644 --- a/src/plugins/platforms/wayland/qwaylandinputcontext.cpp +++ b/src/plugins/platforms/wayland/qwaylandinputcontext.cpp @@ -48,9 +48,9 @@ #include "qwaylanddisplay_p.h" #include "qwaylandinputdevice_p.h" -#include "qwaylandinputmethodeventbuilder.h" +#include "qwaylandinputmethodeventbuilder_p.h" #include "qwaylandwindow_p.h" -#include "qwaylandxkb.h" +#include "qwaylandxkb_p.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/wayland/qwaylandinputcontext_p.h b/src/plugins/platforms/wayland/qwaylandinputcontext_p.h index 8b789e3420a..53eab994f5b 100644 --- a/src/plugins/platforms/wayland/qwaylandinputcontext_p.h +++ b/src/plugins/platforms/wayland/qwaylandinputcontext_p.h @@ -60,7 +60,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp index cf1c7ac448e..e85a8d98403 100644 --- a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp +++ b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp @@ -49,7 +49,7 @@ #include "qwaylandcursor_p.h" #include "qwaylanddisplay_p.h" #include "qwaylandshmbackingstore_p.h" -#include "../shared/qwaylandxkb.h" +#include "../shared/qwaylandxkb_p.h" #include "qwaylandinputcontext_p.h" #include diff --git a/src/plugins/platforms/wayland/qwaylandshm.cpp b/src/plugins/platforms/wayland/qwaylandshm.cpp index 137789679b0..790a0e1b99f 100644 --- a/src/plugins/platforms/wayland/qwaylandshm.cpp +++ b/src/plugins/platforms/wayland/qwaylandshm.cpp @@ -39,7 +39,7 @@ #include #include -#include "qwaylandshmformathelper.h" +#include "qwaylandshmformathelper_p.h" QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/wayland/shared/qwaylandinputmethodeventbuilder.cpp b/src/plugins/platforms/wayland/shared/qwaylandinputmethodeventbuilder.cpp index fe93f51463f..0e2d1a406b3 100644 --- a/src/plugins/platforms/wayland/shared/qwaylandinputmethodeventbuilder.cpp +++ b/src/plugins/platforms/wayland/shared/qwaylandinputmethodeventbuilder.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "qwaylandinputmethodeventbuilder.h" +#include "qwaylandinputmethodeventbuilder_p.h" #include #include diff --git a/src/plugins/platforms/wayland/shared/qwaylandinputmethodeventbuilder.h b/src/plugins/platforms/wayland/shared/qwaylandinputmethodeventbuilder_p.h similarity index 100% rename from src/plugins/platforms/wayland/shared/qwaylandinputmethodeventbuilder.h rename to src/plugins/platforms/wayland/shared/qwaylandinputmethodeventbuilder_p.h diff --git a/src/plugins/platforms/wayland/shared/qwaylandmimehelper.cpp b/src/plugins/platforms/wayland/shared/qwaylandmimehelper.cpp index c223efbe5b4..a5fdd34dec4 100644 --- a/src/plugins/platforms/wayland/shared/qwaylandmimehelper.cpp +++ b/src/plugins/platforms/wayland/shared/qwaylandmimehelper.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "qwaylandmimehelper.h" +#include "qwaylandmimehelper_p.h" #include #include #include diff --git a/src/plugins/platforms/wayland/shared/qwaylandmimehelper.h b/src/plugins/platforms/wayland/shared/qwaylandmimehelper_p.h similarity index 100% rename from src/plugins/platforms/wayland/shared/qwaylandmimehelper.h rename to src/plugins/platforms/wayland/shared/qwaylandmimehelper_p.h diff --git a/src/plugins/platforms/wayland/shared/qwaylandshmformathelper.h b/src/plugins/platforms/wayland/shared/qwaylandshmformathelper_p.h similarity index 100% rename from src/plugins/platforms/wayland/shared/qwaylandshmformathelper.h rename to src/plugins/platforms/wayland/shared/qwaylandshmformathelper_p.h diff --git a/src/plugins/platforms/wayland/shared/qwaylandxkb.cpp b/src/plugins/platforms/wayland/shared/qwaylandxkb.cpp index 32d24bd62d1..499257009cf 100644 --- a/src/plugins/platforms/wayland/shared/qwaylandxkb.cpp +++ b/src/plugins/platforms/wayland/shared/qwaylandxkb.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include "qwaylandxkb.h" +#include "qwaylandxkb_p.h" #include #include diff --git a/src/plugins/platforms/wayland/shared/qwaylandxkb.h b/src/plugins/platforms/wayland/shared/qwaylandxkb_p.h similarity index 100% rename from src/plugins/platforms/wayland/shared/qwaylandxkb.h rename to src/plugins/platforms/wayland/shared/qwaylandxkb_p.h