diff options
Diffstat (limited to 'tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp')
| -rw-r--r-- | tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp | 50 |
1 files changed, 7 insertions, 43 deletions
diff --git a/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp b/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp index b32a2b4d73..45e241ef5c 100644 --- a/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp +++ b/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 Intel Corporation. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2018 Intel Corporation. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QTest> #include <QCborStreamWriter> @@ -65,7 +29,7 @@ private Q_SLOTS: // Get the data from TinyCBOR (see src/3rdparty/tinycbor/tests/encoder/data.cpp) typedef quint64 CborTag; -#include "data.cpp" +#include "encoder/data.cpp" void encodeVariant(QCborStreamWriter &writer, const QVariant &v) { @@ -117,9 +81,9 @@ void encodeVariant(QCborStreamWriter &writer, const QVariant &v) list = v.value<IndeterminateLengthArray>(); writer.startArray(); } else { - writer.startArray(list.length()); + writer.startArray(list.size()); } - for (const QVariant &v2 : qAsConst(list)) + for (const QVariant &v2 : std::as_const(list)) encodeVariant(writer, v2); QVERIFY(writer.endArray()); return; @@ -130,9 +94,9 @@ void encodeVariant(QCborStreamWriter &writer, const QVariant &v) map = v.value<IndeterminateLengthMap>(); writer.startMap(); } else { - writer.startMap(map.length()); + writer.startMap(map.size()); } - for (auto pair : qAsConst(map)) { + for (auto pair : std::as_const(map)) { encodeVariant(writer, pair.first); encodeVariant(writer, pair.second); } |