From 0f4e9514006799244c896c2d1506811b5f23fcb9 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Fri, 13 May 2016 09:15:00 +0200 Subject: Rename private headers to _p.h Change-Id: I0f0d1bd8efabc39325eec7dba4166ae0bccbf6ff Reviewed-by: Johan Helsing Reviewed-by: Giulio Camuffo --- src/compositor/compositor.pro | 10 ++++++++-- src/compositor/compositor_api/qwaylandcompositor.cpp | 4 ++-- src/compositor/extensions/qwaylandtextinput.cpp | 4 ++-- src/compositor/wayland_wrapper/qwldatadevicemanager.cpp | 2 +- src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp | 2 +- src/compositor/wayland_wrapper/wayland_wrapper.pri | 2 +- 6 files changed, 15 insertions(+), 9 deletions(-) (limited to 'src/compositor') diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro index e60506417..fe58df7ec 100644 --- a/src/compositor/compositor.pro +++ b/src/compositor/compositor.pro @@ -20,8 +20,14 @@ QMAKE_DOCS = $$PWD/doc/qtwaylandcompositor.qdocconf } INCLUDEPATH += ../shared -HEADERS += ../shared/qwaylandmimehelper.h ../shared/qwaylandinputmethodeventbuilder.h -SOURCES += ../shared/qwaylandmimehelper.cpp ../shared/qwaylandinputmethodeventbuilder.cpp + +HEADERS += ../shared/qwaylandmimehelper_p.h \ + ../shared/qwaylandinputmethodeventbuilder_p.h \ + ../shared/qwaylandshmformathelper_p.h + +SOURCES += ../shared/qwaylandmimehelper.cpp \ + ../shared/qwaylandinputmethodeventbuilder.cpp + RESOURCES += compositor.qrc include ($$PWD/global/global.pri) diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index 696ee772f..41de5b459 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -62,8 +62,8 @@ #include "extensions/qwaylandwindowmanagerextension.h" -#include "qwaylandxkb.h" -#include "qwaylandshmformathelper.h" +#include "qwaylandxkb_p.h" +#include "qwaylandshmformathelper_p.h" #include #include diff --git a/src/compositor/extensions/qwaylandtextinput.cpp b/src/compositor/extensions/qwaylandtextinput.cpp index 3ac960245..8243cfb41 100644 --- a/src/compositor/extensions/qwaylandtextinput.cpp +++ b/src/compositor/extensions/qwaylandtextinput.cpp @@ -42,8 +42,8 @@ #include "qwaylandsurface.h" #include "qwaylandview.h" -#include "qwaylandxkb.h" -#include "qwaylandinputmethodeventbuilder.h" +#include "qwaylandxkb_p.h" +#include "qwaylandinputmethodeventbuilder_p.h" #include #include diff --git a/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp b/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp index 3aa55ce18..2f40b0e43 100644 --- a/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp +++ b/src/compositor/wayland_wrapper/qwldatadevicemanager.cpp @@ -43,7 +43,7 @@ #include "qwldatadevice_p.h" #include "qwldatasource_p.h" #include "qwldataoffer_p.h" -#include "qwaylandmimehelper.h" +#include "qwaylandmimehelper_p.h" #include #include diff --git a/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp b/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp index 14ccde13a..240ce01bc 100644 --- a/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp +++ b/src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp @@ -44,7 +44,7 @@ #include #include -#include "qwaylandshmformathelper.h" +#include "qwaylandshmformathelper_p.h" #include diff --git a/src/compositor/wayland_wrapper/wayland_wrapper.pri b/src/compositor/wayland_wrapper/wayland_wrapper.pri index 91ccbe1f8..f338ddc05 100644 --- a/src/compositor/wayland_wrapper/wayland_wrapper.pri +++ b/src/compositor/wayland_wrapper/wayland_wrapper.pri @@ -9,7 +9,7 @@ HEADERS += \ wayland_wrapper/qwldatasource_p.h \ wayland_wrapper/qwlregion_p.h \ wayland_wrapper/qwlsurfacebuffer_p.h \ - ../shared/qwaylandxkb.h \ + ../shared/qwaylandxkb_p.h \ SOURCES += \ wayland_wrapper/qwldatadevice.cpp \ -- cgit v1.2.3