diff options
22 files changed, 59 insertions, 54 deletions
diff --git a/src/designer/src/components/buddyeditor/buddyeditor.cpp b/src/designer/src/components/buddyeditor/buddyeditor.cpp index 36a5bf18e..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> @@ -141,7 +142,7 @@ void BuddyEditor::updateBackground() ConnectionEdit::updateBackground(); m_updating = true; - QList<Connection *> newList; + QVector<Connection *> newList; const auto label_list = background()->findChildren<QLabel*>(); for (QLabel *label : label_list) { const QString buddy_name = buddy(label, m_formWindow->core()); @@ -163,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++) { 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 051e08b9c..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; 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/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/objectinspector/objectinspectormodel.cpp b/src/designer/src/components/objectinspector/objectinspectormodel.cpp index 91b941765..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,7 +267,7 @@ namespace qdesigner_internal { ObjectModel &model, const ModelRecursionContext &ctx) { - using ButtonGroupList = QList<QButtonGroup *>; + using ButtonGroupList = QVector<QButtonGroup *>; // 1) Create entry const ObjectData entry(parent, object, ctx); model.push_back(entry); 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/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/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/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp index aec582e91..69f067ec3 100644 --- a/src/designer/src/designer/qdesigner_workbench.cpp +++ b/src/designer/src/designer/qdesigner_workbench.cpp @@ -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/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/iconselector.cpp b/src/designer/src/lib/shared/iconselector.cpp index c45402be5..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; 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/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..208df169c 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 @@ -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_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/qtresourcemodel.cpp b/src/designer/src/lib/shared/qtresourcemodel.cpp index 391cf49a3..fec22a015 100644 --- a/src/designer/src/lib/shared/qtresourcemodel.cpp +++ b/src/designer/src/lib/shared/qtresourcemodel.cpp @@ -295,7 +295,7 @@ void QtResourceModelPrivate::activate(QtResourceSet *resourceSet, const QStringL 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); 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/shared/deviceskin/deviceskin.cpp b/src/shared/deviceskin/deviceskin.cpp index 593502d0a..bc594f118 100644 --- a/src/shared/deviceskin/deviceskin.cpp +++ b/src/shared/deviceskin/deviceskin.cpp @@ -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; } |