diff options
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_debugger/qqmlwatcher.cpp')
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_debugger/qqmlwatcher.cpp | 73 |
1 files changed, 23 insertions, 50 deletions
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qqmlwatcher.cpp b/src/plugins/qmltooling/qmldbg_debugger/qqmlwatcher.cpp index 8caa5ac23e..d72c11d439 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qqmlwatcher.cpp +++ b/src/plugins/qmltooling/qmldbg_debugger/qqmlwatcher.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 "qqmlwatcher.h" @@ -82,22 +46,27 @@ private: QQmlExpression *m_expr; }; -QQmlWatchProxy::QQmlWatchProxy(int id, - QQmlExpression *exp, - int debugId, - QQmlWatcher *parent) -: QObject(parent), m_id(id), m_watch(parent), m_object(nullptr), m_debugId(debugId), m_expr(exp) +QQmlWatchProxy::QQmlWatchProxy(int id, QQmlExpression *exp, int debugId, QQmlWatcher *parent) + : QObject(parent), + m_id(id), + m_watch(parent), + m_object(nullptr), + m_debugId(debugId), + m_expr(exp) { QObject::connect(m_expr, &QQmlExpression::valueChanged, this, &QQmlWatchProxy::notifyValueChanged); } -QQmlWatchProxy::QQmlWatchProxy(int id, - QObject *object, - int debugId, - const QMetaProperty &prop, - QQmlWatcher *parent) -: QObject(parent), m_id(id), m_watch(parent), m_object(object), m_debugId(debugId), m_property(prop), m_expr(nullptr) +QQmlWatchProxy::QQmlWatchProxy(int id, QObject *object, int debugId, const QMetaProperty &prop, + QQmlWatcher *parent) + : QObject(parent), + m_id(id), + m_watch(parent), + m_object(object), + m_debugId(debugId), + m_property(prop), + m_expr(nullptr) { static int refreshIdx = -1; if(refreshIdx == -1) @@ -109,7 +78,11 @@ QQmlWatchProxy::QQmlWatchProxy(int id, void QQmlWatchProxy::notifyValueChanged() { - const QVariant v = m_expr ? m_expr->evaluate() : m_property.read(m_object); + QVariant v; + if (m_expr) + v = m_expr->evaluate(); + else + v = m_property.read(m_object); emit m_watch->propertyChanged(m_id, m_debugId, m_property, v); } |