diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2016-05-13 09:15:00 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2016-05-19 07:33:26 +0000 |
| commit | 0f4e9514006799244c896c2d1506811b5f23fcb9 (patch) | |
| tree | a58c370698a5f18fabd236af59bf7f3742d287ca /src/compositor | |
| parent | c7832b0a1d4e5e095e56315c43145bb8964f7030 (diff) | |
Rename private headers to _p.h
Change-Id: I0f0d1bd8efabc39325eec7dba4166ae0bccbf6ff
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Diffstat (limited to 'src/compositor')
| -rw-r--r-- | src/compositor/compositor.pro | 10 | ||||
| -rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.cpp | 4 | ||||
| -rw-r--r-- | src/compositor/extensions/qwaylandtextinput.cpp | 4 | ||||
| -rw-r--r-- | src/compositor/wayland_wrapper/qwldatadevicemanager.cpp | 2 | ||||
| -rw-r--r-- | src/compositor/wayland_wrapper/qwlsurfacebuffer.cpp | 2 | ||||
| -rw-r--r-- | src/compositor/wayland_wrapper/wayland_wrapper.pri | 2 |
6 files changed, 15 insertions, 9 deletions
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 <QtCore/QCoreApplication> #include <QtCore/QStringList> 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 <QGuiApplication> #include <QInputMethodEvent> 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 <QtCore/QDebug> #include <QtCore/QSocketNotifier> 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 <QtCore/QDebug> #include <wayland-server-protocol.h> -#include "qwaylandshmformathelper.h" +#include "qwaylandshmformathelper_p.h" #include <QtWaylandCompositor/private/qwaylandcompositor_p.h> 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 \ |