diff options
Diffstat (limited to 'tests/auto/gui/image/qpicture/tst_qpicture.cpp')
-rw-r--r-- | tests/auto/gui/image/qpicture/tst_qpicture.cpp | 48 |
1 files changed, 12 insertions, 36 deletions
diff --git a/tests/auto/gui/image/qpicture/tst_qpicture.cpp b/tests/auto/gui/image/qpicture/tst_qpicture.cpp index 6287960457..2fa4436154 100644 --- a/tests/auto/gui/image/qpicture/tst_qpicture.cpp +++ b/tests/auto/gui/image/qpicture/tst_qpicture.cpp @@ -1,33 +1,9 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ - - -#include <QtTest/QtTest> +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only + + +#include <QTest> +#include <QBuffer> #include <qpicture.h> #include <qpainter.h> @@ -152,11 +128,11 @@ class PaintEngine : public QPaintEngine { public: PaintEngine() : QPaintEngine() {} - bool begin(QPaintDevice *) { return true; } - bool end() { return true; } - void updateState(const QPaintEngineState &) {} - void drawPixmap(const QRectF &, const QPixmap &, const QRectF &) {} - Type type() const { return Raster; } + bool begin(QPaintDevice *) override { return true; } + bool end() override { return true; } + void updateState(const QPaintEngineState &) override {} + void drawPixmap(const QRectF &, const QPixmap &, const QRectF &) override {} + Type type() const override { return Raster; } QFont font() { return state->font(); } }; @@ -165,7 +141,7 @@ class Picture : public QPicture { public: Picture() : QPicture() {} - QPaintEngine *paintEngine() const { return (QPaintEngine*)&mPaintEngine; } + QPaintEngine *paintEngine() const override { return (QPaintEngine*)&mPaintEngine; } private: PaintEngine mPaintEngine; }; |