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-glx | |
| parent | 2e0efd201aa75121f4dd4049598f4d120811d784 (diff) | |
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-glx')
6 files changed, 18 insertions, 0 deletions
diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxcontext.cpp b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxcontext.cpp index 4ba499255..286436909 100644 --- a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxcontext.cpp +++ b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxcontext.cpp @@ -47,6 +47,8 @@ #include <QRegion> +QT_USE_NAMESPACE + QWaylandXCompositeGLXContext::QWaylandXCompositeGLXContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, Display *display, int screen) : m_display(display) { diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxcontext.h b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxcontext.h index 55b6c2aff..de0311262 100644 --- a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxcontext.h +++ b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxcontext.h @@ -47,6 +47,8 @@ #include "qwaylandxcompositeglxintegration.h" #include <QtPlatformSupport/private/qglxconvenience_p.h> +QT_BEGIN_NAMESPACE + class QWaylandXCompositeGLXWindow; class QWaylandShmBuffer; @@ -71,4 +73,6 @@ private: QSurfaceFormat m_format; }; +QT_END_NAMESPACE + #endif // QWAYLANDXCOMPOSITEGLXCONTEXT_H diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxintegration.cpp b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxintegration.cpp index d82c6456c..56554236b 100644 --- a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxintegration.cpp +++ b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxintegration.cpp @@ -47,6 +47,8 @@ #include "wayland-xcomposite-client-protocol.h" +QT_USE_NAMESPACE + QWaylandGLIntegration * QWaylandGLIntegration::createGLIntegration(QWaylandDisplay *waylandDisplay) { return new QWaylandXCompositeGLXIntegration(waylandDisplay); diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxintegration.h b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxintegration.h index 3417967c2..8bbbab89b 100644 --- a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxintegration.h +++ b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxintegration.h @@ -55,6 +55,8 @@ struct wl_xcomposite; +QT_BEGIN_NAMESPACE + class QWaylandXCompositeGLXIntegration : public QWaylandGLIntegration { public: @@ -92,4 +94,6 @@ private: uint32_t root_window); }; +QT_END_NAMESPACE + #endif // QWAYLANDXCOMPOSITEGLXINTEGRATION_H diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxwindow.cpp b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxwindow.cpp index ad1916b3b..1ffb5b87c 100644 --- a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxwindow.cpp +++ b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxwindow.cpp @@ -49,6 +49,8 @@ #include <X11/extensions/Xcomposite.h> +QT_USE_NAMESPACE + QWaylandXCompositeGLXWindow::QWaylandXCompositeGLXWindow(QWindow *window, QWaylandXCompositeGLXIntegration *glxIntegration) : QWaylandWindow(window) , m_glxIntegration(glxIntegration) diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxwindow.h b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxwindow.h index 6c19ee498..fa16c36d5 100644 --- a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxwindow.h +++ b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxwindow.h @@ -50,6 +50,8 @@ #include "qwaylandbuffer.h" +QT_BEGIN_NAMESPACE + class QWaylandXCompositeGLXWindow : public QWaylandWindow { public: @@ -77,4 +79,6 @@ private: static void sync_function(void *data, struct wl_callback *wl_callback, uint32_t time); }; +QT_END_NAMESPACE + #endif // QWAYLANDXCOMPOSITEGLXWINDOW_H |