diff options
Diffstat (limited to 'src/designer/src/lib/shared/promotiontaskmenu.cpp')
| -rw-r--r-- | src/designer/src/lib/shared/promotiontaskmenu.cpp | 40 |
1 files changed, 6 insertions, 34 deletions
diff --git a/src/designer/src/lib/shared/promotiontaskmenu.cpp b/src/designer/src/lib/shared/promotiontaskmenu.cpp index c458d2604..7cedb226b 100644 --- a/src/designer/src/lib/shared/promotiontaskmenu.cpp +++ b/src/designer/src/lib/shared/promotiontaskmenu.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 "promotiontaskmenu_p.h" #include "qdesigner_promotiondialog_p.h" @@ -146,10 +121,9 @@ PromotionTaskMenu::PromotionState PromotionTaskMenu::createPromotionActions(QDe QMenu *candidatesMenu = new QMenu(); // Create a sub menu - const WidgetDataBaseItemList::const_iterator cend = candidates.constEnd(); // Set up actions and map class names - for (WidgetDataBaseItemList::const_iterator it = candidates.constBegin(); it != cend; ++it) { - const QString customClassName = (*it)->name(); + for (auto *item : candidates) { + const QString customClassName = item->name(); candidatesMenu->addAction(customClassName, this, [this, customClassName] { this->slotPromoteToCustomWidget(customClassName); }); } @@ -169,7 +143,7 @@ void PromotionTaskMenu::addActions(QDesignerFormWindowInterface *fw, unsigned fl ActionList &actionList) { Q_ASSERT(m_widget); - const int previousSize = actionList.size(); + const auto previousSize = actionList.size(); const PromotionState promotionState = createPromotionActions(fw); // Promotion candidates/demote @@ -290,9 +264,7 @@ PromotionTaskMenu::PromotionSelectionList PromotionTaskMenu::promotionSelectionL designerObjectInspector->getSelection(s); // Find objects of similar state const QWidgetList &source = m_mode == ModeManagedMultiSelection ? s.managed : s.unmanaged; - const QWidgetList::const_iterator cend = source.constEnd(); - for (QWidgetList::const_iterator it = source.constBegin(); it != cend; ++it) { - QWidget *w = *it; + for (auto *w : source) { if (w != m_widget) { // Selection state mismatch if (intro->metaObject(w)->className() != className || isPromoted(core, w) != promoted) |