diff options
Diffstat (limited to 'src/qml/qml/ftw/qlazilyallocated_p.h')
| -rw-r--r-- | src/qml/qml/ftw/qlazilyallocated_p.h | 109 |
1 files changed, 29 insertions, 80 deletions
diff --git a/src/qml/qml/ftw/qlazilyallocated_p.h b/src/qml/qml/ftw/qlazilyallocated_p.h index 9073e41558..81f6ab7e89 100644 --- a/src/qml/qml/ftw/qlazilyallocated_p.h +++ b/src/qml/qml/ftw/qlazilyallocated_p.h @@ -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) 2020 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 QLAZILYALLOCATED_P_H #define QLAZILYALLOCATED_P_H @@ -51,13 +15,12 @@ // We mean it. // -#include <QtCore/qglobal.h> - -#include <private/qflagpointer_p.h> +#include <QtCore/private/qglobal_p.h> +#include <QtCore/qtaggedpointer.h> QT_BEGIN_NAMESPACE -template<typename T> +template<typename T, typename Tag = typename QtPrivate::TagInfo<T>::TagType> class QLazilyAllocated { public: inline QLazilyAllocated(); @@ -70,73 +33,59 @@ public: inline T &value(); inline const T &value() const; - inline bool flag() const; - inline void setFlag(); - inline void clearFlag(); - inline void setFlagValue(bool); + inline Tag tag() const; + inline void setTag(Tag t); private: - mutable QFlagPointer<T> d; + mutable QTaggedPointer<T, Tag> d; }; -template<typename T> -QLazilyAllocated<T>::QLazilyAllocated() +template<typename T, typename Tag> +QLazilyAllocated<T, Tag>::QLazilyAllocated() { } -template<typename T> -QLazilyAllocated<T>::~QLazilyAllocated() +template<typename T, typename Tag> +QLazilyAllocated<T, Tag>::~QLazilyAllocated() { - delete *d; + delete d.data(); } -template<typename T> -bool QLazilyAllocated<T>::isAllocated() const +template<typename T, typename Tag> +bool QLazilyAllocated<T, Tag>::isAllocated() const { return !d.isNull(); } -template<typename T> -T &QLazilyAllocated<T>::value() +template<typename T, typename Tag> +T &QLazilyAllocated<T, Tag>::value() { if (d.isNull()) d = new T; - return *(*d); + return *d; } -template<typename T> -const T &QLazilyAllocated<T>::value() const +template<typename T, typename Tag> +const T &QLazilyAllocated<T, Tag>::value() const { if (d.isNull()) d = new T; - return *(*d); -} - -template<typename T> -T *QLazilyAllocated<T>::operator->() const -{ return *d; } -template<typename T> -bool QLazilyAllocated<T>::flag() const -{ - return d.flag(); -} - -template<typename T> -void QLazilyAllocated<T>::setFlag() +template<typename T, typename Tag> +T *QLazilyAllocated<T, Tag>::operator->() const { - d.setFlag(); + return d.data(); } -template<typename T> -void QLazilyAllocated<T>::clearFlag() +template<typename T, typename Tag> +Tag QLazilyAllocated<T, Tag>::tag() const { - d.clearFlag(); + return d.tag(); } -template<typename T> -void QLazilyAllocated<T>::setFlagValue(bool v) +template<typename T, typename Tag> +void QLazilyAllocated<T, Tag>::setTag(Tag t) { - d.setFlagValue(v); + d.setTag(t); } QT_END_NAMESPACE |