diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-08 13:27:30 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-19 15:35:46 +0100 |
commit | fc42c9d35665dbe9d5bce72d50ea14d1c6091628 (patch) | |
tree | b2ac99b215c7c8af979469dbe5bfd59267d38c32 /src | |
parent | 01b12aabdc40a2d2c3f38fc03dfde9659458491b (diff) |
Qt Designer: Prepare for deprecation of classes in Qt 6
- Use auto for QStringRef.
- Use auto for QList and iterators, refactoring some loops.
Task-number: QTBUG-79896
Change-Id: I065d5b6d49404e51a10a7e1d7373eff41f9cb032
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src')
58 files changed, 292 insertions, 349 deletions
diff --git a/src/designer/src/components/buddyeditor/buddyeditor.cpp b/src/designer/src/components/buddyeditor/buddyeditor.cpp index 93e143c2a..36a5bf18e 100644 --- a/src/designer/src/components/buddyeditor/buddyeditor.cpp +++ b/src/designer/src/components/buddyeditor/buddyeditor.cpp @@ -83,8 +83,6 @@ static QString buddy(QLabel *label, QDesignerFormEditorInterface *core) return sheet->property(prop_idx).toString(); } -using LabelList = QList<QLabel *>; - namespace qdesigner_internal { /******************************************************************************* @@ -144,7 +142,7 @@ void BuddyEditor::updateBackground() m_updating = true; QList<Connection *> newList; - const LabelList label_list = background()->findChildren<QLabel*>(); + const auto label_list = background()->findChildren<QLabel*>(); for (QLabel *label : label_list) { const QString buddy_name = buddy(label, m_formWindow->core()); if (buddy_name.isEmpty()) @@ -212,7 +210,7 @@ void BuddyEditor::setBackground(QWidget *background) clear(); ConnectionEdit::setBackground(background); - const LabelList label_list = background->findChildren<QLabel*>(); + const auto label_list = background->findChildren<QLabel*>(); for (QLabel *label : label_list) { const QString buddy_name = buddy(label, m_formWindow->core()); if (buddy_name.isEmpty()) @@ -328,7 +326,7 @@ void BuddyEditor::deleteSelected() void BuddyEditor::autoBuddy() { // Any labels? - LabelList labelList = background()->findChildren<QLabel*>(); + auto labelList = background()->findChildren<QLabel*>(); if (labelList.isEmpty()) return; // Find already used buddies @@ -338,7 +336,7 @@ void BuddyEditor::autoBuddy() usedBuddies.push_back(c->widget(EndPoint::Target)); // Find potential new buddies, keep lists in sync QWidgetList buddies; - for (LabelList::iterator it = labelList.begin(); it != labelList.end(); ) { + for (auto it = labelList.begin(); it != labelList.end(); ) { QLabel *label = *it; QWidget *newBuddy = nullptr; if (m_formWindow->isManaged(label)) { diff --git a/src/designer/src/components/formeditor/deviceprofiledialog.cpp b/src/designer/src/components/formeditor/deviceprofiledialog.cpp index 40a9e6ab6..ef1693c39 100644 --- a/src/designer/src/components/formeditor/deviceprofiledialog.cpp +++ b/src/designer/src/components/formeditor/deviceprofiledialog.cpp @@ -73,7 +73,7 @@ DeviceProfileDialog::DeviceProfileDialog(QDesignerDialogGuiInterface *dlgGui, QW setModal(true); m_ui->setupUi(this); - const QList<int> standardFontSizes = QFontDatabase::standardSizes(); + const auto standardFontSizes = QFontDatabase::standardSizes(); populateNumericCombo(standardFontSizes.constBegin(), standardFontSizes.constEnd(), m_ui->m_systemFontSizeCombo); // 288pt observed on macOS. diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp index 91896f06a..051e08b9c 100644 --- a/src/designer/src/components/formeditor/formwindow.cpp +++ b/src/designer/src/components/formeditor/formwindow.cpp @@ -1159,15 +1159,15 @@ bool FormWindow::unify(QObject *w, QString &s, bool changeIt) if (!widgetChildren.isEmpty()) insertNames(metaDataBase, widgetChildren.constBegin(), widgetChildren.constEnd(), w, existingNames); - const QList<QLayout *> layoutChildren = main->findChildren<QLayout*>(); + const auto layoutChildren = main->findChildren<QLayout*>(); if (!layoutChildren.isEmpty()) insertNames(metaDataBase, layoutChildren.constBegin(), layoutChildren.constEnd(), w, existingNames); - const QList<QAction *> actionChildren = main->findChildren<QAction*>(); + const auto actionChildren = main->findChildren<QAction*>(); if (!actionChildren.isEmpty()) insertNames(metaDataBase, actionChildren.constBegin(), actionChildren.constEnd(), w, existingNames); - const QList<QButtonGroup *> buttonGroupChildren = main->findChildren<QButtonGroup*>(); + const auto buttonGroupChildren = main->findChildren<QButtonGroup*>(); if (!buttonGroupChildren.isEmpty()) insertNames(metaDataBase, buttonGroupChildren.constBegin(), buttonGroupChildren.constEnd(), w, existingNames); diff --git a/src/designer/src/components/formeditor/qmdiarea_container.cpp b/src/designer/src/components/formeditor/qmdiarea_container.cpp index e1930501f..03fe667a3 100644 --- a/src/designer/src/components/formeditor/qmdiarea_container.cpp +++ b/src/designer/src/components/formeditor/qmdiarea_container.cpp @@ -117,7 +117,7 @@ void QMdiAreaContainer::insertWidget(int, QWidget *widget) void QMdiAreaContainer::remove(int index) { - QList<QMdiSubWindow *> subWins = m_mdiArea->subWindowList(QMdiArea::CreationOrder); + auto subWins = m_mdiArea->subWindowList(QMdiArea::CreationOrder); if (index >= 0 && index < subWins.size()) { QMdiSubWindow *f = subWins.at(index); m_mdiArea->removeSubWindow(f->widget()); diff --git a/src/designer/src/components/formeditor/templateoptionspage.cpp b/src/designer/src/components/formeditor/templateoptionspage.cpp index e50260406..4e638c913 100644 --- a/src/designer/src/components/formeditor/templateoptionspage.cpp +++ b/src/designer/src/components/formeditor/templateoptionspage.cpp @@ -96,7 +96,7 @@ void TemplateOptionsWidget::addTemplatePath() if (templatePath.isEmpty()) return; - const QList<QListWidgetItem *> existing + const auto existing = m_ui->m_templatePathListWidget->findItems(templatePath, Qt::MatchExactly); if (!existing.isEmpty()) return; @@ -108,8 +108,7 @@ void TemplateOptionsWidget::addTemplatePath() void TemplateOptionsWidget::removeTemplatePath() { - const QList<QListWidgetItem *> selectedPaths - = m_ui->m_templatePathListWidget->selectedItems(); + const auto selectedPaths = m_ui->m_templatePathListWidget->selectedItems(); if (selectedPaths.isEmpty()) return; delete selectedPaths.constFirst(); @@ -117,7 +116,7 @@ void TemplateOptionsWidget::removeTemplatePath() void TemplateOptionsWidget::templatePathSelectionChanged() { - const QList<QListWidgetItem *> selectedPaths = m_ui->m_templatePathListWidget->selectedItems(); + const auto selectedPaths = m_ui->m_templatePathListWidget->selectedItems(); m_ui->m_removeTemplatePathButton->setEnabled(!selectedPaths.isEmpty()); } diff --git a/src/designer/src/components/formeditor/tool_widgeteditor.cpp b/src/designer/src/components/formeditor/tool_widgeteditor.cpp index d3ecf8087..bdfdc2675 100644 --- a/src/designer/src/components/formeditor/tool_widgeteditor.cpp +++ b/src/designer/src/components/formeditor/tool_widgeteditor.cpp @@ -222,7 +222,7 @@ void WidgetEditorTool::detectDockDrag(const QDesignerMimeData *mimeData) if (!mw) return; - const QList<QDesignerDnDItemInterface*> item_list = mimeData->items(); + const auto item_list = mimeData->items(); for (QDesignerDnDItemInterface *item : item_list) { if (item->decoration() && item->decoration()->property("_q_dockDrag").toBool()) diff --git a/src/designer/src/components/objectinspector/objectinspectormodel.cpp b/src/designer/src/components/objectinspector/objectinspectormodel.cpp index b980d3967..91b941765 100644 --- a/src/designer/src/components/objectinspector/objectinspectormodel.cpp +++ b/src/designer/src/components/objectinspector/objectinspectormodel.cpp @@ -270,8 +270,6 @@ namespace qdesigner_internal { const ModelRecursionContext &ctx) { using ButtonGroupList = QList<QButtonGroup *>; - using ActionList = QList<QAction *>; - // 1) Create entry const ObjectData entry(parent, object, ctx); model.push_back(entry); @@ -289,46 +287,41 @@ namespace qdesigner_internal { } } - QObjectList children = object->children(); - if (!children.isEmpty()) { + if (!object->children().isEmpty()) { ButtonGroupList buttonGroups; + QObjectList children = object->children(); std::sort(children.begin(), children.end(), sortEntry); - const QObjectList::const_iterator cend = children.constEnd(); - for (QObjectList::const_iterator it = children.constBegin(); it != cend; ++it) { + for (QObject *childObject : qAsConst(children)) { // Managed child widgets unless we had a container extension - if ((*it)->isWidgetType()) { + if (childObject->isWidgetType()) { if (!containerExtension) { - QWidget *widget = qobject_cast<QWidget*>(*it); + QWidget *widget = qobject_cast<QWidget*>(childObject); if (fwi->isManaged(widget)) createModelRecursion(fwi, object, widget, model, ctx); } } else { - if (ctx.mdb->item(*it)) { - if (QButtonGroup *bg = qobject_cast<QButtonGroup*>(*it)) + if (ctx.mdb->item(childObject)) { + if (auto bg = qobject_cast<QButtonGroup*>(childObject)) buttonGroups.push_back(bg); } // Has MetaDataBase entry } } // Add button groups if (!buttonGroups.isEmpty()) { - const ButtonGroupList::const_iterator bgcend = buttonGroups.constEnd(); - for (ButtonGroupList::const_iterator bgit = buttonGroups.constBegin(); bgit != bgcend; ++bgit) - createModelRecursion(fwi, object, *bgit, model, ctx); + for (QButtonGroup *group : qAsConst(buttonGroups)) + createModelRecursion(fwi, object, group, model, ctx); } } // has children if (object->isWidgetType()) { // Add actions - const ActionList actions = static_cast<QWidget*>(object)->actions(); - if (!actions.isEmpty()) { - const ActionList::const_iterator cend = actions.constEnd(); - for (ActionList::const_iterator it = actions.constBegin(); it != cend; ++it) - if (ctx.mdb->item(*it)) { - QAction *action = *it; - QObject *obj = action; - if (action->menu()) - obj = action->menu(); - createModelRecursion(fwi, object, obj, model, ctx); - } + const auto actions = static_cast<QWidget*>(object)->actions(); + for (QAction *action : actions) { + if (ctx.mdb->item(action)) { + QObject *childObject = action; + if (auto menu = action->menu()) + childObject = menu; + createModelRecursion(fwi, object, childObject, model, ctx); + } } } } diff --git a/src/designer/src/components/propertyeditor/designerpropertymanager.cpp b/src/designer/src/components/propertyeditor/designerpropertymanager.cpp index ad1b6505c..27d265696 100644 --- a/src/designer/src/components/propertyeditor/designerpropertymanager.cpp +++ b/src/designer/src/components/propertyeditor/designerpropertymanager.cpp @@ -1012,7 +1012,7 @@ void DesignerPropertyManager::slotValueChanged(QtProperty *property, const QVari } if (QtProperty *flagProperty = m_flagToProperty.value(property, 0)) { - const QList<QtProperty *> subFlags = m_propertyToFlags.value(flagProperty); + const auto subFlags = m_propertyToFlags.value(flagProperty); const int subFlagCount = subFlags.count(); // flag changed const bool subValue = variantProperty(property)->value().toBool(); @@ -1025,7 +1025,7 @@ void DesignerPropertyManager::slotValueChanged(QtProperty *property, const QVari m_changingSubValue = true; FlagData data = m_flagValues.value(flagProperty); - const QList<uint> values = data.values; + const auto values = data.values; // Compute new value, without including (additional) supermasks if (values.at(subIndex) == 0) { for (int i = 0; i < subFlagCount; ++i) { @@ -1123,7 +1123,7 @@ void DesignerPropertyManager::slotPropertyDestroyed(QtProperty *property) { if (QtProperty *flagProperty = m_flagToProperty.value(property, 0)) { PropertyToPropertyListMap::iterator it = m_propertyToFlags.find(flagProperty); - QList<QtProperty *> &propertyList = it.value(); + auto &propertyList = it.value(); propertyList.replace(propertyList.indexOf(property), 0); m_flagToProperty.remove(property); } else if (QtProperty *alignProperty = m_alignHToProperty.value(property, 0)) { @@ -1516,15 +1516,13 @@ QString DesignerPropertyManager::valueText(const QtProperty *property) const const uint v = data.val; const QChar bar = QLatin1Char('|'); QString valueStr; - const QList<QPair<QString, uint> > flags = data.flags; - const QList<QPair<QString, uint> >::const_iterator fcend = flags.constEnd(); - for (QList<QPair<QString, uint> >::const_iterator it = flags.constBegin(); it != fcend; ++it) { - const uint val = it->second; + for (const DesignerIntPair &p : data.flags) { + const uint val = p.second; const bool checked = (val == 0) ? (v == 0) : ((val & v) == val); if (checked) { if (!valueStr.isEmpty()) valueStr += bar; - valueStr += it->first; + valueStr += p.first; } } return valueStr; @@ -1754,8 +1752,8 @@ void DesignerPropertyManager::setValue(QtProperty *property, const QVariant &val // set Value - const QList<uint> values = data.values; - const QList<QtProperty *> subFlags = m_propertyToFlags.value(property); + const auto values = data.values; + const auto subFlags = m_propertyToFlags.value(property); const int subFlagCount = subFlags.count(); for (int i = 0; i < subFlagCount; ++i) { QtVariantProperty *subFlag = variantProperty(subFlags.at(i)); @@ -2317,7 +2315,7 @@ void DesignerEditorFactory::slotPropertyChanged(QtProperty *property) defaultPixmap = qvariant_cast<QIcon>(manager->attributeValue(property, QLatin1String(defaultResourceAttributeC))).pixmap(16, 16); else if (m_fwb) defaultPixmap = m_fwb->iconCache()->icon(qvariant_cast<PropertySheetIconValue>(manager->value(property))).pixmap(16, 16); - const QList<PixmapEditor *> editors = m_iconPropertyToEditors.value(property); + const auto editors = m_iconPropertyToEditors.value(property); for (PixmapEditor *editor : editors) editor->setDefaultPixmap(defaultPixmap); } @@ -2746,7 +2744,7 @@ ResetDecorator::ResetDecorator(const QDesignerFormEditorInterface *core, QObject ResetDecorator::~ResetDecorator() { - const QList<ResetWidget *> editors = m_resetWidgetToProperty.keys(); + const auto editors = m_resetWidgetToProperty.keys(); qDeleteAll(editors); } @@ -2819,7 +2817,7 @@ QWidget *ResetDecorator::editor(QWidget *subEditor, bool resettable, QtAbstractP void ResetDecorator::slotPropertyChanged(QtProperty *property) { - QMap<QtProperty *, QList<ResetWidget *> >::ConstIterator prIt = m_createdResetWidgets.constFind(property); + const auto prIt = m_createdResetWidgets.constFind(property); if (prIt == m_createdResetWidgets.constEnd()) return; diff --git a/src/designer/src/components/propertyeditor/propertyeditor.cpp b/src/designer/src/components/propertyeditor/propertyeditor.cpp index 85724eb01..392f1c3f5 100644 --- a/src/designer/src/components/propertyeditor/propertyeditor.cpp +++ b/src/designer/src/components/propertyeditor/propertyeditor.cpp @@ -452,13 +452,13 @@ void PropertyEditor::storePropertiesExpansionState(const QList<QtBrowserItem *> void PropertyEditor::storeExpansionState() { - const QList<QtBrowserItem *> items = m_currentBrowser->topLevelItems(); + const auto items = m_currentBrowser->topLevelItems(); if (m_sorting) { storePropertiesExpansionState(items); } else { for (QtBrowserItem *item : items) { const QString groupName = item->property()->propertyName(); - QList<QtBrowserItem *> propertyItems = item->children(); + auto propertyItems = item->children(); if (!propertyItems.isEmpty()) m_expansionState[groupName] = isExpanded(item); @@ -470,7 +470,7 @@ void PropertyEditor::storeExpansionState() void PropertyEditor::collapseAll() { - const QList<QtBrowserItem *> items = m_currentBrowser->topLevelItems(); + const auto items = m_currentBrowser->topLevelItems(); for (QtBrowserItem *group : items) setExpanded(group, false); } @@ -498,7 +498,7 @@ void PropertyEditor::applyPropertiesExpansionState(const QList<QtBrowserItem *> void PropertyEditor::applyExpansionState() { - const QList<QtBrowserItem *> items = m_currentBrowser->topLevelItems(); + const auto items = m_currentBrowser->topLevelItems(); if (m_sorting) { applyPropertiesExpansionState(items); } else { @@ -533,7 +533,7 @@ int PropertyEditor::applyPropertiesFilter(const QList<QtBrowserItem *> &items) void PropertyEditor::applyFilter() { - const QList<QtBrowserItem *> items = m_currentBrowser->topLevelItems(); + const auto items = m_currentBrowser->topLevelItems(); if (m_sorting) { applyPropertiesFilter(items); } else { @@ -664,7 +664,7 @@ void PropertyEditor::slotSorting(bool sort) void PropertyEditor::updateColors() { if (m_treeBrowser && m_currentBrowser == m_treeBrowser) { - const QList<QtBrowserItem *> items = m_treeBrowser->topLevelItems(); + const auto items = m_treeBrowser->topLevelItems(); for (QtBrowserItem *item : items) m_treeBrowser->setBackgroundColor(item, propertyColor(item->property())); } @@ -1092,7 +1092,7 @@ void PropertyEditor::setObject(QObject *object) if (lastGroup != groupProperty) { lastGroup = groupProperty; lastProperty = nullptr; // Append at end - const QList<QtProperty*> subProperties = lastGroup->subProperties(); + const auto subProperties = lastGroup->subProperties(); if (!subProperties.isEmpty()) lastProperty = subProperties.constLast(); lastGroup = groupProperty; @@ -1108,7 +1108,7 @@ void PropertyEditor::setObject(QObject *object) property->setModified(m_propertySheet->isChanged(i)); if (propertyName == QStringLiteral("geometry") && type == QVariant::Rect) { - const QList<QtProperty *> &subProperties = property->subProperties(); + const auto &subProperties = property->subProperties(); for (QtProperty *subProperty : subProperties) { const QString subPropertyName = subProperty->propertyName(); if (subPropertyName == QStringLiteral("X") || subPropertyName == QStringLiteral("Y")) @@ -1157,7 +1157,7 @@ QtBrowserItem *PropertyEditor::nonFakePropertyBrowserItem(QtBrowserItem *item) c { // Top-level properties are QObject/QWidget groups, etc. Find first item property below // which should be nonfake - const QList<QtBrowserItem *> topLevelItems = m_currentBrowser->topLevelItems(); + const auto topLevelItems = m_currentBrowser->topLevelItems(); do { if (topLevelItems.contains(item->parent())) return item; @@ -1245,7 +1245,7 @@ void PropertyEditor::editProperty(const QString &name) // find the browser item belonging to the property, make it current and edit it QtBrowserItem *browserItem = nullptr; if (QtVariantProperty *property = m_nameToProperty.value(name, 0)) { - const QList<QtBrowserItem *> items = m_currentBrowser->items(property); + const auto items = m_currentBrowser->items(property); if (items.size() == 1) browserItem = items.constFirst(); } diff --git a/src/designer/src/components/signalsloteditor/connectdialog.cpp b/src/designer/src/components/signalsloteditor/connectdialog.cpp index 6eef6dcc7..dcb6f1ded 100644 --- a/src/designer/src/components/signalsloteditor/connectdialog.cpp +++ b/src/designer/src/components/signalsloteditor/connectdialog.cpp @@ -42,10 +42,6 @@ QT_BEGIN_NAMESPACE -namespace { - using ListWidgetItems = QList<QListWidgetItem *>; -} - static QString realClassName(QDesignerFormEditorInterface *core, QWidget *widget) { QString class_name = QLatin1String(widget->metaObject()->className()); @@ -138,7 +134,7 @@ void ConnectDialog::populateLists() void ConnectDialog::setSignalSlot(const QString &signal, const QString &slot) { - ListWidgetItems sigItems = m_ui.signalList->findItems(signal, Qt::MatchExactly); + auto sigItems = m_ui.signalList->findItems(signal, Qt::MatchExactly); if (sigItems.isEmpty()) { m_ui.showAllCheckBox->setChecked(true); @@ -147,7 +143,7 @@ void ConnectDialog::setSignalSlot(const QString &signal, const QString &slot) if (!sigItems.isEmpty()) { selectSignal(sigItems.constFirst()); - ListWidgetItems slotItems = m_ui.slotList->findItems(slot, Qt::MatchExactly); + auto slotItems = m_ui.slotList->findItems(slot, Qt::MatchExactly); if (slotItems.isEmpty()) { m_ui.showAllCheckBox->setChecked(true); slotItems = m_ui.slotList->findItems(slot, Qt::MatchExactly); @@ -194,7 +190,7 @@ void ConnectDialog::selectSlot(QListWidgetItem *item) QString ConnectDialog::signal() const { - const ListWidgetItems item_list = m_ui.signalList->selectedItems(); + const auto item_list = m_ui.signalList->selectedItems(); if (item_list.size() != 1) return QString(); return item_list.at(0)->text(); @@ -202,7 +198,7 @@ QString ConnectDialog::signal() const QString ConnectDialog::slot() const { - const ListWidgetItems item_list = m_ui.slotList->selectedItems(); + const auto item_list = m_ui.slotList->selectedItems(); if (item_list.size() != 1) return QString(); return item_list.at(0)->text(); diff --git a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp index 175b4f6a8..0868c9fe2 100644 --- a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp +++ b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp @@ -79,9 +79,6 @@ static void addWidgetToObjectList(const QWidget *w, QStringList &r) static QStringList objectNameList(QDesignerFormWindowInterface *form) { - using ActionList = QList<QAction *>; - using ButtonGroupList = QList<QButtonGroup *>; - QStringList result; QWidget *mainContainer = form->mainContainer(); @@ -104,30 +101,24 @@ static QStringList objectNameList(QDesignerFormWindowInterface *form) const QDesignerMetaDataBaseInterface *mdb = form->core()->metaDataBase(); // Add managed actions and actions with managed menus - const ActionList actions = mainContainer->findChildren<QAction*>(); - if (!actions.isEmpty()) { - const ActionList::const_iterator cend = actions.constEnd(); - for (ActionList::const_iterator it = actions.constBegin(); it != cend; ++it) { - QAction *a = *it; - if (!a->isSeparator()) { - if (QMenu *menu = a->menu()) { - if (mdb->item(menu)) - result.push_back(menu->objectName()); - } else { - if (mdb->item(a)) - result.push_back(a->objectName()); - } + const auto actions = mainContainer->findChildren<QAction*>(); + for (QAction *a : actions) { + if (!a->isSeparator()) { + if (QMenu *menu = a->menu()) { + if (mdb->item(menu)) + result.push_back(menu->objectName()); + } else { + if (mdb->item(a)) + result.push_back(a->objectName()); } } } // Add managed buttons groups - const ButtonGroupList buttonGroups = mainContainer->findChildren<QButtonGroup *>(); - if (!buttonGroups.isEmpty()) { - const ButtonGroupList::const_iterator cend = buttonGroups.constEnd(); - for (ButtonGroupList::const_iterator it = buttonGroups.constBegin(); it != cend; ++it) - if (mdb->item(*it)) - result.append((*it)->objectName()); + const auto buttonGroups = mainContainer->findChildren<QButtonGroup *>(); + for (QButtonGroup * b : buttonGroups) { + if (mdb->item(b)) + result.append(b->objectName()); } result.sort(); diff --git a/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp b/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp index 1df9e4bbb..b4cd1cb2b 100644 --- a/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp @@ -150,7 +150,7 @@ QList<QAction*> ContainerWidgetTaskMenu::taskActions() const const QDesignerContainerExtension *ce = containerExtension(); const int index = ce->currentIndex(); - QList<QAction*> actions = QDesignerTaskMenu::taskActions(); + auto actions = QDesignerTaskMenu::taskActions(); actions += m_taskActions; // Update the page submenu, deletion and promotion. Updated on demand due to promotion state. m_pageMenu->clear(); @@ -224,7 +224,7 @@ WizardContainerWidgetTaskMenu::WizardContainerWidgetTaskMenu(QWizard *w, QObject { connect(m_nextAction, &QAction::triggered, w, &QWizard::next); connect(m_previousAction, &QAction::triggered, w, &QWizard::back); - QList<QAction*> &l = containerActions(); + auto &l = containerActions(); l.push_front(createSeparator()); l.push_front(m_nextAction); l.push_front(m_previousAction); @@ -260,7 +260,7 @@ void MdiContainerWidgetTaskMenu::initializeActions() m_tileAction = new QAction(tr("Tile"), this); m_cascadeAction = new QAction(tr("Cascade"), this); - QList<QAction*> &l = containerActions(); + auto &l = containerActions(); l.push_front(createSeparator()); l.push_front(m_tileAction); l.push_front(m_cascadeAction); @@ -271,7 +271,7 @@ void MdiContainerWidgetTaskMenu::initializeActions() QList<QAction*> MdiContainerWidgetTaskMenu::taskActions() const { - const QList<QAction*> rc = ContainerWidgetTaskMenu::taskActions(); + const auto rc = ContainerWidgetTaskMenu::taskActions(); // Enable const int count = pageCount(); m_nextAction->setEnabled(count > 1); diff --git a/src/designer/src/components/taskmenu/layouttaskmenu.cpp b/src/designer/src/components/taskmenu/layouttaskmenu.cpp index 94c2095c4..b69051212 100644 --- a/src/designer/src/components/taskmenu/layouttaskmenu.cpp +++ b/src/designer/src/components/taskmenu/layouttaskmenu.cpp @@ -73,7 +73,7 @@ QAction *SpacerTaskMenu::preferredEditAction() const QList<QAction*> SpacerTaskMenu::taskActions() const { - return QList<QAction*>(); + return {}; } QT_END_NAMESPACE diff --git a/src/designer/src/components/taskmenu/toolbar_taskmenu.cpp b/src/designer/src/components/taskmenu/toolbar_taskmenu.cpp index 158917e24..42f3b271a 100644 --- a/src/designer/src/components/taskmenu/toolbar_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/toolbar_taskmenu.cpp @@ -58,7 +58,7 @@ namespace qdesigner_internal { { if (ToolBarEventFilter *ef = ToolBarEventFilter::eventFilterOf(m_toolBar)) return ef->contextMenuActions(); - return QList<QAction*>(); + return {}; } // ------------ StatusBarTaskMenu diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp index a170fa7c7..054d622a0 100644 --- a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp +++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp @@ -366,7 +366,7 @@ bool WidgetBoxTreeWidget::readCategories(const QString &fileName, const QString while (!reader.atEnd()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement: { - const QStringRef tag = reader.name(); + const auto tag = reader.name(); if (tag == QLatin1String(widgetBoxRootElementC)) { //<widgetbox version="4.5"> continue; @@ -411,7 +411,7 @@ bool WidgetBoxTreeWidget::readCategories(const QString &fileName, const QString break; } case QXmlStreamReader::EndElement: { - const QStringRef tag = reader.name(); + const auto tag = reader.name(); if (tag == QLatin1String(widgetBoxRootElementC)) { continue; } @@ -472,7 +472,7 @@ bool WidgetBoxTreeWidget::readWidget(Widget *w, const QString &xml, QXmlStreamRe case QXmlStreamReader::StartElement: if (nesting++ == 0) { // First element must be <ui> or (legacy) <widget> - const QStringRef name = r.name(); + const auto name = r.name(); if (name == QLatin1String(uiElementC)) { startTagPosition = currentPosition; } else { @@ -593,7 +593,7 @@ static int findCategory(const QString &name, const WidgetBoxTreeWidget::Category static inline bool isValidIcon(const QIcon &icon) { if (!icon.isNull()) { - const QList<QSize> availableSizes = icon.availableSizes(); + const auto availableSizes = icon.availableSizes(); return !availableSizes.isEmpty() && !availableSizes.constFirst().isEmpty(); } return false; diff --git a/src/designer/src/designer/mainwindow.cpp b/src/designer/src/designer/mainwindow.cpp index d47be9ad0..dba96fd86 100644 --- a/src/designer/src/designer/mainwindow.cpp +++ b/src/designer/src/designer/mainwindow.cpp @@ -150,12 +150,11 @@ QStringList DockedMdiArea::uiFiles(const QMimeData *d) const QStringList rc; if (!d->hasFormat(QLatin1String(uriListMimeFormatC))) return rc; - const QList<QUrl> urls = d->urls(); + const auto urls = d->urls(); if (urls.isEmpty()) return rc; - const QList<QUrl>::const_iterator cend = urls.constEnd(); - for (QList<QUrl>::const_iterator it = urls.constBegin(); it != cend; ++it) { - const QString fileName = it->toLocalFile(); + for (const auto &url : urls) { + const QString fileName = url.toLocalFile(); if (!fileName.isEmpty() && fileName.endsWith(m_extension)) rc.push_back(fileName); } diff --git a/src/designer/src/designer/newform.cpp b/src/designer/src/designer/newform.cpp index 12553c393..35199927a 100644 --- a/src/designer/src/designer/newform.cpp +++ b/src/designer/src/designer/newform.cpp @@ -103,13 +103,10 @@ QDialogButtonBox *NewForm::createButtonBox() QDesignerActions *da = m_workbench->actionManager(); QMenu *recentFilesMenu = new QMenu(tr("&Recent Forms"), m_recentButton); // Pop the "Recent Files" stuff in here. - const QList<QAction *> recentActions = da->recentFilesActions()->actions(); - if (!recentActions.isEmpty()) { - const QList<QAction *>::const_iterator acend = recentActions.constEnd(); - for (QList<QAction *>::const_iterator it = recentActions.constBegin(); it != acend; ++it) { - recentFilesMenu->addAction(*it); - connect(*it, &QAction::triggered, this, &NewForm::recentFileChosen); - } + const auto recentActions = da->recentFilesActions()->actions(); + for (auto action : recentActions) { + recentFilesMenu->addAction(action); + connect(action, &QAction::triggered, this, &NewForm::recentFileChosen); } m_recentButton->setMenu(recentFilesMenu); connect(buttonBox, &QDialogButtonBox::clicked, this, &NewForm::slotButtonBoxClicked); diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp index 71a02f759..ea296fc27 100644 --- a/src/designer/src/designer/qdesigner_actions.cpp +++ b/src/designer/src/designer/qdesigner_actions.cpp @@ -907,7 +907,7 @@ void QDesignerActions::updateRecentFileActions() QStringList files = m_settings.recentFilesList(); const int originalSize = files.size(); int numRecentFiles = qMin(files.size(), int(MaxRecentFiles)); - const QList<QAction *> recentFilesActs = m_recentFilesActions->actions(); + const auto recentFilesActs = m_recentFilesActions->actions(); for (int i = 0; i < numRecentFiles; ++i) { const QFileInfo fi(files[i]); diff --git a/src/designer/src/designer/qdesigner_formwindow.cpp b/src/designer/src/designer/qdesigner_formwindow.cpp index 77223e416..19c79e52d 100644 --- a/src/designer/src/designer/qdesigner_formwindow.cpp +++ b/src/designer/src/designer/qdesigner_formwindow.cpp @@ -173,7 +173,7 @@ int QDesignerFormWindow::getNumberOfUntitledWindows() const if (maxUntitled == 0) ++maxUntitled; if (match.lastCapturedIndex() >= 2) { - const QStringRef numberCapture = match.capturedRef(2); + const auto numberCapture = match.capturedRef(2); if (!numberCapture.isEmpty()) maxUntitled = qMax(numberCapture.toInt(), maxUntitled); } diff --git a/src/designer/src/designer/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp index 6262747dd..aec582e91 100644 --- a/src/designer/src/designer/qdesigner_workbench.cpp +++ b/src/designer/src/designer/qdesigner_workbench.cpp @@ -235,7 +235,7 @@ QDesignerWorkbench::QDesignerWorkbench() : { // Add application specific options pages QDesignerAppearanceOptionsPage *appearanceOptions = new QDesignerAppearanceOptionsPage(m_core); connect(appearanceOptions, &QDesignerAppearanceOptionsPage::settingsChanged, this, &QDesignerWorkbench::notifyUISettingsChanged); - QList<QDesignerOptionsPageInterface*> optionsPages = m_core->optionsPages(); + auto optionsPages = m_core->optionsPages(); optionsPages.push_front(appearanceOptions); m_core->setOptionsPages(optionsPages); } diff --git a/src/designer/src/lib/shared/actionprovider_p.h b/src/designer/src/lib/shared/actionprovider_p.h index 085162a8e..63d902951 100644 --- a/src/designer/src/lib/shared/actionprovider_p.h +++ b/src/designer/src/lib/shared/actionprovider_p.h @@ -66,7 +66,7 @@ public: template <class Widget> int actionIndexAt(const Widget *w, const QPoint &pos, Qt::Orientation orientation) { - const QList<QAction*> actions = w->actions(); + const auto actions = w->actions(); const int actionCount = actions.count(); if (actionCount == 0) return -1; diff --git a/src/designer/src/lib/shared/iconselector.cpp b/src/designer/src/lib/shared/iconselector.cpp index d9d50e782..c45402be5 100644 --- a/src/designer/src/lib/shared/iconselector.cpp +++ b/src/designer/src/lib/shared/iconselector.cpp @@ -329,7 +329,7 @@ bool IconSelector::checkPixmap(const QString &fileName, CheckMode cm, QString *e static QString imageFilter() { QString filter = QApplication::translate("IconSelector", "All Pixmaps ("); - const QList<QByteArray> supportedImageFormats = QImageReader::supportedImageFormats(); + const auto supportedImageFormats = QImageReader::supportedImageFormats(); const QString jpeg = QStringLiteral("JPEG"); const int count = supportedImageFormats.count(); for (int i = 0; i< count; ++i) { diff --git a/src/designer/src/lib/shared/layoutinfo.cpp b/src/designer/src/lib/shared/layoutinfo.cpp index d4a3286d0..73651a36c 100644 --- a/src/designer/src/lib/shared/layoutinfo.cpp +++ b/src/designer/src/lib/shared/layoutinfo.cpp @@ -177,12 +177,10 @@ LayoutInfo::Type LayoutInfo::laidoutWidgetType(const QDesignerFormEditorInterfac } // 3) Some child layout (see below comment about Q3GroupBox) - const QList<QLayout*> childLayouts = parentLayout->findChildren<QLayout*>(); + const auto childLayouts = parentLayout->findChildren<QLayout*>(); if (childLayouts.isEmpty()) return NoLayout; - const QList<QLayout*>::const_iterator lcend = childLayouts.constEnd(); - for (QList<QLayout*>::const_iterator it = childLayouts.constBegin(); it != lcend; ++it) { - QLayout *layout = *it; + for (QLayout *layout : childLayouts) { if (layout->indexOf(widget) != -1) { if (isManaged) *isManaged = core->metaDataBase()->item(layout); diff --git a/src/designer/src/lib/shared/morphmenu.cpp b/src/designer/src/lib/shared/morphmenu.cpp index 9f700bb22..f92d9600b 100644 --- a/src/designer/src/lib/shared/morphmenu.cpp +++ b/src/designer/src/lib/shared/morphmenu.cpp @@ -226,14 +226,10 @@ static QString suggestObjectName(const QString &oldClassName, const QString &new // Find the label whose buddy the widget is. QLabel *buddyLabelOf(QDesignerFormWindowInterface *fw, QWidget *w) { - using LabelList = QList<QLabel *>; - const LabelList labelList = fw->findChildren<QLabel*>(); - if (labelList.isEmpty()) - return nullptr; - const LabelList::const_iterator cend = labelList.constEnd(); - for (LabelList::const_iterator it = labelList.constBegin(); it != cend; ++it ) - if ( (*it)->buddy() == w) - return *it; + const auto labelList = fw->findChildren<QLabel*>(); + for (QLabel *label : labelList) + if (label->buddy() == w) + return label; return nullptr; } diff --git a/src/designer/src/lib/shared/plugindialog.cpp b/src/designer/src/lib/shared/plugindialog.cpp index 8f73099e7..86f90f963 100644 --- a/src/designer/src/lib/shared/plugindialog.cpp +++ b/src/designer/src/lib/shared/plugindialog.cpp @@ -101,7 +101,7 @@ void PluginDialog::populateTreeWidget() if (QObject *plugin = loader.instance()) { if (const QDesignerCustomWidgetCollectionInterface *c = qobject_cast<QDesignerCustomWidgetCollectionInterface*>(plugin)) { - const QList<QDesignerCustomWidgetInterface *> &collCustomWidgets = c->customWidgets(); + const auto &collCustomWidgets = c->customWidgets(); for (const QDesignerCustomWidgetInterface *p : collCustomWidgets) setItem(pluginItem, p->name(), p->toolTip(), p->whatsThis(), p->icon()); } else { diff --git a/src/designer/src/lib/shared/pluginmanager.cpp b/src/designer/src/lib/shared/pluginmanager.cpp index 8abe94c12..88b581862 100644 --- a/src/designer/src/lib/shared/pluginmanager.cpp +++ b/src/designer/src/lib/shared/pluginmanager.cpp @@ -544,7 +544,7 @@ void QDesignerPluginManagerPrivate::addCustomWidgets(const QObject *o, return; } if (const QDesignerCustomWidgetCollectionInterface *coll = qobject_cast<QDesignerCustomWidgetCollectionInterface*>(o)) { - const QList<QDesignerCustomWidgetInterface *> &collCustomWidgets = coll->customWidgets(); + const auto &collCustomWidgets = coll->customWidgets(); for (QDesignerCustomWidgetInterface *c : collCustomWidgets) addCustomWidget(c, pluginPath, designerLanguage); } diff --git a/src/designer/src/lib/shared/qdesigner_command.cpp b/src/designer/src/lib/shared/qdesigner_command.cpp index 59c27f5f5..04cbfeff3 100644 --- a/src/designer/src/lib/shared/qdesigner_command.cpp +++ b/src/designer/src/lib/shared/qdesigner_command.cpp @@ -232,18 +232,15 @@ void InsertWidgetCommand::undo() void InsertWidgetCommand::refreshBuddyLabels() { - using LabelList = QList<QLabel *>; - - const LabelList label_list = formWindow()->findChildren<QLabel*>(); + const auto label_list = formWindow()->findChildren<QLabel*>(); if (label_list.isEmpty()) return; const QString buddyProperty = QStringLiteral("buddy"); const QByteArray objectNameU8 = m_widget->objectName().toUtf8(); // Re-set the buddy (The sheet locates the object by name and sets it) - const LabelList::const_iterator cend = label_list.constEnd(); - for (LabelList::const_iterator it = label_list.constBegin(); it != cend; ++it ) { - if (QDesignerPropertySheetExtension* sheet = propertySheet(*it)) { + for (QLabel *label : label_list) { + if (QDesignerPropertySheetExtension* sheet = propertySheet(label)) { const int idx = sheet->indexOf(buddyProperty); if (idx != -1) { const QVariant value = sheet->property(idx); @@ -2656,7 +2653,7 @@ static RemoveActionCommand::ActionData findActionIn(QAction *action) const QWidgetList &associatedWidgets = action->associatedWidgets(); for (QWidget *widget : associatedWidgets) { if (qobject_cast<const QMenu *>(widget) || qobject_cast<const QToolBar *>(widget)) { - const QList<QAction*> actionList = widget->actions(); + const auto actionList = widget->actions(); const int size = actionList.size(); for (int i = 0; i < size; ++i) { if (actionList.at(i) == action) { diff --git a/src/designer/src/lib/shared/qdesigner_dnditem.cpp b/src/designer/src/lib/shared/qdesigner_dnditem.cpp index a4add41ff..4a7864372 100644 --- a/src/designer/src/lib/shared/qdesigner_dnditem.cpp +++ b/src/designer/src/lib/shared/qdesigner_dnditem.cpp @@ -253,7 +253,7 @@ void QDesignerMimeData::removeMovedWidgetsFromSourceForm(const QDesignerDnDItems if (FormWindowBase *fb = qobject_cast<FormWindowBase *>((*it)->source())) formWidgetMap.insert(fb, w); - const QList<FormWindowBase *> &formWindows = formWidgetMap.uniqueKeys(); + const auto &formWindows = formWidgetMap.uniqueKeys(); for (FormWindowBase *fb : formWindows) fb->deleteWidgetList(formWidgetMap.values(fb)); } diff --git a/src/designer/src/lib/shared/qdesigner_formwindowcommand.cpp b/src/designer/src/lib/shared/qdesigner_formwindowcommand.cpp index f1a15c48e..190540db2 100644 --- a/src/designer/src/lib/shared/qdesigner_formwindowcommand.cpp +++ b/src/designer/src/lib/shared/qdesigner_formwindowcommand.cpp @@ -100,9 +100,7 @@ void QDesignerFormWindowCommand::updateBuddies(QDesignerFormWindowInterface *for { QExtensionManager* extensionManager = form->core()->extensionManager(); - using LabelList = QList<QLabel *>; - - const LabelList label_list = form->findChildren<QLabel*>(); + const auto label_list = form->findChildren<QLabel*>(); if (label_list.isEmpty()) return; @@ -110,9 +108,9 @@ void QDesignerFormWindowCommand::updateBuddies(QDesignerFormWindowInterface *for const QByteArray oldNameU8 = old_name.toUtf8(); const QByteArray newNameU8 = new_name.toUtf8(); - const LabelList::const_iterator cend = label_list.constEnd(); - for (LabelList::const_iterator it = label_list.constBegin(); it != cend; ++it ) { - if (QDesignerPropertySheetExtension* sheet = qt_extension<QDesignerPropertySheetExtension*>(extensionManager, *it)) { + for (QLabel *label : label_list) { + if (QDesignerPropertySheetExtension* sheet = + qt_extension<QDesignerPropertySheetExtension*>(extensionManager, label)) { const int idx = sheet->indexOf(buddyProperty); if (idx != -1) { const QByteArray oldBuddy = sheet->property(idx).toByteArray(); diff --git a/src/designer/src/lib/shared/qdesigner_menu.cpp b/src/designer/src/lib/shared/qdesigner_menu.cpp index c56a4517b..a8cad50d3 100644 --- a/src/designer/src/lib/shared/qdesigner_menu.cpp +++ b/src/designer/src/lib/shared/qdesigner_menu.cpp @@ -568,7 +568,7 @@ void QDesignerMenu::paintEvent(QPaintEvent *event) QAction *current = currentAction(); - const QList<QAction *> &actionList = actions(); + const auto &actionList = actions(); for (QAction *a : actionList) { const QRect g = actionGeometry(a); @@ -851,7 +851,7 @@ void QDesignerMenu::closeMenuChain() w = w->parentWidget(); if (w) { - const QList<QMenu *> &menus = w->findChildren<QMenu *>(); + const auto &menus = w->findChildren<QMenu *>(); for (QMenu *subMenu : menus) subMenu->hide(); } @@ -1298,7 +1298,7 @@ QAction *QDesignerMenu::safeActionAt(int index) const void QDesignerMenu::hideSubMenu() { m_lastSubMenuIndex = -1; - const QList<QMenu *> &menus = findChildren<QMenu *>(); + const auto &menus = findChildren<QMenu *>(); for (QMenu *subMenu : menus) subMenu->hide(); } diff --git a/src/designer/src/lib/shared/qdesigner_propertycommand.cpp b/src/designer/src/lib/shared/qdesigner_propertycommand.cpp index eab11e033..8eec59868 100644 --- a/src/designer/src/lib/shared/qdesigner_propertycommand.cpp +++ b/src/designer/src/lib/shared/qdesigner_propertycommand.cpp @@ -881,7 +881,7 @@ QVariant PropertyHelper::findDefaultValue(QDesignerFormWindowInterface *fw) cons return m_oldValue.first; // We simply don't know the value in this case const QDesignerWidgetDataBaseItemInterface *item = fw->core()->widgetDataBase()->item(item_idx); - const QList<QVariant> default_prop_values = item->defaultPropertyValues(); + const auto default_prop_values = item->defaultPropertyValues(); if (m_index < default_prop_values.size()) return default_prop_values.at(m_index); diff --git a/src/designer/src/lib/shared/qdesigner_tabwidget.cpp b/src/designer/src/lib/shared/qdesigner_tabwidget.cpp index 9500f0673..42a72b403 100644 --- a/src/designer/src/lib/shared/qdesigner_tabwidget.cpp +++ b/src/designer/src/lib/shared/qdesigner_tabwidget.cpp @@ -118,7 +118,7 @@ QTabBar *QTabWidgetEventFilter::tabBar() const { // QTabWidget::tabBar() accessor is protected, grmbl... if (!m_cachedTabBar) { - const QList<QTabBar *> tabBars = m_tabWidget->findChildren<QTabBar *>(); + const auto tabBars = m_tabWidget->findChildren<QTabBar *>(); Q_ASSERT(tabBars.size() == 1); m_cachedTabBar = tabBars.constFirst(); } diff --git a/src/designer/src/lib/shared/qdesigner_toolbar.cpp b/src/designer/src/lib/shared/qdesigner_toolbar.cpp index 840d99a57..08723c2ff 100644 --- a/src/designer/src/lib/shared/qdesigner_toolbar.cpp +++ b/src/designer/src/lib/shared/qdesigner_toolbar.cpp @@ -124,7 +124,7 @@ ActionList ToolBarEventFilter::contextMenuActions(const QPoint &globalPos) { ActionList rc; const int index = actionIndexAt(m_toolBar, m_toolBar->mapFromGlobal(globalPos), m_toolBar->orientation()); - const ActionList actions = m_toolBar->actions(); + const auto actions = m_toolBar->actions(); QAction *action = index != -1 ?actions.at(index) : 0; QVariant itemData; diff --git a/src/designer/src/lib/shared/qdesigner_utils.cpp b/src/designer/src/lib/shared/qdesigner_utils.cpp index 40b7d8464..a16266cae 100644 --- a/src/designer/src/lib/shared/qdesigner_utils.cpp +++ b/src/designer/src/lib/shared/qdesigner_utils.cpp @@ -695,7 +695,7 @@ namespace qdesigner_internal if (const QDesignerTaskMenuExtension *taskMenu = qt_extension<QDesignerTaskMenuExtension*>(core->extensionManager(), managedWidget)) { action = taskMenu->preferredEditAction(); if (!action) { - const QList<QAction *> actions = taskMenu->taskActions(); + const auto actions = taskMenu->taskActions(); if (!actions.isEmpty()) action = actions.first(); } @@ -705,7 +705,7 @@ namespace qdesigner_internal core->extensionManager()->extension(managedWidget, QStringLiteral("QDesignerInternalTaskMenuExtension")))) { action = taskMenu->preferredEditAction(); if (!action) { - const QList<QAction *> actions = taskMenu->taskActions(); + const auto actions = taskMenu->taskActions(); if (!actions.isEmpty()) action = actions.first(); } diff --git a/src/designer/src/lib/shared/qdesigner_widgetbox.cpp b/src/designer/src/lib/shared/qdesigner_widgetbox.cpp index 1ca79d777..e530bcfc1 100644 --- a/src/designer/src/lib/shared/qdesigner_widgetbox.cpp +++ b/src/designer/src/lib/shared/qdesigner_widgetbox.cpp @@ -190,7 +190,7 @@ DomUI *QDesignerWidgetBox::xmlToUi(const QString &name, const QString &xml, bool while (!reader.atEnd()) { if (reader.readNext() == QXmlStreamReader::StartElement) { - const QStringRef name = reader.name(); + const auto name = reader.name(); if (ui) { reader.raiseError(tr("Unexpected element <%1>").arg(name.toString())); continue; diff --git a/src/designer/src/lib/shared/qlayout_widget.cpp b/src/designer/src/lib/shared/qlayout_widget.cpp index 52965171f..d87874105 100644 --- a/src/designer/src/lib/shared/qlayout_widget.cpp +++ b/src/designer/src/lib/shared/qlayout_widget.cpp @@ -638,12 +638,11 @@ QRect LayoutHelper::itemInfo(QLayout *lt, const QWidget *widget) const GridLayoutState::CellStates GridLayoutState::cellStates(const QList<QRect> &rects, int numRows, int numColumns) { CellStates rc = CellStates(numRows * numColumns, CellState(Free, Free)); - const QList<QRect>::const_iterator rcend = rects.constEnd(); - for (QList<QRect>::const_iterator it = rects.constBegin(); it != rcend; ++it) { - const int leftColumn = it->x(); - const int topRow = it->y(); - const int rightColumn = leftColumn + it->width() - 1; - const int bottomRow = topRow + it->height() - 1; + for (const auto &rect : rects) { + const int leftColumn = rect.x(); + const int topRow = rect.y(); + const int rightColumn = leftColumn + rect.width() - 1; + const int bottomRow = topRow + rect.height() - 1; for (int r = topRow; r <= bottomRow; r++) for (int c = leftColumn; c <= rightColumn; c++) { const int flatIndex = r * numColumns + c; diff --git a/src/designer/src/lib/shared/qtresourceeditordialog.cpp b/src/designer/src/lib/shared/qtresourceeditordialog.cpp index f2275d0b9..a1c15e708 100644 --- a/src/designer/src/lib/shared/qtresourceeditordialog.cpp +++ b/src/designer/src/lib/shared/qtresourceeditordialog.cpp @@ -399,10 +399,10 @@ void QtQrcManager::exportQrcFile(QtQrcFile *qrcFile, QtQrcFileData *qrcFileData) QList<QtResourcePrefixData> resourceList; - const QList<QtResourcePrefix *> resourcePrefixes = qrcFile->resourcePrefixList(); + const auto resourcePrefixes = qrcFile->resourcePrefixList(); for (const QtResourcePrefix *prefix : resourcePrefixes) { QList<QtResourceFileData> resourceFileList; - const QList<QtResourceFile *> resourceFiles = prefix->resourceFiles(); + const auto resourceFiles = prefix->resourceFiles(); for (QtResourceFile *file : resourceFiles) { QtResourceFileData fileData; fileData.path = file->path(); @@ -460,7 +460,7 @@ QtResourcePrefix *QtQrcManager::prevResourcePrefix(QtResourcePrefix *resourcePre { if (!resourcePrefix) return nullptr; - QList<QtResourcePrefix *> prefixes = qrcFileOf(resourcePrefix)->resourcePrefixList(); + const auto prefixes = qrcFileOf(resourcePrefix)->resourcePrefixList(); const int idx = prefixes.indexOf(resourcePrefix); if (idx <= 0) return nullptr; @@ -471,7 +471,7 @@ QtResourcePrefix *QtQrcManager::nextResourcePrefix(QtResourcePrefix *resourcePre { if (!resourcePrefix) return nullptr; - QList<QtResourcePrefix *> prefixes = qrcFileOf(resourcePrefix)->resourcePrefixList(); + const auto prefixes = qrcFileOf(resourcePrefix)->resourcePrefixList(); const int idx = prefixes.indexOf(resourcePrefix); if (idx < 0 || idx == prefixes.size() - 1) return nullptr; @@ -482,7 +482,7 @@ QtResourceFile *QtQrcManager::prevResourceFile(QtResourceFile *resourceFile) con { if (!resourceFile) return nullptr; - QList<QtResourceFile *> files = resourcePrefixOf(resourceFile)->resourceFiles(); + const auto files = resourcePrefixOf(resourceFile)->resourceFiles(); const int idx = files.indexOf(resourceFile); if (idx <= 0) return nullptr; @@ -493,7 +493,7 @@ QtResourceFile *QtQrcManager::nextResourceFile(QtResourceFile *resourceFile) con { if (!resourceFile) return nullptr; - QList<QtResourceFile *> files = resourcePrefixOf(resourceFile)->resourceFiles(); + const auto files = resourcePrefixOf(resourceFile)->resourceFiles(); const int idx = files.indexOf(resourceFile); if (idx < 0 || idx == files.size() - 1) return nullptr; @@ -502,7 +502,7 @@ QtResourceFile *QtQrcManager::nextResourceFile(QtResourceFile *resourceFile) con void QtQrcManager::clear() { - const QList<QtQrcFile *> oldQrcFiles = qrcFiles(); + const auto oldQrcFiles = qrcFiles(); for (QtQrcFile *qf : oldQrcFiles) removeQrcFile(qf); } @@ -569,7 +569,7 @@ void QtQrcManager::removeQrcFile(QtQrcFile *qrcFile) if (idx < 0) return; - const QList<QtResourcePrefix *> resourcePrefixes = qrcFile->resourcePrefixList(); + const auto resourcePrefixes = qrcFile->resourcePrefixList(); for (QtResourcePrefix *rp : resourcePrefixes) removeResourcePrefix(rp); @@ -672,7 +672,7 @@ void QtQrcManager::removeResourcePrefix(QtResourcePrefix *resourcePrefix) const int idx = qrcFile->m_resourcePrefixes.indexOf(resourcePrefix); - const QList<QtResourceFile *> resourceFiles = resourcePrefix->resourceFiles(); + const auto resourceFiles = resourcePrefix->resourceFiles(); for (QtResourceFile *rf : resourceFiles) removeResourceFile(rf); @@ -1013,7 +1013,7 @@ void QtResourceEditorDialogPrivate::slotResourcePrefixMoved(QtResourcePrefix *re const QModelIndex index = m_treeModel->indexFromItem(prefixItem); const bool expanded = m_ui.resourceTreeView->isExpanded(index); m_ignoreCurrentChanged = true; - const QList<QStandardItem *> items = m_treeModel->takeRow(index.row()); + const auto items = m_treeModel->takeRow(index.row()); int row = m_treeModel->rowCount(); QtResourcePrefix *nextResourcePrefix = m_qrcManager->nextResourcePrefix(resourcePrefix); @@ -1126,7 +1126,7 @@ void QtResourceEditorDialogPrivate::slotResourceFileMoved(QtResourceFile *resour QStandardItem *parentItem = pathItem->parent(); m_ignoreCurrentChanged = true; - const QList<QStandardItem *> items = parentItem->takeRow(m_treeModel->indexFromItem(pathItem).row()); + const auto items = parentItem->takeRow(m_treeModel->indexFromItem(pathItem).row()); int row = parentItem->rowCount(); QtResourceFile *nextResourceFile = m_qrcManager->nextResourceFile(resourceFile); @@ -1189,7 +1189,7 @@ void QtResourceEditorDialogPrivate::slotCurrentQrcFileChanged(QListWidgetItem *i QMap<QtResourcePrefix *, QStandardItem *> currentPrefixList = m_resourcePrefixToPrefixItem; for (auto it = currentPrefixList.cbegin(), end = currentPrefixList.cend(); it != end; ++it) { QtResourcePrefix *resourcePrefix = it.key(); - const QList<QtResourceFile *> currentResourceFiles = resourcePrefix->resourceFiles(); + const auto currentResourceFiles = resourcePrefix->resourceFiles(); for (QtResourceFile *rf : currentResourceFiles) slotResourceFileRemoved(rf); slotResourcePrefixRemoved(resourcePrefix); @@ -1200,12 +1200,12 @@ void QtResourceEditorDialogPrivate::slotCurrentQrcFileChanged(QListWidgetItem *i slotCurrentTreeViewItemChanged(QModelIndex()); QStandardItem *firstPrefix = nullptr; // select first prefix if (m_currentQrcFile) { - const QList<QtResourcePrefix *> newPrefixList = m_currentQrcFile->resourcePrefixList(); + const auto newPrefixList = m_currentQrcFile->resourcePrefixList(); for (QtResourcePrefix *resourcePrefix : newPrefixList) { if (QStandardItem *newPrefixItem = insertResourcePrefix(resourcePrefix)) if (!firstPrefix) firstPrefix = newPrefixItem; - const QList<QtResourceFile *> newResourceFiles = resourcePrefix->resourceFiles(); + const auto newResourceFiles = resourcePrefix->resourceFiles(); for (QtResourceFile *rf : newResourceFiles) slotResourceFileInserted(rf); } @@ -1542,7 +1542,7 @@ void QtResourceEditorDialogPrivate::slotAddFiles() QtResourceFile *nextResourceFile = m_qrcManager->nextResourceFile(currentResourceFile); if (!currentResourceFile) { - QList<QtResourceFile *> resourceFiles = currentResourcePrefix->resourceFiles(); + const auto resourceFiles = currentResourcePrefix->resourceFiles(); if (resourceFiles.count() > 0) nextResourceFile = resourceFiles.first(); } @@ -1660,7 +1660,7 @@ void QtResourceEditorDialogPrivate::slotClonePrefix() QtResourcePrefix *newResourcePrefix = m_qrcManager->insertResourcePrefix(m_currentQrcFile, currentResourcePrefix->prefix(), currentResourcePrefix->language(), m_qrcManager->nextResourcePrefix(currentResourcePrefix)); if (newResourcePrefix) { - const QList<QtResourceFile *> files = currentResourcePrefix->resourceFiles(); + const auto files = currentResourcePrefix->resourceFiles(); for (QtResourceFile *resourceFile : files) { QString path = resourceFile->path(); QFileInfo fi(path); @@ -2096,7 +2096,7 @@ void QtResourceEditorDialog::accept() QStringList newQrcPaths; QList<QtQrcFileData> currentState; - const QList<QtQrcFile *> qrcFiles = d_ptr->m_qrcManager->qrcFiles(); + const auto qrcFiles = d_ptr->m_qrcManager->qrcFiles(); for (QtQrcFile *qrcFile : qrcFiles) { QtQrcFileData qrcFileData; d_ptr->m_qrcManager->exportQrcFile(qrcFile, &qrcFileData); diff --git a/src/designer/src/lib/shared/qtresourcemodel.cpp b/src/designer/src/lib/shared/qtresourcemodel.cpp index 7801cf580..391cf49a3 100644 --- a/src/designer/src/lib/shared/qtresourcemodel.cpp +++ b/src/designer/src/lib/shared/qtresourcemodel.cpp @@ -279,9 +279,9 @@ void QtResourceModelPrivate::activate(QtResourceSet *resourceSet, const QStringL m_pathToModified.insert(path, false); m_pathToContents.insert(path, contents); newResourceSetChanged = true; - const QMap<QString, QList<QtResourceSet *> >::iterator itReload = m_pathToResourceSet.find(path); + const auto itReload = m_pathToResourceSet.find(path); if (itReload != m_pathToResourceSet.end()) { - const QList<QtResourceSet *> resources = itReload.value(); + const auto resources = itReload.value(); for (QtResourceSet *res : resources) { if (res != resourceSet) { m_resourceSetToReload[res] = true; @@ -292,8 +292,8 @@ void QtResourceModelPrivate::activate(QtResourceSet *resourceSet, const QStringL } } - const QList<const QByteArray *> oldData = m_pathToData.values(); - const QList<const QByteArray *> newData = newPathToData.values(); + const auto oldData = m_pathToData.values(); + const auto newData = newPathToData.values(); QList<const QByteArray *> toDelete; for (const QByteArray *array : oldData) { @@ -373,7 +373,7 @@ void QtResourceModelPrivate::removeOldPaths(QtResourceSet *resourceSet, const QS // remove old for (const QString &oldPath : oldPaths) { if (!newPaths.contains(oldPath)) { - const QMap<QString, QList<QtResourceSet *> >::iterator itRemove = m_pathToResourceSet.find(oldPath); + const auto itRemove = m_pathToResourceSet.find(oldPath); if (itRemove != m_pathToResourceSet.end()) { const int idx = itRemove.value().indexOf(resourceSet); if (idx >= 0) @@ -452,7 +452,7 @@ QtResourceModel::QtResourceModel(QObject *parent) : QtResourceModel::~QtResourceModel() { blockSignals(true); - const QList<QtResourceSet *> resourceList = resourceSets(); + const auto resourceList = resourceSets(); for (QtResourceSet *rs : resourceList) removeResourceSet(rs); blockSignals(false); @@ -478,11 +478,11 @@ void QtResourceModel::setModified(const QString &path) return; d_ptr->m_pathToModified[path] = true; - QMap<QString, QList<QtResourceSet *> >::const_iterator it = d_ptr->m_pathToResourceSet.constFind(path); + const auto it = d_ptr->m_pathToResourceSet.constFind(path); if (it == d_ptr->m_pathToResourceSet.constEnd()) return; - const QList<QtResourceSet *> resourceList = it.value(); + const auto resourceList = it.value(); for (QtResourceSet *rs : resourceList) d_ptr->m_resourceSetToReload.insert(rs, true); } diff --git a/src/designer/src/lib/shared/rcc.cpp b/src/designer/src/lib/shared/rcc.cpp index b98f17e07..e75b68f0a 100644 --- a/src/designer/src/lib/shared/rcc.cpp +++ b/src/designer/src/lib/shared/rcc.cpp @@ -895,12 +895,11 @@ bool RCCResourceLibrary::writeDataStructure() file->m_childOffset = offset; //sort by hash value for binary lookup - QList<RCCFileInfo*> m_children = file->m_children.values(); - std::sort(m_children.begin(), m_children.end(), qt_rcc_compare_hash); + auto children = file->m_children.values(); + std::sort(children.begin(), children.end(), qt_rcc_compare_hash); //write out the actual data now - for (int i = 0; i < m_children.size(); ++i) { - RCCFileInfo *child = m_children.at(i); + for (RCCFileInfo *child : children) { ++offset; if (child->m_flags & RCCFileInfo::Directory) pending.push(child); @@ -914,12 +913,11 @@ bool RCCResourceLibrary::writeDataStructure() RCCFileInfo *file = pending.pop(); //sort by hash value for binary lookup - QList<RCCFileInfo*> m_children = file->m_children.values(); - std::sort(m_children.begin(), m_children.end(), qt_rcc_compare_hash); + auto children = file->m_children.values(); + std::sort(children.begin(), children.end(), qt_rcc_compare_hash); //write out the actual data now - for (int i = 0; i < m_children.size(); ++i) { - RCCFileInfo *child = m_children.at(i); + for (RCCFileInfo *child : children) { child->writeDataInfo(*this); if (child->m_flags & RCCFileInfo::Directory) pending.push(child); diff --git a/src/designer/src/lib/shared/richtexteditor.cpp b/src/designer/src/lib/shared/richtexteditor.cpp index ca2a82b09..666bdd1cb 100644 --- a/src/designer/src/lib/shared/richtexteditor.cpp +++ b/src/designer/src/lib/shared/richtexteditor.cpp @@ -131,7 +131,7 @@ QString simplifyRichTextFilter(const QString &in, bool *isPlainTextPtr = nullptr case QXmlStreamReader::StartElement: elementCount++; if (filterElement(reader.name())) { - const QStringRef name = reader.name(); + const auto name = reader.name(); QXmlStreamAttributes attributes = reader.attributes(); filterAttributes(name, &attributes, ¶graphAlignmentFound); writer.writeStartElement(name.toString()); @@ -425,7 +425,7 @@ RichTextEditorToolBar::RichTextEditorToolBar(QDesignerFormEditorInterface *core, { // Font size combo box m_font_size_input->setEditable(false); - const QList<int> font_sizes = QFontDatabase::standardSizes(); + const auto font_sizes = QFontDatabase::standardSizes(); for (int font_size : font_sizes) m_font_size_input->addItem(QString::number(font_size)); diff --git a/src/designer/src/lib/shared/selectsignaldialog.cpp b/src/designer/src/lib/shared/selectsignaldialog.cpp index 67b988a56..8c2678f1f 100644 --- a/src/designer/src/lib/shared/selectsignaldialog.cpp +++ b/src/designer/src/lib/shared/selectsignaldialog.cpp @@ -162,7 +162,7 @@ void SelectSignalDialog::populate(QDesignerFormEditorInterface *core, QObject *o if (defaultSignal.isEmpty()) { selectedIndex = m_model->index(0, 0, m_model->index(0, 0, QModelIndex())); // first method } else { - const QList<QStandardItem *> items = m_model->findItems(defaultSignal, Qt::MatchExactly | Qt::MatchRecursive, 0); + const auto items = m_model->findItems(defaultSignal, Qt::MatchExactly | Qt::MatchRecursive, 0); if (!items.isEmpty()) selectedIndex = m_model->indexFromItem(items.constFirst()); } diff --git a/src/designer/src/lib/shared/widgetdatabase.cpp b/src/designer/src/lib/shared/widgetdatabase.cpp index 8c6382112..6b63ac7b4 100644 --- a/src/designer/src/lib/shared/widgetdatabase.cpp +++ b/src/designer/src/lib/shared/widgetdatabase.cpp @@ -374,9 +374,7 @@ void WidgetDataBase::loadPlugins() unsigned addedPlugins = 0; unsigned removedPlugins = 0; if (!pluginList.isEmpty()) { - ItemList::const_iterator cend = pluginList.constEnd(); - for (ItemList::const_iterator it = pluginList.constBegin();it != cend; ++it ) { - QDesignerWidgetDataBaseItemInterface* pluginItem = *it; + for (QDesignerWidgetDataBaseItemInterface *pluginItem : qAsConst(pluginList)) { const QString pluginName = pluginItem->name(); NameIndexMap::iterator existingIt = existingCustomClasses.find(pluginName); if (existingIt == existingCustomClasses.end()) { @@ -429,10 +427,10 @@ QList<QVariant> WidgetDataBase::defaultPropertyValues(const QString &name) object = factory->createWidget(name, nullptr); if (!object) { qDebug() << "** WARNING Factory failed to create " << name; - return QList<QVariant>(); + return {}; } // Get properties from sheet. - QList<QVariant> result; + QVariantList result; if (const QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(m_core->extensionManager(), object)) { const int propertyCount = sheet->count(); for (int i = 0; i < propertyCount; ++i) { @@ -448,7 +446,7 @@ void WidgetDataBase::grabDefaultPropertyValues() const int itemCount = count(); for (int i = 0; i < itemCount; ++i) { QDesignerWidgetDataBaseItemInterface *dbItem = item(i); - const QList<QVariant> default_prop_values = defaultPropertyValues(dbItem->name()); + const auto default_prop_values = defaultPropertyValues(dbItem->name()); dbItem->setDefaultPropertyValues(default_prop_values); } } diff --git a/src/designer/src/lib/shared/widgetfactory.cpp b/src/designer/src/lib/shared/widgetfactory.cpp index 14cd72124..c8db16f97 100644 --- a/src/designer/src/lib/shared/widgetfactory.cpp +++ b/src/designer/src/lib/shared/widgetfactory.cpp @@ -212,8 +212,7 @@ void WidgetFactory::loadPlugins() { m_customFactory.clear(); - const QList<QDesignerCustomWidgetInterface*> &lst = - m_core->pluginManager()->registeredCustomWidgets(); + const auto &lst = m_core->pluginManager()->registeredCustomWidgets(); for (QDesignerCustomWidgetInterface *c : lst) m_customFactory.insert(c->name(), c); } diff --git a/src/designer/src/lib/shared/zoomwidget.cpp b/src/designer/src/lib/shared/zoomwidget.cpp index fef509a39..af184f5ea 100644 --- a/src/designer/src/lib/shared/zoomwidget.cpp +++ b/src/designer/src/lib/shared/zoomwidget.cpp @@ -43,9 +43,6 @@ QT_BEGIN_NAMESPACE -using ActionList = QList<QAction *>; -using GraphicsItemList = QList<QGraphicsItem *>; - enum { debugZoomWidget = 0 }; static const int menuZoomList[] = { 100, 25, 50, 75, 125, 150 , 175, 200 }; @@ -77,11 +74,10 @@ int ZoomMenu::zoomOf(const QAction *a) void ZoomMenu::addActions(QMenu *m) { - const ActionList za = m_menuActions->actions(); - const ActionList::const_iterator cend = za.constEnd(); - for (ActionList::const_iterator it = za.constBegin(); it != cend; ++it) { - m->addAction(*it); - if (zoomOf(*it) == 100) + const auto za = m_menuActions->actions(); + for (QAction *a : za) { + m->addAction(a); + if (zoomOf(a) == 100) m->addSeparator(); } } @@ -93,13 +89,13 @@ int ZoomMenu::zoom() const void ZoomMenu::setZoom(int percent) { - const ActionList za = m_menuActions->actions(); - const ActionList::const_iterator cend = za.constEnd(); - for (ActionList::const_iterator it = za.constBegin(); it != cend; ++it) - if (zoomOf(*it) == percent) { - (*it)->setChecked(true); + const auto za = m_menuActions->actions(); + for (QAction *a : za) { + if (zoomOf(a) == percent) { + a->setChecked(true); return; } + } } void ZoomMenu::slotZoomMenu(QAction *a) diff --git a/src/designer/src/lib/uilib/abstractformbuilder.cpp b/src/designer/src/lib/uilib/abstractformbuilder.cpp index 04e3fd1de..2a6aaf9ed 100644 --- a/src/designer/src/lib/uilib/abstractformbuilder.cpp +++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp @@ -796,8 +796,8 @@ static inline Qt::Alignment alignmentFromDom(const QString &in) { Qt::Alignment rc = nullptr; if (!in.isEmpty()) { - const QVector<QStringRef> flags = in.splitRef(QLatin1Char('|')); - for (const QStringRef &f : flags) { + const auto flags = in.splitRef(QLatin1Char('|')); + for (const auto &f : flags) { if (f == QStringLiteral("Qt::AlignLeft")) { rc |= Qt::AlignLeft; } else if (f == QStringLiteral("Qt::AlignRight")) { @@ -1172,7 +1172,7 @@ DomWidget *QAbstractFormBuilder::createDom(QWidget *widget, DomWidget *ui_parent continue; if (QMenu *menu = qobject_cast<QMenu *>(childWidget)) { - const QList<QAction *> actions = menu->parentWidget()->actions(); + const auto actions = menu->parentWidget()->actions(); const bool found = std::any_of(actions.cbegin(), actions.cend(), [menu] (const QAction *a) { return a->menu() == menu; }); @@ -1201,7 +1201,7 @@ DomWidget *QAbstractFormBuilder::createDom(QWidget *widget, DomWidget *ui_parent // add-action QVector<DomActionRef *> ui_action_refs; - const QList<QAction *> &actions = widget->actions(); + const auto &actions = widget->actions(); ui_action_refs.reserve(actions.size()); for (QAction *action : actions) { if (DomActionRef *ui_action_ref = createActionRefDom(action)) { @@ -1452,7 +1452,7 @@ QList<DomProperty*> QAbstractFormBuilder::computeProperties(QObject *obj) for(int i=0; i < propertyCount; ++i) properties.insert(meta->property(i).name(), true); - const QList<QByteArray> propertyNames = properties.keys(); + const auto propertyNames = properties.keys(); const int propertyNamesCount = propertyNames.size(); for(int i=0; i<propertyNamesCount ; ++i) { @@ -2484,7 +2484,7 @@ DomActionGroup *QAbstractFormBuilder::createDom(QActionGroup *actionGroup) QVector<DomAction *> ui_actions; - const QList<QAction *> &actions = actionGroup->actions(); + const auto &actions = actionGroup->actions(); ui_actions.reserve(actions.size()); for (QAction *action : actions) { if (DomAction *ui_action = createDom(action)) { diff --git a/src/designer/src/lib/uilib/formbuilderextra.cpp b/src/designer/src/lib/uilib/formbuilderextra.cpp index 14174711f..8dfb1b479 100644 --- a/src/designer/src/lib/uilib/formbuilderextra.cpp +++ b/src/designer/src/lib/uilib/formbuilderextra.cpp @@ -386,7 +386,7 @@ inline bool parsePerCellProperty(Layout *l, int count, void (Layout::*setter)(in clearPerCellValue(l, count, setter, defaultValue); return true; } - const QVector<QStringRef> list = s.splitRef(QLatin1Char(',')); + const auto list = s.splitRef(QLatin1Char(',')); if (list.isEmpty()) { clearPerCellValue(l, count, setter, defaultValue); return true; @@ -804,7 +804,8 @@ QFormBuilderStrings::QFormBuilderStrings() : whatsThisAttribute)); // Note: this skips the first item! - QList<TextRoleNName>::const_iterator it = itemTextRoles.constBegin(), end = itemTextRoles.constEnd(); + auto it = itemTextRoles.constBegin(); + const auto end = itemTextRoles.constEnd(); while (++it != end) treeItemTextRoleHash.insert(it->second, it->first); } diff --git a/src/designer/src/uitools/quiloader.cpp b/src/designer/src/uitools/quiloader.cpp index 4aec975d9..d1d4c5a73 100644 --- a/src/designer/src/uitools/quiloader.cpp +++ b/src/designer/src/uitools/quiloader.cpp @@ -242,7 +242,7 @@ public: bool eventFilter(QObject *o, QEvent *event) override { if (event->type() == QEvent::LanguageChange) { - const QList<QByteArray> &dynamicPropertyNames = o->dynamicPropertyNames(); + const auto &dynamicPropertyNames = o->dynamicPropertyNames(); for (const QByteArray &prop : dynamicPropertyNames) { if (prop.startsWith(PROP_GENERIC_PREFIX)) { const QByteArray propName = prop.mid(sizeof(PROP_GENERIC_PREFIX) - 1); diff --git a/src/shared/deviceskin/deviceskin.cpp b/src/shared/deviceskin/deviceskin.cpp index b8649b9b3..593502d0a 100644 --- a/src/shared/deviceskin/deviceskin.cpp +++ b/src/shared/deviceskin/deviceskin.cpp @@ -69,7 +69,7 @@ namespace { } static void parseRect(const QString &value, QRect *rect) { - const QVector<QStringRef> l = value.splitRef(QLatin1Char(' ')); + const auto l = value.splitRef(QLatin1Char(' ')); rect->setRect(l[0].toInt(), l[1].toInt(), l[2].toInt(), l[3].toInt()); } diff --git a/src/shared/fontpanel/fontpanel.cpp b/src/shared/fontpanel/fontpanel.cpp index 59238f6eb..2645d992e 100644 --- a/src/shared/fontpanel/fontpanel.cpp +++ b/src/shared/fontpanel/fontpanel.cpp @@ -64,7 +64,7 @@ FontPanel::FontPanel(QWidget *parentWidget) : // writing systems m_writingSystemComboBox->setEditable(false); - QList<QFontDatabase::WritingSystem> writingSystems = m_fontDatabase.writingSystems(); + auto writingSystems = m_fontDatabase.writingSystems(); writingSystems.push_front(QFontDatabase::Any); for (QFontDatabase::WritingSystem ws : qAsConst(writingSystems)) m_writingSystemComboBox->addItem(QFontDatabase::writingSystemName(ws), QVariant(ws)); @@ -269,7 +269,7 @@ void FontPanel::updatePointSizes(const QString &family, const QString &styleStri { const int oldPointSize = pointSize(); - QList<int> pointSizes = m_fontDatabase.pointSizes(family, styleString); + auto pointSizes = m_fontDatabase.pointSizes(family, styleString); if (pointSizes.isEmpty()) pointSizes = QFontDatabase::standardSizes(); diff --git a/src/shared/qtgradienteditor/qtgradientstopscontroller.cpp b/src/shared/qtgradienteditor/qtgradientstopscontroller.cpp index 57303f009..9fb44469a 100644 --- a/src/shared/qtgradienteditor/qtgradientstopscontroller.cpp +++ b/src/shared/qtgradienteditor/qtgradientstopscontroller.cpp @@ -402,7 +402,7 @@ void QtGradientStopsControllerPrivate::slotChangeColor(const QColor &color) if (!stop) return; m_model->changeStop(stop, color); - const QList<QtGradientStop *> stops = m_model->selectedStops(); + const auto stops = m_model->selectedStops(); for (QtGradientStop *s : stops) { if (s != stop) m_model->changeStop(s, color); @@ -415,7 +415,7 @@ void QtGradientStopsControllerPrivate::slotChangeHue(const QColor &color) if (!stop) return; m_model->changeStop(stop, color); - const QList<QtGradientStop *> stops = m_model->selectedStops(); + const auto stops = m_model->selectedStops(); for (QtGradientStop *s : stops) { if (s != stop) { QColor c = s->color(); @@ -444,7 +444,7 @@ void QtGradientStopsControllerPrivate::slotChangeSaturation(const QColor &color) if (!stop) return; m_model->changeStop(stop, color); - const QList<QtGradientStop *> stops = m_model->selectedStops(); + const auto stops = m_model->selectedStops(); for (QtGradientStop *s : stops) { if (s != stop) { QColor c = s->color(); @@ -477,7 +477,7 @@ void QtGradientStopsControllerPrivate::slotChangeValue(const QColor &color) if (!stop) return; m_model->changeStop(stop, color); - const QList<QtGradientStop *> stops = m_model->selectedStops(); + const auto stops = m_model->selectedStops(); for (QtGradientStop *s : stops) { if (s != stop) { QColor c = s->color(); @@ -510,7 +510,7 @@ void QtGradientStopsControllerPrivate::slotChangeAlpha(const QColor &color) if (!stop) return; m_model->changeStop(stop, color); - const QList<QtGradientStop *> stops = m_model->selectedStops(); + const auto stops = m_model->selectedStops(); for (QtGradientStop *s : stops) { if (s != stop) { QColor c = s->color(); @@ -676,7 +676,7 @@ void QtGradientStopsController::setGradientStops(const QGradientStops &stops) QGradientStops QtGradientStopsController::gradientStops() const { QGradientStops stops; - const QList<QtGradientStop *> stopsList = d_ptr->m_model->stops().values(); + const auto stopsList = d_ptr->m_model->stops().values(); for (const QtGradientStop *stop : stopsList) stops << QPair<qreal, QColor>(stop->position(), stop->color()); return stops; diff --git a/src/shared/qtgradienteditor/qtgradientstopsmodel.cpp b/src/shared/qtgradienteditor/qtgradientstopsmodel.cpp index d35c1f025..0afbf49bb 100644 --- a/src/shared/qtgradienteditor/qtgradientstopsmodel.cpp +++ b/src/shared/qtgradienteditor/qtgradientstopsmodel.cpp @@ -375,7 +375,7 @@ void QtGradientStopsModel::moveStops(double newPosition) PositionStopMap stopList; - const QList<QtGradientStop *> selected = selectedStops(); + const auto selected = selectedStops(); for (QtGradientStop *stop : selected) stopList[stop->position()] = stop; stopList[current->position()] = current; @@ -406,14 +406,14 @@ void QtGradientStopsModel::moveStops(double newPosition) void QtGradientStopsModel::clear() { - const QList<QtGradientStop *> stopsList = stops().values(); + const auto stopsList = stops().values(); for (QtGradientStop *stop : stopsList) removeStop(stop); } void QtGradientStopsModel::clearSelection() { - const QList<QtGradientStop *> stopsList = selectedStops(); + const auto stopsList = selectedStops(); for (QtGradientStop *stop : stopsList) selectStop(stop, false); } @@ -452,7 +452,7 @@ void QtGradientStopsModel::selectAll() void QtGradientStopsModel::deleteStops() { - const QList<QtGradientStop *> selected = selectedStops(); + const auto selected = selectedStops(); for (QtGradientStop *stop : selected) removeStop(stop); QtGradientStop *current = currentStop(); diff --git a/src/shared/qtgradienteditor/qtgradientstopswidget.cpp b/src/shared/qtgradienteditor/qtgradientstopswidget.cpp index 3bfd30627..49569869e 100644 --- a/src/shared/qtgradienteditor/qtgradientstopswidget.cpp +++ b/src/shared/qtgradienteditor/qtgradientstopswidget.cpp @@ -170,7 +170,7 @@ void QtGradientStopsWidgetPrivate::setupMove(QtGradientStop *stop, int x) int viewportX = qRound(toViewport(stop->position())); m_moveOffset = x - viewportX; - const QList<QtGradientStop *> stops = m_stops; + const auto stops = m_stops; m_stops.clear(); for (QtGradientStop *s : stops) { if (m_model->isSelected(s) || s == stop) { @@ -450,7 +450,7 @@ void QtGradientStopsWidget::setGradientStopsModel(QtGradientStopsModel *model) for (auto it = stopsMap.cbegin(), end = stopsMap.cend(); it != end; ++it) d_ptr->slotStopAdded(it.value()); - const QList<QtGradientStop *> selected = d_ptr->m_model->selectedStops(); + const auto selected = d_ptr->m_model->selectedStops(); for (QtGradientStop *stop : selected) d_ptr->slotStopSelected(stop, true); @@ -652,8 +652,8 @@ void QtGradientStopsWidget::mouseMoveEvent(QMouseEvent *e) p2 = QPoint(xv2, qRound(d_ptr->m_handleSize / 2)); } - QList<QtGradientStop *> beginList = d_ptr->stopsAt(p1); - QList<QtGradientStop *> endList = d_ptr->stopsAt(p2); + const auto beginList = d_ptr->stopsAt(p1); + const auto endList = d_ptr->stopsAt(p2); double x1 = d_ptr->fromViewport(xv1); double x2 = d_ptr->fromViewport(xv2); diff --git a/src/shared/qtgradienteditor/qtgradientwidget.cpp b/src/shared/qtgradienteditor/qtgradientwidget.cpp index 9db1b82e6..ebd5ba159 100644 --- a/src/shared/qtgradienteditor/qtgradientwidget.cpp +++ b/src/shared/qtgradienteditor/qtgradientwidget.cpp @@ -203,7 +203,7 @@ void QtGradientWidgetPrivate::setupDrag(QtGradientStop *stop, int x) int viewportX = qRound(toViewport(stop->position())); m_dragOffset = x - viewportX; - const QList<QtGradientStop *> stops = m_stops; + const auto stops = m_stops; m_stops.clear(); for (QtGradientStop *s : stops) { if (m_model->isSelected(s) || s == stop) { diff --git a/src/shared/qtpropertybrowser/qteditorfactory.cpp b/src/shared/qtpropertybrowser/qteditorfactory.cpp index aa3ddbf00..c83d20cfd 100644 --- a/src/shared/qtpropertybrowser/qteditorfactory.cpp +++ b/src/shared/qtpropertybrowser/qteditorfactory.cpp @@ -1543,7 +1543,7 @@ bool QtCharEdit::eventFilter(QObject *o, QEvent *e) if (o == m_lineEdit && e->type() == QEvent::ContextMenu) { QContextMenuEvent *c = static_cast<QContextMenuEvent *>(e); QMenu *menu = m_lineEdit->createStandardContextMenu(); - const QList<QAction *> actions = menu->actions(); + const auto actions = menu->actions(); for (QAction *action : actions) { action->setShortcut(QKeySequence()); QString actionString = action->text(); diff --git a/src/shared/qtpropertybrowser/qtpropertybrowser.cpp b/src/shared/qtpropertybrowser/qtpropertybrowser.cpp index 0e892a2ee..601fb854a 100644 --- a/src/shared/qtpropertybrowser/qtpropertybrowser.cpp +++ b/src/shared/qtpropertybrowser/qtpropertybrowser.cpp @@ -452,7 +452,7 @@ void QtProperty::insertSubProperty(QtProperty *property, return; // traverse all children of item. if this item is a child of item then cannot add. - QList<QtProperty *> pendingList = property->subProperties(); + auto pendingList = property->subProperties(); QMap<QtProperty *, bool> visited; while (!pendingList.isEmpty()) { QtProperty *i = pendingList.first(); @@ -499,7 +499,7 @@ void QtProperty::removeSubProperty(QtProperty *property) d_ptr->m_manager->d_ptr->propertyRemoved(property, this); - QList<QtProperty *> pendingList = subProperties(); + auto pendingList = subProperties(); int pos = 0; while (pos < pendingList.count()) { if (pendingList.at(pos) == property) { @@ -1279,7 +1279,7 @@ void QtAbstractPropertyBrowserPrivate::insertSubTree(QtProperty *property, m_managerToProperties[manager].append(property); m_propertyToParents[property].append(parentProperty); - const QList<QtProperty *> subList = property->subProperties(); + const auto subList = property->subProperties(); for (QtProperty *subProperty : subList) insertSubTree(subProperty, property); } @@ -1316,7 +1316,7 @@ void QtAbstractPropertyBrowserPrivate::removeSubTree(QtProperty *property, m_managerToProperties.remove(manager); } - const QList<QtProperty *> subList = property->subProperties(); + const auto subList = property->subProperties(); for (QtProperty *subProperty : subList) removeSubTree(subProperty, property); } @@ -1325,8 +1325,7 @@ void QtAbstractPropertyBrowserPrivate::createBrowserIndexes(QtProperty *property { QMap<QtBrowserItem *, QtBrowserItem *> parentToAfter; if (afterProperty) { - QMap<QtProperty *, QList<QtBrowserItem *> >::ConstIterator it = - m_propertyToIndexes.constFind(afterProperty); + const auto it = m_propertyToIndexes.constFind(afterProperty); if (it == m_propertyToIndexes.constEnd()) return; @@ -1336,8 +1335,7 @@ void QtAbstractPropertyBrowserPrivate::createBrowserIndexes(QtProperty *property parentToAfter[idx->parent()] = idx; } } else if (parentProperty) { - QMap<QtProperty *, QList<QtBrowserItem *> >::ConstIterator it = - m_propertyToIndexes.find(parentProperty); + const auto it = m_propertyToIndexes.find(parentProperty); if (it == m_propertyToIndexes.constEnd()) return; @@ -1366,7 +1364,7 @@ QtBrowserItem *QtAbstractPropertyBrowserPrivate::createBrowserIndex(QtProperty * q_ptr->itemInserted(newIndex, afterIndex); - const QList<QtProperty *> subItems = property->subProperties(); + const auto subItems = property->subProperties(); QtBrowserItem *afterChild = 0; for (QtProperty *child : subItems) afterChild = createBrowserIndex(child, newIndex, afterChild); @@ -1376,8 +1374,7 @@ QtBrowserItem *QtAbstractPropertyBrowserPrivate::createBrowserIndex(QtProperty * void QtAbstractPropertyBrowserPrivate::removeBrowserIndexes(QtProperty *property, QtProperty *parentProperty) { QList<QtBrowserItem *> toRemove; - QMap<QtProperty *, QList<QtBrowserItem *> >::ConstIterator it = - m_propertyToIndexes.constFind(property); + const auto it = m_propertyToIndexes.constFind(property); if (it == m_propertyToIndexes.constEnd()) return; @@ -1393,7 +1390,7 @@ void QtAbstractPropertyBrowserPrivate::removeBrowserIndexes(QtProperty *property void QtAbstractPropertyBrowserPrivate::removeBrowserIndex(QtBrowserItem *index) { - QList<QtBrowserItem *> children = index->children(); + const auto children = index->children(); for (int i = children.count(); i > 0; i--) { removeBrowserIndex(children.at(i - 1)); } @@ -1418,7 +1415,7 @@ void QtAbstractPropertyBrowserPrivate::removeBrowserIndex(QtBrowserItem *index) void QtAbstractPropertyBrowserPrivate::clearIndex(QtBrowserItem *index) { - const QList<QtBrowserItem *> children = index->children(); + const auto children = index->children(); for (QtBrowserItem *item : children) clearIndex(item); delete index; @@ -1456,12 +1453,11 @@ void QtAbstractPropertyBrowserPrivate::slotPropertyDataChanged(QtProperty *prope if (!m_propertyToParents.contains(property)) return; - QMap<QtProperty *, QList<QtBrowserItem *> >::ConstIterator it = - m_propertyToIndexes.find(property); + const auto it = m_propertyToIndexes.constFind(property); if (it == m_propertyToIndexes.constEnd()) return; - const QList<QtBrowserItem *> indexes = it.value(); + const auto indexes = it.value(); for (QtBrowserItem *idx : indexes) q_ptr->itemChanged(idx); //q_ptr->propertyChanged(property); @@ -1662,7 +1658,7 @@ QtAbstractPropertyBrowser::QtAbstractPropertyBrowser(QWidget *parent) */ QtAbstractPropertyBrowser::~QtAbstractPropertyBrowser() { - const QList<QtBrowserItem *> indexes = topLevelItems(); + const auto indexes = topLevelItems(); for (QtBrowserItem *item : indexes) d_ptr->clearIndex(item); } @@ -1727,7 +1723,7 @@ QList<QtBrowserItem *> QtAbstractPropertyBrowser::topLevelItems() const */ void QtAbstractPropertyBrowser::clear() { - const QList<QtProperty *> subList = properties(); + const auto subList = properties(); for (auto rit = subList.crbegin(), rend = subList.crend(); rit != rend; ++rit) removeProperty(*rit); } @@ -1775,7 +1771,7 @@ QtBrowserItem *QtAbstractPropertyBrowser::insertProperty(QtProperty *property, return 0; // if item is already inserted in this item then cannot add. - QList<QtProperty *> pendingList = properties(); + auto pendingList = properties(); int pos = 0; int newPos = 0; while (pos < pendingList.count()) { @@ -1813,7 +1809,7 @@ void QtAbstractPropertyBrowser::removeProperty(QtProperty *property) if (!property) return; - QList<QtProperty *> pendingList = properties(); + auto pendingList = properties(); int pos = 0; while (pos < pendingList.count()) { if (pendingList.at(pos) == property) { diff --git a/src/shared/qtpropertybrowser/qtpropertymanager.cpp b/src/shared/qtpropertybrowser/qtpropertymanager.cpp index 2abcb1657..c1aeb624c 100644 --- a/src/shared/qtpropertybrowser/qtpropertymanager.cpp +++ b/src/shared/qtpropertybrowser/qtpropertymanager.cpp @@ -428,7 +428,7 @@ void QtMetaEnumProvider::initLocale() if (!nameToLanguage.contains(QLocale::languageToString(system.language()))) nameToLanguage.insert(QLocale::languageToString(system.language()), system.language()); - const QList<QLocale::Language> languages = nameToLanguage.values(); + const auto languages = nameToLanguage.values(); for (QLocale::Language language : languages) { QList<QLocale::Country> countries; countries = QLocale::countriesForLanguage(language); diff --git a/src/shared/qtpropertybrowser/qtvariantproperty.cpp b/src/shared/qtpropertybrowser/qtvariantproperty.cpp index e776f85fb..1ddc64fbc 100644 --- a/src/shared/qtpropertybrowser/qtvariantproperty.cpp +++ b/src/shared/qtpropertybrowser/qtvariantproperty.cpp @@ -1784,7 +1784,7 @@ void QtVariantPropertyManager::initializeProperty(QtProperty *property) } propertyToWrappedProperty()->insert(varProp, internProp); if (internProp) { - const QList<QtProperty *> children = internProp->subProperties(); + const auto children = internProp->subProperties(); QtVariantProperty *lastProperty = 0; for (QtProperty *child : children) { QtVariantProperty *prop = d_ptr->createSubProperty(varProp, lastProperty, child); @@ -1993,87 +1993,87 @@ QtVariantEditorFactory::~QtVariantEditorFactory() */ void QtVariantEditorFactory::connectPropertyManager(QtVariantPropertyManager *manager) { - const QList<QtIntPropertyManager *> intPropertyManagers = manager->findChildren<QtIntPropertyManager *>(); + const auto intPropertyManagers = manager->findChildren<QtIntPropertyManager *>(); for (QtIntPropertyManager *manager : intPropertyManagers) d_ptr->m_spinBoxFactory->addPropertyManager(manager); - const QList<QtDoublePropertyManager *> doublePropertyManagers = manager->findChildren<QtDoublePropertyManager *>(); + const auto doublePropertyManagers = manager->findChildren<QtDoublePropertyManager *>(); for (QtDoublePropertyManager *manager : doublePropertyManagers) d_ptr->m_doubleSpinBoxFactory->addPropertyManager(manager); - const QList<QtBoolPropertyManager *> boolPropertyManagers = manager->findChildren<QtBoolPropertyManager *>(); + const auto boolPropertyManagers = manager->findChildren<QtBoolPropertyManager *>(); for (QtBoolPropertyManager *manager : boolPropertyManagers) d_ptr->m_checkBoxFactory->addPropertyManager(manager); - const QList<QtStringPropertyManager *> stringPropertyManagers = manager->findChildren<QtStringPropertyManager *>(); + const auto stringPropertyManagers = manager->findChildren<QtStringPropertyManager *>(); for (QtStringPropertyManager *manager : stringPropertyManagers) d_ptr->m_lineEditFactory->addPropertyManager(manager); - const QList<QtDatePropertyManager *> datePropertyManagers = manager->findChildren<QtDatePropertyManager *>(); + const auto datePropertyManagers = manager->findChildren<QtDatePropertyManager *>(); for (QtDatePropertyManager *manager : datePropertyManagers) d_ptr->m_dateEditFactory->addPropertyManager(manager); - const QList<QtTimePropertyManager *> timePropertyManagers = manager->findChildren<QtTimePropertyManager *>(); + const auto timePropertyManagers = manager->findChildren<QtTimePropertyManager *>(); for (QtTimePropertyManager *manager : timePropertyManagers) d_ptr->m_timeEditFactory->addPropertyManager(manager); - const QList<QtDateTimePropertyManager *> dateTimePropertyManagers = manager->findChildren<QtDateTimePropertyManager *>(); + const auto dateTimePropertyManagers = manager->findChildren<QtDateTimePropertyManager *>(); for (QtDateTimePropertyManager *manager : dateTimePropertyManagers) d_ptr->m_dateTimeEditFactory->addPropertyManager(manager); - const QList<QtKeySequencePropertyManager *> keySequencePropertyManagers = manager->findChildren<QtKeySequencePropertyManager *>(); + const auto keySequencePropertyManagers = manager->findChildren<QtKeySequencePropertyManager *>(); for (QtKeySequencePropertyManager *manager : keySequencePropertyManagers) d_ptr->m_keySequenceEditorFactory->addPropertyManager(manager); - const QList<QtCharPropertyManager *> charPropertyManagers = manager->findChildren<QtCharPropertyManager *>(); + const auto charPropertyManagers = manager->findChildren<QtCharPropertyManager *>(); for (QtCharPropertyManager *manager : charPropertyManagers) d_ptr->m_charEditorFactory->addPropertyManager(manager); - const QList<QtLocalePropertyManager *> localePropertyManagers = manager->findChildren<QtLocalePropertyManager *>(); + const auto localePropertyManagers = manager->findChildren<QtLocalePropertyManager *>(); for (QtLocalePropertyManager *manager : localePropertyManagers) d_ptr->m_comboBoxFactory->addPropertyManager(manager->subEnumPropertyManager()); - const QList<QtPointPropertyManager *> pointPropertyManagers = manager->findChildren<QtPointPropertyManager *>(); + const auto pointPropertyManagers = manager->findChildren<QtPointPropertyManager *>(); for (QtPointPropertyManager *manager : pointPropertyManagers) d_ptr->m_spinBoxFactory->addPropertyManager(manager->subIntPropertyManager()); - const QList<QtPointFPropertyManager *> pointFPropertyManagers = manager->findChildren<QtPointFPropertyManager *>(); + const auto pointFPropertyManagers = manager->findChildren<QtPointFPropertyManager *>(); for (QtPointFPropertyManager *manager : pointFPropertyManagers) d_ptr->m_doubleSpinBoxFactory->addPropertyManager(manager->subDoublePropertyManager()); - const QList<QtSizePropertyManager *> sizePropertyManagers = manager->findChildren<QtSizePropertyManager *>(); + const auto sizePropertyManagers = manager->findChildren<QtSizePropertyManager *>(); for (QtSizePropertyManager *manager : sizePropertyManagers) d_ptr->m_spinBoxFactory->addPropertyManager(manager->subIntPropertyManager()); - const QList<QtSizeFPropertyManager *> sizeFPropertyManagers = manager->findChildren<QtSizeFPropertyManager *>(); + const auto sizeFPropertyManagers = manager->findChildren<QtSizeFPropertyManager *>(); for (QtSizeFPropertyManager *manager : sizeFPropertyManagers) d_ptr->m_doubleSpinBoxFactory->addPropertyManager(manager->subDoublePropertyManager()); - const QList<QtRectPropertyManager *> rectPropertyManagers = manager->findChildren<QtRectPropertyManager *>(); + const auto rectPropertyManagers = manager->findChildren<QtRectPropertyManager *>(); for (QtRectPropertyManager *manager : rectPropertyManagers) d_ptr->m_spinBoxFactory->addPropertyManager(manager->subIntPropertyManager()); - const QList<QtRectFPropertyManager *> rectFPropertyManagers = manager->findChildren<QtRectFPropertyManager *>(); + const auto rectFPropertyManagers = manager->findChildren<QtRectFPropertyManager *>(); for (QtRectFPropertyManager *manager : rectFPropertyManagers) d_ptr->m_doubleSpinBoxFactory->addPropertyManager(manager->subDoublePropertyManager()); - const QList<QtColorPropertyManager *> colorPropertyManagers = manager->findChildren<QtColorPropertyManager *>(); + const auto colorPropertyManagers = manager->findChildren<QtColorPropertyManager *>(); for (QtColorPropertyManager *manager : colorPropertyManagers) { d_ptr->m_colorEditorFactory->addPropertyManager(manager); d_ptr->m_spinBoxFactory->addPropertyManager(manager->subIntPropertyManager()); } - const QList<QtEnumPropertyManager *> enumPropertyManagers = manager->findChildren<QtEnumPropertyManager *>(); + const auto enumPropertyManagers = manager->findChildren<QtEnumPropertyManager *>(); for (QtEnumPropertyManager *manager : enumPropertyManagers) d_ptr->m_comboBoxFactory->addPropertyManager(manager); - const QList<QtSizePolicyPropertyManager *> sizePolicyPropertyManagers = manager->findChildren<QtSizePolicyPropertyManager *>(); + const auto sizePolicyPropertyManagers = manager->findChildren<QtSizePolicyPropertyManager *>(); for (QtSizePolicyPropertyManager *manager : sizePolicyPropertyManagers) { d_ptr->m_spinBoxFactory->addPropertyManager(manager->subIntPropertyManager()); d_ptr->m_comboBoxFactory->addPropertyManager(manager->subEnumPropertyManager()); } - const QList<QtFontPropertyManager *> fontPropertyManagers = manager->findChildren<QtFontPropertyManager *>(); + const auto fontPropertyManagers = manager->findChildren<QtFontPropertyManager *>(); for (QtFontPropertyManager *manager : fontPropertyManagers) { d_ptr->m_fontEditorFactory->addPropertyManager(manager); d_ptr->m_spinBoxFactory->addPropertyManager(manager->subIntPropertyManager()); @@ -2081,11 +2081,11 @@ void QtVariantEditorFactory::connectPropertyManager(QtVariantPropertyManager *ma d_ptr->m_checkBoxFactory->addPropertyManager(manager->subBoolPropertyManager()); } - const QList<QtCursorPropertyManager *> cursorPropertyManagers = manager->findChildren<QtCursorPropertyManager *>(); + const auto cursorPropertyManagers = manager->findChildren<QtCursorPropertyManager *>(); for (QtCursorPropertyManager *manager : cursorPropertyManagers) d_ptr->m_cursorEditorFactory->addPropertyManager(manager); - const QList<QtFlagPropertyManager *> flagPropertyManagers = manager->findChildren<QtFlagPropertyManager *>(); + const auto flagPropertyManagers = manager->findChildren<QtFlagPropertyManager *>(); for (QtFlagPropertyManager *manager : flagPropertyManagers) d_ptr->m_checkBoxFactory->addPropertyManager(manager->subBoolPropertyManager()); } @@ -2112,87 +2112,87 @@ QWidget *QtVariantEditorFactory::createEditor(QtVariantPropertyManager *manager, */ void QtVariantEditorFactory::disconnectPropertyManager(QtVariantPropertyManager *manager) { - const QList<QtIntPropertyManager *> intPropertyManagers = manager->findChildren<QtIntPropertyManager *>(); + const auto intPropertyManagers = manager->findChildren<QtIntPropertyManager *>(); for (QtIntPropertyManager *manager : intPropertyManagers) d_ptr->m_spinBoxFactory->removePropertyManager(manager); - const QList<QtDoublePropertyManager *> doublePropertyManagers = manager->findChildren<QtDoublePropertyManager *>(); + const auto doublePropertyManagers = manager->findChildren<QtDoublePropertyManager *>(); for (QtDoublePropertyManager *manager : doublePropertyManagers) d_ptr->m_doubleSpinBoxFactory->removePropertyManager(manager); - const QList<QtBoolPropertyManager *> boolPropertyManagers = manager->findChildren<QtBoolPropertyManager *>(); + const auto boolPropertyManagers = manager->findChildren<QtBoolPropertyManager *>(); for (QtBoolPropertyManager *manager : boolPropertyManagers) d_ptr->m_checkBoxFactory->removePropertyManager(manager); - const QList<QtStringPropertyManager *> stringPropertyManagers = manager->findChildren<QtStringPropertyManager *>(); + const auto stringPropertyManagers = manager->findChildren<QtStringPropertyManager *>(); for (QtStringPropertyManager *manager : stringPropertyManagers) d_ptr->m_lineEditFactory->removePropertyManager(manager); - const QList<QtDatePropertyManager *> datePropertyManagers = manager->findChildren<QtDatePropertyManager *>(); + const auto datePropertyManagers = manager->findChildren<QtDatePropertyManager *>(); for (QtDatePropertyManager *manager : datePropertyManagers) d_ptr->m_dateEditFactory->removePropertyManager(manager); - const QList<QtTimePropertyManager *> timePropertyManagers = manager->findChildren<QtTimePropertyManager *>(); + const auto timePropertyManagers = manager->findChildren<QtTimePropertyManager *>(); for (QtTimePropertyManager *manager : timePropertyManagers) d_ptr->m_timeEditFactory->removePropertyManager(manager); - const QList<QtDateTimePropertyManager *> dateTimePropertyManagers = manager->findChildren<QtDateTimePropertyManager *>(); + const auto dateTimePropertyManagers = manager->findChildren<QtDateTimePropertyManager *>(); for (QtDateTimePropertyManager *manager : dateTimePropertyManagers) d_ptr->m_dateTimeEditFactory->removePropertyManager(manager); - const QList<QtKeySequencePropertyManager *> keySequencePropertyManagers = manager->findChildren<QtKeySequencePropertyManager *>(); + const auto keySequencePropertyManagers = manager->findChildren<QtKeySequencePropertyManager *>(); for (QtKeySequencePropertyManager *manager : keySequencePropertyManagers) d_ptr->m_keySequenceEditorFactory->removePropertyManager(manager); - const QList<QtCharPropertyManager *> charPropertyManagers = manager->findChildren<QtCharPropertyManager *>(); + const auto charPropertyManagers = manager->findChildren<QtCharPropertyManager *>(); for (QtCharPropertyManager *manager : charPropertyManagers) d_ptr->m_charEditorFactory->removePropertyManager(manager); - const QList<QtLocalePropertyManager *> localePropertyManagers = manager->findChildren<QtLocalePropertyManager *>(); + const auto localePropertyManagers = manager->findChildren<QtLocalePropertyManager *>(); for (QtLocalePropertyManager *manager : localePropertyManagers) d_ptr->m_comboBoxFactory->removePropertyManager(manager->subEnumPropertyManager()); - const QList<QtPointPropertyManager *> pointPropertyManagers = manager->findChildren<QtPointPropertyManager *>(); + const auto pointPropertyManagers = manager->findChildren<QtPointPropertyManager *>(); for (QtPointPropertyManager *manager : pointPropertyManagers) d_ptr->m_spinBoxFactory->removePropertyManager(manager->subIntPropertyManager()); - const QList<QtPointFPropertyManager *> pointFPropertyManagers = manager->findChildren<QtPointFPropertyManager *>(); + const auto pointFPropertyManagers = manager->findChildren<QtPointFPropertyManager *>(); for (QtPointFPropertyManager *manager : pointFPropertyManagers) d_ptr->m_doubleSpinBoxFactory->removePropertyManager(manager->subDoublePropertyManager()); - const QList<QtSizePropertyManager *> sizePropertyManagers = manager->findChildren<QtSizePropertyManager *>(); + const auto sizePropertyManagers = manager->findChildren<QtSizePropertyManager *>(); for (QtSizePropertyManager *manager : sizePropertyManagers) d_ptr->m_spinBoxFactory->removePropertyManager(manager->subIntPropertyManager()); - const QList<QtSizeFPropertyManager *> sizeFPropertyManagers = manager->findChildren<QtSizeFPropertyManager *>(); + const auto sizeFPropertyManagers = manager->findChildren<QtSizeFPropertyManager *>(); for (QtSizeFPropertyManager *manager : sizeFPropertyManagers) d_ptr->m_doubleSpinBoxFactory->removePropertyManager(manager->subDoublePropertyManager()); - const QList<QtRectPropertyManager *> rectPropertyManagers = manager->findChildren<QtRectPropertyManager *>(); + const auto rectPropertyManagers = manager->findChildren<QtRectPropertyManager *>(); for (QtRectPropertyManager *manager : rectPropertyManagers) d_ptr->m_spinBoxFactory->removePropertyManager(manager->subIntPropertyManager()); - const QList<QtRectFPropertyManager *> rectFPropertyManagers = manager->findChildren<QtRectFPropertyManager *>(); + const auto rectFPropertyManagers = manager->findChildren<QtRectFPropertyManager *>(); for (QtRectFPropertyManager *manager : rectFPropertyManagers) d_ptr->m_doubleSpinBoxFactory->removePropertyManager(manager->subDoublePropertyManager()); - const QList<QtColorPropertyManager *> colorPropertyManagers = manager->findChildren<QtColorPropertyManager *>(); + const auto colorPropertyManagers = manager->findChildren<QtColorPropertyManager *>(); for (QtColorPropertyManager *manager : colorPropertyManagers) { d_ptr->m_colorEditorFactory->removePropertyManager(manager); d_ptr->m_spinBoxFactory->removePropertyManager(manager->subIntPropertyManager()); } - const QList<QtEnumPropertyManager *> enumPropertyManagers = manager->findChildren<QtEnumPropertyManager *>(); + const auto enumPropertyManagers = manager->findChildren<QtEnumPropertyManager *>(); for (QtEnumPropertyManager *manager : enumPropertyManagers) d_ptr->m_comboBoxFactory->removePropertyManager(manager); - const QList<QtSizePolicyPropertyManager *> sizePolicyPropertyManagers = manager->findChildren<QtSizePolicyPropertyManager *>(); + const auto sizePolicyPropertyManagers = manager->findChildren<QtSizePolicyPropertyManager *>(); for (QtSizePolicyPropertyManager *manager : sizePolicyPropertyManagers) { d_ptr->m_spinBoxFactory->removePropertyManager(manager->subIntPropertyManager()); d_ptr->m_comboBoxFactory->removePropertyManager(manager->subEnumPropertyManager()); } - const QList<QtFontPropertyManager *> fontPropertyManagers = manager->findChildren<QtFontPropertyManager *>(); + const auto fontPropertyManagers = manager->findChildren<QtFontPropertyManager *>(); for (QtFontPropertyManager *manager : fontPropertyManagers) { d_ptr->m_fontEditorFactory->removePropertyManager(manager); d_ptr->m_spinBoxFactory->removePropertyManager(manager->subIntPropertyManager()); @@ -2200,11 +2200,11 @@ void QtVariantEditorFactory::disconnectPropertyManager(QtVariantPropertyManager d_ptr->m_checkBoxFactory->removePropertyManager(manager->subBoolPropertyManager()); } - const QList<QtCursorPropertyManager *> cursorPropertyManagers = manager->findChildren<QtCursorPropertyManager *>(); + const auto cursorPropertyManagers = manager->findChildren<QtCursorPropertyManager *>(); for (QtCursorPropertyManager *manager : cursorPropertyManagers) d_ptr->m_cursorEditorFactory->removePropertyManager(manager); - const QList<QtFlagPropertyManager *> flagPropertyManagers = manager->findChildren<QtFlagPropertyManager *>(); + const auto flagPropertyManagers = manager->findChildren<QtFlagPropertyManager *>(); for (QtFlagPropertyManager *manager : flagPropertyManagers) d_ptr->m_checkBoxFactory->removePropertyManager(manager->subBoolPropertyManager()); } diff --git a/src/shared/qttoolbardialog/qttoolbardialog.cpp b/src/shared/qttoolbardialog/qttoolbardialog.cpp index 3e9363b93..58f317fd3 100644 --- a/src/shared/qttoolbardialog/qttoolbardialog.cpp +++ b/src/shared/qttoolbardialog/qttoolbardialog.cpp @@ -173,14 +173,14 @@ QToolBar *QtFullToolBarManagerPrivate::toolBarWidgetAction(QAction *action) cons void QtFullToolBarManagerPrivate::removeWidgetActions(const QMap<QToolBar *, QList<QAction *> > &actions) { - QMap<QToolBar *, QList<QAction *> >::ConstIterator itToolBar = actions.constBegin(); + auto itToolBar = actions.constBegin(); while (itToolBar != actions.constEnd()) { QToolBar *toolBar = itToolBar.key(); - QList<QAction *> newActions = toolBars.value(toolBar); - QList<QAction *> newActionsWithSeparators = toolBarsWithSeparators.value(toolBar); + auto newActions = toolBars.value(toolBar); + auto newActionsWithSeparators = toolBarsWithSeparators.value(toolBar); QList<QAction *> removedActions; - const QList<QAction *> actionList = itToolBar.value(); + const auto actionList = itToolBar.value(); for (QAction *action : actionList) { if (newActions.contains(action) && toolBarWidgetAction(action) == toolBar) { newActions.removeAll(action); @@ -206,8 +206,7 @@ void QtFullToolBarManagerPrivate::saveState(QDataStream &stream) const { stream << (uchar) ToolBarMarker; stream << defaultToolBars.size(); - QMap<QToolBar *, QList<QAction *> >::ConstIterator itToolBar = - defaultToolBars.constBegin(); + auto itToolBar = defaultToolBars.constBegin(); while (itToolBar != defaultToolBars.constEnd()) { QToolBar *tb = itToolBar.key(); if (tb->objectName().isEmpty()) { @@ -219,7 +218,7 @@ void QtFullToolBarManagerPrivate::saveState(QDataStream &stream) const stream << tb->objectName(); } - const QList<QAction *> actions = toolBars.value(tb); + const auto actions = toolBars.value(tb); stream << actions.size(); for (QAction *action : actions) { if (action) { @@ -250,7 +249,7 @@ void QtFullToolBarManagerPrivate::saveState(QDataStream &stream) const stream << toolBars[tb].size(); - const QList<QAction *> actions = toolBars.value(tb); + const auto actions = toolBars.value(tb); for (QAction *action : actions) { if (action) { if (action->objectName().isEmpty()) { @@ -310,7 +309,7 @@ bool QtFullToolBarManagerPrivate::restoreState(QDataStream &stream) const if (ctmarker != CustomToolBarMarker) return false; - QList<QToolBar *> oldCustomToolBars = customToolBars; + auto oldCustomToolBars = customToolBars; stream >> toolBars; for (int i = 0; i < toolBars; i++) { @@ -353,8 +352,7 @@ bool QtFullToolBarManagerPrivate::restoreState(QDataStream &stream) const QToolBar *QtFullToolBarManagerPrivate::findDefaultToolBar(const QString &objectName) const { - QMap<QToolBar *, QList<QAction *> >::ConstIterator itToolBar = - defaultToolBars.constBegin(); + auto itToolBar = defaultToolBars.constBegin(); while (itToolBar != defaultToolBars.constEnd()) { QToolBar *tb = itToolBar.key(); if (tb->objectName() == objectName) @@ -406,7 +404,7 @@ QAction *QtFullToolBarManagerPrivate::findAction(const QString &actionName) cons QToolBar *QtFullToolBarManagerPrivate::toolBarByName(const QString &toolBarName) const { - QMap<QToolBar *, QList<QAction *> >::ConstIterator itToolBar = toolBars.constBegin(); + auto itToolBar = toolBars.constBegin(); while (itToolBar != toolBars.constEnd()) { QToolBar *toolBar = itToolBar.key(); if (toolBar->objectName() == toolBarName) @@ -456,11 +454,10 @@ QStringList QtFullToolBarManager::categories() const QList<QAction *> QtFullToolBarManager::categoryActions(const QString &category) const { - QMap<QString, QList<QAction *> >::ConstIterator it = - d_ptr->categoryToActions.find(category); + const auto it = d_ptr->categoryToActions.constFind(category); if (it != d_ptr->categoryToActions.constEnd()) return it.value(); - return QList<QAction *>(); + return {}; } QString QtFullToolBarManager::actionCategory(QAction *action) const @@ -494,7 +491,7 @@ void QtFullToolBarManager::removeAction(QAction *action) if (!d_ptr->allActions.contains(action)) return; - const QList<QToolBar *> toolBars = d_ptr->actionToToolBars[action]; + const auto toolBars = d_ptr->actionToToolBars[action]; for (QToolBar *toolBar : toolBars) { d_ptr->toolBars[toolBar].removeAll(action); d_ptr->toolBarsWithSeparators[toolBar].removeAll(action); @@ -502,8 +499,7 @@ void QtFullToolBarManager::removeAction(QAction *action) toolBar->removeAction(action); } - QMap<QToolBar *, QList<QAction *> >::ConstIterator itDefault = - d_ptr->defaultToolBars.constBegin(); + auto itDefault = d_ptr->defaultToolBars.constBegin(); while (itDefault != d_ptr->defaultToolBars.constEnd()) { if (itDefault.value().contains(action)) d_ptr->defaultToolBars[itDefault.key()].removeAll(action); @@ -546,7 +542,7 @@ void QtFullToolBarManager::addDefaultToolBar(QToolBar *toolBar, const QString &c QList<QAction *> newActionsWithSeparators; QList<QAction *> newActions; - const QList<QAction *> actions = toolBar->actions(); + const auto actions = toolBar->actions(); for (QAction *action : actions) { addAction(action, category); if (d_ptr->widgetActions.contains(action)) @@ -569,7 +565,7 @@ void QtFullToolBarManager::removeDefaultToolBar(QToolBar *toolBar) if (!d_ptr->defaultToolBars.contains(toolBar)) return; - const QList<QAction *> defaultActions = d_ptr->defaultToolBars[toolBar]; + const auto defaultActions = d_ptr->defaultToolBars[toolBar]; setToolBar(toolBar, QList<QAction *>()); for (QAction *action : defaultActions) removeAction(action); @@ -638,7 +634,7 @@ QList<QAction *> QtFullToolBarManager::actions(QToolBar *toolBar) const void QtFullToolBarManager::setToolBars(const QMap<QToolBar *, QList<QAction *> > &actions) { - QMap<QToolBar *, QList<QAction *> >::ConstIterator it = actions.constBegin(); + auto it = actions.constBegin(); while (it != actions.constEnd()) { setToolBar(it.key(), it.value()); ++it; @@ -669,7 +665,7 @@ void QtFullToolBarManager::setToolBar(QToolBar *toolBar, const QList<QAction *> d_ptr->removeWidgetActions(toRemove); - const QList<QAction *> oldActions = d_ptr->toolBarsWithSeparators.value(toolBar); + const auto oldActions = d_ptr->toolBarsWithSeparators.value(toolBar); for (QAction *action : oldActions) { /* When addDefaultToolBar() separator actions could be checked if they are @@ -715,7 +711,7 @@ void QtFullToolBarManager::resetToolBar(QToolBar *toolBar) void QtFullToolBarManager::resetAllToolBars() { setToolBars(defaultToolBars()); - const QList<QToolBar *> oldCustomToolBars = d_ptr->customToolBars; + const auto oldCustomToolBars = d_ptr->customToolBars; for (QToolBar *tb : oldCustomToolBars) deleteToolBar(tb); } @@ -1097,7 +1093,7 @@ void QtToolBarDialogPrivate::fillNew() for (const QString &category : categories) { QTreeWidgetItem *categoryItem = new QTreeWidgetItem(ui.actionTree); categoryItem->setText(0, category); - const QList<QAction *> actions = toolBarManager->categoryActions(category); + const auto actions = toolBarManager->categoryActions(category); for (QAction *action : actions) { item = new QTreeWidgetItem(categoryItem); item->setText(0, action->text()); @@ -1115,8 +1111,8 @@ void QtToolBarDialogPrivate::fillNew() } //ui.actionTree->sortItems(0, Qt::AscendingOrder); - QMap<QToolBar *, QList<QAction *> > toolBars = toolBarManager->toolBarsActions(); - QMap<QToolBar *, QList<QAction *> >::ConstIterator it = toolBars.constBegin(); + const auto toolBars = toolBarManager->toolBarsActions(); + auto it = toolBars.constBegin(); while (it != toolBars.constEnd()) { QToolBar *toolBar = it.key(); ToolBarItem *tbItem = createItem(toolBar); @@ -1125,7 +1121,7 @@ void QtToolBarDialogPrivate::fillNew() ui.toolBarList); toolBarToItem.insert(tbItem, item); itemToToolBar.insert(item, tbItem); - const QList<QAction *> actions = it.value(); + const auto actions = it.value(); for (QAction *action : actions) { if (toolBarManager->isWidgetAction(action)) { widgetActionToToolBar.insert(action, tbItem); @@ -1257,8 +1253,8 @@ void QtToolBarDialogPrivate::removeClicked() void QtToolBarDialogPrivate::defaultClicked() { - QMap<QToolBar *, QList<QAction *> > defaultToolBars = toolBarManager->defaultToolBars(); - QMap<QToolBar *, QList<QAction *> >::ConstIterator itToolBar = defaultToolBars.constBegin(); + const auto defaultToolBars = toolBarManager->defaultToolBars(); + auto itToolBar = defaultToolBars.constBegin(); while (itToolBar != defaultToolBars.constEnd()) { QToolBar *toolBar = itToolBar.key(); ToolBarItem *toolBarItem = toolBarItems.value(toolBar); @@ -1289,7 +1285,7 @@ void QtToolBarDialogPrivate::defaultClicked() } currentToolBarChanged(toolBarToItem.value(currentToolBar)); - const QList<ToolBarItem *> toolBars = currentState.keys(); + const auto toolBars = currentState.keys(); for (ToolBarItem *tb : toolBars) removeToolBar(tb); } @@ -1302,8 +1298,8 @@ void QtToolBarDialogPrivate::okClicked() void QtToolBarDialogPrivate::applyClicked() { - QMap<ToolBarItem *, QList<QAction *> > toolBars = currentState; - QMap<ToolBarItem *, QList<QAction *> >::ConstIterator itToolBar = toolBars.constBegin(); + const auto toolBars = currentState; + auto itToolBar = toolBars.constBegin(); while (itToolBar != toolBars.constEnd()) { ToolBarItem *item = itToolBar.key(); QToolBar *toolBar = item->toolBar(); @@ -1329,7 +1325,7 @@ void QtToolBarDialogPrivate::applyClicked() for (ToolBarItem *item : toCreate) { QString toolBarName = item->toolBarName(); createdItems.remove(item); - QList<QAction *> actions = currentState.value(item); + const auto actions = currentState.value(item); QToolBar *toolBar = toolBarManager->createToolBar(toolBarName); item->setToolBar(toolBar); toolBarManager->setToolBar(toolBar, actions); @@ -1347,7 +1343,7 @@ void QtToolBarDialogPrivate::upClicked() ui.currentToolBarList->takeItem(row); int newRow = row - 1; ui.currentToolBarList->insertItem(newRow, currentToolBarAction); - QList<QAction *> actions = currentState.value(currentToolBar); + auto actions = currentState.value(currentToolBar); QAction *action = actions.at(row); actions.removeAt(row); actions.insert(newRow, action); @@ -1367,7 +1363,7 @@ void QtToolBarDialogPrivate::downClicked() ui.currentToolBarList->takeItem(row); int newRow = row + 1; ui.currentToolBarList->insertItem(newRow, currentToolBarAction); - QList<QAction *> actions = currentState.value(currentToolBar); + auto actions = currentState.value(currentToolBar); QAction *action = actions.at(row); actions.removeAt(row); actions.insert(newRow, action); @@ -1500,7 +1496,7 @@ void QtToolBarDialogPrivate::currentToolBarChanged(QListWidgetItem *current) if (!currentToolBar) { return; } - const QList<QAction *> actions = currentState.value(currentToolBar); + const auto actions = currentState.value(currentToolBar); QListWidgetItem *first = 0; for (QAction *action : actions) { QString actionName = separatorText; |