summaryrefslogtreecommitdiffstats
path: root/tests/auto/compositor/testcompositor.h
diff options
context:
space:
mode:
authorAndy Nichols <andy.nichols@digia.com>2013-02-05 12:22:17 +0100
committerAndy Nichols <andy.nichols@digia.com>2013-02-08 12:34:56 +0100
commit1b39d072c2601d39354fe83dff8b1e5c05095aaf (patch)
tree4b38960a1bcef0de376dc5441ec6372e41341801 /tests/auto/compositor/testcompositor.h
parent2e0efd201aa75121f4dd4049598f4d120811d784 (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 'tests/auto/compositor/testcompositor.h')
-rw-r--r--tests/auto/compositor/testcompositor.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/compositor/testcompositor.h b/tests/auto/compositor/testcompositor.h
index 785024cd7..4cb77aabc 100644
--- a/tests/auto/compositor/testcompositor.h
+++ b/tests/auto/compositor/testcompositor.h
@@ -39,15 +39,15 @@
**
****************************************************************************/
-#include "waylandcompositor.h"
-#include "waylandsurface.h"
+#include "qwaylandcompositor.h"
+#include "qwaylandsurface.h"
-class TestCompositor : public WaylandCompositor
+class TestCompositor : public QWaylandCompositor
{
public:
- void surfaceCreated(WaylandSurface *surface);
- void surfaceAboutToBeDestroyed(WaylandSurface *surface);
+ void surfaceCreated(QWaylandSurface *surface);
+ void surfaceAboutToBeDestroyed(QWaylandSurface *surface);
- QList<WaylandSurface *> surfaces;
+ QList<QWaylandSurface *> surfaces;
};