diff options
112 files changed, 475 insertions, 529 deletions
diff --git a/examples/designer/doc/src/containerextension.qdoc b/examples/designer/doc/src/containerextension.qdoc index 53d595729..b369ba50b 100644 --- a/examples/designer/doc/src/containerextension.qdoc +++ b/examples/designer/doc/src/containerextension.qdoc @@ -171,11 +171,10 @@ another page or changes one of the page titles. To be able to give each page their own title, we have chosen to use the QWidget::windowTitle property to store the page title (for more - information see the MultiPageWidget class \l - {containerextension/multipagewidget.cpp}{implementation}). Note - that currently there is no way of adding a custom property (e.g., - a page title) to the pages without using a predefined property as - placeholder. + information see the MultiPageWidget class implementation in + \e containerextension/multipagewidget.cpp. Note that currently there + is no way of adding a custom property (for example, a page title) to + the pages without using a predefined property as placeholder. The \c MultiPageWidgetPlugin class inherits from both QObject and QDesignerCustomWidgetInterface. It is important to remember, when @@ -279,8 +278,8 @@ QDesignerPropertySheetExtension::indexOf() function. As previously mentioned, we have chosen to use the QWidget::windowTitle property to store the page title (for more information see the - MultiPageWidget class \l - {containerextension/multipagewidget.cpp}{implementation}). + MultiPageWidget class implementation in + \e containerextension/multipagewidget.cpp. Finally, we implicitly force an update of the page's property sheet by calling the QDesignerPropertySheetExtension::setChanged() function. @@ -491,7 +490,6 @@ updated whenever the user views another page or changes one of the page titles. - See the MultiPageWidget class \l - {containerextension/multipagewidget.cpp}{implementation} - for more details. + See the MultiPageWidget class implementation in + \e containerextension/multipagewidget.cpp for more details. */ diff --git a/src/assistant/assistant/centralwidget.cpp b/src/assistant/assistant/centralwidget.cpp index 34304f737..4a4fba7ed 100644 --- a/src/assistant/assistant/centralwidget.cpp +++ b/src/assistant/assistant/centralwidget.cpp @@ -548,7 +548,7 @@ void CentralWidget::highlightSearchTerms() searchInput.split(QRegExp("\\W+"), QString::SkipEmptyParts); HelpViewer *viewer = currentHelpViewer(); for (const QString &word : words) - viewer->findText(word, nullptr, false, true); + viewer->findText(word, {}, false, true); disconnect(viewer, &HelpViewer::loadFinished, this, &CentralWidget::highlightSearchTerms); } diff --git a/src/assistant/assistant/openpageswidget.cpp b/src/assistant/assistant/openpageswidget.cpp index 6400fd97d..933304757 100644 --- a/src/assistant/assistant/openpageswidget.cpp +++ b/src/assistant/assistant/openpageswidget.cpp @@ -184,7 +184,7 @@ void OpenPagesWidget::handleClicked(const QModelIndex &index) QWidget *vp = viewport(); const QPoint &cursorPos = QCursor::pos(); QMouseEvent e(QEvent::MouseMove, vp->mapFromGlobal(cursorPos), cursorPos, - Qt::NoButton, nullptr, nullptr); + Qt::NoButton, {}, {}); QCoreApplication::sendEvent(vp, &e); } } diff --git a/src/assistant/help/qhelpfilterdata.cpp b/src/assistant/help/qhelpfilterdata.cpp index 37b209541..b90aeb6c8 100644 --- a/src/assistant/help/qhelpfilterdata.cpp +++ b/src/assistant/help/qhelpfilterdata.cpp @@ -107,7 +107,7 @@ QHelpFilterData &QHelpFilterData::operator=(const QHelpFilterData &) = default; QHelpFilterData &QHelpFilterData::operator=(QHelpFilterData &&) = default; /*! - \fn void QHelpFilterData::swap(QCompressedHelpInfo &other) + \fn void QHelpFilterData::swap(QHelpFilterData &other) Swaps the filter \a other with this filter. This operation is very fast and never fails. diff --git a/src/designer/src/components/buddyeditor/buddyeditor.cpp b/src/designer/src/components/buddyeditor/buddyeditor.cpp index 93e143c2a..8fb9184e1 100644 --- a/src/designer/src/components/buddyeditor/buddyeditor.cpp +++ b/src/designer/src/components/buddyeditor/buddyeditor.cpp @@ -41,6 +41,7 @@ #include <metadatabase_p.h> #include <QtCore/qdebug.h> +#include <QtCore/qvector.h> #include <QtWidgets/qlabel.h> #include <QtWidgets/qmenu.h> #include <QtWidgets/qaction.h> @@ -83,8 +84,6 @@ static QString buddy(QLabel *label, QDesignerFormEditorInterface *core) return sheet->property(prop_idx).toString(); } -using LabelList = QList<QLabel *>; - namespace qdesigner_internal { /******************************************************************************* @@ -143,8 +142,8 @@ void BuddyEditor::updateBackground() ConnectionEdit::updateBackground(); m_updating = true; - QList<Connection *> newList; - const LabelList label_list = background()->findChildren<QLabel*>(); + QVector<Connection *> newList; + 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()) @@ -165,7 +164,7 @@ void BuddyEditor::updateBackground() newList.append(con); } - QList<Connection *> toRemove; + QVector<Connection *> toRemove; const int c = connectionCount(); for (int i = 0; i < c; i++) { @@ -212,7 +211,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 +327,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 +337,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/embeddedoptionspage.cpp b/src/designer/src/components/formeditor/embeddedoptionspage.cpp index 91474c6aa..85cc1f930 100644 --- a/src/designer/src/components/formeditor/embeddedoptionspage.cpp +++ b/src/designer/src/components/formeditor/embeddedoptionspage.cpp @@ -52,6 +52,7 @@ #include <QtWidgets/qgroupbox.h> #include <QtCore/qset.h> +#include <QtCore/qvector.h> #include <algorithm> @@ -59,7 +60,7 @@ QT_BEGIN_NAMESPACE namespace qdesigner_internal { -using DeviceProfileList = QList<DeviceProfile>; +using DeviceProfileList = QVector<DeviceProfile>; enum { profileComboIndexOffset = 1 }; diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp index 91896f06a..84e065bcb 100644 --- a/src/designer/src/components/formeditor/formwindow.cpp +++ b/src/designer/src/components/formeditor/formwindow.cpp @@ -75,6 +75,7 @@ #include <QtCore/qdebug.h> #include <QtCore/qbuffer.h> #include <QtCore/qtimer.h> +#include <QtCore/qvector.h> #include <QtCore/qxmlstream.h> #include <QtWidgets/qmenu.h> #include <QtWidgets/qaction.h> @@ -162,7 +163,7 @@ public: private: - using SelectionPool = QList<WidgetSelection *>; + using SelectionPool = QVector<WidgetSelection *>; SelectionPool m_selectionPool; typedef QHash<QWidget *, WidgetSelection *> SelectionHash; @@ -1159,15 +1160,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/previewactiongroup.cpp b/src/designer/src/components/formeditor/previewactiongroup.cpp index e0f3b7db1..a85fb22c0 100644 --- a/src/designer/src/components/formeditor/previewactiongroup.cpp +++ b/src/designer/src/components/formeditor/previewactiongroup.cpp @@ -91,12 +91,9 @@ PreviewActionGroup::PreviewActionGroup(QDesignerFormEditorInterface *core, QObje void PreviewActionGroup::updateDeviceProfiles() { - using DeviceProfileList = QList<DeviceProfile>; - using ActionList = QList<QAction *>; - const QDesignerSharedSettings settings(m_core); - const DeviceProfileList profiles = settings.deviceProfiles(); - const ActionList al = actions(); + const auto profiles = settings.deviceProfiles(); + const auto al = actions(); // Separator? const bool hasProfiles = !profiles.isEmpty(); al.at(MaxDeviceActions)->setVisible(hasProfiles); 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/qwizard_container.cpp b/src/designer/src/components/formeditor/qwizard_container.cpp index 5853fbf98..9acb4988c 100644 --- a/src/designer/src/components/formeditor/qwizard_container.cpp +++ b/src/designer/src/components/formeditor/qwizard_container.cpp @@ -33,11 +33,11 @@ #include <QtWidgets/qwizard.h> #include <QtCore/qdebug.h> +#include <QtCore/qvector.h> QT_BEGIN_NAMESPACE -using IdList = QList<int>; -using WizardPageList = QList<QWizardPage *>; +using WizardPageList = QVector<QWizardPage *>; namespace qdesigner_internal { @@ -56,7 +56,7 @@ QWidget *QWizardContainer::widget(int index) const { QWidget *rc = nullptr; if (index >= 0) { - const IdList idList = m_wizard->pageIds(); + const auto idList = m_wizard->pageIds(); if (index < idList.size()) rc = m_wizard->page(idList.at(index)); } @@ -117,7 +117,7 @@ void QWizardContainer::insertWidget(int index, QWidget *widget) return; } - const IdList idList = m_wizard->pageIds(); + const auto idList = m_wizard->pageIds(); const int pageCount = idList.size(); if (index >= pageCount) { addWidget(widget); @@ -139,9 +139,8 @@ void QWizardContainer::insertWidget(int index, QWidget *widget) m_wizard->removePage(idList.at(i)); } int newId = idBefore + delta; - const WizardPageList::const_iterator wcend = pageList.constEnd(); - for (WizardPageList::const_iterator it = pageList.constBegin(); it != wcend; ++it) { - m_wizard->setPage(newId, *it); + for (QWizardPage *page : qAsConst(pageList)) { + m_wizard->setPage(newId, page); newId += delta; } } else { @@ -157,7 +156,7 @@ void QWizardContainer::remove(int index) if (index < 0) return; - const IdList idList = m_wizard->pageIds(); + const auto idList = m_wizard->pageIds(); if (index >= idList.size()) return; 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..f6e7c78f2 100644 --- a/src/designer/src/components/objectinspector/objectinspectormodel.cpp +++ b/src/designer/src/components/objectinspector/objectinspectormodel.cpp @@ -260,8 +260,6 @@ namespace qdesigner_internal { setItemsDisplayData(row, icons, ClassNameChanged|ObjectNameChanged|ClassIconChanged|TypeChanged|LayoutTypeChanged); } - using ObjectModel = QList<ObjectData>; - // Recursive routine that creates the model by traversing the form window object tree. void createModelRecursion(const QDesignerFormWindowInterface *fwi, QObject *parent, @@ -269,9 +267,7 @@ namespace qdesigner_internal { ObjectModel &model, const ModelRecursionContext &ctx) { - using ButtonGroupList = QList<QButtonGroup *>; - using ActionList = QList<QAction *>; - + using ButtonGroupList = QVector<QButtonGroup *>; // 1) Create entry const ObjectData entry(parent, object, ctx); model.push_back(entry); @@ -289,46 +285,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/objectinspector/objectinspectormodel_p.h b/src/designer/src/components/objectinspector/objectinspectormodel_p.h index f138253a5..14bcf78cb 100644 --- a/src/designer/src/components/objectinspector/objectinspectormodel_p.h +++ b/src/designer/src/components/objectinspector/objectinspectormodel_p.h @@ -48,6 +48,7 @@ #include <QtCore/qlist.h> #include <QtCore/qmap.h> #include <QtCore/qpointer.h> +#include <QtCore/qvector.h> QT_BEGIN_NAMESPACE @@ -114,7 +115,7 @@ namespace qdesigner_internal { inline bool operator==(const ObjectData &e1, const ObjectData &e2) { return e1.equals(e2); } inline bool operator!=(const ObjectData &e1, const ObjectData &e2) { return !e1.equals(e2); } - using ObjectModel = QList<ObjectData>; + using ObjectModel = QVector<ObjectData>; // QStandardItemModel for ObjectInspector. Uses ObjectData/ObjectModel // internally for its updates. 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/widgetboxcategorylistview.cpp b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp index 5b00ea68f..9863da25b 100644 --- a/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp +++ b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp @@ -129,7 +129,7 @@ public: bool removeCustomWidgets(); private: - using WidgetBoxCategoryEntrys = QList<WidgetBoxCategoryEntry>; + using WidgetBoxCategoryEntrys = QVector<WidgetBoxCategoryEntry>; QDesignerFormEditorInterface *m_core; WidgetBoxCategoryEntrys m_items; 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/appfontdialog.cpp b/src/designer/src/designer/appfontdialog.cpp index c5524be7f..12dd80bed 100644 --- a/src/designer/src/designer/appfontdialog.cpp +++ b/src/designer/src/designer/appfontdialog.cpp @@ -82,7 +82,7 @@ public: // Store loaded fonts as pair of file name and Id using FileNameFontIdPair = QPair<QString,int>; - using FileNameFontIdPairs = QList<FileNameFontIdPair>; + using FileNameFontIdPairs = QVector<FileNameFontIdPair>; const FileNameFontIdPairs &fonts() const; private: diff --git a/src/designer/src/designer/doc/src/qtdesigner-module.qdoc b/src/designer/src/designer/doc/src/qtdesigner-module.qdoc index eaf816f42..b13f2ae9f 100644 --- a/src/designer/src/designer/doc/src/qtdesigner-module.qdoc +++ b/src/designer/src/designer/doc/src/qtdesigner-module.qdoc @@ -46,3 +46,8 @@ \snippet plugins/doc_src_qtdesigner.pro 1 */ + +/*! + \namespace qdesigner_internal + \internal +*/ 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..d18d2a179 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); } @@ -329,7 +329,7 @@ Qt::WindowFlags QDesignerWorkbench::magicalWindowFlags(const QWidget *widgetForF return Qt::Window; default: Q_ASSERT(0); - return nullptr; + return {}; } } @@ -687,7 +687,7 @@ QDesignerFormWindow *QDesignerWorkbench::findFormWindow(QWidget *widget) const bool QDesignerWorkbench::handleClose() { m_state = StateClosing; - QList<QDesignerFormWindow *> dirtyForms; + QVector<QDesignerFormWindow *> dirtyForms; for (QDesignerFormWindow *w : qAsConst(m_formWindows)) { if (w->editor()->isDirty()) dirtyForms << w; diff --git a/src/designer/src/lib/sdk/abstractdialoggui_p.h b/src/designer/src/lib/sdk/abstractdialoggui_p.h index 4906bfd7a..d8f47dc8b 100644 --- a/src/designer/src/lib/sdk/abstractdialoggui_p.h +++ b/src/designer/src/lib/sdk/abstractdialoggui_p.h @@ -79,11 +79,11 @@ public: QMessageBox::StandardButton defaultButton = QMessageBox::NoButton) = 0; virtual QString getExistingDirectory(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), QFileDialog::Options options = QFileDialog::ShowDirsOnly)= 0; - virtual QString getOpenFileName(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, QFileDialog::Options options = nullptr)= 0; - virtual QString getOpenImageFileName(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, QFileDialog::Options options = nullptr); - virtual QStringList getOpenFileNames(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, QFileDialog::Options options = nullptr)= 0; - virtual QStringList getOpenImageFileNames(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, QFileDialog::Options options = nullptr); - virtual QString getSaveFileName(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, QFileDialog::Options options = nullptr)= 0; + virtual QString getOpenFileName(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, QFileDialog::Options options = {})= 0; + virtual QString getOpenImageFileName(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, QFileDialog::Options options = {}); + virtual QStringList getOpenFileNames(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, QFileDialog::Options options = {})= 0; + virtual QStringList getOpenImageFileNames(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, QFileDialog::Options options = {}); + virtual QString getSaveFileName(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, QFileDialog::Options options = {})= 0; }; QT_END_NAMESPACE diff --git a/src/designer/src/lib/sdk/abstractpromotioninterface.cpp b/src/designer/src/lib/sdk/abstractpromotioninterface.cpp index cb9f84c8d..a8e8ecdb6 100644 --- a/src/designer/src/lib/sdk/abstractpromotioninterface.cpp +++ b/src/designer/src/lib/sdk/abstractpromotioninterface.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE */ /*! - \fn virtual QDesignerPromotionInterface::PromotedClasses promotedClasses() const + \fn QDesignerPromotionInterface::PromotedClasses QDesignerPromotionInterface::promotedClasses() const Returns a list of promoted classes along with their base classes in alphabetical order. It can be used to populate tree models for editing promoted widgets. 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/connectionedit.cpp b/src/designer/src/lib/shared/connectionedit.cpp index 8916c4e1c..35b3bbf94 100644 --- a/src/designer/src/lib/shared/connectionedit.cpp +++ b/src/designer/src/lib/shared/connectionedit.cpp @@ -1379,8 +1379,10 @@ void ConnectionEdit::widgetRemoved(QWidget *widget) const ConnectionSet remove_set = findConnectionsOf(m_con_list, child_list.constBegin(), child_list.constEnd()); - if (!remove_set.isEmpty()) - m_undo_stack->push(new DeleteConnectionsCommand(this, remove_set.keys())); + if (!remove_set.isEmpty()) { + auto cmd = new DeleteConnectionsCommand(this, ConnectionList(remove_set.cbegin(), remove_set.cend())); + m_undo_stack->push(cmd); + } updateBackground(); } @@ -1394,8 +1396,10 @@ void ConnectionEdit::objectRemoved(QObject *o) QObjectList child_list = o->children(); child_list.prepend(o); const ConnectionSet remove_set = findConnectionsOf(m_con_list, child_list.constBegin(), child_list.constEnd()); - if (!remove_set.isEmpty()) - m_undo_stack->push(new DeleteConnectionsCommand(this, remove_set.keys())); + if (!remove_set.isEmpty()) { + auto cmd = new DeleteConnectionsCommand(this, ConnectionList(remove_set.cbegin(), remove_set.cend())); + m_undo_stack->push(cmd); + } updateBackground(); } @@ -1500,7 +1504,8 @@ void ConnectionEdit::deleteSelected() { if (m_sel_con_set.isEmpty()) return; - m_undo_stack->push(new DeleteConnectionsCommand(this, m_sel_con_set.keys())); + auto cmd = new DeleteConnectionsCommand(this, ConnectionList(m_sel_con_set.cbegin(), m_sel_con_set.cend())); + m_undo_stack->push(cmd); } void ConnectionEdit::addConnection(Connection *con) diff --git a/src/designer/src/lib/shared/connectionedit_p.h b/src/designer/src/lib/shared/connectionedit_p.h index 6fd623457..51ad450f8 100644 --- a/src/designer/src/lib/shared/connectionedit_p.h +++ b/src/designer/src/lib/shared/connectionedit_p.h @@ -45,6 +45,7 @@ #include <QtCore/qhash.h> #include <QtCore/qlist.h> +#include <QtCore/qvector.h> #include <QtCore/qpointer.h> #include <QtWidgets/qwidget.h> @@ -67,7 +68,7 @@ class ConnectionEdit; class QDESIGNER_SHARED_EXPORT CETypes { public: - using ConnectionList = QList<Connection *>; + using ConnectionList = QVector<Connection *>; using ConnectionSet = QHash<Connection*, Connection*> ; using WidgetSet = QHash<QWidget*, QWidget*>; @@ -132,7 +133,7 @@ public: private: QPoint m_source_pos, m_target_pos; QObject *m_source, *m_target; - QList<QPoint> m_knee_list; + QVector<QPoint> m_knee_list; QPolygonF m_arrow_head; ConnectionEdit *m_edit; QString m_source_label, m_target_label; diff --git a/src/designer/src/lib/shared/dialoggui_p.h b/src/designer/src/lib/shared/dialoggui_p.h index 0dde0b34e..4b5f2829f 100644 --- a/src/designer/src/lib/shared/dialoggui_p.h +++ b/src/designer/src/lib/shared/dialoggui_p.h @@ -73,12 +73,12 @@ public: QMessageBox::StandardButton defaultButton = QMessageBox::NoButton) override; QString getExistingDirectory(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), QFileDialog::Options options = QFileDialog::ShowDirsOnly) override; - QString getOpenFileName(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, QFileDialog::Options options = nullptr) override; - QStringList getOpenFileNames(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, QFileDialog::Options options = nullptr) override; - QString getSaveFileName(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, QFileDialog::Options options = nullptr) override; + QString getOpenFileName(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, QFileDialog::Options options = {}) override; + QStringList getOpenFileNames(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, QFileDialog::Options options = {}) override; + QString getSaveFileName(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, QFileDialog::Options options = {}) override; - QString getOpenImageFileName(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, QFileDialog::Options options = nullptr) override; - QStringList getOpenImageFileNames(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, QFileDialog::Options options = nullptr) override; + QString getOpenImageFileName(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, QFileDialog::Options options = {}) override; + QStringList getOpenImageFileNames(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, QFileDialog::Options options = {}) override; private: QFileIconProvider *ensureIconProvider(); diff --git a/src/designer/src/lib/shared/iconselector.cpp b/src/designer/src/lib/shared/iconselector.cpp index d9d50e782..05aaa9c98 100644 --- a/src/designer/src/lib/shared/iconselector.cpp +++ b/src/designer/src/lib/shared/iconselector.cpp @@ -55,6 +55,7 @@ #include <QtWidgets/qlabel.h> #include <QtGui/qvalidator.h> #include <QtCore/qdebug.h> +#include <QtCore/qvector.h> QT_BEGIN_NAMESPACE @@ -189,7 +190,7 @@ public: void slotResetAllActivated(); void slotUpdate(); - QList<QPair<QPair<QIcon::Mode, QIcon::State>, QString> > m_stateToName; // could be static map + QVector<QPair<QPair<QIcon::Mode, QIcon::State>, QString> > m_stateToName; // could be static map QMap<QPair<QIcon::Mode, QIcon::State>, int> m_stateToIndex; QMap<int, QPair<QIcon::Mode, QIcon::State> > m_indexToState; @@ -329,7 +330,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/layout.cpp b/src/designer/src/lib/shared/layout.cpp index f121f31d6..d5414dbf1 100644 --- a/src/designer/src/lib/shared/layout.cpp +++ b/src/designer/src/lib/shared/layout.cpp @@ -392,7 +392,7 @@ void Layout::breakLayout() for (auto it = rects.cbegin(), end = rects.cend(); it != end; ++it) { QWidget *w = it.key(); if (needReparent) { - w->setParent(m_layoutBase->parentWidget(), nullptr); + w->setParent(m_layoutBase->parentWidget(), {}); w->move(m_layoutBasePos + it.value().topLeft()); w->show(); } @@ -456,7 +456,7 @@ QLayout *Layout::createLayout(int type) void Layout::reparentToLayoutBase(QWidget *w) { if (w->parent() != m_layoutBase) { - w->setParent(m_layoutBase, nullptr); + w->setParent(m_layoutBase, {}); w->move(QPoint(0,0)); } } @@ -1104,7 +1104,7 @@ void GridLayout<GridLikeLayout, LayoutType, GridMode>::doLayout() if (needReparent) reparentToLayoutBase(w); - Qt::Alignment alignment = Qt::Alignment(nullptr); + Qt::Alignment alignment; if (const Spacer *spacer = qobject_cast<const Spacer*>(w)) alignment = spacer->alignment(); 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/newformwidget.cpp b/src/designer/src/lib/shared/newformwidget.cpp index 32a65c7de..dda60fd16 100644 --- a/src/designer/src/lib/shared/newformwidget.cpp +++ b/src/designer/src/lib/shared/newformwidget.cpp @@ -129,8 +129,6 @@ NewFormWidget::NewFormWidget(QDesignerFormEditorInterface *core, QWidget *parent m_currentItem(nullptr), m_acceptedItem(nullptr) { - using DeviceProfileList = QList<qdesigner_internal::DeviceProfile>; - m_ui->setupUi(this); m_ui->treeWidget->setItemDelegate(new qdesigner_internal::SheetDelegate(m_ui->treeWidget, this)); m_ui->treeWidget->header()->hide(); @@ -186,9 +184,8 @@ NewFormWidget::NewFormWidget(QDesignerFormEditorInterface *core, QWidget *parent if (m_deviceProfiles.isEmpty()) { m_ui->profileComboBox->setEnabled(false); } else { - const DeviceProfileList::const_iterator dcend = m_deviceProfiles.constEnd(); - for (DeviceProfileList::const_iterator it = m_deviceProfiles.constBegin(); it != dcend; ++it) - m_ui->profileComboBox->addItem(it->name()); + for (const auto &deviceProfile : qAsConst(m_deviceProfiles)) + m_ui->profileComboBox->addItem(deviceProfile.name()); const int ci = settings.currentDeviceProfileIndex(); if (ci >= 0) m_ui->profileComboBox->setCurrentIndex(ci + profileComboIndexOffset); diff --git a/src/designer/src/lib/shared/newformwidget_p.h b/src/designer/src/lib/shared/newformwidget_p.h index f6daae122..b428d5bc6 100644 --- a/src/designer/src/lib/shared/newformwidget_p.h +++ b/src/designer/src/lib/shared/newformwidget_p.h @@ -51,6 +51,7 @@ #include <QtCore/qstringlist.h> #include <QtCore/qpair.h> #include <QtCore/qmap.h> +#include <QtCore/qvector.h> QT_BEGIN_NAMESPACE @@ -69,7 +70,7 @@ class QDESIGNER_SHARED_EXPORT NewFormWidget : public QDesignerNewFormWidgetInter Q_DISABLE_COPY_MOVE(NewFormWidget) public: - using DeviceProfileList = QList<qdesigner_internal::DeviceProfile>; + using DeviceProfileList = QVector<qdesigner_internal::DeviceProfile>; explicit NewFormWidget(QDesignerFormEditorInterface *core, QWidget *parentWidget); ~NewFormWidget() override; 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/previewconfigurationwidget.cpp b/src/designer/src/lib/shared/previewconfigurationwidget.cpp index 6089f91a6..4aa68d083 100644 --- a/src/designer/src/lib/shared/previewconfigurationwidget.cpp +++ b/src/designer/src/lib/shared/previewconfigurationwidget.cpp @@ -57,7 +57,7 @@ static const char *skinExtensionC = "skin"; // Pair of skin name, path typedef QPair<QString, QString> SkinNamePath; -using Skins = QList<SkinNamePath>; +using Skins = QVector<SkinNamePath>; enum { SkinComboNoneIndex = 0 }; // find default skins (resources) @@ -144,9 +144,8 @@ PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate::PreviewConfigurat Skins skins = defaultSkins(); skins.push_front(SkinNamePath(PreviewConfigurationWidget::tr("None"), QString())); - const Skins::const_iterator scend = skins.constEnd(); - for (Skins::const_iterator it = skins.constBegin(); it != scend; ++it) - m_ui.m_skinCombo->addItem (it->first, QVariant(it->second)); + for (const auto &skin : qAsConst(skins)) + m_ui.m_skinCombo->addItem(skin.first, QVariant(skin.second)); m_browseSkinIndex = m_firstUserSkinIndex = skins.size(); m_ui.m_skinCombo->addItem(PreviewConfigurationWidget::tr("Browse..."), QString()); diff --git a/src/designer/src/lib/shared/previewmanager.cpp b/src/designer/src/lib/shared/previewmanager.cpp index 2fbe2e012..f7947d938 100644 --- a/src/designer/src/lib/shared/previewmanager.cpp +++ b/src/designer/src/lib/shared/previewmanager.cpp @@ -59,6 +59,7 @@ #include <QtCore/qmap.h> #include <QtCore/qdebug.h> #include <QtCore/qshareddata.h> +#include <QtCore/qvector.h> QT_BEGIN_NAMESPACE @@ -207,7 +208,7 @@ void PreviewDeviceSkin::setPreview(QWidget *formWidget) void PreviewDeviceSkin::slotSkinKeyPressEvent(int code, const QString& text, bool autorep) { if (QWidget *focusWidget = QApplication::focusWidget()) { - QKeyEvent e(QEvent::KeyPress, code, nullptr, text, autorep); + QKeyEvent e(QEvent::KeyPress, code, {}, text, autorep); QApplication::sendEvent(focusWidget, &e); } } @@ -215,7 +216,7 @@ void PreviewDeviceSkin::slotSkinKeyPressEvent(int code, const QString& text, boo void PreviewDeviceSkin::slotSkinKeyReleaseEvent(int code, const QString& text, bool autorep) { if (QWidget *focusWidget = QApplication::focusWidget()) { - QKeyEvent e(QEvent::KeyRelease, code, nullptr, text, autorep); + QKeyEvent e(QEvent::KeyRelease, code, {}, text, autorep); QApplication::sendEvent(focusWidget, &e); } } @@ -555,7 +556,7 @@ public: QPointer<QWidget> m_activePreview; - using PreviewDataList = QList<PreviewData>; + using PreviewDataList = QVector<PreviewData>; PreviewDataList m_previews; diff --git a/src/designer/src/lib/shared/promotiontaskmenu_p.h b/src/designer/src/lib/shared/promotiontaskmenu_p.h index 830986968..641efa9b3 100644 --- a/src/designer/src/lib/shared/promotiontaskmenu_p.h +++ b/src/designer/src/lib/shared/promotiontaskmenu_p.h @@ -45,6 +45,7 @@ #include <QtCore/qobject.h> #include <QtCore/qpointer.h> #include <QtCore/qlist.h> +#include <QtCore/qvector.h> QT_BEGIN_NAMESPACE @@ -111,7 +112,7 @@ private: PromotionState createPromotionActions(QDesignerFormWindowInterface *formWindow); QDesignerFormWindowInterface *formWindow() const; - using PromotionSelectionList = QList<QPointer<QWidget> >; + using PromotionSelectionList = QVector<QPointer<QWidget> >; PromotionSelectionList promotionSelectionList(QDesignerFormWindowInterface *formWindow) const; Mode m_mode; 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_command2.cpp b/src/designer/src/lib/shared/qdesigner_command2.cpp index e956e7d92..ac035f6ec 100644 --- a/src/designer/src/lib/shared/qdesigner_command2.cpp +++ b/src/designer/src/lib/shared/qdesigner_command2.cpp @@ -143,7 +143,7 @@ QString MorphLayoutCommand::formatDescription(QDesignerFormEditorInterface * /* LayoutAlignmentCommand::LayoutAlignmentCommand(QDesignerFormWindowInterface *formWindow) : QDesignerFormWindowCommand(QApplication::translate("Command", "Change layout alignment"), formWindow), - m_newAlignment(nullptr), m_oldAlignment(nullptr), m_widget(nullptr) + m_widget(nullptr) { } @@ -180,7 +180,7 @@ Qt::Alignment LayoutAlignmentCommand::alignmentOf(const QDesignerFormEditorInter (type == LayoutInfo::HBox || type == LayoutInfo::VBox || type == LayoutInfo::Grid); if (!enabled) - return Qt::Alignment(nullptr); + return {}; // Get alignment const int index = layout->indexOf(w); Q_ASSERT(index >= 0); diff --git a/src/designer/src/lib/shared/qdesigner_command_p.h b/src/designer/src/lib/shared/qdesigner_command_p.h index 8053c8918..fc20745f7 100644 --- a/src/designer/src/lib/shared/qdesigner_command_p.h +++ b/src/designer/src/lib/shared/qdesigner_command_p.h @@ -56,6 +56,7 @@ #include <QtCore/qhash.h> #include <QtCore/qpoint.h> #include <QtCore/qrect.h> +#include <QtCore/qvector.h> QT_BEGIN_NAMESPACE @@ -316,7 +317,7 @@ private: class QDESIGNER_SHARED_EXPORT PromoteToCustomWidgetCommand : public QDesignerFormWindowCommand { public: - using WidgetPointerList = QList<QPointer<QWidget> >; + using WidgetPointerList = QVector<QPointer<QWidget> >; explicit PromoteToCustomWidgetCommand(QDesignerFormWindowInterface *formWindow); @@ -354,7 +355,7 @@ public: void restore(QDesignerFormWindowInterface *formWindow) const; private: - using WidgetPointerList = QList<QPointer<QWidget> >; + using WidgetPointerList = QVector<QPointer<QWidget> >; WidgetPointerList m_selection; QPointer<QWidget> m_current; }; @@ -871,7 +872,7 @@ struct QDESIGNER_SHARED_EXPORT ListContents { bool operator==(const ListContents &rhs) const { return m_items == rhs.m_items; } bool operator!=(const ListContents &rhs) const { return m_items != rhs.m_items; } - QList<ItemData> m_items; + QVector<ItemData> m_items; }; // Data structure representing the contents of a QTableWidget with @@ -933,7 +934,7 @@ struct QDESIGNER_SHARED_EXPORT TreeWidgetContents { //bool m_firstColumnSpanned:1; //bool m_hidden:1; //bool m_expanded:1; - QList<ItemContents> m_children; + QVector<ItemContents> m_children; }; void clear(); @@ -945,7 +946,7 @@ struct QDESIGNER_SHARED_EXPORT TreeWidgetContents { bool operator!=(const TreeWidgetContents &rhs) const { return !(*this == rhs); } ListContents m_headerItem; - QList<ItemContents> m_rootItems; + QVector<ItemContents> m_rootItems; }; class QDESIGNER_SHARED_EXPORT ChangeTreeContentsCommand: public QDesignerFormWindowCommand @@ -1016,7 +1017,7 @@ public: QAction *before; QWidget *widget; }; - using ActionData = QList<ActionDataItem>; + using ActionData = QVector<ActionDataItem>; private: QAction *m_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_formwindowmanager.cpp b/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp index 91332b0ec..243a2cac7 100644 --- a/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp +++ b/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp @@ -38,6 +38,7 @@ using namespace qdesigner_internal; /*! \class qdesigner_internal::QDesignerFormWindowManager \inmodule QtDesigner + \internal Extends QDesignerFormWindowManagerInterface with methods to control the preview and printing of forms. It provides a facade that simplifies 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_propertyeditor_p.h b/src/designer/src/lib/shared/qdesigner_propertyeditor_p.h index dbb116f65..5995cd21e 100644 --- a/src/designer/src/lib/shared/qdesigner_propertyeditor_p.h +++ b/src/designer/src/lib/shared/qdesigner_propertyeditor_p.h @@ -56,7 +56,7 @@ class QDESIGNER_SHARED_EXPORT QDesignerPropertyEditor: public QDesignerPropertyE { Q_OBJECT public: - explicit QDesignerPropertyEditor(QWidget *parent = nullptr, Qt::WindowFlags flags = nullptr); + explicit QDesignerPropertyEditor(QWidget *parent = nullptr, Qt::WindowFlags flags = {}); // A pair <ValidationMode, bool isTranslatable>. using StringPropertyParameters = QPair<TextPropertyValidationMode, bool>; 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_taskmenu.cpp b/src/designer/src/lib/shared/qdesigner_taskmenu.cpp index f1783587f..3168eae73 100644 --- a/src/designer/src/lib/shared/qdesigner_taskmenu.cpp +++ b/src/designer/src/lib/shared/qdesigner_taskmenu.cpp @@ -250,7 +250,7 @@ bool LayoutAlignmentMenu::setAlignment(const QDesignerFormEditorInterface *core, Qt::Alignment LayoutAlignmentMenu::alignment() const { - Qt::Alignment alignment = nullptr; + Qt::Alignment alignment; if (const QAction *horizAction = m_horizGroup->checkedAction()) if (const int horizAlign = horizAction->data().toInt()) alignment |= static_cast<Qt::Alignment>(horizAlign); 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/qdesigner_widgetbox_p.h b/src/designer/src/lib/shared/qdesigner_widgetbox_p.h index efedb34b2..cad8e04da 100644 --- a/src/designer/src/lib/shared/qdesigner_widgetbox_p.h +++ b/src/designer/src/lib/shared/qdesigner_widgetbox_p.h @@ -57,7 +57,7 @@ class QDESIGNER_SHARED_EXPORT QDesignerWidgetBox : public QDesignerWidgetBoxInte public: enum LoadMode { LoadMerge, LoadReplace, LoadCustomWidgetsOnly }; - explicit QDesignerWidgetBox(QWidget *parent = nullptr, Qt::WindowFlags flags = nullptr); + explicit QDesignerWidgetBox(QWidget *parent = nullptr, Qt::WindowFlags flags = {}); LoadMode loadMode() const; void setLoadMode(LoadMode lm); diff --git a/src/designer/src/lib/shared/qdesigner_widgetitem.cpp b/src/designer/src/lib/shared/qdesigner_widgetitem.cpp index 93dd2112e..e6e6cd00a 100644 --- a/src/designer/src/lib/shared/qdesigner_widgetitem.cpp +++ b/src/designer/src/lib/shared/qdesigner_widgetitem.cpp @@ -224,7 +224,7 @@ bool QDesignerWidgetItem::check(const QLayout *layout, QWidget *w, Qt::Orientati // well. Avoid nested layouts (as the effective stretch cannot be easily // computed and may mess things up). if (ptrToOrientations) - *ptrToOrientations = nullptr; + *ptrToOrientations = {}; const QObject *layoutParent = layout->parent(); if (!layoutParent || !layoutParent->isWidgetType() || !WidgetFactory::isFormEditorObject(layoutParent)) 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..fec22a015 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,10 +292,10 @@ 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; + QVector<const QByteArray *> toDelete; for (const QByteArray *array : oldData) { if (array && !newData.contains(array)) toDelete.append(array); @@ -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/shared_settings_p.h b/src/designer/src/lib/shared/shared_settings_p.h index 65dcf29bc..cd7b32779 100644 --- a/src/designer/src/lib/shared/shared_settings_p.h +++ b/src/designer/src/lib/shared/shared_settings_p.h @@ -45,7 +45,7 @@ #include "deviceprofile_p.h" #include <QtCore/qglobal.h> -#include <QtCore/qlist.h> +#include <QtCore/qvector.h> QT_BEGIN_NAMESPACE @@ -67,7 +67,7 @@ namespace qdesigner_internal { class QDESIGNER_SHARED_EXPORT QDesignerSharedSettings { public: - using DeviceProfileList = QList<DeviceProfile>; + using DeviceProfileList = QVector<DeviceProfile>; explicit QDesignerSharedSettings(QDesignerFormEditorInterface *core); 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 1ca74f44b..7a7ca2afc 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 c6b7b2375..4d39cdb5d 100644 --- a/src/designer/src/lib/uilib/abstractformbuilder.cpp +++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp @@ -794,10 +794,10 @@ static inline QString alignmentValue(Qt::Alignment a) static inline Qt::Alignment alignmentFromDom(const QString &in) { - Qt::Alignment rc = nullptr; + Qt::Alignment rc; 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")) { @@ -1043,7 +1043,7 @@ QActionGroup *QAbstractFormBuilder::createActionGroup(QObject *parent, const QSt Therefore, you should remove properties that are not required from your resulting XML files, before loading them. Alternatively, if you already know which properties you want to save when you call this method, - you can overload \l computeProperties() and return a filtered list of + you can overload \c computeProperties() and return a filtered list of required properties. Otherwise, unexpected behavior may occur as some of these properties may depend on each other. @@ -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/linguist/linguist/phrasemodel.cpp b/src/linguist/linguist/phrasemodel.cpp index afd880cc1..8a820e1ce 100644 --- a/src/linguist/linguist/phrasemodel.cpp +++ b/src/linguist/linguist/phrasemodel.cpp @@ -116,7 +116,7 @@ QVariant PhraseModel::headerData(int section, Qt::Orientation orientation, int r Qt::ItemFlags PhraseModel::flags(const QModelIndex &index) const { if (!index.isValid()) - return 0; + return {}; Qt::ItemFlags flags = Qt::ItemIsSelectable | Qt::ItemIsEnabled; // Edit is allowed for source & translation if item is from phrasebook if (plist.at(index.row())->phraseBook() diff --git a/src/linguist/linguist/statistics.h b/src/linguist/linguist/statistics.h index 632332ffd..6fcbdcf07 100644 --- a/src/linguist/linguist/statistics.h +++ b/src/linguist/linguist/statistics.h @@ -39,7 +39,7 @@ class Statistics : public QDialog, public Ui::Statistics Q_OBJECT public: - Statistics(QWidget *parent = 0, Qt::WindowFlags fl = 0); + Statistics(QWidget *parent = 0, Qt::WindowFlags fl = {}); ~Statistics() {} public slots: diff --git a/src/qdbus/qdbusviewer/propertydialog.h b/src/qdbus/qdbusviewer/propertydialog.h index a151de473..6621c60fd 100644 --- a/src/qdbus/qdbusviewer/propertydialog.h +++ b/src/qdbus/qdbusviewer/propertydialog.h @@ -38,7 +38,7 @@ class PropertyDialog: public QDialog { Q_OBJECT public: - explicit PropertyDialog(QWidget *parent = 0, Qt::WindowFlags f = 0); + explicit PropertyDialog(QWidget *parent = 0, Qt::WindowFlags f = {}); void addProperty(const QString &name, int type); void setInfo(const QString &caption); diff --git a/src/qdoc/atom.h b/src/qdoc/atom.h index 70a639158..9ad1d2b7a 100644 --- a/src/qdoc/atom.h +++ b/src/qdoc/atom.h @@ -198,7 +198,7 @@ public: virtual const QString &error() { return noError_; } virtual void resolveSquareBracketParams() { } - protected: +protected: static QString noError_; Atom *next_; AtomType type_; @@ -207,7 +207,7 @@ public: class LinkAtom : public Atom { - public: +public: LinkAtom(const QString &p1, const QString &p2); LinkAtom(const LinkAtom &t); LinkAtom(Atom *previous, const LinkAtom &t); @@ -221,7 +221,7 @@ class LinkAtom : public Atom const QString &error() override { return error_; } void resolveSquareBracketParams() override; - protected: +protected: bool resolved_; Node::Genus genus_; Node::NodeType goal_; diff --git a/src/qdoc/clangcodeparser.cpp b/src/qdoc/clangcodeparser.cpp index 475becf4d..5d95c9c7e 100644 --- a/src/qdoc/clangcodeparser.cpp +++ b/src/qdoc/clangcodeparser.cpp @@ -899,6 +899,8 @@ void ClangVisitor::parseProperty(const QString &spelling, const Location &loc) QString signature = spelling.mid(lpIdx + 1, rpIdx - lpIdx - 1); signature = signature.simplified(); QStringList part = signature.split(QChar(' ')); + if (part.first() == QLatin1String("enum")) + part.takeFirst(); // QTBUG-80027 if (part.size() < 2) return; QString type = part.at(0); diff --git a/src/qdoc/clangcodeparser.h b/src/qdoc/clangcodeparser.h index e0ca2fba1..b47c5f79c 100644 --- a/src/qdoc/clangcodeparser.h +++ b/src/qdoc/clangcodeparser.h @@ -63,7 +63,7 @@ public: void precompileHeaders() override; Node *parseFnArg(const Location &location, const QString &fnArg) override; - private: +private: void getDefaultArgs(); bool getMoreArgs(); void buildPCH(); diff --git a/src/qdoc/cppcodeparser.h b/src/qdoc/cppcodeparser.h index c6d6ca788..d6b1cead0 100644 --- a/src/qdoc/cppcodeparser.h +++ b/src/qdoc/cppcodeparser.h @@ -85,15 +85,15 @@ protected: void processTopicArgs(const Doc &doc, const QString &topic, NodeList &nodes, DocList &docs); bool hasTooManyTopics(const Doc &doc) const; - private: +private: void setExampleFileLists(PageNode *pn); - protected: +protected: typedef bool (Node::*NodeTypeTestFunc) () const; QMap<QString, NodeTypeTestFunc> nodeTypeTestFuncMap_; QMap<QString, Node::NodeType> nodeTypeMap_; - private: +private: static QStringList exampleFiles; static QStringList exampleDirs; static QSet<QString> excludeDirs; diff --git a/src/qdoc/doc/images/windowsvista-toolbutton.png b/src/qdoc/doc/images/windowsvista-toolbutton.png Binary files differnew file mode 100644 index 000000000..0baa9809c --- /dev/null +++ b/src/qdoc/doc/images/windowsvista-toolbutton.png diff --git a/src/qdoc/doc/qdoc-guide/qdoc-guide.qdoc b/src/qdoc/doc/qdoc-guide/qdoc-guide.qdoc index fd6dc7a75..201706b70 100644 --- a/src/qdoc/doc/qdoc-guide/qdoc-guide.qdoc +++ b/src/qdoc/doc/qdoc-guide/qdoc-guide.qdoc @@ -541,26 +541,21 @@ For example, if a type called \c TabWidget is in the \c UIComponents module, it must be linked as \c {UIComponents::TabWidget}. - The \l{componentset}{UIComponents} example demonstrates proper usage of - QDoc commands to document QML types and QML modules. - \section3 Read-only and Internal QML Properties QDoc detects QML properties that are marked as \c readonly. Note that the property must be initialized with a value. - \code + \badcode readonly property int sampleReadOnlyProperty: 0 \endcode - For example, the example \l{TabWidget} type has a fictitious read-only - property \c sampleReadOnlyProperty. Its declaration has the \c readonly - identifier and it has an initial value. Properties and signals that are not meant for the public interface may be marked with the \l{internal-command}{\\internal} command. QDoc will not publish the documentation in the generated outputs. \section1 Articles & Overviews + Articles and overviews are a style of writing best used for providing summary detail on a topic or concept. It may introduce a technology or discuss how a concept may be applied, but without discussing exact steps diff --git a/src/qdoc/doc/qdoc-manual-topiccmds.qdoc b/src/qdoc/doc/qdoc-manual-topiccmds.qdoc index 4e80f8f12..5c3de3a98 100644 --- a/src/qdoc/doc/qdoc-manual-topiccmds.qdoc +++ b/src/qdoc/doc/qdoc-manual-topiccmds.qdoc @@ -1365,9 +1365,6 @@ responds to a \c clicked() event. \endcode - The \l{componentset}{UIComponents} example demonstrates proper usage of - QDoc commands to document QML types and QML modules. - \target inqmlmodule-command \section1 \\inqmlmodule @@ -1387,9 +1384,6 @@ To link to the \c ClickableButton, use the \c{\l ClickableComponents::ClickableButton} format. - The \l{componentset}{UIComponents} example demonstrates proper usage of - QDoc commands to document QML types and QML modules. - The \l {noautolist-command} {\\noautolist} command can be used here to omit the automatically generated list of types at the end. diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp index fb02f3cc9..39c629465 100644 --- a/src/qdoc/generator.cpp +++ b/src/qdoc/generator.cpp @@ -1235,14 +1235,14 @@ void Generator::generateDocumentation(Node *node) */ void Generator::generateMaintainerList(const Aggregate *node, CodeMarker *marker) { - QStringList sl = getMetadataElements(node,"maintainer"); + QStringList sl = getMetadataElements(node, "maintainer"); if (!sl.isEmpty()) { Text text; text << Atom::ParaLeft - << Atom(Atom::FormattingLeft,ATOM_FORMATTING_BOLD) + << Atom(Atom::FormattingLeft, ATOM_FORMATTING_BOLD) << "Maintained by: " - << Atom(Atom::FormattingRight,ATOM_FORMATTING_BOLD); + << Atom(Atom::FormattingRight, ATOM_FORMATTING_BOLD); for (int i = 0; i < sl.size(); ++i) text << sl.at(i) << separator(i, sl.size()); diff --git a/src/qdoc/generator.h b/src/qdoc/generator.h index f9bb4d53b..f90c82315 100644 --- a/src/qdoc/generator.h +++ b/src/qdoc/generator.h @@ -239,7 +239,7 @@ private: const QString &configVar, const QString &subDir); - protected: +protected: const Config *config_; QDocDatabase *qdb_; bool inLink_; diff --git a/src/qdoc/main.cpp b/src/qdoc/main.cpp index 48166257d..c6552129f 100644 --- a/src/qdoc/main.cpp +++ b/src/qdoc/main.cpp @@ -128,8 +128,11 @@ static void loadIndexFiles(Config &config, const QSet<QString> &formats) Add all subdirectories of the indexdirs as dependModules, when an asterisk is used in the 'depends' list. */ + bool asteriskUsed = false; if (config.dependModules().contains("*")) { config.dependModules().removeOne("*"); + asteriskUsed = true; + Location::logToStdErrAlways("qdocconf file has depends = *; loading all index files found"); for (int i = 0; i < config.indexDirs().size(); i++) { QDir scanDir = QDir(config.indexDirs()[i]); scanDir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot); @@ -183,7 +186,7 @@ static void loadIndexFiles(Config &config, const QSet<QString> &formats) if (!indexFiles.contains(indexToAdd)) indexFiles << indexToAdd; } - else { + else if (!asteriskUsed) { Location::null.warning(QString("\"%1\" Cannot locate index file for dependency \"%2\"").arg( config.getString(CONFIG_PROJECT), config.dependModules()[i])); } @@ -336,8 +339,11 @@ static void processQdocconfFile(const QString &fileName, Config &config) else clangParser_->setModuleHeader(project); - config.dependModules() = config.getStringList(CONFIG_DEPENDS); - config.dependModules().removeDuplicates(); + // Retrieve the dependencies if loadIndexFiles() was not called + if (config.dependModules().isEmpty()) { + config.dependModules() = config.getStringList(CONFIG_DEPENDS); + config.dependModules().removeDuplicates(); + } qdb->setSearchOrder(config.dependModules()); // Store the title of the index (landing) page diff --git a/src/qdoc/node.h b/src/qdoc/node.h index ee8e1c537..9227ac313 100644 --- a/src/qdoc/node.h +++ b/src/qdoc/node.h @@ -426,10 +426,10 @@ public: void setOutputFileName(const QString &f) override { outputFileName_ = f; } QString outputFileName() const override { return outputFileName_; } - protected: +protected: friend class Node; - protected: +protected: bool noAutoList_; QString title_; QString subtitle_; @@ -508,7 +508,7 @@ private: void adoptFunction(FunctionNode *fn); static bool isSameSignature(const FunctionNode *f1, const FunctionNode *f2); - protected: +protected: NodeList children_; NodeList relatedByProxy_; @@ -518,14 +518,14 @@ private: NodeMap nonfunctionMap_; NodeList nonfunctionList_; - protected: +protected: int functionCount_; FunctionMap functionMap_; }; class ProxyNode : public Aggregate { - public: +public: ProxyNode(Aggregate *parent, const QString &name); bool docMustBeGenerated() const override { return true; } bool isRelatableType() const override { return true; } @@ -634,7 +634,7 @@ public: PropertyNode *findOverriddenProperty(const FunctionNode *fn); bool docMustBeGenerated() const override; - private: +private: void promotePublicBases(const QList<RelatedClass> &bases); private: diff --git a/src/qdoc/parameters.h b/src/qdoc/parameters.h index db704426f..dcd4517eb 100644 --- a/src/qdoc/parameters.h +++ b/src/qdoc/parameters.h @@ -41,7 +41,7 @@ class CodeChunk; class Parameter { - public: +public: Parameter() {} Parameter(const QString &type, const QString &name = QString(), @@ -65,7 +65,7 @@ class Parameter QString signature(bool includeValue = false) const; - public: +public: QString type_; QString name_; QString defaultValue_; @@ -75,7 +75,7 @@ typedef QVector<Parameter> ParameterVector; class Parameters { - public: +public: Parameters(); Parameters(const QString &signature); @@ -102,7 +102,7 @@ class Parameters void getTypeAndNameList(QString &out) const; bool match(const Parameters ¶meters) const; - private: +private: void readToken(); QString lexeme(); QString previousLexeme(); @@ -112,7 +112,7 @@ class Parameters bool matchParameter(); bool parse(const QString &signature); - private: +private: static QRegExp varComment_; bool valid_; diff --git a/src/qdoc/puredocparser.h b/src/qdoc/puredocparser.h index 7d814e982..67824f399 100644 --- a/src/qdoc/puredocparser.h +++ b/src/qdoc/puredocparser.h @@ -48,7 +48,7 @@ public: static PureDocParser *pureDocParser() { return pureParser_; } - private: +private: bool processQdocComments(); static PureDocParser *pureParser_; Tokenizer *tokenizer_; diff --git a/src/qdoc/qdocdatabase.h b/src/qdoc/qdocdatabase.h index 28b1cea83..1ff3aff15 100644 --- a/src/qdoc/qdocdatabase.h +++ b/src/qdoc/qdocdatabase.h @@ -54,7 +54,7 @@ enum FindFlag { class QDocForest { - private: +private: friend class QDocDatabase; QDocForest(QDocDatabase *qdb) : qdb_(qdb), primaryTree_(nullptr), currentIndex_(0) { } @@ -197,7 +197,7 @@ class QDocForest void setPrimaryTree(const QString &t); NamespaceNode *newIndexTree(const QString &module); - private: +private: QDocDatabase *qdb_; Tree *primaryTree_; int currentIndex_; @@ -211,7 +211,7 @@ class QDocDatabase { Q_DECLARE_TR_FUNCTIONS(QDoc::QDocDatabase) - public: +public: static QDocDatabase *qdocDB(); static void destroyQdocDB(); ~QDocDatabase(); @@ -261,7 +261,7 @@ class QDocDatabase static NodeMapMap &newQmlTypeMaps() { return newQmlTypeMaps_; } static NodeMultiMapMap &newSinceMaps() { return newSinceMaps_; } - private: +private: void findAllClasses(Aggregate *node) { node->findAllClasses(); } void findAllFunctions(Aggregate *node) { node->findAllFunctions(functionIndex_); } void findAllAttributions(Aggregate *node) { node->findAllAttributions(attributions_); } @@ -269,7 +269,7 @@ class QDocDatabase void findAllObsoleteThings(Aggregate *node) { node->findAllObsoleteThings(); } void findAllSince(Aggregate *node) { node->findAllSince(); } - public: +public: /******************************************************************* special collection access functions ********************************************************************/ @@ -334,7 +334,7 @@ class QDocDatabase FunctionNode *findFunctionNodeForTag(QString tag) { return primaryTree()->findFunctionNodeForTag(tag); } FunctionNode *findMacroNode(const QString &t) { return primaryTree()->findMacroNode(t); } - private: +private: const Node *findNodeForTarget(QStringList &targetPath, const Node *relative, Node::Genus genus, @@ -349,7 +349,7 @@ class QDocDatabase } /*******************************************************************/ - public: +public: void addPropertyFunction(PropertyNode *property, const QString &funcName, PropertyNode::FunctionRole funcRole) { @@ -402,7 +402,7 @@ class QDocDatabase void resolveProxies(); void resolveBaseClasses(); - private: +private: friend class Tree; const Node *findNode(const QStringList &path, @@ -415,16 +415,16 @@ class QDocDatabase bool isLoaded(const QString &t) { return forest_.isLoaded(t); } static void initializeDB(); - private: +private: QDocDatabase(); QDocDatabase(QDocDatabase const &) : showInternal_(false), forest_(this) { } QDocDatabase& operator=(QDocDatabase const &); - public: +public: static bool debug; Tree *primaryTree() { return forest_.primaryTree(); } - private: +private: static QDocDatabase *qdocDB_; static NodeMap typeNodeMap_; static NodeMultiMap obsoleteClasses_; diff --git a/src/qdoc/qdocindexfiles.h b/src/qdoc/qdocindexfiles.h index a93df774a..0e758049a 100644 --- a/src/qdoc/qdocindexfiles.h +++ b/src/qdoc/qdocindexfiles.h @@ -56,7 +56,7 @@ class QDocIndexFiles friend class QDocDatabase; friend class WebXMLGenerator; // for using generateIndexSections() - private: +private: static QDocIndexFiles* qdocIndexFiles(); static void destroyQDocIndexFiles(); @@ -75,7 +75,7 @@ class QDocIndexFiles bool generateIndexSection(QXmlStreamWriter &writer, Node *node, IndexSectionWriter *post = nullptr); void generateIndexSections(QXmlStreamWriter &writer, Node *node, IndexSectionWriter *post = nullptr); - private: +private: static QDocIndexFiles* qdocIndexFiles_; QDocDatabase *qdb_; Generator *gen_; diff --git a/src/qdoc/qdoctagfiles.h b/src/qdoc/qdoctagfiles.h index e1b8b5f73..05ad628d4 100644 --- a/src/qdoc/qdoctagfiles.h +++ b/src/qdoc/qdoctagfiles.h @@ -41,7 +41,7 @@ class QDocTagFiles { friend class QDocDatabase; - private: +private: static QDocTagFiles *qdocTagFiles(); static void destroyQDocTagFiles(); @@ -52,7 +52,7 @@ class QDocTagFiles void generateTagFileMembers(QXmlStreamWriter &writer, const Aggregate *inner); void generateTagFile(const QString &fileName, Generator *g); - private: +private: static QDocTagFiles *qdocTagFiles_; QDocDatabase *qdb_; Generator *gen_; diff --git a/src/qdoc/sections.h b/src/qdoc/sections.h index 92c2cdd2b..d9aeeb28f 100644 --- a/src/qdoc/sections.h +++ b/src/qdoc/sections.h @@ -45,11 +45,11 @@ typedef QList<ClassKeysNodes *> ClassKeysNodesList; class Section { - public: +public: enum Style { Summary, Details, AllMembers, Accessors }; enum Status { Obsolete, Active }; - public: +public: Section() : style_(Details), status_(Active), aggregate_(nullptr) { } Section(Style style, Status status); ~Section(); @@ -108,10 +108,10 @@ class Section const Aggregate *aggregate() const { return aggregate_; } void setAggregate(Aggregate *t) { aggregate_ = t; } - private: +private: QString sortName(const Node *node, const QString *name = nullptr); - private: +private: Style style_; Status status_; QString title_; @@ -139,7 +139,7 @@ typedef QVector<const Section *> SectionPtrVector; class Sections { - public: +public: enum VectorIndex { AllMembers = 0, PublicTypes = 0, @@ -228,7 +228,7 @@ class Sections Aggregate *aggregate() const { return aggregate_; } - private: +private: void stdRefPageSwitch(SectionVector &v, Node *n, Node *t = nullptr); void distributeNodeInSummaryVector(SectionVector &sv, Node *n); void distributeNodeInDetailsVector(SectionVector &dv, Node *n); @@ -236,7 +236,7 @@ class Sections void distributeQmlNodeInSummaryVector(SectionVector &sv, Node *n, bool sharing = false); void initAggregate(SectionVector &v, Aggregate *aggregate); - private: +private: Aggregate *aggregate_; static SectionVector stdSummarySections_; diff --git a/src/qdoc/tree.h b/src/qdoc/tree.h index b9b507f97..0d56425dc 100644 --- a/src/qdoc/tree.h +++ b/src/qdoc/tree.h @@ -44,7 +44,7 @@ class QDocDatabase; struct TargetRec { - public: +public: enum TargetType { Unknown, Target, Keyword, Contents, Class, Function, Page, Subtitle }; TargetRec(const QString &name, @@ -71,7 +71,7 @@ struct TargetRec struct TargetLoc { - public: +public: TargetLoc(const Node *loc, const QString &t, const QString &fileName, const QString &text, bool broken) : loc_(loc), target_(t), fileName_(fileName), text_(text), broken_(broken) { } const Node *loc_; @@ -93,14 +93,14 @@ class Tree friend class QDocForest; friend class QDocDatabase; - private: // Note the constructor and destructor are private. +private: // Note the constructor and destructor are private. typedef QMap<PropertyNode::FunctionRole, QString> RoleMap; typedef QMap<PropertyNode *, RoleMap> PropertyMap; Tree(const QString &camelCaseModuleName, QDocDatabase *qdb); ~Tree(); - public: // Of necessity, a few public functions remain. +public: // Of necessity, a few public functions remain. const QString &camelCaseModuleName() const { return camelCaseModuleName_; } const QString &physicalModuleName() const { return physicalModuleName_; } const QString &indexFileName() const { return indexFileName_; } @@ -114,7 +114,7 @@ class Tree void addToDontDocumentMap(QString &arg); void markDontDocumentNodes(); - private: // The rest of the class is private. +private: // The rest of the class is private. Aggregate *findAggregate(const QString &name); Node *findNodeForInclude(const QStringList &path) const; ClassNode *findClassNode(const QStringList &path, const Node *start = nullptr) const; diff --git a/src/qdoc/webxmlgenerator.cpp b/src/qdoc/webxmlgenerator.cpp index 89c8c093f..be19eb435 100644 --- a/src/qdoc/webxmlgenerator.cpp +++ b/src/qdoc/webxmlgenerator.cpp @@ -765,7 +765,10 @@ void WebXMLGenerator::startLink(QXmlStreamWriter &writer, const Atom *atom, fullName = node->fullName(); if (!fullName.isEmpty() && !link.isEmpty()) { writer.writeStartElement("link"); - writer.writeAttribute("raw", atom->string()); + if (!atom->string().isEmpty()) + writer.writeAttribute("raw", atom->string()); + else + writer.writeAttribute("raw", fullName); writer.writeAttribute("href", link); writer.writeAttribute("type", targetType(node)); if (node) { @@ -801,6 +804,13 @@ void WebXMLGenerator::startLink(QXmlStreamWriter &writer, const Atom *atom, } } +void WebXMLGenerator::endLink(QXmlStreamWriter &writer) { + if (inLink) { + writer.writeEndElement(); // link + inLink = false; + } +} + QString WebXMLGenerator::targetType(const Node *node) { if (!node) @@ -895,7 +905,9 @@ void WebXMLGenerator::generateAnnotatedList(QXmlStreamWriter &writer, writer.writeStartElement("row"); writer.writeStartElement("item"); writer.writeStartElement("para"); - generateFullName(writer, node, relative); + const QString link = linkForNode(node, relative); + startLink(writer, node->doc().body().firstAtom(), node, link); + endLink(writer); writer.writeEndElement(); // para writer.writeEndElement(); // item @@ -909,20 +921,6 @@ void WebXMLGenerator::generateAnnotatedList(QXmlStreamWriter &writer, writer.writeEndElement(); // table } -void WebXMLGenerator::generateFullName(QXmlStreamWriter &writer, - const Node *node, const Node *relative) -{ - QString type = targetType(node); - QString name = node->fullName(relative); - writer.writeStartElement("link"); - writer.writeAttribute("href", fullDocumentLocation(node)); - writer.writeAttribute("type", type); - if (type == QLatin1String("page")) - writer.writeAttribute("page", name); - writer.writeCharacters(name); - writer.writeEndElement(); // link -} - const QPair<QString,QString> WebXMLGenerator::anchorForNode(const Node *node) { QPair<QString,QString> anchorPair; diff --git a/src/qdoc/webxmlgenerator.h b/src/qdoc/webxmlgenerator.h index 5e3e0e9e2..320d8169e 100644 --- a/src/qdoc/webxmlgenerator.h +++ b/src/qdoc/webxmlgenerator.h @@ -67,11 +67,10 @@ private: const QPair<QString,QString> anchorForNode(const Node *node); void generateAnnotatedList(QXmlStreamWriter &writer, const Node *relative, const NodeMap &nodeMap); void generateAnnotatedList(QXmlStreamWriter &writer, const Node *relative, const NodeList &nodeList); - void generateFullName(QXmlStreamWriter &writer, const Node *node, - const Node *relative); void generateRelations(QXmlStreamWriter &writer, const Node *node); void startLink(QXmlStreamWriter &writer, const Atom *atom, const Node *node, const QString &link); + void endLink(QXmlStreamWriter &writer); QString targetType(const Node *node); bool inLink; diff --git a/src/shared/deviceskin/deviceskin.cpp b/src/shared/deviceskin/deviceskin.cpp index b8649b9b3..bc594f118 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()); } @@ -535,7 +535,7 @@ void DeviceSkin::paintEvent( QPaintEvent *) } else { p.drawPixmap(0, 0, skinImageClosed); } - QList<int> toDraw; + QVector<int> toDraw; if ( buttonPressed == true ) { toDraw += buttonIndex; } 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; diff --git a/src/shared/qttoolbardialog/qttoolbardialog.h b/src/shared/qttoolbardialog/qttoolbardialog.h index 72d34bafb..1599d9da5 100644 --- a/src/shared/qttoolbardialog/qttoolbardialog.h +++ b/src/shared/qttoolbardialog/qttoolbardialog.h @@ -98,7 +98,7 @@ class QtToolBarDialog : public QDialog Q_OBJECT public: - explicit QtToolBarDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0); + explicit QtToolBarDialog(QWidget *parent = 0, Qt::WindowFlags flags = {}); ~QtToolBarDialog(); void setToolBarManager(QtToolBarManager *toolBarManager); |
