diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-03-18 17:02:11 +0100 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-03-29 11:18:57 +0100 |
commit | bcaff2b06fc46fce8a3ae6d613c025c8d097229c (patch) | |
tree | fde5485241a96c5ea1222e8299b046fdea9084e6 /src/widgets/kernel/qaction_p.h | |
parent | e3d01840656a07f17549864da163b67094c03c0e (diff) |
Remove QGuiAction again and split QAction implementation up instead
Duplicating the number of classes is a high price to pay to be able to
have some QAction functionality behave differently, or be only available
in widgets applications.
Instead, declare the entire API in QtGui in QAction* classes, and
delegate the implementation of QtWidgets specific functionality to
the private. The creation of the private is then delegated to the
Q(Gui)ApplicationPrivate instance through a virtual factory function.
Change some public APIs that are primarily useful for specialized tools
such as Designer to operate on QObject* rather than QWidget*. APIs that
depend on QtWidgets types have been turned into inline template
functions, so that they are instantiated only at the caller side, where
we can expect the respective types to be fully defined. This way, we
only need to forward declare a few classes in the header, and don't
need to generate any additional code for e.g. language bindings.
Change-Id: Id0b27f9187652ec531a2e8b1b9837e82dc81625c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/widgets/kernel/qaction_p.h')
-rw-r--r-- | src/widgets/kernel/qaction_p.h | 100 |
1 files changed, 0 insertions, 100 deletions
diff --git a/src/widgets/kernel/qaction_p.h b/src/widgets/kernel/qaction_p.h deleted file mode 100644 index b865769372..0000000000 --- a/src/widgets/kernel/qaction_p.h +++ /dev/null @@ -1,100 +0,0 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ - -#ifndef QACTION_P_H -#define QACTION_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of other Qt classes. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include <QtWidgets/private/qtwidgetsglobal_p.h> -#include <QtGui/private/qguiaction_p.h> -#include "QtWidgets/qaction.h" -#if QT_CONFIG(menu) -#include "QtWidgets/qmenu.h" -#endif -#if QT_CONFIG(graphicsview) -#include "private/qgraphicswidget_p.h" -#endif -#include "private/qobject_p.h" - -QT_BEGIN_NAMESPACE - -#ifndef QT_NO_ACTION - - -class QShortcutMap; - -class Q_WIDGETS_EXPORT QActionPrivate : public QGuiActionPrivate -{ - Q_DECLARE_PUBLIC(QAction) -public: - QActionPrivate() = default; - -#if QT_CONFIG(shortcut) - QShortcutMap::ContextMatcher contextMatcher() const override; -#endif - - static QActionPrivate *get(QAction *q) - { - return q->d_func(); - } - - bool showStatusText(QWidget *w, const QString &str); - - QPointer<QMenu> menu; - QWidgetList widgets; -#if QT_CONFIG(graphicsview) - QList<QGraphicsWidget *> graphicsWidgets; -#endif -}; - -#endif // QT_NO_ACTION - -QT_END_NAMESPACE - -#endif // QACTION_P_H |