diff options
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp')
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp | 50 |
1 files changed, 8 insertions, 42 deletions
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp index 4702bc3c33..955ec7ecae 100644 --- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp +++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQml 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) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qqmlprofileradapter.h" #include "qqmlprofilerservice.h" @@ -98,8 +62,8 @@ static void qQmlProfilerDataToByteArrays(const QQmlProfilerData &d, if (d.locationId != 0) ds << static_cast<qint64>(d.locationId); } else { - auto i = locations.find(d.locationId); - if (i != locations.end()) { + auto i = locations.constFind(d.locationId); + if (i != locations.cend()) { ds << d.time << decodedMessageType << static_cast<quint32>(d.detailType); ds << (i->url.isEmpty() ? i->location.sourceFile : i->url.toString()) << static_cast<qint32>(i->location.line) @@ -128,9 +92,9 @@ static void qQmlProfilerDataToByteArrays(const QQmlProfilerData &d, qint64 QQmlProfilerAdapter::sendMessages(qint64 until, QList<QByteArray> &messages) { - while (next != data.length()) { + while (next != data.size()) { const QQmlProfilerData &nextData = data.at(next); - if (nextData.time > until || messages.length() > s_numMessagesPerBatch) + if (nextData.time > until || messages.size() > s_numMessagesPerBatch) return nextData.time; qQmlProfilerDataToByteArrays(nextData, locations, messages); ++next; @@ -159,3 +123,5 @@ void QQmlProfilerAdapter::receiveData(const QVector<QQmlProfilerData> &new_data, } QT_END_NAMESPACE + +#include "moc_qqmlprofileradapter.cpp" |