From e4726ae8ac65e3b24914116edf62d14b28e034a3 Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Tue, 5 Feb 2013 12:22:17 +0100 Subject: [PATCH] Qt-ify the QtCompositor module Currently the QtCompositor library and API do not follow the Qt API naming conventions. This commit intends to fix these inconsistencies. filenames start with q headers containing private API's end in _p public API classes begin with Q use the qt namespace macros where necessary Wayland namespace is now QtWayland wayland_wrapper classes are now private API's It's important to make these changes not just for stylistic reasons, but also because when qmake builds the module in checks for these conventions to determine how to deploy the include files. Change-Id: I8bfadeceda92a0f52cb73c704551da75540e7587 Reviewed-by: Paul Olav Tvete --- src/plugins/platforms/wayland/shared/qwaylandmimehelper.cpp | 2 ++ src/plugins/platforms/wayland/shared/qwaylandmimehelper.h | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/plugins/platforms/wayland/shared/qwaylandmimehelper.cpp b/src/plugins/platforms/wayland/shared/qwaylandmimehelper.cpp index ccc48ef2c21..d7e51144026 100644 --- a/src/plugins/platforms/wayland/shared/qwaylandmimehelper.cpp +++ b/src/plugins/platforms/wayland/shared/qwaylandmimehelper.cpp @@ -46,6 +46,8 @@ #include #include +QT_USE_NAMESPACE + QByteArray QWaylandMimeHelper::getByteArray(QMimeData *mimeData, const QString &mimeType) { QByteArray content; diff --git a/src/plugins/platforms/wayland/shared/qwaylandmimehelper.h b/src/plugins/platforms/wayland/shared/qwaylandmimehelper.h index f31685cd6f5..539fc3adc80 100644 --- a/src/plugins/platforms/wayland/shared/qwaylandmimehelper.h +++ b/src/plugins/platforms/wayland/shared/qwaylandmimehelper.h @@ -46,10 +46,14 @@ #include #include +QT_BEGIN_NAMESPACE + class QWaylandMimeHelper { public: static QByteArray getByteArray(QMimeData *mimeData, const QString &mimeType); }; +QT_END_NAMESPACE + #endif