diff options
Diffstat (limited to 'tests/auto/gui/text/qtextdocument/common.h')
-rw-r--r-- | tests/auto/gui/text/qtextdocument/common.h | 43 |
1 files changed, 9 insertions, 34 deletions
diff --git a/tests/auto/gui/text/qtextdocument/common.h b/tests/auto/gui/text/qtextdocument/common.h index 0681f7f0e2..3c05913008 100644 --- a/tests/auto/gui/text/qtextdocument/common.h +++ b/tests/auto/gui/text/qtextdocument/common.h @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QAbstractTextDocumentLayout> #include <private/qtextdocument_p.h> @@ -36,10 +11,10 @@ class QTestDocumentLayout : public QAbstractTextDocumentLayout Q_OBJECT public: QTestDocumentLayout(QTextDocument *doc) : QAbstractTextDocumentLayout(doc), f(-1), called(false) {} - virtual void draw(QPainter *, const PaintContext &) {} - virtual int hitTest(const QPointF &, Qt::HitTestAccuracy ) const { return 0; } + virtual void draw(QPainter *, const PaintContext &) override {} + virtual int hitTest(const QPointF &, Qt::HitTestAccuracy ) const override { return 0; } - virtual void documentChanged(int from, int oldLength, int length) + virtual void documentChanged(int from, int oldLength, int length) override { called = true; lastDocumentLengths.append(QTextDocumentPrivate::get(document())->length()); @@ -55,11 +30,11 @@ public: } } - virtual int pageCount() const { return 1; } - virtual QSizeF documentSize() const { return QSizeF(); } + virtual int pageCount() const override { return 1; } + virtual QSizeF documentSize() const override { return QSizeF(); } - virtual QRectF frameBoundingRect(QTextFrame *) const { return QRectF(); } - virtual QRectF blockBoundingRect(const QTextBlock &) const { return QRectF(); } + virtual QRectF frameBoundingRect(QTextFrame *) const override { return QRectF(); } + virtual QRectF blockBoundingRect(const QTextBlock &) const override { return QRectF(); } int f; int o; |