diff options
Diffstat (limited to 'src/quick/scenegraph/coreapi/qsgnode.h')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgnode.h | 52 |
1 files changed, 8 insertions, 44 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgnode.h b/src/quick/scenegraph/coreapi/qsgnode.h index 854e284c9e..50dc6021ea 100644 --- a/src/quick/scenegraph/coreapi/qsgnode.h +++ b/src/quick/scenegraph/coreapi/qsgnode.h @@ -1,45 +1,10 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQuick 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 #ifndef QSGNODE_H #define QSGNODE_H +#include <QtCore/qlist.h> #include <QtQuick/qsggeometry.h> #include <QtGui/QMatrix4x4> @@ -95,8 +60,8 @@ public: // Uppermost 8 bits are reserved for internal use. IsVisitableNode = 0x01000000 -#ifdef Q_CLANG_QDOC - InternalReserved = 0x01000000 +#ifdef Q_QDOC + , InternalReserved = 0x01000000 #endif }; Q_DECLARE_FLAGS(Flags, Flag) @@ -146,7 +111,7 @@ public: QT_DEPRECATED void clearDirty() { } void markDirty(DirtyState bits); - QT_DEPRECATED DirtyState dirtyState() const { return nullptr; } + QT_DEPRECATED DirtyState dirtyState() const { return { }; } virtual bool isSubtreeBlocked() const; @@ -177,7 +142,6 @@ private: int m_subtreeRenderableCount = 0; Flags m_nodeFlags; - DirtyState m_dirtyState; // Obsolete, remove in Qt 6 protected: friend class QSGNodePrivate; @@ -211,8 +175,8 @@ private: QSGGeometry *m_geometry; - int m_reserved_start_index; - int m_reserved_end_index; + Q_DECL_UNUSED_MEMBER int m_reserved_start_index; + Q_DECL_UNUSED_MEMBER int m_reserved_end_index; const QMatrix4x4 *m_matrix; const QSGClipNode *m_clip_list; |