diff options
Diffstat (limited to 'src/corelib/kernel/qbindingstorage.h')
-rw-r--r-- | src/corelib/kernel/qbindingstorage.h | 57 |
1 files changed, 17 insertions, 40 deletions
diff --git a/src/corelib/kernel/qbindingstorage.h b/src/corelib/kernel/qbindingstorage.h index bfc3e31d3f..1c03b23bfa 100644 --- a/src/corelib/kernel/qbindingstorage.h +++ b/src/corelib/kernel/qbindingstorage.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** 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) 2021 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 #ifndef QBINDINGSTORAGE_H #define QBINDINGSTORAGE_H @@ -65,6 +29,11 @@ struct QBindingStatus QPropertyDelayedNotifications *groupUpdateData = nullptr; }; +namespace QtPrivate { +struct QBindingStatusAccessToken; +Q_AUTOTEST_EXPORT QBindingStatus *getBindingStatus(QBindingStatusAccessToken); +} + struct QBindingStorageData; class Q_CORE_EXPORT QBindingStorage @@ -81,10 +50,13 @@ public: ~QBindingStorage(); bool isEmpty() { return !d; } + bool isValid() const noexcept { return bindingStatus; } + + const QBindingStatus *status(QtPrivate::QBindingStatusAccessToken) const; void registerDependency(const QUntypedPropertyData *data) const { - if (!bindingStatus->currentlyEvaluatingBinding) + if (!bindingStatus || !bindingStatus->currentlyEvaluatingBinding) return; registerDependency_helper(data); } @@ -94,8 +66,10 @@ public: return nullptr; return bindingData_helper(data); } - // ### Qt 7: remove unused BIC shim + +#if QT_CORE_REMOVED_SINCE(6, 2) void maybeUpdateBindingAndRegister(const QUntypedPropertyData *data) const { registerDependency(data); } +#endif QtPrivate::QPropertyBindingData *bindingData(QUntypedPropertyData *data, bool create) { @@ -104,10 +78,13 @@ public: return bindingData_helper(data, create); } private: + void reinitAfterThreadMove(); void clear(); void registerDependency_helper(const QUntypedPropertyData *data) const; +#if QT_CORE_REMOVED_SINCE(6, 2) // ### Unused, but keep for BC void maybeUpdateBindingAndRegister_helper(const QUntypedPropertyData *data) const; +#endif QtPrivate::QPropertyBindingData *bindingData_helper(const QUntypedPropertyData *data) const; QtPrivate::QPropertyBindingData *bindingData_helper(QUntypedPropertyData *data, bool create); }; |