diff options
Diffstat (limited to 'src/plugins/platforms/offscreen/qoffscreencommon.h')
| -rw-r--r-- | src/plugins/platforms/offscreen/qoffscreencommon.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/plugins/platforms/offscreen/qoffscreencommon.h b/src/plugins/platforms/offscreen/qoffscreencommon.h index 88615d2da4..95b75b6a84 100644 --- a/src/plugins/platforms/offscreen/qoffscreencommon.h +++ b/src/plugins/platforms/offscreen/qoffscreencommon.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the plugins of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -51,12 +51,12 @@ class QOffscreenScreen : public QPlatformScreen public: QOffscreenScreen(); - QRect geometry() const { return m_geometry; } - int depth() const { return 32; } - QImage::Format format() const { return QImage::Format_RGB32; } - QPlatformCursor *cursor() const { return m_cursor.data(); } + QRect geometry() const Q_DECL_OVERRIDE { return m_geometry; } + int depth() const Q_DECL_OVERRIDE { return 32; } + QImage::Format format() const Q_DECL_OVERRIDE { return QImage::Format_RGB32; } + QPlatformCursor *cursor() const Q_DECL_OVERRIDE { return m_cursor.data(); } - QPixmap grabWindow(WId window, int x, int y, int width, int height) const; + QPixmap grabWindow(WId window, int x, int y, int width, int height) const Q_DECL_OVERRIDE; static QPlatformWindow *windowContainingCursor; @@ -69,8 +69,8 @@ public: class QOffscreenDrag : public QPlatformDrag { public: - QMimeData *platformDropData() { return 0; } - Qt::DropAction drag(QDrag *) { return Qt::IgnoreAction; } + QMimeData *platformDropData() Q_DECL_OVERRIDE { return 0; } + Qt::DropAction drag(QDrag *) Q_DECL_OVERRIDE { return Qt::IgnoreAction; } }; #endif @@ -80,10 +80,10 @@ public: QOffscreenBackingStore(QWindow *window); ~QOffscreenBackingStore(); - QPaintDevice *paintDevice(); - void flush(QWindow *window, const QRegion ®ion, const QPoint &offset); - void resize(const QSize &size, const QRegion &staticContents); - bool scroll(const QRegion &area, int dx, int dy); + QPaintDevice *paintDevice() Q_DECL_OVERRIDE; + void flush(QWindow *window, const QRegion ®ion, const QPoint &offset) Q_DECL_OVERRIDE; + void resize(const QSize &size, const QRegion &staticContents) Q_DECL_OVERRIDE; + bool scroll(const QRegion &area, int dx, int dy) Q_DECL_OVERRIDE; QPixmap grabWindow(WId window, const QRect &rect) const; |