diff options
| author | Andy Nichols <andy.nichols@digia.com> | 2013-02-05 12:22:17 +0100 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@digia.com> | 2013-02-08 12:34:56 +0100 |
| commit | 1b39d072c2601d39354fe83dff8b1e5c05095aaf (patch) | |
| tree | 4b38960a1bcef0de376dc5441ec6372e41341801 /src/plugins/platforms/qwayland-xcomposite-egl | |
| parent | 2e0efd201aa75121f4dd4049598f4d120811d784 (diff) | |
| download | qtwayland-1b39d072c2601d39354fe83dff8b1e5c05095aaf.tar.gz | |
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 <paul.tvete@digia.com>
Diffstat (limited to 'src/plugins/platforms/qwayland-xcomposite-egl')
6 files changed, 18 insertions, 0 deletions
diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglcontext.cpp b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglcontext.cpp index 5024ba25..42139ef1 100644 --- a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglcontext.cpp +++ b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglcontext.cpp @@ -48,6 +48,8 @@ #include <QtPlatformSupport/private/qeglconvenience_p.h> +QT_USE_NAMESPACE + QWaylandXCompositeEGLContext::QWaylandXCompositeEGLContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display) : QEGLPlatformContext(format, share, display) { diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglcontext.h b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglcontext.h index 906f8a3f..32cdb432 100644 --- a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglcontext.h +++ b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglcontext.h @@ -48,6 +48,8 @@ #include <QtPlatformSupport/private/qeglplatformcontext_p.h> +QT_BEGIN_NAMESPACE + class QWaylandXCompositeEGLWindow; class QWaylandXCompositeEGLContext : public QEGLPlatformContext @@ -61,4 +63,6 @@ private: EGLSurface eglSurfaceForPlatformSurface(QPlatformSurface *surface); }; +QT_END_NAMESPACE + #endif // QWAYLANDXCOMPOSITEEGLCONTEXT_H diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglintegration.cpp b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglintegration.cpp index c4d98a8e..992c2dcf 100644 --- a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglintegration.cpp +++ b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglintegration.cpp @@ -47,6 +47,8 @@ #include "wayland-xcomposite-client-protocol.h" +QT_USE_NAMESPACE + QWaylandGLIntegration * QWaylandGLIntegration::createGLIntegration(QWaylandDisplay *waylandDisplay) { return new QWaylandXCompositeEGLIntegration(waylandDisplay); diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglintegration.h b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglintegration.h index ae0fc30b..d3015ab5 100644 --- a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglintegration.h +++ b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglintegration.h @@ -60,6 +60,8 @@ struct wl_xcomposite; +QT_BEGIN_NAMESPACE + class QWaylandXCompositeEGLIntegration : public QWaylandGLIntegration { public: @@ -99,4 +101,6 @@ private: uint32_t root_window); }; +QT_END_NAMESPACE + #endif // QWAYLANDXCOMPOSITEEGLINTEGRATION_H diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglwindow.cpp b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglwindow.cpp index 0f50f63f..edf77a64 100644 --- a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglwindow.cpp +++ b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglwindow.cpp @@ -53,6 +53,8 @@ #include <QtCore/QDebug> +QT_USE_NAMESPACE + QWaylandXCompositeEGLWindow::QWaylandXCompositeEGLWindow(QWindow *window, QWaylandXCompositeEGLIntegration *glxIntegration) : QWaylandWindow(window) , m_glxIntegration(glxIntegration) diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglwindow.h b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglwindow.h index ac7419a9..895ac28f 100644 --- a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglwindow.h +++ b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglwindow.h @@ -48,6 +48,8 @@ #include "qwaylandxcompositeeglintegration.h" #include "qwaylandxcompositeeglcontext.h" +QT_BEGIN_NAMESPACE + class QWaylandXCompositeEGLWindow : public QWaylandWindow { public: @@ -77,4 +79,6 @@ private: uint32_t time); }; +QT_END_NAMESPACE + #endif // QWAYLANDXCOMPOSITEEGLWINDOW_H |