diff options
Diffstat (limited to 'src/designer/src/components/formeditor/formwindow_widgetstack.cpp')
| -rw-r--r-- | src/designer/src/components/formeditor/formwindow_widgetstack.cpp | 41 |
1 files changed, 10 insertions, 31 deletions
diff --git a/src/designer/src/components/formeditor/formwindow_widgetstack.cpp b/src/designer/src/components/formeditor/formwindow_widgetstack.cpp index da6512211..e42345b41 100644 --- a/src/designer/src/components/formeditor/formwindow_widgetstack.cpp +++ b/src/designer/src/components/formeditor/formwindow_widgetstack.cpp @@ -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 #include "formwindow_widgetstack.h" #include <QtDesigner/abstractformwindowtool.h> @@ -40,7 +15,9 @@ QT_BEGIN_NAMESPACE -using namespace qdesigner_internal; +using namespace Qt::StringLiterals; + +namespace qdesigner_internal { FormWindowWidgetStack::FormWindowWidgetStack(QObject *parent) : QObject(parent), @@ -56,7 +33,7 @@ FormWindowWidgetStack::FormWindowWidgetStack(QObject *parent) : // the form windows as it ignores the sizePolicy of // its child (for example, Fixed would cause undesired side effects). m_formContainerLayout->setContentsMargins(QMargins()); - m_formContainer->setObjectName(QStringLiteral("formContainer")); + m_formContainer->setObjectName(u"formContainer"_s); m_formContainer->setLayout(m_formContainerLayout); m_formContainerLayout->setStackingMode(QStackedLayout::StackAll); // System settings might have different background colors, autofill them @@ -68,7 +45,7 @@ FormWindowWidgetStack::~FormWindowWidgetStack() = default; int FormWindowWidgetStack::count() const { - return m_tools.count(); + return m_tools.size(); } QDesignerFormWindowToolInterface *FormWindowWidgetStack::currentTool() const @@ -112,7 +89,7 @@ void FormWindowWidgetStack::setSenderAsCurrentTool() return; } - for (QDesignerFormWindowToolInterface *t : qAsConst(m_tools)) { + for (QDesignerFormWindowToolInterface *t : std::as_const(m_tools)) { if (action == t->action()) { tool = t; break; @@ -202,4 +179,6 @@ QLayout *FormWindowWidgetStack::layout() const return m_layout; } +} // namespace qdesigner_internal + QT_END_NAMESPACE |