diff options
Diffstat (limited to 'src/designer/src/lib/shared/widgetfactory_p.h')
| -rw-r--r-- | src/designer/src/lib/shared/widgetfactory_p.h | 68 |
1 files changed, 7 insertions, 61 deletions
diff --git a/src/designer/src/lib/shared/widgetfactory_p.h b/src/designer/src/lib/shared/widgetfactory_p.h index e9fd4bfe6..6844ed578 100644 --- a/src/designer/src/lib/shared/widgetfactory_p.h +++ b/src/designer/src/lib/shared/widgetfactory_p.h @@ -1,30 +1,8 @@ -/**************************************************************************** -** -** 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 // // W A R N I N G @@ -119,49 +97,17 @@ public slots: void formWindowAdded(QDesignerFormWindowInterface *formWindow); private: - struct Strings { // Reduce string allocations by storing predefined strings - Strings(); - const QString m_alignment; - const QString m_bottomMargin; - const QString m_geometry; - const QString m_leftMargin; - const QString m_line; - const QString m_objectName; - const QString m_spacerName; - const QString m_orientation; - const QString m_qAction; - const QString m_qButtonGroup; - const QString m_qAxWidget; - const QString m_qDialog; - const QString m_qDockWidget; - const QString m_qLayoutWidget; - const QString m_qMenu; - const QString m_qMenuBar; - const QString m_qWidget; - const QString m_rightMargin; - const QString m_sizeHint; - const QString m_spacer; - const QString m_text; - const QString m_title; - const QString m_topMargin; - const QString m_windowIcon; - const QString m_windowTitle; - }; - QWidget* createCustomWidget(const QString &className, QWidget *parentWidget, bool *creationError) const; QDesignerFormWindowInterface *findFormWindow(QWidget *parentWidget) const; void setFormWindowStyle(QDesignerFormWindowInterface *formWindow); - const Strings m_strings; QDesignerFormEditorInterface *m_core; - using CustomWidgetFactoryMap = QMap<QString, QDesignerCustomWidgetInterface*>; - CustomWidgetFactoryMap m_customFactory; + QMap<QString, QDesignerCustomWidgetInterface *> m_customFactory; QDesignerFormWindowInterface *m_formWindow; // Points to the cached style or 0 if the default (qApp) is active QStyle *m_currentStyle; - using StyleCache = QHash<QString, QStyle *>; - StyleCache m_styleCache; + QHash<QString, QStyle *> m_styleCache; }; } // namespace qdesigner_internal |