diff options
Diffstat (limited to 'src/widgets/kernel/qwidgetaction_p.h')
-rw-r--r-- | src/widgets/kernel/qwidgetaction_p.h | 48 |
1 files changed, 7 insertions, 41 deletions
diff --git a/src/widgets/kernel/qwidgetaction_p.h b/src/widgets/kernel/qwidgetaction_p.h index 0e633a65e4..6a1cd8c186 100644 --- a/src/widgets/kernel/qwidgetaction_p.h +++ b/src/widgets/kernel/qwidgetaction_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 QtWidgets 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 QWIDGETACTION_P_H #define QWIDGETACTION_P_H @@ -52,13 +16,15 @@ // #include <QtWidgets/private/qtwidgetsglobal_p.h> -#include "private/qaction_p.h" +#include "private/qaction_widgets_p.h" + +#include <QtCore/qpointer.h> QT_REQUIRE_CONFIG(action); QT_BEGIN_NAMESPACE -class QWidgetActionPrivate : public QActionPrivate +class QWidgetActionPrivate : public QtWidgetsActionPrivate { Q_DECLARE_PUBLIC(QWidgetAction) public: @@ -68,7 +34,7 @@ public: uint defaultWidgetInUse : 1; uint autoCreated : 1; // created by QToolBar::addWidget and the like - inline void _q_widgetDestroyed(QObject *o) { + inline void widgetDestroyed(QObject *o) { createdWidgets.removeAll(static_cast<QWidget *>(o)); } }; |