diff options
Diffstat (limited to 'src/designer/src/lib/extension/default_extensionfactory.h')
-rw-r--r-- | src/designer/src/lib/extension/default_extensionfactory.h | 37 |
1 files changed, 5 insertions, 32 deletions
diff --git a/src/designer/src/lib/extension/default_extensionfactory.h b/src/designer/src/lib/extension/default_extensionfactory.h index f14c33361..825b9d5a1 100644 --- a/src/designer/src/lib/extension/default_extensionfactory.h +++ b/src/designer/src/lib/extension/default_extensionfactory.h @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Designer of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #ifndef DEFAULT_EXTENSIONFACTORY_H #define DEFAULT_EXTENSIONFACTORY_H @@ -57,11 +32,9 @@ protected: virtual QObject *createExtension(QObject *object, const QString &iid, QObject *parent) const; private: - typedef QPair<QString,QObject*> IdObjectKey; - typedef QMap< IdObjectKey, QObject*> ExtensionMap; - mutable ExtensionMap m_extensions; - typedef QHash<QObject*, bool> ExtendedSet; - mutable ExtendedSet m_extended; + mutable QMap<std::pair<QString, QObject *>, QObject *> m_extensions; + // ### FIXME Qt 7: Use QSet, add out of line destructor. + mutable QHash<QObject*, bool> m_extended; }; QT_END_NAMESPACE |