diff options
Diffstat (limited to 'tests/auto/qml/animation/qabstractanimationjob/tst_qabstractanimationjob.cpp')
| -rw-r--r-- | tests/auto/qml/animation/qabstractanimationjob/tst_qabstractanimationjob.cpp | 42 |
1 files changed, 8 insertions, 34 deletions
diff --git a/tests/auto/qml/animation/qabstractanimationjob/tst_qabstractanimationjob.cpp b/tests/auto/qml/animation/qabstractanimationjob/tst_qabstractanimationjob.cpp index 7e19e925b6..40eb8a6910 100644 --- a/tests/auto/qml/animation/qabstractanimationjob/tst_qabstractanimationjob.cpp +++ b/tests/auto/qml/animation/qabstractanimationjob/tst_qabstractanimationjob.cpp @@ -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 <QtQml/private/qabstractanimationjob_p.h> @@ -54,10 +29,10 @@ class TestableQAbstractAnimation : public QAbstractAnimationJob { public: TestableQAbstractAnimation() {} - virtual ~TestableQAbstractAnimation() {}; + ~TestableQAbstractAnimation() override {}; - int duration() const { return m_duration; } - virtual void updateCurrentTime(int) {} + int duration() const override { return m_duration; } + void updateCurrentTime(int) override {} void setDuration(int duration) { m_duration = duration; } private: @@ -67,8 +42,8 @@ private: class DummyQAnimationGroup : public QAnimationGroupJob { public: - int duration() const { return 10; } - virtual void updateCurrentTime(int) {} + int duration() const override { return 10; } + void updateCurrentTime(int) override {} }; void tst_QAbstractAnimationJob::construction() @@ -78,8 +53,7 @@ void tst_QAbstractAnimationJob::construction() void tst_QAbstractAnimationJob::destruction() { - TestableQAbstractAnimation *anim = new TestableQAbstractAnimation; - delete anim; + std::unique_ptr<TestableQAbstractAnimation> anim = std::make_unique<TestableQAbstractAnimation>(); } void tst_QAbstractAnimationJob::currentLoop() |