diff options
Diffstat (limited to 'src/designer/src/designer/preferencesdialog.cpp')
| -rw-r--r-- | src/designer/src/designer/preferencesdialog.cpp | 38 |
1 files changed, 6 insertions, 32 deletions
diff --git a/src/designer/src/designer/preferencesdialog.cpp b/src/designer/src/designer/preferencesdialog.cpp index 439f0194b..eac6e82dd 100644 --- a/src/designer/src/designer/preferencesdialog.cpp +++ b/src/designer/src/designer/preferencesdialog.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 "preferencesdialog.h" #include "ui_preferencesdialog.h" @@ -40,16 +15,15 @@ QT_BEGIN_NAMESPACE PreferencesDialog::PreferencesDialog(QDesignerFormEditorInterface *core, QWidget *parentWidget) : QDialog(parentWidget), - m_ui(new Ui::PreferencesDialog()), + m_ui(new QT_PREPEND_NAMESPACE(Ui)::PreferencesDialog()), m_core(core) { - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); m_ui->setupUi(this); m_optionsPages = core->optionsPages(); m_ui->m_optionTabWidget->clear(); - for (QDesignerOptionsPageInterface *optionsPage : qAsConst(m_optionsPages)) { + for (QDesignerOptionsPageInterface *optionsPage : std::as_const(m_optionsPages)) { QWidget *page = optionsPage->createPage(this); m_ui->m_optionTabWidget->addTab(page, optionsPage->name()); if (QDesignerAppearanceOptionsWidget *appearanceWidget = qobject_cast<QDesignerAppearanceOptionsWidget *>(page)) @@ -74,7 +48,7 @@ QPushButton *PreferencesDialog::applyButton() const void PreferencesDialog::slotApply() { - for (QDesignerOptionsPageInterface *optionsPage : qAsConst(m_optionsPages)) + for (QDesignerOptionsPageInterface *optionsPage : std::as_const(m_optionsPages)) optionsPage->apply(); } @@ -99,7 +73,7 @@ void PreferencesDialog::slotUiModeChanged(bool modified) void PreferencesDialog::closeOptionPages() { - for (QDesignerOptionsPageInterface *optionsPage : qAsConst(m_optionsPages)) + for (QDesignerOptionsPageInterface *optionsPage : std::as_const(m_optionsPages)) optionsPage->finish(); } |