diff options
author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-08-29 15:19:45 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-08-29 15:29:58 +0200 |
commit | e1b83432c1ea27f8028fd63fe9bc328f6e8b63a9 (patch) | |
tree | 888f40166d21beca15476f81c6226ded050dfe99 | |
parent | 3913ba57462b7c370b66771c16b1976a4b439607 (diff) |
qwindow-compositor: Rename QOpenGLWindow
That's a public class in Qt 5.4. Use the more appropriate CompositorWindow.
Change-Id: Id7de20c7e2d5b373f8ef9fe9a836188dc864479e
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
-rw-r--r-- | examples/qwindow-compositor/compositorwindow.cpp (renamed from examples/qwindow-compositor/qopenglwindow.cpp) | 10 | ||||
-rw-r--r-- | examples/qwindow-compositor/compositorwindow.h (renamed from examples/qwindow-compositor/qopenglwindow.h) | 17 | ||||
-rw-r--r-- | examples/qwindow-compositor/main.cpp | 4 | ||||
-rw-r--r-- | examples/qwindow-compositor/qwindow-compositor.pro | 4 | ||||
-rw-r--r-- | examples/qwindow-compositor/qwindowcompositor.cpp | 2 | ||||
-rw-r--r-- | examples/qwindow-compositor/qwindowcompositor.h | 6 |
6 files changed, 22 insertions, 21 deletions
diff --git a/examples/qwindow-compositor/qopenglwindow.cpp b/examples/qwindow-compositor/compositorwindow.cpp index bfd30ddb0..6f8f2321d 100644 --- a/examples/qwindow-compositor/qopenglwindow.cpp +++ b/examples/qwindow-compositor/compositorwindow.cpp @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the Qt Compositor. +** This file is part of the examples of the Qt Wayland module ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: @@ -38,10 +38,10 @@ ** ****************************************************************************/ -#include "qopenglwindow.h" +#include "compositorwindow.h" #include <QTouchEvent> -QOpenGLWindow::QOpenGLWindow(const QSurfaceFormat &format, const QRect &geometry) +CompositorWindow::CompositorWindow(const QSurfaceFormat &format, const QRect &geometry) : m_format(format) { setSurfaceType(QWindow::OpenGLSurface); @@ -53,7 +53,7 @@ QOpenGLWindow::QOpenGLWindow(const QSurfaceFormat &format, const QRect &geometry m_context->create(); } -void QOpenGLWindow::touchEvent(QTouchEvent *event) +void CompositorWindow::touchEvent(QTouchEvent *event) { // Do not want any automatically synthesized mouse events // so make sure the touch is always accepted. diff --git a/examples/qwindow-compositor/qopenglwindow.h b/examples/qwindow-compositor/compositorwindow.h index 486b6f01a..dc87b31a3 100644 --- a/examples/qwindow-compositor/qopenglwindow.h +++ b/examples/qwindow-compositor/compositorwindow.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the Qt Compositor. +** This file is part of the examples of the Qt Wayland module ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: @@ -38,26 +38,27 @@ ** ****************************************************************************/ -#ifndef QOPENGLWINDOW_H -#define QOPENGLWINDOW_H +#ifndef COMPOSITORWINDOW_H +#define COMPOSITORWINDOW_H #include <QWindow> #include <QOpenGLContext> #include <QSurfaceFormat> -class QOpenGLWindow : public QWindow +class CompositorWindow : public QWindow { public: - QOpenGLWindow(const QSurfaceFormat &format, const QRect &geometry); -public: + CompositorWindow(const QSurfaceFormat &format, const QRect &geometry); QOpenGLContext* context() { return m_context; } bool makeCurrent() { return m_context->makeCurrent(this); } void swapBuffers() { m_context->swapBuffers(this); } + protected: void touchEvent(QTouchEvent *event); + private: QOpenGLContext *m_context; QSurfaceFormat m_format; }; -#endif // QOPENGLWINDOW_H +#endif // COMPOSITORWINDOW_H diff --git a/examples/qwindow-compositor/main.cpp b/examples/qwindow-compositor/main.cpp index e82ec6eb0..a0288982e 100644 --- a/examples/qwindow-compositor/main.cpp +++ b/examples/qwindow-compositor/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include "qopenglwindow.h" +#include "compositorwindow.h" #include "qwindowcompositor.h" #include <QGuiApplication> @@ -65,7 +65,7 @@ int main(int argc, char *argv[]) geom = QRect(screenGeometry.width() / 4, screenGeometry.height() / 4, screenGeometry.width() / 2, screenGeometry.height() / 2); - QOpenGLWindow window(format, geom); + CompositorWindow window(format, geom); QWindowCompositor compositor(&window); window.show(); diff --git a/examples/qwindow-compositor/qwindow-compositor.pro b/examples/qwindow-compositor/qwindow-compositor.pro index 465c0d997..7b0e24c43 100644 --- a/examples/qwindow-compositor/qwindow-compositor.pro +++ b/examples/qwindow-compositor/qwindow-compositor.pro @@ -4,12 +4,12 @@ LIBS += -L ../../lib #include (../../src/qt-compositor/qt-compositor.pri) HEADERS += \ - qopenglwindow.h \ + compositorwindow.h \ qwindowcompositor.h \ textureblitter.h SOURCES += main.cpp \ - qopenglwindow.cpp \ + compositorwindow.cpp \ qwindowcompositor.cpp \ textureblitter.cpp diff --git a/examples/qwindow-compositor/qwindowcompositor.cpp b/examples/qwindow-compositor/qwindowcompositor.cpp index 73182ba33..c933152d8 100644 --- a/examples/qwindow-compositor/qwindowcompositor.cpp +++ b/examples/qwindow-compositor/qwindowcompositor.cpp @@ -107,7 +107,7 @@ public: GLuint texture; }; -QWindowCompositor::QWindowCompositor(QOpenGLWindow *window) +QWindowCompositor::QWindowCompositor(CompositorWindow *window) : QWaylandCompositor(window, 0, DefaultExtensions | SubSurfaceExtension) , m_window(window) , m_backgroundTexture(0) diff --git a/examples/qwindow-compositor/qwindowcompositor.h b/examples/qwindow-compositor/qwindowcompositor.h index 8b224e6b8..57f3e8536 100644 --- a/examples/qwindow-compositor/qwindowcompositor.h +++ b/examples/qwindow-compositor/qwindowcompositor.h @@ -44,7 +44,7 @@ #include "qwaylandcompositor.h" #include "qwaylandsurface.h" #include "textureblitter.h" -#include "qopenglwindow.h" +#include "compositorwindow.h" #include <QtGui/private/qopengltexturecache_p.h> #include <QObject> @@ -59,7 +59,7 @@ class QWindowCompositor : public QObject, public QWaylandCompositor { Q_OBJECT public: - QWindowCompositor(QOpenGLWindow *window); + QWindowCompositor(CompositorWindow *window); ~QWindowCompositor(); private slots: @@ -91,7 +91,7 @@ private slots: private: void drawSubSurface(const QPoint &offset, QWaylandSurface *surface); - QOpenGLWindow *m_window; + CompositorWindow *m_window; QImage m_backgroundImage; QOpenGLTexture *m_backgroundTexture; QList<QWaylandSurface *> m_surfaces; |