diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-18 16:37:31 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-08 08:11:08 +0000 |
| commit | de3454fcaaea88ad0805814c231d796c9fbed2c7 (patch) | |
| tree | ac1cd6b1601fc4ca588160e3f0ce41d695f2e84d | |
| parent | 131d08f789237cd59d108e8ca882a797089764f9 (diff) | |
Revert "Qt Designer: Migrate from QList to QVector"
This reverts commit ee87edebe6f934ec915b7cb4a0f5a28f73e9f221.
The official class name will be QList.
Task-number: QTBUG-84469
Change-Id: Ia6c1f0ed64b3ef3d5b8e0c0435ec76fbe76f867b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
136 files changed, 372 insertions, 369 deletions
diff --git a/examples/designer/taskmenuextension/tictactoetaskmenu.cpp b/examples/designer/taskmenuextension/tictactoetaskmenu.cpp index 4ea54e3ae..75d1f625c 100644 --- a/examples/designer/taskmenuextension/tictactoetaskmenu.cpp +++ b/examples/designer/taskmenuextension/tictactoetaskmenu.cpp @@ -81,9 +81,9 @@ QAction *TicTacToeTaskMenu::preferredEditAction() const //! [2] //! [3] -QVector<QAction *> TicTacToeTaskMenu::taskActions() const +QList<QAction *> TicTacToeTaskMenu::taskActions() const { - return {editStateAction}; + return QList<QAction *>{editStateAction}; } //! [3] diff --git a/examples/designer/taskmenuextension/tictactoetaskmenu.h b/examples/designer/taskmenuextension/tictactoetaskmenu.h index 8f0f9ce8a..a57ded625 100644 --- a/examples/designer/taskmenuextension/tictactoetaskmenu.h +++ b/examples/designer/taskmenuextension/tictactoetaskmenu.h @@ -70,7 +70,7 @@ public: explicit TicTacToeTaskMenu(TicTacToe *tic, QObject *parent); QAction *preferredEditAction() const override; - QVector<QAction *> taskActions() const override; + QList<QAction *> taskActions() const override; private slots: void editState(); diff --git a/src/designer/src/components/formeditor/formeditor.cpp b/src/designer/src/components/formeditor/formeditor.cpp index 0e1db2501..05e7fc4ee 100644 --- a/src/designer/src/components/formeditor/formeditor.cpp +++ b/src/designer/src/components/formeditor/formeditor.cpp @@ -142,7 +142,7 @@ FormEditor::FormEditor(QObject *parent) connect(resourceModel, &QtResourceModel::qrcFileModifiedExternally, this, &FormEditor::slotQrcFileChangedExternally); - QVector<QDesignerOptionsPageInterface*> optionsPages; + QList<QDesignerOptionsPageInterface*> optionsPages; optionsPages << new TemplateOptionsPage(this) << new FormEditorOptionsPage(this) << new EmbeddedOptionsPage(this); setOptionsPages(optionsPages); diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp index b5c5e27e0..d9a73aa50 100644 --- a/src/designer/src/components/formeditor/formwindow.cpp +++ b/src/designer/src/components/formeditor/formwindow.cpp @@ -725,7 +725,7 @@ bool FormWindow::handleMouseMoveEvent(QWidget *, QWidget *, QMouseEvent *e) sel.prepend(current); } - QVector<QDesignerDnDItemInterface*> item_list; + QList<QDesignerDnDItemInterface*> item_list; const QPoint globalPos = mapToGlobal(m_startPos); const QDesignerDnDItemInterface::DropType dropType = (mouseFlags(e->modifiers()) & CopyDragModifier) ? QDesignerDnDItemInterface::CopyDrop : QDesignerDnDItemInterface::MoveDrop; @@ -2829,7 +2829,7 @@ bool FormWindow::dropDockWidget(QDesignerDnDItemInterface *item, const QPoint &g return true; } -bool FormWindow::dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list, QWidget *target, +bool FormWindow::dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, QWidget *target, const QPoint &global_mouse_pos) { diff --git a/src/designer/src/components/formeditor/formwindow.h b/src/designer/src/components/formeditor/formwindow.h index 6bc7dd342..a2d16fe5f 100644 --- a/src/designer/src/components/formeditor/formwindow.h +++ b/src/designer/src/components/formeditor/formwindow.h @@ -189,7 +189,7 @@ public: void resizeWidget(QWidget *widget, const QRect &geometry); bool dropDockWidget(QDesignerDnDItemInterface *item, const QPoint &global_mouse_pos); - bool dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list, QWidget *target, + bool dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, QWidget *target, const QPoint &global_mouse_pos) override; QWidget *findContainer(QWidget *w, bool excludeLayout) const override; diff --git a/src/designer/src/components/formeditor/formwindow_widgetstack.h b/src/designer/src/components/formeditor/formwindow_widgetstack.h index e1a5dd161..01ee921fd 100644 --- a/src/designer/src/components/formeditor/formwindow_widgetstack.h +++ b/src/designer/src/components/formeditor/formwindow_widgetstack.h @@ -76,7 +76,7 @@ protected: QWidget *defaultEditor() const; private: - QVector<QDesignerFormWindowToolInterface*> m_tools; + QList<QDesignerFormWindowToolInterface*> m_tools; QWidget *m_formContainer; QStackedLayout *m_formContainerLayout; QStackedLayout *m_layout; diff --git a/src/designer/src/components/formeditor/formwindowmanager.cpp b/src/designer/src/components/formeditor/formwindowmanager.cpp index 75af54fe3..60ad4da5e 100644 --- a/src/designer/src/components/formeditor/formwindowmanager.cpp +++ b/src/designer/src/components/formeditor/formwindowmanager.cpp @@ -956,7 +956,7 @@ void FormWindowManager::deviceProfilesChanged() // DnD stuff -void FormWindowManager::dragItems(const QVector<QDesignerDnDItemInterface*> &item_list) +void FormWindowManager::dragItems(const QList<QDesignerDnDItemInterface*> &item_list) { QDesignerMimeData::execDrag(item_list, m_core->topLevel()); } diff --git a/src/designer/src/components/formeditor/formwindowmanager.h b/src/designer/src/components/formeditor/formwindowmanager.h index cae24e407..d9723cea6 100644 --- a/src/designer/src/components/formeditor/formwindowmanager.h +++ b/src/designer/src/components/formeditor/formwindowmanager.h @@ -77,7 +77,7 @@ public: bool eventFilter(QObject *o, QEvent *e) override; - void dragItems(const QVector<QDesignerDnDItemInterface*> &item_list) override; + void dragItems(const QList<QDesignerDnDItemInterface*> &item_list) override; QUndoGroup *undoGroup() const; @@ -122,7 +122,7 @@ private: QDesignerFormEditorInterface *m_core; FormWindow *m_activeFormWindow; - QVector<FormWindow*> m_formWindows; + QList<FormWindow*> m_formWindows; PreviewManager *m_previewManager; diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp index 0acfc4fc9..7d549f3f8 100644 --- a/src/designer/src/components/formeditor/qdesigner_resource.cpp +++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp @@ -109,7 +109,7 @@ Q_DECLARE_METATYPE(QWidgetList) QT_BEGIN_NAMESPACE namespace { - using DomPropertyList = QVector<DomProperty *>; + using DomPropertyList = QList<DomProperty *>; } static const char *currentUiVersion = "4.0"; @@ -940,7 +940,7 @@ static bool readDomEnumerationValue(const DomProperty *p, return false; } -void QDesignerResource::applyProperties(QObject *o, const QVector<DomProperty*> &properties) +void QDesignerResource::applyProperties(QObject *o, const QList<DomProperty*> &properties) { if (properties.isEmpty()) return; @@ -1388,7 +1388,7 @@ DomWidget *QDesignerResource::saveWidget(QTabWidget *widget, DomWidget *ui_paren designerWarning(msgUnmanagedPage(core(), widget, i, page)); continue; } - QVector<DomProperty*> ui_attribute_list; + QList<DomProperty*> ui_attribute_list; const QFormBuilderStrings &strings = QFormBuilderStrings::instance(); // attribute `icon' @@ -1457,7 +1457,7 @@ DomWidget *QDesignerResource::saveWidget(QToolBox *widget, DomWidget *ui_parentW } // attribute `label' - QVector<DomProperty*> ui_attribute_list; + QList<DomProperty*> ui_attribute_list; const QFormBuilderStrings &strings = QFormBuilderStrings::instance(); @@ -1890,13 +1890,13 @@ bool QDesignerResource::canCompressSpacings(QObject *object) const return false; } -QVector<DomProperty*> QDesignerResource::computeProperties(QObject *object) +QList<DomProperty*> QDesignerResource::computeProperties(QObject *object) { - QVector<DomProperty*> properties; + QList<DomProperty*> properties; if (QDesignerPropertySheetExtension *sheet = qt_extension<QDesignerPropertySheetExtension*>(core()->extensionManager(), object)) { QDesignerDynamicPropertySheetExtension *dynamicSheet = qt_extension<QDesignerDynamicPropertySheetExtension*>(core()->extensionManager(), object); const int count = sheet->count(); - QVector<DomProperty *> spacingProperties; + QList<DomProperty *> spacingProperties; const bool compressSpacings = canCompressSpacings(object); for (int index = 0; index < count; ++index) { if (!sheet->isChanged(index) && (!dynamicSheet || !dynamicSheet->isDynamicProperty(index))) diff --git a/src/designer/src/components/formeditor/qdesigner_resource.h b/src/designer/src/components/formeditor/qdesigner_resource.h index 78e4bacb6..d667f1372 100644 --- a/src/designer/src/components/formeditor/qdesigner_resource.h +++ b/src/designer/src/components/formeditor/qdesigner_resource.h @@ -90,8 +90,8 @@ protected: QWidget *create(DomWidget *ui_widget, QWidget *parentWidget) override; QLayout *create(DomLayout *ui_layout, QLayout *layout, QWidget *parentWidget) override; QLayoutItem *create(DomLayoutItem *ui_layoutItem, QLayout *layout, QWidget *parentWidget) override; - void applyProperties(QObject *o, const QVector<DomProperty*> &properties) override; - QVector<DomProperty*> computeProperties(QObject *obj) override; + void applyProperties(QObject *o, const QList<DomProperty*> &properties) override; + QList<DomProperty*> computeProperties(QObject *obj) override; DomProperty *createProperty(QObject *object, const QString &propertyName, const QVariant &value) override; QWidget *createWidget(const QString &widgetName, QWidget *parentWidget, const QString &name) override; @@ -145,7 +145,7 @@ private: QStringList mergeWithLoadedPaths(const QStringList &paths) const; void applyAttributesToPropertySheet(const DomWidget *ui_widget, QWidget *widget); - using DomCustomWidgetList = QVector<DomCustomWidget *>; + using DomCustomWidgetList = QList<DomCustomWidget *>; void addCustomWidgetsToWidgetDatabase(DomCustomWidgetList& list); FormWindow *m_formWindow; bool m_isMainWidget; diff --git a/src/designer/src/components/formeditor/qmainwindow_container.cpp b/src/designer/src/components/formeditor/qmainwindow_container.cpp index 37b376115..180c38e79 100644 --- a/src/designer/src/components/formeditor/qmainwindow_container.cpp +++ b/src/designer/src/components/formeditor/qmainwindow_container.cpp @@ -92,7 +92,7 @@ Qt::DockWidgetArea dockWidgetArea(QDockWidget *me) if (const QMainWindow *mw = qobject_cast<const QMainWindow*>(me->parentWidget())) { // Make sure that me is actually managed by mw, otherwise // QMainWindow::dockWidgetArea() will be VERY upset - QVector<QLayout*> candidates; + QList<QLayout*> candidates; if (mw->layout()) { candidates.append(mw->layout()); candidates += mw->layout()->findChildren<QLayout*>(); diff --git a/src/designer/src/components/objectinspector/objectinspectormodel_p.h b/src/designer/src/components/objectinspector/objectinspectormodel_p.h index 35446cc49..14bcf78cb 100644 --- a/src/designer/src/components/objectinspector/objectinspectormodel_p.h +++ b/src/designer/src/components/objectinspector/objectinspectormodel_p.h @@ -76,7 +76,7 @@ namespace qdesigner_internal { ExtensionContainer // QTabWidget and the like, container extension }; - using StandardItemList = QVector<QStandardItem *>; + using StandardItemList = QList<QStandardItem *>; explicit ObjectData(QObject *parent, QObject *object, const ModelRecursionContext &ctx); ObjectData(); @@ -121,7 +121,7 @@ namespace qdesigner_internal { // internally for its updates. class ObjectInspectorModel : public QStandardItemModel { public: - using StandardItemList = QVector<QStandardItem *>; + using StandardItemList = QList<QStandardItem *>; enum { ObjectNameColumn, ClassNameColumn, NumColumns }; explicit ObjectInspectorModel(QObject *parent); diff --git a/src/designer/src/components/propertyeditor/designerpropertymanager.cpp b/src/designer/src/components/propertyeditor/designerpropertymanager.cpp index b82d884aa..64cedbd61 100644 --- a/src/designer/src/components/propertyeditor/designerpropertymanager.cpp +++ b/src/designer/src/components/propertyeditor/designerpropertymanager.cpp @@ -1292,7 +1292,7 @@ void DesignerPropertyManager::setAttribute(QtProperty *property, } pfit.value().clear(); - QVector<uint> values; + QList<uint> values; for (const QPair<QString, uint> &pair : flags) { const QString flagName = pair.first; @@ -2041,7 +2041,7 @@ void DesignerPropertyManager::initializeProperty(QtProperty *property) default: if (type == designerFlagTypeId()) { m_flagValues[property] = FlagData(); - m_propertyToFlags[property] = QVector<QtProperty *>(); + m_propertyToFlags[property] = QList<QtProperty *>(); } else if (type == designerAlignmentTypeId()) { const uint align = Qt::AlignLeft | Qt::AlignVCenter; m_alignValues[property] = align; @@ -2267,7 +2267,7 @@ void DesignerEditorFactory::disconnectPropertyManager(QtVariantPropertyManager * } // A helper that calls a setter with a value on a pointer list of editor objects. -// Could use QVector<Editor*> instead of EditorContainer/Editor, but that crashes VS 6. +// Could use QList<Editor*> instead of EditorContainer/Editor, but that crashes VS 6. template <class EditorContainer, class Editor, class SetterParameter, class Value> static inline void applyToEditors(const EditorContainer &list, void (Editor::*setter)(SetterParameter), const Value &value) { @@ -2545,7 +2545,7 @@ QWidget *DesignerEditorFactory::createEditor(QtVariantPropertyManager *manager, template <class Editor> bool removeEditor(QObject *object, - QMap<QtProperty *, QVector<Editor> > *propertyToEditors, + QMap<QtProperty *, QList<Editor> > *propertyToEditors, QMap<Editor, QtProperty *> *editorToProperty) { if (!propertyToEditors) diff --git a/src/designer/src/components/propertyeditor/designerpropertymanager.h b/src/designer/src/components/propertyeditor/designerpropertymanager.h index 85c183a31..abc6e385c 100644 --- a/src/designer/src/components/propertyeditor/designerpropertymanager.h +++ b/src/designer/src/components/propertyeditor/designerpropertymanager.h @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE typedef QPair<QString, uint> DesignerIntPair; -using DesignerFlagList = QVector<DesignerIntPair>; +using DesignerFlagList = QList<DesignerIntPair>; class QDesignerFormEditorInterface; class QLineEdit; @@ -80,7 +80,7 @@ private slots: void slotPropertyChanged(QtProperty *property); void slotEditorDestroyed(QObject *object); private: - QMap<QtProperty *, QVector<ResetWidget *> > m_createdResetWidgets; + QMap<QtProperty *, QList<ResetWidget *> > m_createdResetWidgets; QMap<ResetWidget *, QtProperty *> m_resetWidgetToProperty; int m_spacing; const QDesignerFormEditorInterface *m_core; @@ -180,11 +180,11 @@ private: { uint val{0}; DesignerFlagList flags; - QVector<uint> values; + QList<uint> values; }; typedef QMap<QtProperty *, FlagData> PropertyFlagDataMap; PropertyFlagDataMap m_flagValues; - typedef QMap<QtProperty *, QVector<QtProperty *> > PropertyToPropertyListMap; + typedef QMap<QtProperty *, QList<QtProperty *> > PropertyToPropertyListMap; PropertyToPropertyListMap m_propertyToFlags; QMap<QtProperty *, QtProperty *> m_flagToProperty; @@ -290,28 +290,28 @@ private: int m_spacing; - QMap<QtProperty *, QVector<TextEditor *> > m_stringPropertyToEditors; - QMap<TextEditor *, QtProperty *> m_editorToStringProperty; - QMap<QtProperty *, QVector<QKeySequenceEdit *> > m_keySequencePropertyToEditors; + QMap<QtProperty *, QList<TextEditor *> > m_stringPropertyToEditors; + QMap<TextEditor *, QtProperty *> m_editorToStringProperty; + QMap<QtProperty *, QList<QKeySequenceEdit *> > m_keySequencePropertyToEditors; QMap<QKeySequenceEdit *, QtProperty *> m_editorToKeySequenceProperty; - QMap<QtProperty *, QVector<PaletteEditorButton *> > m_palettePropertyToEditors; - QMap<PaletteEditorButton *, QtProperty *> m_editorToPaletteProperty; - QMap<QtProperty *, QVector<PixmapEditor *> > m_pixmapPropertyToEditors; - QMap<PixmapEditor *, QtProperty *> m_editorToPixmapProperty; - QMap<QtProperty *, QVector<PixmapEditor *> > m_iconPropertyToEditors; - QMap<PixmapEditor *, QtProperty *> m_editorToIconProperty; - QMap<QtProperty *, QVector<QLineEdit *> > m_uintPropertyToEditors; - QMap<QLineEdit *, QtProperty *> m_editorToUintProperty; - QMap<QtProperty *, QVector<QLineEdit *> > m_longLongPropertyToEditors; - QMap<QLineEdit *, QtProperty *> m_editorToLongLongProperty; - QMap<QtProperty *, QVector<QLineEdit *> > m_uLongLongPropertyToEditors; - QMap<QLineEdit *, QtProperty *> m_editorToULongLongProperty; - QMap<QtProperty *, QVector<TextEditor *> > m_urlPropertyToEditors; - QMap<TextEditor *, QtProperty *> m_editorToUrlProperty; - QMap<QtProperty *, QVector<TextEditor *> > m_byteArrayPropertyToEditors; - QMap<TextEditor *, QtProperty *> m_editorToByteArrayProperty; - QMap<QtProperty *, QVector<StringListEditorButton *> > m_stringListPropertyToEditors; - QMap<StringListEditorButton *, QtProperty *> m_editorToStringListProperty; + QMap<QtProperty *, QList<PaletteEditorButton *> > m_palettePropertyToEditors; + QMap<PaletteEditorButton *, QtProperty *> m_editorToPaletteProperty; + QMap<QtProperty *, QList<PixmapEditor *> > m_pixmapPropertyToEditors; + QMap<PixmapEditor *, QtProperty *> m_editorToPixmapProperty; + QMap<QtProperty *, QList<PixmapEditor *> > m_iconPropertyToEditors; + QMap<PixmapEditor *, QtProperty *> m_editorToIconProperty; + QMap<QtProperty *, QList<QLineEdit *> > m_uintPropertyToEditors; + QMap<QLineEdit *, QtProperty *> m_editorToUintProperty; + QMap<QtProperty *, QList<QLineEdit *> > m_longLongPropertyToEditors; + QMap<QLineEdit *, QtProperty *> m_editorToLongLongProperty; + QMap<QtProperty *, QList<QLineEdit *> > m_uLongLongPropertyToEditors; + QMap<QLineEdit *, QtProperty *> m_editorToULongLongProperty; + QMap<QtProperty *, QList<TextEditor *> > m_urlPropertyToEditors; + QMap<TextEditor *, QtProperty *> m_editorToUrlProperty; + QMap<QtProperty *, QList<TextEditor *> > m_byteArrayPropertyToEditors; + QMap<TextEditor *, QtProperty *> m_editorToByteArrayProperty; + QMap<QtProperty *, QList<StringListEditorButton *> > m_stringListPropertyToEditors; + QMap<StringListEditorButton *, QtProperty *> m_editorToStringListProperty; }; } // namespace qdesigner_internal diff --git a/src/designer/src/components/propertyeditor/fontpropertymanager.h b/src/designer/src/components/propertyeditor/fontpropertymanager.h index fd6c5186f..1041cd357 100644 --- a/src/designer/src/components/propertyeditor/fontpropertymanager.h +++ b/src/designer/src/components/propertyeditor/fontpropertymanager.h @@ -81,7 +81,7 @@ public: private: using PropertyToPropertyMap = QMap<QtProperty *, QtProperty *>; - using PropertyList = QVector<QtProperty *>; + using PropertyList = QList<QtProperty *>; using PropertyToSubPropertiesMap = QMap<QtProperty *, PropertyList>; void removeAntialiasingProperty(QtProperty *); diff --git a/src/designer/src/components/propertyeditor/propertyeditor.cpp b/src/designer/src/components/propertyeditor/propertyeditor.cpp index 6880c8fd2..50cb794dc 100644 --- a/src/designer/src/components/propertyeditor/propertyeditor.cpp +++ b/src/designer/src/components/propertyeditor/propertyeditor.cpp @@ -433,7 +433,7 @@ bool PropertyEditor::isItemVisible(QtBrowserItem *item) const * - Anything below (properties) is assumed to be collapsed * That is, the map is required, the state cannot be stored in a set */ -void PropertyEditor::storePropertiesExpansionState(const QVector<QtBrowserItem *> &items) +void PropertyEditor::storePropertiesExpansionState(const QList<QtBrowserItem *> &items) { const QChar bar = QLatin1Char('|'); for (QtBrowserItem *propertyItem : items) { @@ -476,7 +476,7 @@ void PropertyEditor::collapseAll() setExpanded(group, false); } -void PropertyEditor::applyPropertiesExpansionState(const QVector<QtBrowserItem *> &items) +void PropertyEditor::applyPropertiesExpansionState(const QList<QtBrowserItem *> &items) { const QChar bar = QLatin1Char('|'); for (QtBrowserItem *propertyItem : items) { @@ -517,7 +517,7 @@ void PropertyEditor::applyExpansionState() } } -int PropertyEditor::applyPropertiesFilter(const QVector<QtBrowserItem *> &items) +int PropertyEditor::applyPropertiesFilter(const QList<QtBrowserItem *> &items) { int showCount = 0; const bool matchAll = m_filterPattern.isEmpty(); @@ -1012,7 +1012,7 @@ void PropertyEditor::setObject(QObject *object) m_updatingBrowser = false; } else if (type == DesignerPropertyManager::designerFlagTypeId()) { const PropertySheetFlagValue f = qvariant_cast<PropertySheetFlagValue>(value); - QVector<QPair<QString, uint> > flags; + QList<QPair<QString, uint> > flags; for (const QString &name : f.metaFlags.keys()) { const uint val = f.metaFlags.keyToValue(name); flags.append(qMakePair(name, val)); diff --git a/src/designer/src/components/propertyeditor/propertyeditor.h b/src/designer/src/components/propertyeditor/propertyeditor.h index 0d5ade2d2..993c4418d 100644 --- a/src/designer/src/components/propertyeditor/propertyeditor.h +++ b/src/designer/src/components/propertyeditor/propertyeditor.h @@ -108,10 +108,10 @@ private: QString realClassName(QObject *object) const; void storeExpansionState(); void applyExpansionState(); - void storePropertiesExpansionState(const QVector<QtBrowserItem *> &items); - void applyPropertiesExpansionState(const QVector<QtBrowserItem *> &items); + void storePropertiesExpansionState(const QList<QtBrowserItem *> &items); + void applyPropertiesExpansionState(const QList<QtBrowserItem *> &items); void applyFilter(); - int applyPropertiesFilter(const QVector<QtBrowserItem *> &items); + int applyPropertiesFilter(const QList<QtBrowserItem *> &items); void setExpanded(QtBrowserItem *item, bool expanded); bool isExpanded(QtBrowserItem *item) const; void setItemVisible(QtBrowserItem *item, bool visible); @@ -157,7 +157,7 @@ private: QMap<QString, QtVariantProperty*> m_nameToProperty; QMap<QtProperty*, QString> m_propertyToGroup; QMap<QString, QtVariantProperty*> m_nameToGroup; - QVector<QtProperty *> m_groups; + QList<QtProperty *> m_groups; QtProperty *m_dynamicGroup = nullptr; QString m_recentlyAddedDynamicProperty; bool m_updatingBrowser = false; diff --git a/src/designer/src/components/signalsloteditor/signalslot_utils_p.h b/src/designer/src/components/signalsloteditor/signalslot_utils_p.h index ef0c52a80..7ab98c3d4 100644 --- a/src/designer/src/components/signalsloteditor/signalslot_utils_p.h +++ b/src/designer/src/components/signalsloteditor/signalslot_utils_p.h @@ -71,7 +71,7 @@ struct ClassMemberFunctions QStringList m_memberList; }; -using ClassesMemberFunctions = QVector<ClassMemberFunctions>; +using ClassesMemberFunctions = QList<ClassMemberFunctions>; // Return classes and members in reverse class order to // populate of the combo of the ToolWindow. diff --git a/src/designer/src/components/taskmenu/button_taskmenu.cpp b/src/designer/src/components/taskmenu/button_taskmenu.cpp index bd7fd448a..ee0e3db1b 100644 --- a/src/designer/src/components/taskmenu/button_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/button_taskmenu.cpp @@ -58,8 +58,8 @@ namespace qdesigner_internal { enum { debugButtonMenu = 0 }; -using ButtonList = QVector<QAbstractButton *>; -using ButtonGroupList = QVector<QButtonGroup *>; +using ButtonList = QList<QAbstractButton *>; +using ButtonGroupList = QList<QButtonGroup *>; // ButtonGroupCommand: Base for commands handling button groups and button lists // addButtonsToGroup() and removeButtonsFromGroup() are low-level helpers for @@ -365,7 +365,7 @@ QAction *ButtonGroupTaskMenu::preferredEditAction() const return m_menu.selectGroupAction(); } -QVector<QAction*> ButtonGroupTaskMenu::taskActions() const +QList<QAction*> ButtonGroupTaskMenu::taskActions() const { m_menu.initialize(QDesignerFormWindowInterface::findFormWindow(m_buttonGroup), m_buttonGroup); return m_taskActions; @@ -511,7 +511,7 @@ bool ButtonTaskMenu::refreshAssignMenu(const QDesignerFormWindowInterface *fw, i return !m_assignGroupSubMenu->isEmpty(); } -QVector<QAction*> ButtonTaskMenu::taskActions() const +QList<QAction*> ButtonTaskMenu::taskActions() const { ButtonTaskMenu *ncThis = const_cast<ButtonTaskMenu*>(this); QButtonGroup *buttonGroup = nullptr; diff --git a/src/designer/src/components/taskmenu/button_taskmenu.h b/src/designer/src/components/taskmenu/button_taskmenu.h index 6123543a7..ab58c0630 100644 --- a/src/designer/src/components/taskmenu/button_taskmenu.h +++ b/src/designer/src/components/taskmenu/button_taskmenu.h @@ -84,11 +84,11 @@ public: explicit ButtonGroupTaskMenu(QButtonGroup *buttonGroup, QObject *parent = nullptr); QAction *preferredEditAction() const override; - QVector<QAction*> taskActions() const override; + QList<QAction*> taskActions() const override; private: QButtonGroup *m_buttonGroup; - QVector<QAction*> m_taskActions; + QList<QAction*> m_taskActions; mutable ButtonGroupMenu m_menu; }; @@ -102,7 +102,7 @@ public: ~ButtonTaskMenu() override; QAction *preferredEditAction() const override; - QVector<QAction*> taskActions() const override; + QList<QAction*> taskActions() const override; QAbstractButton *button() const; @@ -125,7 +125,7 @@ private: bool refreshAssignMenu(const QDesignerFormWindowInterface *fw, int buttonCount, SelectionType st, QButtonGroup *currentGroup); QMenu *createGroupSelectionMenu(const QDesignerFormWindowInterface *fw); - QVector<QAction*> m_taskActions; + QList<QAction*> m_taskActions; mutable ButtonGroupMenu m_groupMenu; QMenu *m_assignGroupSubMenu; QActionGroup *m_assignActionGroup; diff --git a/src/designer/src/components/taskmenu/combobox_taskmenu.cpp b/src/designer/src/components/taskmenu/combobox_taskmenu.cpp index 37bd05b91..6613b03d2 100644 --- a/src/designer/src/components/taskmenu/combobox_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/combobox_taskmenu.cpp @@ -69,7 +69,7 @@ QAction *ComboBoxTaskMenu::preferredEditAction() const return m_editItemsAction; } -QVector<QAction*> ComboBoxTaskMenu::taskActions() const +QList<QAction*> ComboBoxTaskMenu::taskActions() const { return m_taskActions + QDesignerTaskMenu::taskActions(); } diff --git a/src/designer/src/components/taskmenu/combobox_taskmenu.h b/src/designer/src/components/taskmenu/combobox_taskmenu.h index 6bb97398f..8ff36c1a8 100644 --- a/src/designer/src/components/taskmenu/combobox_taskmenu.h +++ b/src/designer/src/components/taskmenu/combobox_taskmenu.h @@ -51,7 +51,7 @@ public: ~ComboBoxTaskMenu() override; QAction *preferredEditAction() const override; - QVector<QAction*> taskActions() const override; + QList<QAction*> taskActions() const override; private slots: void editItems(); @@ -61,7 +61,7 @@ private: QComboBox *m_comboBox; QPointer<QDesignerFormWindowInterface> m_formWindow; QPointer<QLineEdit> m_editor; - mutable QVector<QAction*> m_taskActions; + mutable QList<QAction*> m_taskActions; QAction *m_editItemsAction; }; diff --git a/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp b/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp index 2fe3a39d1..1bbca9d10 100644 --- a/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp @@ -146,7 +146,7 @@ QString ContainerWidgetTaskMenu::pageMenuText(ContainerType ct, int index, int c return tr("Page %1 of %2").arg(index + 1).arg(count); } -QVector<QAction*> ContainerWidgetTaskMenu::taskActions() const +QList<QAction*> ContainerWidgetTaskMenu::taskActions() const { const QDesignerContainerExtension *ce = containerExtension(); const int index = ce->currentIndex(); @@ -232,7 +232,7 @@ WizardContainerWidgetTaskMenu::WizardContainerWidgetTaskMenu(QWizard *w, QObject l.push_front(createSeparator()); } -QVector<QAction*> WizardContainerWidgetTaskMenu::taskActions() const +QList<QAction*> WizardContainerWidgetTaskMenu::taskActions() const { // Enable const QDesignerContainerExtension *ce = containerExtension(); @@ -270,7 +270,7 @@ void MdiContainerWidgetTaskMenu::initializeActions() l.push_front(createSeparator()); } -QVector<QAction*> MdiContainerWidgetTaskMenu::taskActions() const +QList<QAction*> MdiContainerWidgetTaskMenu::taskActions() const { const auto rc = ContainerWidgetTaskMenu::taskActions(); // Enable diff --git a/src/designer/src/components/taskmenu/containerwidget_taskmenu.h b/src/designer/src/components/taskmenu/containerwidget_taskmenu.h index 5a96cf9ac..b0f4127ee 100644 --- a/src/designer/src/components/taskmenu/containerwidget_taskmenu.h +++ b/src/designer/src/components/taskmenu/containerwidget_taskmenu.h @@ -60,7 +60,7 @@ public: ~ContainerWidgetTaskMenu() override; QAction *preferredEditAction() const override; - QVector<QAction*> taskActions() const override; + QList<QAction*> taskActions() const override; private slots: void removeCurrentPage(); @@ -69,7 +69,7 @@ private slots: protected: QDesignerContainerExtension *containerExtension() const; - QVector<QAction*> &containerActions() { return m_taskActions; } + QList<QAction*> &containerActions() { return m_taskActions; } int pageCount() const; private: @@ -85,7 +85,7 @@ private: PromotionTaskMenu *m_pagePromotionTaskMenu; QAction *m_pageMenuAction; QMenu *m_pageMenu; - QVector<QAction*> m_taskActions; + QList<QAction*> m_taskActions; QAction *m_actionInsertPageAfter; QAction *m_actionInsertPage; QAction *m_actionDeletePage; @@ -99,7 +99,7 @@ class WizardContainerWidgetTaskMenu : public ContainerWidgetTaskMenu { public: explicit WizardContainerWidgetTaskMenu(QWizard *w, QObject *parent = nullptr); - QVector<QAction*> taskActions() const override; + QList<QAction*> taskActions() const override; private: QAction *m_nextAction; @@ -114,7 +114,7 @@ class MdiContainerWidgetTaskMenu : public ContainerWidgetTaskMenu { public: explicit MdiContainerWidgetTaskMenu(QMdiArea *m, QObject *parent = nullptr); - QVector<QAction*> taskActions() const override; + QList<QAction*> taskActions() const override; private: void initializeActions(); diff --git a/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp b/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp index 1871cd50c..f2b39d053 100644 --- a/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp @@ -79,7 +79,7 @@ GroupBoxTaskMenu::GroupBoxTaskMenu(QGroupBox *groupbox, QObject *parent) m_taskActions.append(sep); } -QVector<QAction*> GroupBoxTaskMenu::taskActions() const +QList<QAction*> GroupBoxTaskMenu::taskActions() const { return m_taskActions + QDesignerTaskMenu::taskActions(); } diff --git a/src/designer/src/components/taskmenu/groupbox_taskmenu.h b/src/designer/src/components/taskmenu/groupbox_taskmenu.h index d963e44a8..e09a883a0 100644 --- a/src/designer/src/components/taskmenu/groupbox_taskmenu.h +++ b/src/designer/src/components/taskmenu/groupbox_taskmenu.h @@ -49,11 +49,11 @@ public: explicit GroupBoxTaskMenu(QGroupBox *groupbox, QObject *parent = nullptr); QAction *preferredEditAction() const override; - QVector<QAction*> taskActions() const override; + QList<QAction*> taskActions() const override; private: QAction *m_editTitleAction; - QVector<QAction*> m_taskActions; + QList<QAction*> m_taskActions; }; typedef ExtensionFactory<QDesignerTaskMenuExtension, QGroupBox, GroupBoxTaskMenu> GroupBoxTaskMenuFactory; diff --git a/src/designer/src/components/taskmenu/itemlisteditor.h b/src/designer/src/components/taskmenu/itemlisteditor.h index ebdfa37b4..97bcb19d9 100644 --- a/src/designer/src/components/taskmenu/itemlisteditor.h +++ b/src/designer/src/components/taskmenu/itemlisteditor.h @@ -99,8 +99,8 @@ protected: DesignerEditorFactory *m_editorFactory; QSplitter *m_propertySplitter = nullptr; QtTreePropertyBrowser *m_propertyBrowser; - QVector<QtVariantProperty*> m_properties; - QVector<QtVariantProperty*> m_rootProperties; + QList<QtVariantProperty*> m_properties; + QList<QtVariantProperty*> m_rootProperties; QHash<QtVariantProperty*, int> m_propertyToRole; bool m_updatingBrowser = false; }; diff --git a/src/designer/src/components/taskmenu/label_taskmenu.cpp b/src/designer/src/components/taskmenu/label_taskmenu.cpp index 607a10815..d6a45d438 100644 --- a/src/designer/src/components/taskmenu/label_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/label_taskmenu.cpp @@ -91,7 +91,7 @@ QAction *LabelTaskMenu::preferredEditAction() const return Qt::mightBeRichText(m_label->text()) ? m_editRichTextAction : m_editPlainTextAction; } -QVector<QAction*> LabelTaskMenu::taskActions() const +QList<QAction*> LabelTaskMenu::taskActions() const { return m_taskActions + QDesignerTaskMenu::taskActions(); } diff --git a/src/designer/src/components/taskmenu/label_taskmenu.h b/src/designer/src/components/taskmenu/label_taskmenu.h index 394243916..a1744b583 100644 --- a/src/designer/src/components/taskmenu/label_taskmenu.h +++ b/src/designer/src/components/taskmenu/label_taskmenu.h @@ -48,14 +48,14 @@ public: explicit LabelTaskMenu(QLabel *button, QObject *parent = nullptr); QAction *preferredEditAction() const override; - QVector<QAction*> taskActions() const override; + QList<QAction*> taskActions() const override; private slots: void editRichText(); private: QLabel *m_label; - QVector<QAction*> m_taskActions; + QList<QAction*> m_taskActions; QAction *m_editRichTextAction; QAction *m_editPlainTextAction; }; diff --git a/src/designer/src/components/taskmenu/layouttaskmenu.cpp b/src/designer/src/components/taskmenu/layouttaskmenu.cpp index f28593c57..39ea6df2e 100644 --- a/src/designer/src/components/taskmenu/layouttaskmenu.cpp +++ b/src/designer/src/components/taskmenu/layouttaskmenu.cpp @@ -52,9 +52,9 @@ QAction *LayoutWidgetTaskMenu::preferredEditAction() const return m_formLayoutMenu->preferredEditAction(m_widget, m_widget->formWindow()); } -QVector<QAction*> LayoutWidgetTaskMenu::taskActions() const +QList<QAction*> LayoutWidgetTaskMenu::taskActions() const { - QVector<QAction*> rc; + QList<QAction*> rc; QDesignerFormWindowInterface *fw = m_widget->formWindow(); m_morphMenu->populate(m_widget, fw, rc); m_formLayoutMenu->populate(m_widget, fw, rc); @@ -72,7 +72,7 @@ QAction *SpacerTaskMenu::preferredEditAction() const return nullptr; } -QVector<QAction*> SpacerTaskMenu::taskActions() const +QList<QAction*> SpacerTaskMenu::taskActions() const { return {}; } diff --git a/src/designer/src/components/taskmenu/layouttaskmenu.h b/src/designer/src/components/taskmenu/layouttaskmenu.h index 523477719..afd1afe0f 100644 --- a/src/designer/src/components/taskmenu/layouttaskmenu.h +++ b/src/designer/src/components/taskmenu/layouttaskmenu.h @@ -51,7 +51,7 @@ public: explicit LayoutWidgetTaskMenu(QLayoutWidget *w, QObject *parent = nullptr); QAction *preferredEditAction() const override; - QVector<QAction*> taskActions() const override; + QList<QAction*> taskActions() const override; private: QLayoutWidget *m_widget; @@ -68,7 +68,7 @@ public: explicit SpacerTaskMenu(Spacer *bar, QObject *parent = nullptr); QAction *preferredEditAction() const override; - QVector<QAction*> taskActions() const override; + QList<QAction*> taskActions() const override; }; diff --git a/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp b/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp index 5f9aa9a9a..b39797564 100644 --- a/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp @@ -81,7 +81,7 @@ QAction *LineEditTaskMenu::preferredEditAction() const return m_editTextAction; } -QVector<QAction*> LineEditTaskMenu::taskActions() const +QList<QAction*> LineEditTaskMenu::taskActions() const { return m_taskActions + QDesignerTaskMenu::taskActions(); } diff --git a/src/designer/src/components/taskmenu/lineedit_taskmenu.h b/src/designer/src/components/taskmenu/lineedit_taskmenu.h index 4c67c4884..e28ab7336 100644 --- a/src/designer/src/components/taskmenu/lineedit_taskmenu.h +++ b/src/designer/src/components/taskmenu/lineedit_taskmenu.h @@ -46,10 +46,10 @@ public: explicit LineEditTaskMenu(QLineEdit *button, QObject *parent = nullptr); QAction *preferredEditAction() const override; - QVector<QAction*> taskActions() const override; + QList<QAction*> taskActions() const override; private: - QVector<QAction*> m_taskActions; + QList<QAction*> m_taskActions; QAction *m_editTextAction; }; diff --git a/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp b/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp index b5f9bc200..d4b2cb71a 100644 --- a/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp @@ -68,7 +68,7 @@ QAction *ListWidgetTaskMenu::preferredEditAction() const return m_editItemsAction; } -QVector<QAction*> ListWidgetTaskMenu::taskActions() const +QList<QAction*> ListWidgetTaskMenu::taskActions() const { return m_taskActions + QDesignerTaskMenu::taskActions(); } diff --git a/src/designer/src/components/taskmenu/listwidget_taskmenu.h b/src/designer/src/components/taskmenu/listwidget_taskmenu.h index f28df59de..63708be61 100644 --- a/src/designer/src/components/taskmenu/listwidget_taskmenu.h +++ b/src/designer/src/components/taskmenu/listwidget_taskmenu.h @@ -50,7 +50,7 @@ public: ~ListWidgetTaskMenu() override; QAction *preferredEditAction() const override; - QVector<QAction*> taskActions() const override; + QList<QAction*> taskActions() const override; private slots: void editItems(); @@ -60,7 +60,7 @@ private: QListWidget *m_listWidget; QPointer<QDesignerFormWindowInterface> m_formWindow; QPointer<QLineEdit> m_editor; - mutable QVector<QAction*> m_taskActions; + mutable QList<QAction*> m_taskActions; QAction *m_editItemsAction; }; diff --git a/src/designer/src/components/taskmenu/menutaskmenu.cpp b/src/designer/src/components/taskmenu/menutaskmenu.cpp index 35f6ab9be..87cd4bee5 100644 --- a/src/designer/src/components/taskmenu/menutaskmenu.cpp +++ b/src/designer/src/components/taskmenu/menutaskmenu.cpp @@ -52,9 +52,9 @@ namespace qdesigner_internal { return nullptr; } - QVector<QAction*> MenuTaskMenu::taskActions() const + QList<QAction*> MenuTaskMenu::taskActions() const { - QVector<QAction*> rc; + QList<QAction*> rc; rc.push_back(m_removeAction); m_promotionTaskMenu->addActions(PromotionTaskMenu::LeadingSeparator, rc); return rc; @@ -85,7 +85,7 @@ namespace qdesigner_internal { return nullptr; } - QVector<QAction*> MenuBarTaskMenu::taskActions() const + QList<QAction*> MenuBarTaskMenu::taskActions() const { return m_bar->contextMenuActions(); } diff --git a/src/designer/src/components/taskmenu/menutaskmenu.h b/src/designer/src/components/taskmenu/menutaskmenu.h index fa9e8ad32..935836896 100644 --- a/src/designer/src/components/taskmenu/menutaskmenu.h +++ b/src/designer/src/components/taskmenu/menutaskmenu.h @@ -55,7 +55,7 @@ public: explicit MenuTaskMenu(QDesignerMenu *menu, QObject *parent = nullptr); QAction *preferredEditAction() const override; - QVector<QAction*> taskActions() const override; + QList<QAction*> taskActions() const override; private slots: void removeMenu(); @@ -77,7 +77,7 @@ public: explicit MenuBarTaskMenu(QDesignerMenuBar *bar, QObject *parent = nullptr); QAction *preferredEditAction() const override; - QVector<QAction*> taskActions() const override; + QList<QAction*> taskActions() const override; private: QDesignerMenuBar *m_bar; diff --git a/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp b/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp index 51945a9f3..e0d8d5c94 100644 --- a/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp @@ -67,7 +67,7 @@ QAction *TableWidgetTaskMenu::preferredEditAction() const return m_editItemsAction; } -QVector<QAction*> TableWidgetTaskMenu::taskActions() const +QList<QAction*> TableWidgetTaskMenu::taskActions() const { return m_taskActions + QDesignerTaskMenu::taskActions(); } diff --git a/src/designer/src/components/taskmenu/tablewidget_taskmenu.h b/src/designer/src/components/taskmenu/tablewidget_taskmenu.h index c68dd4afa..b4d5462f2 100644 --- a/src/designer/src/components/taskmenu/tablewidget_taskmenu.h +++ b/src/designer/src/components/taskmenu/tablewidget_taskmenu.h @@ -50,7 +50,7 @@ public: ~TableWidgetTaskMenu() override; QAction *preferredEditAction() const override; - QVector<QAction*> taskActions() const override; + QList<QAction*> taskActions() const override; private slots: void editItems(); @@ -60,7 +60,7 @@ private: QTableWidget *m_tableWidget; QPointer<QDesignerFormWindowInterface> m_formWindow; QPointer<QLineEdit> m_editor; - mutable QVector<QAction*> m_taskActions; + mutable QList<QAction*> m_taskActions; QAction *m_editItemsAction; }; diff --git a/src/designer/src/components/taskmenu/textedit_taskmenu.cpp b/src/designer/src/components/taskmenu/textedit_taskmenu.cpp index f95c99103..989458392 100644 --- a/src/designer/src/components/taskmenu/textedit_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/textedit_taskmenu.cpp @@ -77,7 +77,7 @@ QAction *TextEditTaskMenu::preferredEditAction() const return m_editTextAction; } -QVector<QAction*> TextEditTaskMenu::taskActions() const +QList<QAction*> TextEditTaskMenu::taskActions() const { return m_taskActions + QDesignerTaskMenu::taskActions(); } diff --git a/src/designer/src/components/taskmenu/textedit_taskmenu.h b/src/designer/src/components/taskmenu/textedit_taskmenu.h index 77517c8da..2e50b8ca1 100644 --- a/src/designer/src/components/taskmenu/textedit_taskmenu.h +++ b/src/designer/src/components/taskmenu/textedit_taskmenu.h @@ -51,7 +51,7 @@ public: ~TextEditTaskMenu() override; QAction *preferredEditAction() const override; - QVector<QAction*> taskActions() const override; + QList<QAction*> taskActions() const override; private slots: void editText(); @@ -63,7 +63,7 @@ private: const QString m_property; const QString m_windowTitle; - mutable QVector<QAction*> m_taskActions; + mutable QList<QAction*> m_taskActions; QAction *m_editTextAction; }; diff --git a/src/designer/src/components/taskmenu/toolbar_taskmenu.cpp b/src/designer/src/components/taskmenu/toolbar_taskmenu.cpp index 7571836e2..3fc1b8b4d 100644 --- a/src/designer/src/components/taskmenu/toolbar_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/toolbar_taskmenu.cpp @@ -54,7 +54,7 @@ namespace qdesigner_internal { return nullptr; } - QVector<QAction*> ToolBarTaskMenu::taskActions() const + QList<QAction*> ToolBarTaskMenu::taskActions() const { if (ToolBarEventFilter *ef = ToolBarEventFilter::eventFilterOf(m_toolBar)) return ef->contextMenuActions(); @@ -76,9 +76,9 @@ namespace qdesigner_internal { return nullptr; } - QVector<QAction*> StatusBarTaskMenu::taskActions() const + QList<QAction*> StatusBarTaskMenu::taskActions() const { - QVector<QAction*> rc; + QList<QAction*> rc; rc.push_back(m_removeAction); m_promotionTaskMenu->addActions(PromotionTaskMenu::LeadingSeparator, rc); return rc; diff --git a/src/designer/src/components/taskmenu/toolbar_taskmenu.h b/src/designer/src/components/taskmenu/toolbar_taskmenu.h index 0c3f5592f..3e8d5909b 100644 --- a/src/designer/src/components/taskmenu/toolbar_taskmenu.h +++ b/src/designer/src/components/taskmenu/toolbar_taskmenu.h @@ -50,7 +50,7 @@ public: explicit ToolBarTaskMenu(QToolBar *tb, QObject *parent = nullptr); QAction *preferredEditAction() const override; - QVector<QAction*> taskActions() const override; + QList<QAction*> taskActions() const override; private: QToolBar *m_toolBar; @@ -65,7 +65,7 @@ public: explicit StatusBarTaskMenu(QStatusBar *tb, QObject *parent = nullptr); QAction *preferredEditAction() const override; - QVector<QAction*> taskActions() const override; + QList<QAction*> taskActions() const override; private slots: void removeStatusBar(); diff --git a/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp b/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp index 77ebd2eca..6b4969c52 100644 --- a/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp @@ -66,7 +66,7 @@ QAction *TreeWidgetTaskMenu::preferredEditAction() const return m_editItemsAction; } -QVector<QAction*> TreeWidgetTaskMenu::taskActions() const +QList<QAction*> TreeWidgetTaskMenu::taskActions() const { return m_taskActions + QDesignerTaskMenu::taskActions(); } diff --git a/src/designer/src/components/taskmenu/treewidget_taskmenu.h b/src/designer/src/components/taskmenu/treewidget_taskmenu.h index b64401d76..9a9c882df 100644 --- a/src/designer/src/components/taskmenu/treewidget_taskmenu.h +++ b/src/designer/src/components/taskmenu/treewidget_taskmenu.h @@ -50,7 +50,7 @@ public: ~TreeWidgetTaskMenu() override; QAction *preferredEditAction() const override; - QVector<QAction*> taskActions() const override; + QList<QAction*> taskActions() const override; private slots: void editItems(); @@ -60,7 +60,7 @@ private: QTreeWidget *m_treeWidget; QPointer<QDesignerFormWindowInterface> m_formWindow; QPointer<QLineEdit> m_editor; - mutable QVector<QAction*> m_taskActions; + mutable QList<QAction*> m_taskActions; QAction *m_editItemsAction; }; diff --git a/src/designer/src/components/taskmenu/treewidgeteditor.cpp b/src/designer/src/components/taskmenu/treewidgeteditor.cpp index 8a70a7d33..5e77939e5 100644 --- a/src/designer/src/components/taskmenu/treewidgeteditor.cpp +++ b/src/designer/src/components/taskmenu/treewidgeteditor.cpp @@ -153,7 +153,7 @@ TreeWidgetContents TreeWidgetEditor::fillContentsFromTreeWidget(QTreeWidget *tre treeCont.m_headerItem.applyToListWidget(m_columnEditor->listWidget(), iconCache(), true); m_columnEditor->setupEditor(treeWidget, treeHeaderPropList); - QVector<QtVariantProperty*> rootProperties; + QList<QtVariantProperty*> rootProperties; rootProperties.append(setupPropertyGroup(tr("Per column properties"), treeItemColumnPropList)); rootProperties.append(setupPropertyGroup(tr("Common properties"), treeItemCommonPropList)); m_rootProperties = rootProperties; @@ -498,7 +498,7 @@ void TreeWidgetEditor::moveColumnItems(const PropertyDefinition *propList, { BoolBlocker block(m_updatingBrowser); - QVector<QVariant> saveCol; + QList<QVariant> saveCol; for (int j = 0; propList[j].name; j++) saveCol.append(item->data(toColumn, propList[j].role)); QVariant editVariant = item->data(toColumn, Qt::EditRole); diff --git a/src/designer/src/components/widgetbox/widgetbox.cpp b/src/designer/src/components/widgetbox/widgetbox.cpp index 70c5923aa..4415c4dbe 100644 --- a/src/designer/src/components/widgetbox/widgetbox.cpp +++ b/src/designer/src/components/widgetbox/widgetbox.cpp @@ -132,7 +132,7 @@ void WidgetBox::handleMousePress(const QString &name, const QString &xml, const DomUI *ui = xmlToUi(name, xml, true); if (ui == nullptr) return; - QVector<QDesignerDnDItemInterface*> item_list; + QList<QDesignerDnDItemInterface*> item_list; item_list.append(new WidgetBoxDnDItem(core(), ui, global_mouse_pos)); m_core->formWindowManager()->dragItems(item_list); } @@ -177,7 +177,7 @@ void WidgetBox::removeWidget(int cat_idx, int wgt_idx) m_view->removeWidget(cat_idx, wgt_idx); } -void WidgetBox::dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list, const QPoint&) +void WidgetBox::dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, const QPoint&) { m_view->dropWidgets(item_list); } diff --git a/src/designer/src/components/widgetbox/widgetbox.h b/src/designer/src/components/widgetbox/widgetbox.h index aa687498e..27e1b461a 100644 --- a/src/designer/src/components/widgetbox/widgetbox.h +++ b/src/designer/src/components/widgetbox/widgetbox.h @@ -61,7 +61,7 @@ public: void addWidget(int cat_idx, const Widget &wgt) override; void removeWidget(int cat_idx, int wgt_idx) override; - void dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list, const QPoint &global_mouse_pos) override; + void dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, const QPoint &global_mouse_pos) override; void setFileName(const QString &file_name) override; QString fileName() const override; diff --git a/src/designer/src/components/widgetbox/widgetboxcategorylistview.h b/src/designer/src/components/widgetbox/widgetboxcategorylistview.h index bb476a6d8..28db852f6 100644 --- a/src/designer/src/components/widgetbox/widgetboxcategorylistview.h +++ b/src/designer/src/components/widgetbox/widgetboxcategorylistview.h @@ -57,7 +57,7 @@ public: explicit WidgetBoxCategoryListView(QDesignerFormEditorInterface *core, QWidget *parent = nullptr); void setViewMode(ViewMode vm); - void dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list); + void dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list); using QListView::contentsSize; diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp index 56eee5772..4fe5881b6 100644 --- a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp +++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp @@ -901,7 +901,7 @@ void WidgetBoxTreeWidget::contextMenuEvent(QContextMenuEvent *e) menu.exec(mapToGlobal(e->pos())); } -void WidgetBoxTreeWidget::dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list) +void WidgetBoxTreeWidget::dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list) { QTreeWidgetItem *scratch_item = nullptr; WidgetBoxCategoryListView *categoryView = nullptr; diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.h b/src/designer/src/components/widgetbox/widgetboxtreewidget.h index 2262b50bd..0961e658d 100644 --- a/src/designer/src/components/widgetbox/widgetboxtreewidget.h +++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.h @@ -72,7 +72,7 @@ public: void addWidget(int cat_idx, const Widget &wgt); void removeWidget(int cat_idx, int wgt_idx); - void dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list); + void dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list); void setFileName(const QString &file_name); QString fileName() const; diff --git a/src/designer/src/designer/doc/snippets/lib/tools_designer_src_lib_sdk_abstractformwindow.cpp b/src/designer/src/designer/doc/snippets/lib/tools_designer_src_lib_sdk_abstractformwindow.cpp index 03e1a96bd..259eb4668 100644 --- a/src/designer/src/designer/doc/snippets/lib/tools_designer_src_lib_sdk_abstractformwindow.cpp +++ b/src/designer/src/designer/doc/snippets/lib/tools_designer_src_lib_sdk_abstractformwindow.cpp @@ -55,7 +55,7 @@ //! [1] - QVector<QDesignerFormWindowInterface *> forms; + QList<QDesignerFormWindowInterface *> forms; QDesignerFormWindowInterface *formWindow; QDesignerFormWindowManagerInterface *manager = formEditor->formWindowManager(); diff --git a/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp b/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp index f7d789ed6..1f76bc71d 100644 --- a/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp +++ b/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp @@ -183,7 +183,7 @@ public: MyTaskMenuExtension(MyCustomWidget *widget, QObject *parent); QAction *preferredEditAction() const; - QVector<QAction *> taskActions() const; + QList<QAction *> taskActions() const; private slots: void mySlot(); @@ -246,10 +246,10 @@ class MyCustomWidgets: public QObject, public QDesignerCustomWidgetCollectionInt public: MyCustomWidgets(QObject *parent = 0); - QVector<QDesignerCustomWidgetInterface*> customWidgets() const override; + QList<QDesignerCustomWidgetInterface*> customWidgets() const override; private: - QVector<QDesignerCustomWidgetInterface*> widgets; + QList<QDesignerCustomWidgetInterface*> widgets; }; //! [12] @@ -263,7 +263,7 @@ MyCustomWidgets::MyCustomWidgets(QObject *parent) widgets.append(new CustomWidgetThreeInterface(this)); } -QVector<QDesignerCustomWidgetInterface*> MyCustomWidgets::customWidgets() const +QList<QDesignerCustomWidgetInterface*> MyCustomWidgets::customWidgets() const { return widgets; } diff --git a/src/designer/src/designer/mainwindow.cpp b/src/designer/src/designer/mainwindow.cpp index 09f956117..ac80dae4a 100644 --- a/src/designer/src/designer/mainwindow.cpp +++ b/src/designer/src/designer/mainwindow.cpp @@ -58,7 +58,7 @@ static const char *uriListMimeFormatC = "text/uri-list"; QT_BEGIN_NAMESPACE -using ActionList = QVector<QAction *>; +using ActionList = QList<QAction *>; // Helpers for creating toolbars and menu diff --git a/src/designer/src/designer/preferencesdialog.h b/src/designer/src/designer/preferencesdialog.h index b7b20d90e..654e93388 100644 --- a/src/designer/src/designer/preferencesdialog.h +++ b/src/designer/src/designer/preferencesdialog.h @@ -61,7 +61,7 @@ private: Ui::PreferencesDialog *m_ui; QDesignerFormEditorInterface *m_core; - QVector<QDesignerOptionsPageInterface*> m_optionsPages; + QList<QDesignerOptionsPageInterface*> m_optionsPages; }; QT_END_NAMESPACE diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp index 037ab60c9..cf404d51c 100644 --- a/src/designer/src/designer/qdesigner_actions.cpp +++ b/src/designer/src/designer/qdesigner_actions.cpp @@ -122,7 +122,7 @@ static QActionGroup *createActionGroup(QObject *parent, bool exclusive = false) return rc; } -static void fixActionContext(const QVector<QAction *> &actions) +static void fixActionContext(const QList<QAction *> &actions) { for (QAction *a : actions) a->setShortcutContext(Qt::ApplicationShortcut); @@ -317,7 +317,7 @@ QDesignerActions::QDesignerActions(QDesignerWorkbench *workbench) // m_editWidgetsAction->setCheckable(true); - QVector<QKeySequence> shortcuts; + QList<QKeySequence> shortcuts; shortcuts.append(QKeySequence(Qt::Key_F3)); shortcuts.append(QKeySequence(Qt::Key_Escape)); m_editWidgetsAction->setShortcuts(shortcuts); diff --git a/src/designer/src/designer/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp index 9af0b3138..0577fcc02 100644 --- a/src/designer/src/designer/qdesigner_workbench.cpp +++ b/src/designer/src/designer/qdesigner_workbench.cpp @@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE static const char *appFontPrefixC = "AppFonts"; -using ActionList = QVector<QAction *>; +using ActionList = QList<QAction *>; static QMdiSubWindow *mdiSubWindowOf(const QWidget *w) { diff --git a/src/designer/src/lib/extension/qextensionmanager.h b/src/designer/src/lib/extension/qextensionmanager.h index b0cef39d5..49dd56224 100644 --- a/src/designer/src/lib/extension/qextensionmanager.h +++ b/src/designer/src/lib/extension/qextensionmanager.h @@ -51,7 +51,7 @@ public: QObject *extension(QObject *object, const QString &iid) const override; private: - using FactoryList = QVector<QAbstractExtensionFactory *>; + using FactoryList = QList<QAbstractExtensionFactory *>; typedef QHash<QString, FactoryList> FactoryMap; FactoryMap m_extensions; FactoryList m_globalExtension; diff --git a/src/designer/src/lib/sdk/abstractformeditor.cpp b/src/designer/src/lib/sdk/abstractformeditor.cpp index 0b62e6d1a..2d4b20812 100644 --- a/src/designer/src/lib/sdk/abstractformeditor.cpp +++ b/src/designer/src/lib/sdk/abstractformeditor.cpp @@ -96,7 +96,7 @@ public: QDesignerDialogGuiInterface *m_dialogGui = nullptr; QPointer<QtResourceModel> m_resourceModel; QPointer<QtGradientManager> m_gradientManager; // instantiated and deleted by designer_integration - QVector<QDesignerOptionsPageInterface*> m_optionsPages; + QList<QDesignerOptionsPageInterface*> m_optionsPages; }; QDesignerFormEditorInterfacePrivate::QDesignerFormEditorInterfacePrivate() = default; @@ -399,7 +399,7 @@ void QDesignerFormEditorInterface::setIntegration(QDesignerIntegrationInterface \since 4.5 Returns the list of options pages that allow the user to configure \QD components. */ -QVector<QDesignerOptionsPageInterface*> QDesignerFormEditorInterface::optionsPages() const +QList<QDesignerOptionsPageInterface*> QDesignerFormEditorInterface::optionsPages() const { return d->m_optionsPages; } @@ -409,7 +409,7 @@ QVector<QDesignerOptionsPageInterface*> QDesignerFormEditorInterface::optionsPag \since 4.5 Sets the list of options pages that allow the user to configure \QD components. */ -void QDesignerFormEditorInterface::setOptionsPages(const QVector<QDesignerOptionsPageInterface*> &optionsPages) +void QDesignerFormEditorInterface::setOptionsPages(const QList<QDesignerOptionsPageInterface*> &optionsPages) { d->m_optionsPages = optionsPages; } diff --git a/src/designer/src/lib/sdk/abstractformeditor.h b/src/designer/src/lib/sdk/abstractformeditor.h index 05d503403..39f5054cc 100644 --- a/src/designer/src/lib/sdk/abstractformeditor.h +++ b/src/designer/src/lib/sdk/abstractformeditor.h @@ -88,7 +88,7 @@ public: QString resourceLocation() const; QtResourceModel *resourceModel() const; QtGradientManager *gradientManager() const; - QVector<QDesignerOptionsPageInterface*> optionsPages() const; + QList<QDesignerOptionsPageInterface*> optionsPages() const; void setTopLevel(QWidget *topLevel); void setWidgetBox(QDesignerWidgetBoxInterface *widgetBox); @@ -102,7 +102,7 @@ public: void setSettingsManager(QDesignerSettingsInterface *settingsManager); void setResourceModel(QtResourceModel *model); void setGradientManager(QtGradientManager *manager); - void setOptionsPages(const QVector<QDesignerOptionsPageInterface*> &optionsPages); + void setOptionsPages(const QList<QDesignerOptionsPageInterface*> &optionsPages); QObjectList pluginInstances() const; diff --git a/src/designer/src/lib/sdk/abstractformwindow.cpp b/src/designer/src/lib/sdk/abstractformwindow.cpp index f1b2f335f..0b24920aa 100644 --- a/src/designer/src/lib/sdk/abstractformwindow.cpp +++ b/src/designer/src/lib/sdk/abstractformwindow.cpp @@ -609,7 +609,7 @@ void QDesignerFormWindowInterface::activateResourceFilePaths(const QStringList & */ /*! - \fn virtual void QDesignerFormWindowInterface::simplifySelection(QVector<QWidget*> *widgets) const + \fn virtual void QDesignerFormWindowInterface::simplifySelection(QList<QWidget*> *widgets) const Simplifies the selection of widgets specified by \a widgets. diff --git a/src/designer/src/lib/sdk/abstractformwindow.h b/src/designer/src/lib/sdk/abstractformwindow.h index de23917a7..63aeaada8 100644 --- a/src/designer/src/lib/sdk/abstractformwindow.h +++ b/src/designer/src/lib/sdk/abstractformwindow.h @@ -133,7 +133,7 @@ public: virtual void beginCommand(const QString &description) = 0; virtual void endCommand() = 0; - virtual void simplifySelection(QVector<QWidget*> *widgets) const = 0; + virtual void simplifySelection(QList<QWidget*> *widgets) const = 0; // notifications virtual void emitSelectionChanged() = 0; diff --git a/src/designer/src/lib/sdk/abstractformwindowmanager.cpp b/src/designer/src/lib/sdk/abstractformwindowmanager.cpp index 2ae2711a5..387f0665c 100644 --- a/src/designer/src/lib/sdk/abstractformwindowmanager.cpp +++ b/src/designer/src/lib/sdk/abstractformwindowmanager.cpp @@ -505,7 +505,7 @@ QAction *QDesignerFormWindowManagerInterface::actionRedo() const */ /*! - \fn void QDesignerFormWindowManagerInterface::dragItems(const QVector<QDesignerDnDItemInterface*> &item_list) + \fn void QDesignerFormWindowManagerInterface::dragItems(const QList<QDesignerDnDItemInterface*> &item_list) \internal */ diff --git a/src/designer/src/lib/sdk/abstractformwindowmanager.h b/src/designer/src/lib/sdk/abstractformwindowmanager.h index b6fd734c4..eddba7387 100644 --- a/src/designer/src/lib/sdk/abstractformwindowmanager.h +++ b/src/designer/src/lib/sdk/abstractformwindowmanager.h @@ -120,7 +120,7 @@ public: virtual QDesignerFormEditorInterface *core() const = 0; - virtual void dragItems(const QVector<QDesignerDnDItemInterface*> &item_list) = 0; + virtual void dragItems(const QList<QDesignerDnDItemInterface*> &item_list) = 0; virtual QPixmap createPreviewPixmap() const = 0; diff --git a/src/designer/src/lib/sdk/abstractmetadatabase.cpp b/src/designer/src/lib/sdk/abstractmetadatabase.cpp index df28d91b6..3ba2d5804 100644 --- a/src/designer/src/lib/sdk/abstractmetadatabase.cpp +++ b/src/designer/src/lib/sdk/abstractmetadatabase.cpp @@ -71,7 +71,7 @@ QDesignerMetaDataBaseInterface::~QDesignerMetaDataBaseInterface() = default; */ /*! - \fn QVector<QObject*> QDesignerMetaDataBaseInterface::objects() const + \fn QList<QObject*> QDesignerMetaDataBaseInterface::objects() const Returns the list of objects that have corresponding items in the meta database. */ @@ -119,7 +119,7 @@ QDesignerMetaDataBaseInterface::~QDesignerMetaDataBaseInterface() = default; */ /*! - \fn QVector<QWidget*> QDesignerMetaDataBaseItemInterface::tabOrder() const + \fn QList<QWidget*> QDesignerMetaDataBaseItemInterface::tabOrder() const Returns a list of widgets in the order defined by the form's tab order. @@ -128,7 +128,7 @@ QDesignerMetaDataBaseInterface::~QDesignerMetaDataBaseInterface() = default; /*! - \fn void QDesignerMetaDataBaseItemInterface::setTabOrder(const QVector<QWidget*> &tabOrder) + \fn void QDesignerMetaDataBaseItemInterface::setTabOrder(const QList<QWidget*> &tabOrder) Sets the tab order in the form using the list of widgets defined by \a tabOrder. diff --git a/src/designer/src/lib/sdk/abstractmetadatabase.h b/src/designer/src/lib/sdk/abstractmetadatabase.h index 17e0ac160..adeb6c7ee 100644 --- a/src/designer/src/lib/sdk/abstractmetadatabase.h +++ b/src/designer/src/lib/sdk/abstractmetadatabase.h @@ -53,8 +53,8 @@ public: virtual QString name() const = 0; virtual void setName(const QString &name) = 0; - virtual QVector<QWidget*> tabOrder() const = 0; - virtual void setTabOrder(const QVector<QWidget*> &tabOrder) = 0; + virtual QList<QWidget*> tabOrder() const = 0; + virtual void setTabOrder(const QList<QWidget*> &tabOrder) = 0; virtual bool enabled() const = 0; virtual void setEnabled(bool b) = 0; @@ -72,7 +72,7 @@ public: virtual void add(QObject *object) = 0; virtual void remove(QObject *object) = 0; - virtual QVector<QObject*> objects() const = 0; + virtual QList<QObject*> objects() const = 0; virtual QDesignerFormEditorInterface *core() const = 0; diff --git a/src/designer/src/lib/sdk/abstractpromotioninterface.cpp b/src/designer/src/lib/sdk/abstractpromotioninterface.cpp index d59c7fb3d..a8e8ecdb6 100644 --- a/src/designer/src/lib/sdk/abstractpromotioninterface.cpp +++ b/src/designer/src/lib/sdk/abstractpromotioninterface.cpp @@ -91,7 +91,7 @@ QT_BEGIN_NAMESPACE with an error message in \a errorMessage on failure. */ -/*! \fn virtual QVector<QDesignerWidgetDataBaseItemInterface *> QDesignerPromotionInterface::promotionBaseClasses() const +/*! \fn virtual QList<QDesignerWidgetDataBaseItemInterface *> QDesignerPromotionInterface::promotionBaseClasses() const Return a list of base classes that are suitable for promotion. */ diff --git a/src/designer/src/lib/sdk/abstractpromotioninterface.h b/src/designer/src/lib/sdk/abstractpromotioninterface.h index d709c8f03..3ec2a3038 100644 --- a/src/designer/src/lib/sdk/abstractpromotioninterface.h +++ b/src/designer/src/lib/sdk/abstractpromotioninterface.h @@ -53,7 +53,7 @@ public: QDesignerWidgetDataBaseItemInterface *promotedItem; }; - using PromotedClasses = QVector<PromotedClass>; + using PromotedClasses = QList<PromotedClass>; virtual PromotedClasses promotedClasses() const = 0; @@ -70,7 +70,7 @@ public: virtual bool setPromotedClassIncludeFile(const QString &className, const QString &includeFile, QString *errorMessage) = 0; - virtual QVector<QDesignerWidgetDataBaseItemInterface *> promotionBaseClasses() const = 0; + virtual QList<QDesignerWidgetDataBaseItemInterface *> promotionBaseClasses() const = 0; }; QT_END_NAMESPACE diff --git a/src/designer/src/lib/sdk/abstractwidgetbox.cpp b/src/designer/src/lib/sdk/abstractwidgetbox.cpp index 39dad6ec5..9bdef3c5b 100644 --- a/src/designer/src/lib/sdk/abstractwidgetbox.cpp +++ b/src/designer/src/lib/sdk/abstractwidgetbox.cpp @@ -158,7 +158,7 @@ int QDesignerWidgetBoxInterface::findOrInsertCategory(const QString &categoryNam /*! \internal - \fn void QDesignerWidgetBoxInterface::dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list, const QPoint &global_mouse_pos) + \fn void QDesignerWidgetBoxInterface::dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, const QPoint &global_mouse_pos) */ diff --git a/src/designer/src/lib/sdk/abstractwidgetbox.h b/src/designer/src/lib/sdk/abstractwidgetbox.h index 846fb8b3d..6d038fc6a 100644 --- a/src/designer/src/lib/sdk/abstractwidgetbox.h +++ b/src/designer/src/lib/sdk/abstractwidgetbox.h @@ -72,7 +72,7 @@ public: QSharedDataPointer<QDesignerWidgetBoxWidgetData> m_data; }; - using WidgetList = QVector<Widget>; + using WidgetList = QList<Widget>; class Category { @@ -99,7 +99,7 @@ public: WidgetList m_widget_list; }; - using CategoryList = QVector<Category>; + using CategoryList = QList<Category>; explicit QDesignerWidgetBoxInterface(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags()); virtual ~QDesignerWidgetBoxInterface(); @@ -116,7 +116,7 @@ public: int findOrInsertCategory(const QString &categoryName); - virtual void dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list, + virtual void dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, const QPoint &global_mouse_pos) = 0; virtual void setFileName(const QString &file_name) = 0; diff --git a/src/designer/src/lib/sdk/abstractwidgetdatabase.cpp b/src/designer/src/lib/sdk/abstractwidgetdatabase.cpp index 581fd464d..a348580ea 100644 --- a/src/designer/src/lib/sdk/abstractwidgetdatabase.cpp +++ b/src/designer/src/lib/sdk/abstractwidgetdatabase.cpp @@ -333,13 +333,13 @@ bool QDesignerWidgetDataBaseInterface::isCustom(QObject *object, bool resolveNam */ /*! - \fn virtual void QDesignerWidgetDataBaseItemInterface::setDefaultPropertyValues(const QVector<QVariant> &list) = 0 + \fn virtual void QDesignerWidgetDataBaseItemInterface::setDefaultPropertyValues(const QList<QVariant> &list) = 0 Sets the default property values for the widget to the given \a list. */ /*! - \fn virtual QVector<QVariant> QDesignerWidgetDataBaseItemInterface::defaultPropertyValues() const = 0 + \fn virtual QList<QVariant> QDesignerWidgetDataBaseItemInterface::defaultPropertyValues() const = 0 Returns a list of default values to be used as properties for the item. */ diff --git a/src/designer/src/lib/sdk/abstractwidgetdatabase.h b/src/designer/src/lib/sdk/abstractwidgetdatabase.h index 3320018cd..c162039fc 100644 --- a/src/designer/src/lib/sdk/abstractwidgetdatabase.h +++ b/src/designer/src/lib/sdk/abstractwidgetdatabase.h @@ -85,8 +85,8 @@ public: virtual QString extends() const = 0; virtual void setExtends(const QString &s) = 0; - virtual void setDefaultPropertyValues(const QVector<QVariant> &list) = 0; - virtual QVector<QVariant> defaultPropertyValues() const = 0; + virtual void setDefaultPropertyValues(const QList<QVariant> &list) = 0; + virtual QList<QVariant> defaultPropertyValues() const = 0; }; class QDESIGNER_SDK_EXPORT QDesignerWidgetDataBaseInterface: public QObject @@ -115,7 +115,7 @@ Q_SIGNALS: void changed(); protected: - QVector<QDesignerWidgetDataBaseItemInterface *> m_items; + QList<QDesignerWidgetDataBaseItemInterface *> m_items; }; QT_END_NAMESPACE diff --git a/src/designer/src/lib/sdk/layoutdecoration.h b/src/designer/src/lib/sdk/layoutdecoration.h index 91f8c06b1..e893d1947 100644 --- a/src/designer/src/lib/sdk/layoutdecoration.h +++ b/src/designer/src/lib/sdk/layoutdecoration.h @@ -57,7 +57,7 @@ public: QDesignerLayoutDecorationExtension() = default; virtual ~QDesignerLayoutDecorationExtension() = default; - virtual QVector<QWidget*> widgets(QLayout *layout) const = 0; + virtual QList<QWidget*> widgets(QLayout *layout) const = 0; virtual QRect itemInfo(int index) const = 0; virtual int indexOf(QWidget *widget) const = 0; diff --git a/src/designer/src/lib/sdk/layoutdecoration.qdoc b/src/designer/src/lib/sdk/layoutdecoration.qdoc index 16cd44830..04beec341 100644 --- a/src/designer/src/lib/sdk/layoutdecoration.qdoc +++ b/src/designer/src/lib/sdk/layoutdecoration.qdoc @@ -49,7 +49,7 @@ */ /*! - \fn virtual QVector<QWidget*> QDesignerLayoutDecorationExtension::widgets(QLayout *layout) const + \fn virtual QList<QWidget*> QDesignerLayoutDecorationExtension::widgets(QLayout *layout) const Returns the widgets that are managed by the given \a layout. diff --git a/src/designer/src/lib/sdk/membersheet.h b/src/designer/src/lib/sdk/membersheet.h index f4d67a9f7..a3a927538 100644 --- a/src/designer/src/lib/sdk/membersheet.h +++ b/src/designer/src/lib/sdk/membersheet.h @@ -65,8 +65,8 @@ public: virtual QString declaredInClass(int index) const = 0; virtual QString signature(int index) const = 0; - virtual QVector<QByteArray> parameterTypes(int index) const = 0; - virtual QVector<QByteArray> parameterNames(int index) const = 0; + virtual QList<QByteArray> parameterTypes(int index) const = 0; + virtual QList<QByteArray> parameterNames(int index) const = 0; }; Q_DECLARE_EXTENSION_INTERFACE(QDesignerMemberSheetExtension, "org.qt-project.Qt.Designer.MemberSheet") diff --git a/src/designer/src/lib/sdk/membersheet.qdoc b/src/designer/src/lib/sdk/membersheet.qdoc index 7ad66e38d..39fc0caa0 100644 --- a/src/designer/src/lib/sdk/membersheet.qdoc +++ b/src/designer/src/lib/sdk/membersheet.qdoc @@ -231,7 +231,7 @@ */ /*! - \fn QVector<QByteArray> QDesignerMemberSheetExtension::parameterTypes(int index) const + \fn QList<QByteArray> QDesignerMemberSheetExtension::parameterTypes(int index) const Returns the parameter types of the member function with the given \a index, as a QByteArray list. @@ -240,7 +240,7 @@ */ /*! - \fn QVector<QByteArray> QDesignerMemberSheetExtension::parameterNames(int index) const + \fn QList<QByteArray> QDesignerMemberSheetExtension::parameterNames(int index) const Returns the parameter names of the member function with the given \a index, as a QByteArray list. diff --git a/src/designer/src/lib/sdk/taskmenu.h b/src/designer/src/lib/sdk/taskmenu.h index 9147f8b3d..fd588baf1 100644 --- a/src/designer/src/lib/sdk/taskmenu.h +++ b/src/designer/src/lib/sdk/taskmenu.h @@ -45,7 +45,7 @@ public: virtual QAction *preferredEditAction() const; - virtual QVector<QAction*> taskActions() const = 0; + virtual QList<QAction*> taskActions() const = 0; }; Q_DECLARE_EXTENSION_INTERFACE(QDesignerTaskMenuExtension, "org.qt-project.Qt.Designer.TaskMenu") diff --git a/src/designer/src/lib/sdk/taskmenu.qdoc b/src/designer/src/lib/sdk/taskmenu.qdoc index aec98be51..b768fc5b2 100644 --- a/src/designer/src/lib/sdk/taskmenu.qdoc +++ b/src/designer/src/lib/sdk/taskmenu.qdoc @@ -128,7 +128,7 @@ */ /*! - \fn QVector<QAction*> QDesignerTaskMenuExtension::taskActions() const + \fn QList<QAction*> QDesignerTaskMenuExtension::taskActions() const Returns the task menu extension as a list of actions which will be included in \QD's task menu when a plugin with the specified diff --git a/src/designer/src/lib/shared/actioneditor_p.h b/src/designer/src/lib/shared/actioneditor_p.h index 73c70ed2a..2f78887ba 100644 --- a/src/designer/src/lib/shared/actioneditor_p.h +++ b/src/designer/src/lib/shared/actioneditor_p.h @@ -122,7 +122,7 @@ signals: void contextMenuRequested(QMenu *menu, QAction *item); private: - using ActionList = QVector<QAction *>; + using ActionList = QList<QAction *>; void deleteActions(QDesignerFormWindowInterface *formWindow, const ActionList &); #if QT_CONFIG(clipboard) void copyActions(QDesignerFormWindowInterface *formWindow, const ActionList &); diff --git a/src/designer/src/lib/shared/actionrepository_p.h b/src/designer/src/lib/shared/actionrepository_p.h index 38ca6a7b7..333093a09 100644 --- a/src/designer/src/lib/shared/actionrepository_p.h +++ b/src/designer/src/lib/shared/actionrepository_p.h @@ -98,7 +98,7 @@ signals: void resourceImageDropped(const QString &path, QAction *action); private: - using QStandardItemList = QVector<QStandardItem *>; + using QStandardItemList = QList<QStandardItem *>; void initializeHeaders(); static void setItems(QDesignerFormEditorInterface *core, QAction *a, @@ -203,7 +203,7 @@ public: QAction *currentAction() const; void setCurrentIndex(const QModelIndex &index); - using ActionList = QVector<QAction *>; + using ActionList = QList<QAction *>; ActionList selectedActions() const; QItemSelection selection() const; @@ -232,7 +232,7 @@ class QDESIGNER_SHARED_EXPORT ActionRepositoryMimeData: public QMimeData { Q_OBJECT public: - using ActionList = QVector<QAction *>; + using ActionList = QList<QAction *>; ActionRepositoryMimeData(const ActionList &, Qt::DropAction dropAction); ActionRepositoryMimeData(QAction *, Qt::DropAction dropAction); diff --git a/src/designer/src/lib/shared/formlayoutmenu_p.h b/src/designer/src/lib/shared/formlayoutmenu_p.h index 9d88d8ced..d4b56ac96 100644 --- a/src/designer/src/lib/shared/formlayoutmenu_p.h +++ b/src/designer/src/lib/shared/formlayoutmenu_p.h @@ -61,7 +61,7 @@ class QDESIGNER_SHARED_EXPORT FormLayoutMenu : public QObject Q_DISABLE_COPY_MOVE(FormLayoutMenu) Q_OBJECT public: - using ActionList = QVector<QAction *>; + using ActionList = QList<QAction *>; explicit FormLayoutMenu(QObject *parent); diff --git a/src/designer/src/lib/shared/formwindowbase.cpp b/src/designer/src/lib/shared/formwindowbase.cpp index 81529d1ad..8a126c1a1 100644 --- a/src/designer/src/lib/shared/formwindowbase.cpp +++ b/src/designer/src/lib/shared/formwindowbase.cpp @@ -462,7 +462,7 @@ void FormWindowBase::deleteWidgetList(const QWidgetList &widget_list) QMenu *FormWindowBase::createExtensionTaskMenu(QDesignerFormWindowInterface *fw, QObject *o, bool trailingSeparator) { - using ActionList = QVector<QAction *>; + using ActionList = QList<QAction *>; ActionList actions; // 1) Standard public extension QExtensionManager *em = fw->core()->extensionManager(); diff --git a/src/designer/src/lib/shared/formwindowbase_p.h b/src/designer/src/lib/shared/formwindowbase_p.h index c18ee0021..b240aa521 100644 --- a/src/designer/src/lib/shared/formwindowbase_p.h +++ b/src/designer/src/lib/shared/formwindowbase_p.h @@ -108,7 +108,7 @@ public: // Helper to create a basic popup menu from task menu extensions (internal/public) static QMenu *createExtensionTaskMenu(QDesignerFormWindowInterface *fw, QObject *o, bool trailingSeparator = true); - virtual bool dropWidgets(const QVector<QDesignerDnDItemInterface*> &item_list, QWidget *target, + virtual bool dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, QWidget *target, const QPoint &global_mouse_pos) = 0; // Helper to find the widget at the mouse position with some flags. diff --git a/src/designer/src/lib/shared/morphmenu_p.h b/src/designer/src/lib/shared/morphmenu_p.h index 58ade96d0..eba1bdf3a 100644 --- a/src/designer/src/lib/shared/morphmenu_p.h +++ b/src/designer/src/lib/shared/morphmenu_p.h @@ -55,7 +55,7 @@ class QDESIGNER_SHARED_EXPORT MorphMenu : public QObject { Q_DISABLE_COPY_MOVE(MorphMenu) Q_OBJECT public: - using ActionList = QVector<QAction *>; + using ActionList = QList<QAction *>; explicit MorphMenu(QObject *parent = nullptr); diff --git a/src/designer/src/lib/shared/pluginmanager.cpp b/src/designer/src/lib/shared/pluginmanager.cpp index c1b601836..88b581862 100644 --- a/src/designer/src/lib/shared/pluginmanager.cpp +++ b/src/designer/src/lib/shared/pluginmanager.cpp @@ -476,8 +476,8 @@ class QDesignerPluginManagerPrivate { // Synced lists of custom widgets and their data. Note that the list // must be ordered for collections to appear in order. - QVector<QDesignerCustomWidgetInterface *> m_customWidgets; - QVector<QDesignerCustomWidgetData> m_customWidgetData; + QList<QDesignerCustomWidgetInterface *> m_customWidgets; + QList<QDesignerCustomWidgetData> m_customWidgetData; QStringList defaultPluginPaths() const; diff --git a/src/designer/src/lib/shared/pluginmanager_p.h b/src/designer/src/lib/shared/pluginmanager_p.h index df264ad02..373d0fe51 100644 --- a/src/designer/src/lib/shared/pluginmanager_p.h +++ b/src/designer/src/lib/shared/pluginmanager_p.h @@ -99,7 +99,7 @@ class QDESIGNER_SHARED_EXPORT QDesignerPluginManager: public QObject { Q_OBJECT public: - using CustomWidgetList = QVector<QDesignerCustomWidgetInterface *>; + using CustomWidgetList = QList<QDesignerCustomWidgetInterface *>; explicit QDesignerPluginManager(QDesignerFormEditorInterface *core); ~QDesignerPluginManager() override; diff --git a/src/designer/src/lib/shared/promotionmodel.cpp b/src/designer/src/lib/shared/promotionmodel.cpp index ec7ac25d9..37136ced6 100644 --- a/src/designer/src/lib/shared/promotionmodel.cpp +++ b/src/designer/src/lib/shared/promotionmodel.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE namespace { - using StandardItemList = QVector<QStandardItem *>; + using StandardItemList = QList<QStandardItem *>; // Model columns. enum { ClassNameColumn, IncludeFileColumn, IncludeTypeColumn, ReferencedColumn, NumColumns }; diff --git a/src/designer/src/lib/shared/promotiontaskmenu_p.h b/src/designer/src/lib/shared/promotiontaskmenu_p.h index 3f02ed380..641efa9b3 100644 --- a/src/designer/src/lib/shared/promotiontaskmenu_p.h +++ b/src/designer/src/lib/shared/promotiontaskmenu_p.h @@ -83,7 +83,7 @@ public: // Defaults to "Demote to %1".arg(class). void setDemoteLabel(const QString &demoteLabel); - using ActionList = QVector<QAction *>; + using ActionList = QList<QAction *>; enum AddFlags { LeadingSeparator = 1, TrailingSeparator = 2, SuppressGlobalEdit = 4}; @@ -120,7 +120,7 @@ private: QPointer<QWidget> m_widget; // Per-Widget actions - QVector<QAction *> m_promotionActions; + QList<QAction *> m_promotionActions; QAction *m_globalEditAction; QAction *m_EditPromoteToAction; diff --git a/src/designer/src/lib/shared/qdesigner_dnditem_p.h b/src/designer/src/lib/shared/qdesigner_dnditem_p.h index 26aa62c4a..36419389b 100644 --- a/src/designer/src/lib/shared/qdesigner_dnditem_p.h +++ b/src/designer/src/lib/shared/qdesigner_dnditem_p.h @@ -91,7 +91,7 @@ class QDESIGNER_SHARED_EXPORT QDesignerMimeData : public QMimeData { Q_OBJECT public: - using QDesignerDnDItems = QVector<QDesignerDnDItemInterface *>; + using QDesignerDnDItems = QList<QDesignerDnDItemInterface *>; ~QDesignerMimeData() override; diff --git a/src/designer/src/lib/shared/qdesigner_formbuilder.cpp b/src/designer/src/lib/shared/qdesigner_formbuilder.cpp index 4c8282ca1..3b25125af 100644 --- a/src/designer/src/lib/shared/qdesigner_formbuilder.cpp +++ b/src/designer/src/lib/shared/qdesigner_formbuilder.cpp @@ -224,7 +224,7 @@ static bool readDomEnumerationValue(const DomProperty *p, return false; } -void QDesignerFormBuilder::applyProperties(QObject *o, const QVector<DomProperty*> &properties) +void QDesignerFormBuilder::applyProperties(QObject *o, const QList<DomProperty*> &properties) { if (properties.isEmpty()) return; diff --git a/src/designer/src/lib/shared/qdesigner_formbuilder_p.h b/src/designer/src/lib/shared/qdesigner_formbuilder_p.h index da1f75eb7..ceaf1b395 100644 --- a/src/designer/src/lib/shared/qdesigner_formbuilder_p.h +++ b/src/designer/src/lib/shared/qdesigner_formbuilder_p.h @@ -111,7 +111,7 @@ protected: virtual QIcon nameToIcon(const QString &filePath, const QString &qrcPath); virtual QPixmap nameToPixmap(const QString &filePath, const QString &qrcPath); - void applyProperties(QObject *o, const QVector<DomProperty*> &properties) override; + void applyProperties(QObject *o, const QList<DomProperty*> &properties) override; void loadExtraInfo(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) override; diff --git a/src/designer/src/lib/shared/qdesigner_membersheet.cpp b/src/designer/src/lib/shared/qdesigner_membersheet.cpp index f0295601a..2e62aab7f 100644 --- a/src/designer/src/lib/shared/qdesigner_membersheet.cpp +++ b/src/designer/src/lib/shared/qdesigner_membersheet.cpp @@ -34,11 +34,14 @@ #include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE -static QVector<QByteArray> stringListToByteArray(const QStringList &l) -{ - QVector<QByteArray> rc; - for (const QString &s : l) - rc.append(s.toUtf8()); +static QList<QByteArray> stringListToByteArray(const QStringList &l) +{ + if (l.isEmpty()) + return QList<QByteArray>(); + QList<QByteArray> rc; + const QStringList::const_iterator cend = l.constEnd(); + for (QStringList::const_iterator it = l.constBegin(); it != cend; ++it) + rc += it->toUtf8(); return rc; } @@ -184,12 +187,12 @@ bool QDesignerMemberSheet::inheritedFromWidget(int index) const } -QVector<QByteArray> QDesignerMemberSheet::parameterTypes(int index) const +QList<QByteArray> QDesignerMemberSheet::parameterTypes(int index) const { return stringListToByteArray(d->m_meta->method(index)->parameterTypes()); } -QVector<QByteArray> QDesignerMemberSheet::parameterNames(int index) const +QList<QByteArray> QDesignerMemberSheet::parameterNames(int index) const { return stringListToByteArray(d->m_meta->method(index)->parameterNames()); } diff --git a/src/designer/src/lib/shared/qdesigner_membersheet_p.h b/src/designer/src/lib/shared/qdesigner_membersheet_p.h index eac3d6383..b67ad3792 100644 --- a/src/designer/src/lib/shared/qdesigner_membersheet_p.h +++ b/src/designer/src/lib/shared/qdesigner_membersheet_p.h @@ -80,8 +80,8 @@ public: QString declaredInClass(int index) const override; QString signature(int index) const override; - QVector<QByteArray> parameterTypes(int index) const override; - QVector<QByteArray> parameterNames(int index) const override; + QList<QByteArray> parameterTypes(int index) const override; + QList<QByteArray> parameterNames(int index) const override; private: QDesignerMemberSheetPrivate *d; diff --git a/src/designer/src/lib/shared/qdesigner_menubar.cpp b/src/designer/src/lib/shared/qdesigner_menubar.cpp index 84bc8e365..287a2fc3c 100644 --- a/src/designer/src/lib/shared/qdesigner_menubar.cpp +++ b/src/designer/src/lib/shared/qdesigner_menubar.cpp @@ -56,7 +56,7 @@ Q_DECLARE_METATYPE(QAction*) QT_BEGIN_NAMESPACE -using ActionList = QVector<QAction *>; +using ActionList = QList<QAction *>; using namespace qdesigner_internal; diff --git a/src/designer/src/lib/shared/qdesigner_menubar_p.h b/src/designer/src/lib/shared/qdesigner_menubar_p.h index 87631ea5b..8b6e5383e 100644 --- a/src/designer/src/lib/shared/qdesigner_menubar_p.h +++ b/src/designer/src/lib/shared/qdesigner_menubar_p.h @@ -91,7 +91,7 @@ public: void moveDown(); // Helpers for MenuTaskMenu/MenuBarTaskMenu extensions - QVector<QAction *> contextMenuActions(); + QList<QAction *> contextMenuActions(); void deleteMenuAction(QAction *action); private slots: diff --git a/src/designer/src/lib/shared/qdesigner_promotion.cpp b/src/designer/src/lib/shared/qdesigner_promotion.cpp index 448fab314..08b2848fd 100644 --- a/src/designer/src/lib/shared/qdesigner_promotion.cpp +++ b/src/designer/src/lib/shared/qdesigner_promotion.cpp @@ -164,7 +164,7 @@ namespace qdesigner_internal { return true; } - QVector<QDesignerWidgetDataBaseItemInterface *> QDesignerPromotion::promotionBaseClasses() const + QList<QDesignerWidgetDataBaseItemInterface *> QDesignerPromotion::promotionBaseClasses() const { using SortedDatabaseItemMap = QMap<QString, QDesignerWidgetDataBaseItemInterface *>; SortedDatabaseItemMap sortedDatabaseItemMap; diff --git a/src/designer/src/lib/shared/qdesigner_promotion_p.h b/src/designer/src/lib/shared/qdesigner_promotion_p.h index c88e7130c..3448fd999 100644 --- a/src/designer/src/lib/shared/qdesigner_promotion_p.h +++ b/src/designer/src/lib/shared/qdesigner_promotion_p.h @@ -70,7 +70,7 @@ namespace qdesigner_internal { bool setPromotedClassIncludeFile(const QString &className, const QString &includeFile, QString *errorMessage) override; - QVector<QDesignerWidgetDataBaseItemInterface *> promotionBaseClasses() const override; + QList<QDesignerWidgetDataBaseItemInterface *> promotionBaseClasses() const override; private: bool canBePromoted(const QDesignerWidgetDataBaseItemInterface *) const; diff --git a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp index 186410fd0..18261f640 100644 --- a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp +++ b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp @@ -290,7 +290,7 @@ namespace qdesigner_internal { } const QStringList &QDesignerPromotionDialog::baseClassNames(const QDesignerPromotionInterface *promotion) { - using WidgetDataBaseItemList = QVector<QDesignerWidgetDataBaseItemInterface *>; + using WidgetDataBaseItemList = QList<QDesignerWidgetDataBaseItemInterface *>; static QStringList rc; if (rc.isEmpty()) { // Convert the item list into a string list. diff --git a/src/designer/src/lib/shared/qdesigner_propertycommand_p.h b/src/designer/src/lib/shared/qdesigner_propertycommand_p.h index 7aaa7e944..1cc528a19 100644 --- a/src/designer/src/lib/shared/qdesigner_propertycommand_p.h +++ b/src/designer/src/lib/shared/qdesigner_propertycommand_p.h @@ -148,7 +148,7 @@ public: protected: using PropertyHelperPtr = QSharedPointer<PropertyHelper>; - using PropertyHelperList = QVector<PropertyHelperPtr>; + using PropertyHelperList = QList<PropertyHelperPtr>; // add an object bool add(QObject *object, const QString &propertyName); @@ -259,14 +259,14 @@ class QDESIGNER_SHARED_EXPORT AddDynamicPropertyCommand: public QDesignerFormWin public: explicit AddDynamicPropertyCommand(QDesignerFormWindowInterface *formWindow); - bool init(const QVector<QObject *> &selection, QObject *current, const QString &propertyName, const QVariant &value); + bool init(const QList<QObject *> &selection, QObject *current, const QString &propertyName, const QVariant &value); void redo() override; void undo() override; private: void setDescription(); QString m_propertyName; - QVector<QObject *> m_selection; + QList<QObject *> m_selection; QVariant m_value; }; @@ -276,7 +276,7 @@ class QDESIGNER_SHARED_EXPORT RemoveDynamicPropertyCommand: public QDesignerForm public: explicit RemoveDynamicPropertyCommand(QDesignerFormWindowInterface *formWindow); - bool init(const QVector<QObject *> &selection, QObject *current, const QString &propertyName); + bool init(const QList<QObject *> &selection, QObject *current, const QString &propertyName); void redo() override; void undo() override; diff --git a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp index 163107732..2582a3a14 100644 --- a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp +++ b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp @@ -693,7 +693,7 @@ QDesignerPropertySheet::QDesignerPropertySheet(QObject *object, QObject *parent) createFakeProperty(QStringLiteral("floating")); } - using ByteArrayList = QVector<QByteArray>; + using ByteArrayList = QList<QByteArray>; const ByteArrayList names = object->dynamicPropertyNames(); if (!names.isEmpty()) { const ByteArrayList::const_iterator cend = names.constEnd(); diff --git a/src/designer/src/lib/shared/qdesigner_taskmenu.cpp b/src/designer/src/lib/shared/qdesigner_taskmenu.cpp index c73a99d86..e51cd3a73 100644 --- a/src/designer/src/lib/shared/qdesigner_taskmenu.cpp +++ b/src/designer/src/lib/shared/qdesigner_taskmenu.cpp @@ -466,14 +466,14 @@ void QDesignerTaskMenu::removeStatusBar() } } -QVector<QAction*> QDesignerTaskMenu::taskActions() const +QList<QAction*> QDesignerTaskMenu::taskActions() const { QDesignerFormWindowInterface *formWindow = QDesignerFormWindowInterface::findFormWindow(widget()); Q_ASSERT(formWindow); const bool isMainContainer = formWindow->mainContainer() == widget(); - QVector<QAction*> actions; + QList<QAction*> actions; if (const QMainWindow *mw = qobject_cast<const QMainWindow*>(formWindow->mainContainer())) { if (isMainContainer || mw->centralWidget() == widget()) { diff --git a/src/designer/src/lib/shared/qdesigner_taskmenu_p.h b/src/designer/src/lib/shared/qdesigner_taskmenu_p.h index 99d64a5ef..b4bc23da4 100644 --- a/src/designer/src/lib/shared/qdesigner_taskmenu_p.h +++ b/src/designer/src/lib/shared/qdesigner_taskmenu_p.h @@ -68,7 +68,7 @@ public: QWidget *widget() const; - QVector<QAction*> taskActions() const override; + QList<QAction*> taskActions() const override; enum PropertyMode { CurrentWidgetMode, MultiSelectionMode }; diff --git a/src/designer/src/lib/shared/qdesigner_toolbar.cpp b/src/designer/src/lib/shared/qdesigner_toolbar.cpp index 62dd127ce..d098e97a0 100644 --- a/src/designer/src/lib/shared/qdesigner_toolbar.cpp +++ b/src/designer/src/lib/shared/qdesigner_toolbar.cpp @@ -56,7 +56,7 @@ Q_DECLARE_METATYPE(QAction*) QT_BEGIN_NAMESPACE -using ActionList = QVector<QAction *>; +using ActionList = QList<QAction *>; namespace qdesigner_internal { // ------------------- ToolBarEventFilter diff --git a/src/designer/src/lib/shared/qdesigner_toolbar_p.h b/src/designer/src/lib/shared/qdesigner_toolbar_p.h index 272b5dddc..a3fa2c2ad 100644 --- a/src/designer/src/lib/shared/qdesigner_toolbar_p.h +++ b/src/designer/src/lib/shared/qdesigner_toolbar_p.h @@ -86,7 +86,7 @@ public: bool eventFilter (QObject *watched, QEvent *event) override; // Helper for task menu extension - QVector<QAction *> contextMenuActions(const QPoint &globalPos = QPoint(-1, -1)); + QList<QAction *> contextMenuActions(const QPoint &globalPos = QPoint(-1, -1)); static ToolBarEventFilter *eventFilterOf(const QToolBar *tb); diff --git a/src/designer/src/lib/shared/qlayout_widget.cpp b/src/designer/src/lib/shared/qlayout_widget.cpp index 647104cd9..5090aae17 100644 --- a/src/designer/src/lib/shared/qlayout_widget.cpp +++ b/src/designer/src/lib/shared/qlayout_widget.cpp @@ -608,7 +608,7 @@ QRect LayoutHelper::itemInfo(QLayout *lt, const QWidget *widget) const // Figure out states of a cell and return as a flat vector of // [column1, column2,...] (address as row * columnCount + col) - static CellStates cellStates(const QVector<QRect> &rects, int numRows, int numColumns); + static CellStates cellStates(const QList<QRect> &rects, int numRows, int numColumns); typedef QMap<QWidget *, QRect> WidgetItemMap; typedef QMap<QWidget *, Qt::Alignment> WidgetAlignmentMap; @@ -635,7 +635,7 @@ QRect LayoutHelper::itemInfo(QLayout *lt, const QWidget *widget) const return str; } - GridLayoutState::CellStates GridLayoutState::cellStates(const QVector<QRect> &rects, int numRows, int numColumns) + GridLayoutState::CellStates GridLayoutState::cellStates(const QList<QRect> &rects, int numRows, int numColumns) { CellStates rc = CellStates(numRows * numColumns, CellState(Free, Free)); for (const auto &rect : rects) { diff --git a/src/designer/src/lib/shared/qsimpleresource_p.h b/src/designer/src/lib/shared/qsimpleresource_p.h index ad8dfb989..e2dccaa53 100644 --- a/src/designer/src/lib/shared/qsimpleresource_p.h +++ b/src/designer/src/lib/shared/qsimpleresource_p.h @@ -101,7 +101,7 @@ private: // Contents of clipboard for formbuilder copy and paste operations // (Actions and widgets) struct QDESIGNER_SHARED_EXPORT FormBuilderClipboard { - using ActionList = QVector<QAction *>; + using ActionList = QList<QAction *>; FormBuilderClipboard() = default; FormBuilderClipboard(QWidget *w); diff --git a/src/designer/src/lib/shared/qtresourceeditordialog.cpp b/src/designer/src/lib/shared/qtresourceeditordialog.cpp index 5c7d27f32..a1c15e708 100644 --- a/src/designer/src/lib/shared/qtresourceeditordialog.cpp +++ b/src/designer/src/lib/shared/qtresourceeditordialog.cpp @@ -82,7 +82,7 @@ struct QtResourceFileData { struct QtResourcePrefixData { QString prefix; QString language; - QVector<QtResourceFileData> resourceFileList; + QList<QtResourceFileData> resourceFileList; bool operator==(const QtResourcePrefixData &other) const { return prefix == other.prefix && language == other.language @@ -92,7 +92,7 @@ struct QtResourcePrefixData { struct QtQrcFileData { QString qrcPath; - QVector<QtResourcePrefixData> resourceList; + QList<QtResourcePrefixData> resourceList; bool operator==(const QtQrcFileData &other) const { return qrcPath == other.qrcPath && resourceList == other.resourceList; } }; @@ -230,13 +230,13 @@ public: QString prefix() const { return m_prefix; } QString language() const { return m_language; } - QVector<QtResourceFile *> resourceFiles() const { return m_resourceFiles; } + QList<QtResourceFile *> resourceFiles() const { return m_resourceFiles; } private: QtResourcePrefix() = default; QString m_prefix; QString m_language; - QVector<QtResourceFile *> m_resourceFiles; + QList<QtResourceFile *> m_resourceFiles; }; // ------------------- QtQrcFile @@ -246,7 +246,7 @@ public: QString path() const { return m_path; } QString fileName() const { return m_fileName; } - QVector<QtResourcePrefix *> resourcePrefixList() const { return m_resourcePrefixes; } + QList<QtResourcePrefix *> resourcePrefixList() const { return m_resourcePrefixes; } QtQrcFileData initialState() const { return m_initialState; } private: @@ -260,7 +260,7 @@ private: QString m_path; QString m_fileName; - QVector<QtResourcePrefix *> m_resourcePrefixes; + QList<QtResourcePrefix *> m_resourcePrefixes; QtQrcFileData m_initialState; }; @@ -272,7 +272,7 @@ public: QtQrcManager(QObject *parent = nullptr); ~QtQrcManager() override; - QVector<QtQrcFile *> qrcFiles() const; + QList<QtQrcFile *> qrcFiles() const; // helpers QtQrcFile *qrcFileOf(const QString &path) const; @@ -332,12 +332,12 @@ signals: void resourceFileRemoved(QtResourceFile *resourceFile); private: - QVector<QtQrcFile *> m_qrcFiles; + QList<QtQrcFile *> m_qrcFiles; QMap<QString, QtQrcFile *> m_pathToQrc; QMap<QtQrcFile *, bool> m_qrcFileToExists; QMap<QtResourcePrefix *, QtQrcFile *> m_prefixToQrc; QMap<QtResourceFile *, QtResourcePrefix *> m_fileToPrefix; - QMap<QString, QVector<QtResourceFile *> > m_fullPathToResourceFiles; + QMap<QString, QList<QtResourceFile *> > m_fullPathToResourceFiles; QMap<QString, QIcon> m_fullPathToIcon; QMap<QString, bool> m_fullPathToExists; }; @@ -353,7 +353,7 @@ QtQrcManager::~QtQrcManager() clear(); } -QVector<QtQrcFile *> QtQrcManager::qrcFiles() const +QList<QtQrcFile *> QtQrcManager::qrcFiles() const { return m_qrcFiles; } @@ -397,11 +397,11 @@ void QtQrcManager::exportQrcFile(QtQrcFile *qrcFile, QtQrcFileData *qrcFileData) QtQrcFileData &data = *qrcFileData; - QVector<QtResourcePrefixData> resourceList; + QList<QtResourcePrefixData> resourceList; const auto resourcePrefixes = qrcFile->resourcePrefixList(); for (const QtResourcePrefix *prefix : resourcePrefixes) { - QVector<QtResourceFileData> resourceFileList; + QList<QtResourceFileData> resourceFileList; const auto resourceFiles = prefix->resourceFiles(); for (QtResourceFile *file : resourceFiles) { QtResourceFileData fileData; @@ -857,7 +857,7 @@ public: QtResourceModel *m_resourceModel = nullptr; QDesignerDialogGuiInterface *m_dlgGui = nullptr; QtQrcManager *m_qrcManager = nullptr; - QVector<QtQrcFileData> m_initialState; + QList<QtQrcFileData> m_initialState; QMap<QtQrcFile *, QListWidgetItem *> m_qrcFileToItem; QMap<QListWidgetItem *, QtQrcFile *> m_itemToQrcFile; @@ -983,7 +983,7 @@ QStandardItem *QtResourceEditorDialogPrivate::insertResourcePrefix(QtResourcePre QStandardItem *prefixItem = new QStandardItem(); QStandardItem *languageItem = new QStandardItem(); - QVector<QStandardItem *> items; + QList<QStandardItem *> items; items << prefixItem; items << languageItem; m_treeModel->insertRow(row, items); @@ -1087,7 +1087,7 @@ void QtResourceEditorDialogPrivate::slotResourceFileInserted(QtResourceFile *res QStandardItem *pathItem = new QStandardItem(resourceFile->path()); QStandardItem *aliasItem = new QStandardItem(); QStandardItem *parentItem = m_resourcePrefixToPrefixItem.value(resourcePrefix); - QVector<QStandardItem *> items; + QList<QStandardItem *> items; items << pathItem; items << aliasItem; @@ -2094,7 +2094,7 @@ void QtResourceEditorDialog::displayResourceFailures(const QString &logOutput, Q void QtResourceEditorDialog::accept() { QStringList newQrcPaths; - QVector<QtQrcFileData> currentState; + QList<QtQrcFileData> currentState; const auto qrcFiles = d_ptr->m_qrcManager->qrcFiles(); for (QtQrcFile *qrcFile : qrcFiles) { diff --git a/src/designer/src/lib/shared/qtresourcemodel.cpp b/src/designer/src/lib/shared/qtresourcemodel.cpp index f853e13c2..fec22a015 100644 --- a/src/designer/src/lib/shared/qtresourcemodel.cpp +++ b/src/designer/src/lib/shared/qtresourcemodel.cpp @@ -79,7 +79,7 @@ public: // then later when that resource set is activated it needs to be reregistered) QMap<QtResourceSet *, bool> m_newlyCreated; // all created but not activated yet // (if was active at some point and it's not now it will not be on that map) - QMap<QString, QVector<QtResourceSet *> > m_pathToResourceSet; + QMap<QString, QList<QtResourceSet *> > m_pathToResourceSet; QtResourceSet *m_currentResourceSet = nullptr; typedef QMap<QString, const QByteArray *> PathDataMap; @@ -487,7 +487,7 @@ void QtResourceModel::setModified(const QString &path) d_ptr->m_resourceSetToReload.insert(rs, true); } -QVector<QtResourceSet *> QtResourceModel::resourceSets() const +QList<QtResourceSet *> QtResourceModel::resourceSets() const { return d_ptr->m_resourceSetToPaths.keys(); } diff --git a/src/designer/src/lib/shared/qtresourcemodel_p.h b/src/designer/src/lib/shared/qtresourcemodel_p.h index e6da05351..65d615f52 100644 --- a/src/designer/src/lib/shared/qtresourcemodel_p.h +++ b/src/designer/src/lib/shared/qtresourcemodel_p.h @@ -91,7 +91,7 @@ public: bool isModified(const QString &path) const; // only for paths which are on loadedQrcFiles() list void setModified(const QString &path); // only for paths which are on loadedQrcPaths() list - QVector<QtResourceSet *> resourceSets() const; + QList<QtResourceSet *> resourceSets() const; QtResourceSet *currentResourceSet() const; void setCurrentResourceSet(QtResourceSet *resourceSet, int *errorCount = nullptr, QString *errorMessages = nullptr); diff --git a/src/designer/src/lib/shared/widgetdatabase.cpp b/src/designer/src/lib/shared/widgetdatabase.cpp index 97769bcee..8621f2840 100644 --- a/src/designer/src/lib/shared/widgetdatabase.cpp +++ b/src/designer/src/lib/shared/widgetdatabase.cpp @@ -188,12 +188,12 @@ void WidgetDataBaseItem::setExtends(const QString &s) m_extends = s; } -void WidgetDataBaseItem::setDefaultPropertyValues(const QVector<QVariant> &list) +void WidgetDataBaseItem::setDefaultPropertyValues(const QList<QVariant> &list) { m_defaultPropertyValues = list; } -QVector<QVariant> WidgetDataBaseItem::defaultPropertyValues() const +QList<QVariant> WidgetDataBaseItem::defaultPropertyValues() const { return m_defaultPropertyValues; } @@ -348,7 +348,7 @@ static WidgetDataBaseItem *createCustomWidgetItem(const QDesignerCustomWidgetInt void WidgetDataBase::loadPlugins() { typedef QMap<QString, int> NameIndexMap; - using ItemList = QVector<QDesignerWidgetDataBaseItemInterface *>; + using ItemList = QList<QDesignerWidgetDataBaseItemInterface *>; using NameSet = QSet<QString>; // 1) create a map of existing custom classes NameIndexMap existingCustomClasses; @@ -417,7 +417,7 @@ void WidgetDataBase::remove(int index) delete m_items.takeAt(index); } -QVector<QVariant> WidgetDataBase::defaultPropertyValues(const QString &name) +QList<QVariant> WidgetDataBase::defaultPropertyValues(const QString &name) { WidgetFactory *factory = qobject_cast<WidgetFactory *>(m_core->widgetFactory()); Q_ASSERT(factory); @@ -537,7 +537,7 @@ QStringList WidgetDataBase::customFormWidgetClasses(const QDesignerFormEditorInt // properties to be suitable for new forms static QString xmlFromWidgetBox(const QDesignerFormEditorInterface *core, const QString &className, const QString &objectName) { - using PropertyList = QVector<DomProperty *>; + using PropertyList = QList<DomProperty *>; QDesignerWidgetBoxInterface::Widget widget; const bool found = QDesignerWidgetBox::findWidget(core->widgetBox(), className, QString(), &widget); diff --git a/src/designer/src/lib/shared/widgetdatabase_p.h b/src/designer/src/lib/shared/widgetdatabase_p.h index 8a591ec6a..73f00b6b6 100644 --- a/src/designer/src/lib/shared/widgetdatabase_p.h +++ b/src/designer/src/lib/shared/widgetdatabase_p.h @@ -101,8 +101,8 @@ public: QString extends() const override; void setExtends(const QString &s) override; - void setDefaultPropertyValues(const QVector<QVariant> &list) override; - QVector<QVariant> defaultPropertyValues() const override; + void setDefaultPropertyValues(const QList<QVariant> &list) override; + QList<QVariant> defaultPropertyValues() const override; static WidgetDataBaseItem *clone(const QDesignerWidgetDataBaseItemInterface *item); @@ -129,7 +129,7 @@ private: uint m_container: 1; uint m_custom: 1; uint m_promoted: 1; - QVector<QVariant> m_defaultPropertyValues; + QList<QVariant> m_defaultPropertyValues; QStringList m_fakeSlots; QStringList m_fakeSignals; }; @@ -170,7 +170,7 @@ public slots: void loadPlugins(); private: - QVector<QVariant> defaultPropertyValues(const QString &name); + QList<QVariant> defaultPropertyValues(const QString &name); QDesignerFormEditorInterface *m_core; }; @@ -184,7 +184,7 @@ QDESIGNER_SHARED_EXPORT QDesignerWidgetDataBaseItemInterface bool promoted, bool custom); -using WidgetDataBaseItemList = QVector<QDesignerWidgetDataBaseItemInterface *>; +using WidgetDataBaseItemList = QList<QDesignerWidgetDataBaseItemInterface *>; QDESIGNER_SHARED_EXPORT WidgetDataBaseItemList promotionCandidates(const QDesignerWidgetDataBaseInterface *db, diff --git a/src/designer/src/lib/uilib/abstractformbuilder.cpp b/src/designer/src/lib/uilib/abstractformbuilder.cpp index fa55b7aae..221acbbaf 100644 --- a/src/designer/src/lib/uilib/abstractformbuilder.cpp +++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp @@ -907,7 +907,7 @@ QLayoutItem *QAbstractFormBuilder::create(DomLayoutItem *ui_layoutItem, QLayout /*! \internal */ -void QAbstractFormBuilder::applyProperties(QObject *o, const QVector<DomProperty*> &properties) +void QAbstractFormBuilder::applyProperties(QObject *o, const QList<DomProperty*> &properties) { for (DomProperty *p : properties) { const QVariant v = toVariant(o->metaObject(), p); @@ -1255,9 +1255,9 @@ void FormBuilderSaveLayoutEntry::setAlignment(Qt::Alignment al) } // Create list from standard box layout -static QVector<FormBuilderSaveLayoutEntry> saveLayoutEntries(const QLayout *layout) +static QList<FormBuilderSaveLayoutEntry> saveLayoutEntries(const QLayout *layout) { - QVector<FormBuilderSaveLayoutEntry> rc; + QList<FormBuilderSaveLayoutEntry> rc; if (const int count = layout->count()) { rc.reserve(count); for (int idx = 0; idx < count; ++idx) { @@ -1271,9 +1271,9 @@ static QVector<FormBuilderSaveLayoutEntry> saveLayoutEntries(const QLayout *layo } // Create list from grid layout -static QVector<FormBuilderSaveLayoutEntry> saveGridLayoutEntries(QGridLayout *gridLayout) +static QList<FormBuilderSaveLayoutEntry> saveGridLayoutEntries(QGridLayout *gridLayout) { - QVector<FormBuilderSaveLayoutEntry> rc; + QList<FormBuilderSaveLayoutEntry> rc; if (const int count = gridLayout->count()) { rc.reserve(count); for (int idx = 0; idx < count; ++idx) { @@ -1289,9 +1289,9 @@ static QVector<FormBuilderSaveLayoutEntry> saveGridLayoutEntries(QGridLayout *gr #if QT_CONFIG(formlayout) // Create list from form layout -static QVector<FormBuilderSaveLayoutEntry> saveFormLayoutEntries(const QFormLayout *formLayout) +static QList<FormBuilderSaveLayoutEntry> saveFormLayoutEntries(const QFormLayout *formLayout) { - QVector<FormBuilderSaveLayoutEntry> rc; + QList<FormBuilderSaveLayoutEntry> rc; if (const int count = formLayout->count()) { rc.reserve(count); for (int idx = 0; idx < count; ++idx) { @@ -1332,7 +1332,7 @@ DomLayout *QAbstractFormBuilder::createDom(QLayout *layout, DomLayout *ui_layout lay->setAttributeName(objectName); lay->setElementProperty(computeProperties(layout)); - QVector<FormBuilderSaveLayoutEntry> newList; + QList<FormBuilderSaveLayoutEntry> newList; if (QGridLayout *gridLayout = qobject_cast<QGridLayout *>(layout)) { newList = saveGridLayoutEntries(gridLayout); #if QT_CONFIG(formlayout) @@ -1394,7 +1394,7 @@ DomSpacer *QAbstractFormBuilder::createDom(QSpacerItem *spacer, DomLayout *ui_la Q_UNUSED(ui_parentWidget); DomSpacer *ui_spacer = new DomSpacer(); - QVector<DomProperty*> properties; + QList<DomProperty*> properties; DomProperty *prop = nullptr; const QFormBuilderStrings &strings = QFormBuilderStrings::instance(); @@ -1430,9 +1430,9 @@ DomProperty *QAbstractFormBuilder::createProperty(QObject *obj, const QString &p /*! \internal */ -QVector<DomProperty*> QAbstractFormBuilder::computeProperties(QObject *obj) +QList<DomProperty*> QAbstractFormBuilder::computeProperties(QObject *obj) { - QVector<DomProperty*> lst; + QList<DomProperty*> lst; const QMetaObject *meta = obj->metaObject(); @@ -1494,7 +1494,7 @@ QVector<DomProperty*> QAbstractFormBuilder::computeProperties(QObject *obj) /*! \internal */ -QAbstractFormBuilder::DomPropertyHash QAbstractFormBuilder::propertyMap(const QVector<DomProperty*> &properties) +QAbstractFormBuilder::DomPropertyHash QAbstractFormBuilder::propertyMap(const QList<DomProperty*> &properties) { DomPropertyHash map; @@ -1607,7 +1607,7 @@ public: }; template<class T> -static void storeItemFlags(const T *item, QVector<DomProperty*> *properties) +static void storeItemFlags(const T *item, QList<DomProperty*> *properties) { static const QFormBuilderStrings &strings = QFormBuilderStrings::instance(); static const Qt::ItemFlags defaultFlags = T().flags(); @@ -1623,7 +1623,7 @@ static void storeItemFlags(const T *item, QVector<DomProperty*> *properties) template<class T> static void storeItemProps(QAbstractFormBuilder *abstractFormBuilder, const T *item, - QVector<DomProperty*> *properties) + QList<DomProperty*> *properties) { static const QFormBuilderStrings &strings = QFormBuilderStrings::instance(); FriendlyFB * const formBuilder = static_cast<FriendlyFB *>(abstractFormBuilder); @@ -1648,7 +1648,7 @@ static void storeItemProps(QAbstractFormBuilder *abstractFormBuilder, const T *i template<class T> static void storeItemPropsNFlags(QAbstractFormBuilder *abstractFormBuilder, const T *item, - QVector<DomProperty*> *properties) + QList<DomProperty*> *properties) { storeItemProps<T>(abstractFormBuilder, item, properties); storeItemFlags<T>(item, properties); @@ -1714,7 +1714,7 @@ void QAbstractFormBuilder::saveTreeWidgetExtraInfo(QTreeWidget *treeWidget, DomW for (int c = 0; c<treeWidget->columnCount(); ++c) { DomColumn *column = new DomColumn; - QVector<DomProperty*> properties; + QList<DomProperty*> properties; for (const QFormBuilderStrings::TextRoleNName &it : strings.itemTextRoles) { p = saveText(it.second, treeWidget->headerItem()->data(c, it.first.second)); @@ -1758,7 +1758,7 @@ void QAbstractFormBuilder::saveTreeWidgetExtraInfo(QTreeWidget *treeWidget, DomW DomItem *currentDomItem = new DomItem; - QVector<DomProperty*> properties; + QList<DomProperty*> properties; for (int c = 0; c < treeWidget->columnCount(); c++) { for (const QFormBuilderStrings::TextRoleNName &it : strings.itemTextRoles) if ((p = saveText(it.second, item->data(c, it.first.second)))) @@ -1799,7 +1799,7 @@ void QAbstractFormBuilder::saveTableWidgetExtraInfo(QTableWidget *tableWidget, D // save the horizontal header QVector<DomColumn *> columns; for (int c = 0; c < tableWidget->columnCount(); c++) { - QVector<DomProperty*> properties; + QList<DomProperty*> properties; QTableWidgetItem *item = tableWidget->horizontalHeaderItem(c); if (item) storeItemProps(this, item, &properties); @@ -1813,7 +1813,7 @@ void QAbstractFormBuilder::saveTableWidgetExtraInfo(QTableWidget *tableWidget, D // save the vertical header QVector<DomRow *> rows; for (int r = 0; r < tableWidget->rowCount(); r++) { - QVector<DomProperty*> properties; + QList<DomProperty*> properties; QTableWidgetItem *item = tableWidget->verticalHeaderItem(r); if (item) storeItemProps(this, item, &properties); @@ -1829,7 +1829,7 @@ void QAbstractFormBuilder::saveTableWidgetExtraInfo(QTableWidget *tableWidget, D for (int c = 0; c < tableWidget->columnCount(); c++) { QTableWidgetItem *item = tableWidget->item(r, c); if (item) { - QVector<DomProperty*> properties; + QList<DomProperty*> properties; storeItemPropsNFlags(this, item, &properties); DomItem *domItem = new DomItem; @@ -1852,7 +1852,7 @@ void QAbstractFormBuilder::saveListWidgetExtraInfo(QListWidget *listWidget, DomW auto ui_items = ui_widget->elementItem(); for (int i=0; i<listWidget->count(); ++i) { - QVector<DomProperty*> properties; + QList<DomProperty*> properties; storeItemPropsNFlags(this, listWidget->item(i), &properties); DomItem *ui_item = new DomItem(); @@ -1879,7 +1879,7 @@ void QAbstractFormBuilder::saveComboBoxExtraInfo(QComboBox *comboBox, DomWidget comboBox->itemData(i, Qt::DisplayPropertyRole)); DomProperty *iconProperty = saveResource(comboBox->itemData(i, Qt::DecorationPropertyRole)); if (textProperty || iconProperty) { - QVector<DomProperty*> properties; + QList<DomProperty*> properties; if (textProperty) properties.push_back(textProperty); if (iconProperty) @@ -1901,7 +1901,7 @@ void QAbstractFormBuilder::saveComboBoxExtraInfo(QComboBox *comboBox, DomWidget void QAbstractFormBuilder::saveButtonExtraInfo(const QAbstractButton *widget, DomWidget *ui_widget, DomWidget *) { - using DomPropertyList = QVector<DomProperty *>; + using DomPropertyList = QList<DomProperty *>; if (const QButtonGroup *buttonGroup = widget->group()) { DomPropertyList attributes = ui_widget->elementAttribute(); DomString *domString = new DomString(); @@ -2315,7 +2315,7 @@ void QAbstractFormBuilder::loadItemViewExtraInfo(DomWidget *ui_widget, QAbstract if (QTreeView *treeView = qobject_cast<QTreeView*>(itemView)) { const auto &allAttributes = ui_widget->elementAttribute(); - QVector<DomProperty *> headerProperties; + QList<DomProperty *> headerProperties; for (QString realPropertyName : realPropertyNames) { const QString upperPropertyName = realPropertyName.at(0).toUpper() + realPropertyName.mid(1); @@ -2335,7 +2335,7 @@ void QAbstractFormBuilder::loadItemViewExtraInfo(DomWidget *ui_widget, QAbstract const auto &allAttributes = ui_widget->elementAttribute(); for (const QString &headerPrefix : headerPrefixes) { - QVector<DomProperty*> headerProperties; + QList<DomProperty*> headerProperties; for (QString realPropertyName : realPropertyNames) { const QString upperPropertyName = realPropertyName.at(0).toUpper() + realPropertyName.mid(1); diff --git a/src/designer/src/lib/uilib/abstractformbuilder.h b/src/designer/src/lib/uilib/abstractformbuilder.h index 58c9aef26..d33ceb76c 100644 --- a/src/designer/src/lib/uilib/abstractformbuilder.h +++ b/src/designer/src/lib/uilib/abstractformbuilder.h @@ -135,7 +135,7 @@ protected: virtual QActionGroup *create(DomActionGroup *ui_action_group, QObject *parent); virtual void addMenuAction(QAction *action); - virtual void applyProperties(QObject *o, const QVector<DomProperty*> &properties); + virtual void applyProperties(QObject *o, const QList<DomProperty*> &properties); bool applyPropertyInternally(QObject *o, const QString &propertyName, const QVariant &value); virtual void applyTabStops(QWidget *widget, DomTabStops *tabStops); @@ -175,7 +175,7 @@ protected: virtual DomTabStops *saveTabStops(); virtual DomResources *saveResources(); DomButtonGroups *saveButtonGroups(const QWidget *mainContainer); - virtual QVector<DomProperty*> computeProperties(QObject *obj); + virtual QList<DomProperty*> computeProperties(QObject *obj); virtual bool checkProperty(QObject *obj, const QString &prop) const; virtual DomProperty *createProperty(QObject *object, const QString &propertyName, const QVariant &value); @@ -210,7 +210,7 @@ protected: static QString toString(const DomString *str); using DomPropertyHash = QHash<QString, DomProperty*>; - static DomPropertyHash propertyMap(const QVector<DomProperty*> &properties); + static DomPropertyHash propertyMap(const QList<DomProperty*> &properties); void setupColorGroup(QPalette &palette, QPalette::ColorGroup colorGroup, DomColorGroup *group); DomColorGroup *saveColorGroup(const QPalette &palette); diff --git a/src/designer/src/lib/uilib/formbuilder.cpp b/src/designer/src/lib/uilib/formbuilder.cpp index 590fe2b3a..4b5e99c69 100644 --- a/src/designer/src/lib/uilib/formbuilder.cpp +++ b/src/designer/src/lib/uilib/formbuilder.cpp @@ -494,11 +494,11 @@ void QFormBuilder::updateCustomWidgets() } /*! - \fn QVector<QDesignerCustomWidgetInterface*> QFormBuilder::customWidgets() const + \fn QList<QDesignerCustomWidgetInterface*> QFormBuilder::customWidgets() const Returns a list of the available plugins. */ -QVector<QDesignerCustomWidgetInterface*> QFormBuilder::customWidgets() const +QList<QDesignerCustomWidgetInterface*> QFormBuilder::customWidgets() const { return d->m_customWidgets.values(); } @@ -507,7 +507,7 @@ QVector<QDesignerCustomWidgetInterface*> QFormBuilder::customWidgets() const \internal */ -void QFormBuilder::applyProperties(QObject *o, const QVector<DomProperty*> &properties) +void QFormBuilder::applyProperties(QObject *o, const QList<DomProperty*> &properties) { if (properties.isEmpty()) diff --git a/src/designer/src/lib/uilib/formbuilder.h b/src/designer/src/lib/uilib/formbuilder.h index b2a61bf9f..79013d221 100644 --- a/src/designer/src/lib/uilib/formbuilder.h +++ b/src/designer/src/lib/uilib/formbuilder.h @@ -69,7 +69,7 @@ public: void addPluginPath(const QString &pluginPath); void setPluginPath(const QStringList &pluginPaths); - QVector<QDesignerCustomWidgetInterface*> customWidgets() const; + QList<QDesignerCustomWidgetInterface*> customWidgets() const; protected: QWidget *create(DomUI *ui, QWidget *parentWidget) override; @@ -88,7 +88,7 @@ protected: bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) override; virtual void updateCustomWidgets(); - void applyProperties(QObject *o, const QVector<DomProperty*> &properties) override; + void applyProperties(QObject *o, const QList<DomProperty*> &properties) override; static QWidget *widgetByName(QWidget *topLevel, const QString &name); diff --git a/src/designer/src/lib/uilib/formbuilderextra_p.h b/src/designer/src/lib/uilib/formbuilderextra_p.h index f70fc7b56..94b0c2231 100644 --- a/src/designer/src/lib/uilib/formbuilderextra_p.h +++ b/src/designer/src/lib/uilib/formbuilderextra_p.h @@ -261,14 +261,14 @@ struct QDESIGNER_UILIB_EXPORT QFormBuilderStrings { const QString scriptChildWidgetsVariable; using RoleNName = QPair<Qt::ItemDataRole, QString>; - QVector<RoleNName> itemRoles; + QList<RoleNName> itemRoles; QHash<QString, Qt::ItemDataRole> treeItemRoleHash; // first.first is primary role, first.second is shadow role. // Shadow is used for either the translation source or the designer // representation of the string value. using TextRoleNName = QPair<QPair<Qt::ItemDataRole, Qt::ItemDataRole>, QString>; - QVector<TextRoleNName> itemTextRoles; + QList<TextRoleNName> itemTextRoles; QHash<QString, QPair<Qt::ItemDataRole, Qt::ItemDataRole> > treeItemTextRoleHash; }; #ifdef QFORMINTERNAL_NAMESPACE diff --git a/src/designer/src/plugins/activeqt/qaxwidgetextrainfo.cpp b/src/designer/src/plugins/activeqt/qaxwidgetextrainfo.cpp index 989c47482..299fb466c 100644 --- a/src/designer/src/plugins/activeqt/qaxwidgetextrainfo.cpp +++ b/src/designer/src/plugins/activeqt/qaxwidgetextrainfo.cpp @@ -65,7 +65,7 @@ bool QAxWidgetExtraInfo::saveWidgetExtraInfo(DomWidget *ui_widget) /* Turn off standard setters and make sure "control" is in front, * otherwise, previews will not work as the properties are not applied via * the caching property sheet, them. */ - typedef QVector<DomProperty *> DomPropertyList; + typedef QList<DomProperty *> DomPropertyList; DomPropertyList props = ui_widget->elementProperty(); const int size = props.size(); const QString controlProperty = QLatin1String(QAxWidgetPropertySheet::controlPropertyName); diff --git a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp index df0d47b21..3aecb74ab 100644 --- a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp +++ b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp @@ -118,7 +118,7 @@ QAxWidgetTaskMenu::QAxWidgetTaskMenu(QDesignerAxWidget *object, QObject *parent) QAxWidgetTaskMenu::~QAxWidgetTaskMenu() = default; -QVector<QAction*> QAxWidgetTaskMenu::taskActions() const +QList<QAction*> QAxWidgetTaskMenu::taskActions() const { const bool loaded = m_axwidget->loaded(); m_setAction->setEnabled(!loaded); diff --git a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.h b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.h index 5c93051ab..ea76dcd5a 100644 --- a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.h +++ b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.h @@ -43,7 +43,7 @@ class QAxWidgetTaskMenu: public QObject, public QDesignerTaskMenuExtension public: explicit QAxWidgetTaskMenu(QDesignerAxWidget *object, QObject *parent = nullptr); virtual ~QAxWidgetTaskMenu(); - QVector<QAction*> taskActions() const override; + QList<QAction*> taskActions() const override; private slots: void setActiveXControl(); @@ -53,7 +53,7 @@ private: QDesignerAxWidget *m_axwidget; QAction *m_setAction; QAction *m_resetAction; - QVector<QAction*> m_taskActions; + QList<QAction*> m_taskActions; }; typedef qdesigner_internal::ExtensionFactory<QDesignerTaskMenuExtension, QDesignerAxWidget, QAxWidgetTaskMenu> ActiveXTaskMenuFactory; diff --git a/src/designer/src/uiplugin/customwidget.h b/src/designer/src/uiplugin/customwidget.h index 1ba6ad33a..efb392009 100644 --- a/src/designer/src/uiplugin/customwidget.h +++ b/src/designer/src/uiplugin/customwidget.h @@ -75,7 +75,7 @@ class QDesignerCustomWidgetCollectionInterface public: virtual ~QDesignerCustomWidgetCollectionInterface() {} - virtual QVector<QDesignerCustomWidgetInterface*> customWidgets() const = 0; + virtual QList<QDesignerCustomWidgetInterface*> customWidgets() const = 0; }; #define QDesignerCustomWidgetCollectionInterface_iid "org.qt-project.Qt.QDesignerCustomWidgetCollectionInterface" diff --git a/src/designer/src/uiplugin/customwidget.qdoc b/src/designer/src/uiplugin/customwidget.qdoc index a49253c72..a63e0db7c 100644 --- a/src/designer/src/uiplugin/customwidget.qdoc +++ b/src/designer/src/uiplugin/customwidget.qdoc @@ -287,7 +287,7 @@ */ /*! - \fn QVector<QDesignerCustomWidgetInterface*> QDesignerCustomWidgetCollectionInterface::customWidgets() const + \fn QList<QDesignerCustomWidgetInterface*> QDesignerCustomWidgetCollectionInterface::customWidgets() const Returns a list of interfaces to the collection's custom widgets. */ diff --git a/src/designer/src/uitools/quiloader.cpp b/src/designer/src/uitools/quiloader.cpp index 22a7aefcd..ccfd4478b 100644 --- a/src/designer/src/uitools/quiloader.cpp +++ b/src/designer/src/uitools/quiloader.cpp @@ -391,7 +391,7 @@ public: return nullptr; } - void applyProperties(QObject *o, const QVector<DomProperty*> &properties) override; + void applyProperties(QObject *o, const QList<DomProperty*> &properties) override; QWidget *create(DomUI *ui, QWidget *parentWidget) override; QWidget *create(DomWidget *ui_widget, QWidget *parentWidget) override; bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) override; @@ -422,7 +422,7 @@ static QString convertTranslatable(const DomProperty *p, const QByteArray &class return strVal->translate(className, idBased); } -void FormBuilderPrivate::applyProperties(QObject *o, const QVector<DomProperty*> &properties) +void FormBuilderPrivate::applyProperties(QObject *o, const QList<DomProperty*> &properties) { QFormBuilder::applyProperties(o, properties); diff --git a/src/shared/deviceskin/deviceskin.h b/src/shared/deviceskin/deviceskin.h index 0802cdf34..fcdb88093 100644 --- a/src/shared/deviceskin/deviceskin.h +++ b/src/shared/deviceskin/deviceskin.h @@ -91,7 +91,7 @@ struct DeviceSkinParameters { int screenDepth; QPoint cursorHot; QVector<DeviceSkinButtonArea> buttonAreas; - QVector<int> toggleAreaList; + QList<int> toggleAreaList; int joystick; QString prefix; diff --git a/src/shared/fontpanel/fontpanel.cpp b/src/shared/fontpanel/fontpanel.cpp index 0a2ab3a66..45d2a456e 100644 --- a/src/shared/fontpanel/fontpanel.cpp +++ b/src/shared/fontpanel/fontpanel.cpp @@ -118,7 +118,7 @@ void FontPanel::setSelectedFont(const QFont &f) m_familyComboBox->setCurrentFont(f); if (m_familyComboBox->currentIndex() < 0) { // family not in writing system - find the corresponding one? - QVector<QFontDatabase::WritingSystem> familyWritingSystems = m_fontDatabase.writingSystems(f.family()); + QList<QFontDatabase::WritingSystem> familyWritingSystems = m_fontDatabase.writingSystems(f.family()); if (familyWritingSystems.isEmpty()) return; diff --git a/src/shared/qtgradienteditor/qtcolorline.cpp b/src/shared/qtgradienteditor/qtcolorline.cpp index 8b9ad0b30..3c48cdfcb 100644 --- a/src/shared/qtgradienteditor/qtcolorline.cpp +++ b/src/shared/qtgradienteditor/qtcolorline.cpp @@ -421,7 +421,7 @@ QPixmap QtColorLinePrivate::hueGradientPixmap(int size, Qt::Orientation orientat gradW = 0; w = 1; } - QVector<QColor> colorList; + QList<QColor> colorList; colorList << QColor::fromHsv(0, saturation, value, alpha); colorList << QColor::fromHsv(60, saturation, value, alpha); colorList << QColor::fromHsv(120, saturation, value, alpha); diff --git a/src/shared/qtgradienteditor/qtgradientstopsmodel.cpp b/src/shared/qtgradienteditor/qtgradientstopsmodel.cpp index 2e3a00f34..0afbf49bb 100644 --- a/src/shared/qtgradienteditor/qtgradientstopsmodel.cpp +++ b/src/shared/qtgradienteditor/qtgradientstopsmodel.cpp @@ -162,7 +162,7 @@ QColor QtGradientStopsModel::color(qreal pos) const return newColor; } -QVector<QtGradientStop *> QtGradientStopsModel::selectedStops() const +QList<QtGradientStop *> QtGradientStopsModel::selectedStops() const { return d_ptr->m_selection.keys(); } diff --git a/src/shared/qtgradienteditor/qtgradientstopsmodel.h b/src/shared/qtgradienteditor/qtgradientstopsmodel.h index f955087cb..71a8783e0 100644 --- a/src/shared/qtgradienteditor/qtgradientstopsmodel.h +++ b/src/shared/qtgradienteditor/qtgradientstopsmodel.h @@ -77,7 +77,7 @@ public: PositionStopMap stops() const; QtGradientStop *at(qreal pos) const; QColor color(qreal pos) const; // calculated between points - QVector<QtGradientStop *> selectedStops() const; + QList<QtGradientStop *> selectedStops() const; QtGradientStop *currentStop() const; bool isSelected(QtGradientStop *stop) const; QtGradientStop *firstSelected() const; diff --git a/src/shared/qtgradienteditor/qtgradientstopswidget.cpp b/src/shared/qtgradienteditor/qtgradientstopswidget.cpp index 5ade1ef32..49569869e 100644 --- a/src/shared/qtgradienteditor/qtgradientstopswidget.cpp +++ b/src/shared/qtgradienteditor/qtgradientstopswidget.cpp @@ -77,7 +77,7 @@ public: double fromViewport(int x) const; double toViewport(double x) const; QtGradientStop *stopAt(const QPoint &viewportPos) const; - QVector<QtGradientStop *> stopsAt(const QPoint &viewportPos) const; + QList<QtGradientStop *> stopsAt(const QPoint &viewportPos) const; void setupMove(QtGradientStop *stop, int x); void ensureVisible(double x); // x = stop position void ensureVisible(QtGradientStop *stop); @@ -105,7 +105,7 @@ public: QRubberBand *m_rubber; QPoint m_clickPos; - QVector<QtGradientStop *> m_stops; + QList<QtGradientStop *> m_stops; bool m_moving; int m_moveOffset; @@ -147,9 +147,9 @@ QtGradientStop *QtGradientStopsWidgetPrivate::stopAt(const QPoint &viewportPos) return 0; } -QVector<QtGradientStop *> QtGradientStopsWidgetPrivate::stopsAt(const QPoint &viewportPos) const +QList<QtGradientStop *> QtGradientStopsWidgetPrivate::stopsAt(const QPoint &viewportPos) const { - QVector<QtGradientStop *> stops; + QList<QtGradientStop *> stops; double posY = m_handleSize / 2; for (QtGradientStop *stop : m_stops) { double posX = toViewport(stop->position()); diff --git a/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp b/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp index afdf5aca6..144d7bee0 100644 --- a/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp +++ b/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp @@ -75,7 +75,7 @@ public: QWidget *container{nullptr}; // container which is expanded when the button is clicked QGridLayout *layout{nullptr}; // layout in container WidgetItem *parent{nullptr}; - QVector<WidgetItem *> children; + QList<WidgetItem *> children; bool expanded{false}; }; private: @@ -93,8 +93,8 @@ private: QMap<QWidget *, WidgetItem *> m_widgetToItem; QMap<QObject *, WidgetItem *> m_buttonToItem; QGridLayout *m_mainLayout; - QVector<WidgetItem *> m_children; - QVector<WidgetItem *> m_recreateQueue; + QList<WidgetItem *> m_children; + QList<WidgetItem *> m_recreateQueue; }; QToolButton *QtButtonPropertyBrowserPrivate::createButton(QWidget *parent) const @@ -116,7 +116,7 @@ QToolButton *QtButtonPropertyBrowserPrivate::createButton(QWidget *parent) const int QtButtonPropertyBrowserPrivate::gridRow(WidgetItem *item) const { - QVector<WidgetItem *> siblings; + QList<WidgetItem *> siblings; if (item->parent) siblings = item->parent->children; else diff --git a/src/shared/qtpropertybrowser/qteditorfactory.cpp b/src/shared/qtpropertybrowser/qteditorfactory.cpp index 5ec9d7be2..60ad54631 100644 --- a/src/shared/qtpropertybrowser/qteditorfactory.cpp +++ b/src/shared/qtpropertybrowser/qteditorfactory.cpp @@ -85,7 +85,7 @@ class EditorFactoryPrivate { public: - typedef QVector<Editor *> EditorList; + typedef QList<Editor *> EditorList; typedef QMap<QtProperty *, EditorList> PropertyToEditorListMap; typedef QMap<Editor *, QtProperty *> EditorToPropertyMap; diff --git a/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp b/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp index ee1ab1c27..b7534e25b 100644 --- a/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp +++ b/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp @@ -73,7 +73,7 @@ public: QGridLayout *layout{nullptr}; QFrame *line{nullptr}; WidgetItem *parent{nullptr}; - QVector<WidgetItem *> children; + QList<WidgetItem *> children; }; private: void updateLater(); @@ -87,8 +87,8 @@ private: QMap<WidgetItem *, QtBrowserItem *> m_itemToIndex; QMap<QWidget *, WidgetItem *> m_widgetToItem; QGridLayout *m_mainLayout; - QVector<WidgetItem *> m_children; - QVector<WidgetItem *> m_recreateQueue; + QList<WidgetItem *> m_children; + QList<WidgetItem *> m_recreateQueue; }; void QtGroupBoxPropertyBrowserPrivate::init(QWidget *parent) diff --git a/src/shared/qtpropertybrowser/qtpropertybrowser.cpp b/src/shared/qtpropertybrowser/qtpropertybrowser.cpp index 2fa9d752e..601fb854a 100644 --- a/src/shared/qtpropertybrowser/qtpropertybrowser.cpp +++ b/src/shared/qtpropertybrowser/qtpropertybrowser.cpp @@ -55,7 +55,7 @@ public: QtProperty *q_ptr; QSet<QtProperty *> m_parentItems; - QVector<QtProperty *> m_subItems; + QList<QtProperty *> m_subItems; QString m_valueToolTip; QString m_descriptionToolTip; @@ -181,7 +181,7 @@ QtProperty::~QtProperty() \sa insertSubProperty(), removeSubProperty() */ -QVector<QtProperty *> QtProperty::subProperties() const +QList<QtProperty *> QtProperty::subProperties() const { return d_ptr->m_subItems; } @@ -1100,7 +1100,7 @@ public: QtBrowserItem *q_ptr; - QVector<QtBrowserItem *> m_children; + QList<QtBrowserItem *> m_children; }; @@ -1176,7 +1176,7 @@ QtBrowserItem *QtBrowserItem::parent() const The \e childrenItems list represents the same list as \e childrenProperties. */ -QVector<QtBrowserItem *> QtBrowserItem::children() const +QList<QtBrowserItem *> QtBrowserItem::children() const { return d_ptr->m_children; } @@ -1206,7 +1206,7 @@ QtBrowserItem::~QtBrowserItem() typedef QMap<QtAbstractPropertyBrowser *, QMap<QtAbstractPropertyManager *, QtAbstractEditorFactoryBase *> > Map1; typedef QMap<QtAbstractPropertyManager *, QMap<QtAbstractEditorFactoryBase *, - QVector<QtAbstractPropertyBrowser *> > > Map2; + QList<QtAbstractPropertyBrowser *> > > Map2; Q_GLOBAL_STATIC(Map1, m_viewToManagerToFactory) Q_GLOBAL_STATIC(Map2, m_managerToFactoryToViews) @@ -1233,13 +1233,13 @@ public: void slotPropertyDestroyed(QtProperty *property); void slotPropertyDataChanged(QtProperty *property); - QVector<QtProperty *> m_subItems; - QMap<QtAbstractPropertyManager *, QVector<QtProperty *> > m_managerToProperties; - QMap<QtProperty *, QVector<QtProperty *> > m_propertyToParents; + QList<QtProperty *> m_subItems; + QMap<QtAbstractPropertyManager *, QList<QtProperty *> > m_managerToProperties; + QMap<QtProperty *, QList<QtProperty *> > m_propertyToParents; QMap<QtProperty *, QtBrowserItem *> m_topLevelPropertyToIndex; - QVector<QtBrowserItem *> m_topLevelIndexes; - QMap<QtProperty *, QVector<QtBrowserItem *> > m_propertyToIndexes; + QList<QtBrowserItem *> m_topLevelIndexes; + QMap<QtProperty *, QList<QtBrowserItem *> > m_propertyToIndexes; QtBrowserItem *m_currentItem; }; @@ -1373,7 +1373,7 @@ QtBrowserItem *QtAbstractPropertyBrowserPrivate::createBrowserIndex(QtProperty * void QtAbstractPropertyBrowserPrivate::removeBrowserIndexes(QtProperty *property, QtProperty *parentProperty) { - QVector<QtBrowserItem *> toRemove; + QList<QtBrowserItem *> toRemove; const auto it = m_propertyToIndexes.constFind(property); if (it == m_propertyToIndexes.constEnd()) return; @@ -1671,7 +1671,7 @@ QtAbstractPropertyBrowser::~QtAbstractPropertyBrowser() \sa addProperty(), insertProperty(), removeProperty() */ -QVector<QtProperty *> QtAbstractPropertyBrowser::properties() const +QList<QtProperty *> QtAbstractPropertyBrowser::properties() const { return d_ptr->m_subItems; } @@ -1685,7 +1685,7 @@ QVector<QtProperty *> QtAbstractPropertyBrowser::properties() const \sa topLevelItem() */ -QVector<QtBrowserItem *> QtAbstractPropertyBrowser::items(QtProperty *property) const +QList<QtBrowserItem *> QtAbstractPropertyBrowser::items(QtProperty *property) const { return d_ptr->m_propertyToIndexes.value(property); } @@ -1710,7 +1710,7 @@ QtBrowserItem *QtAbstractPropertyBrowser::topLevelItem(QtProperty *property) con \sa topLevelItem() */ -QVector<QtBrowserItem *> QtAbstractPropertyBrowser::topLevelItems() const +QList<QtBrowserItem *> QtAbstractPropertyBrowser::topLevelItems() const { return d_ptr->m_topLevelIndexes; } diff --git a/src/shared/qtpropertybrowser/qtpropertybrowser.h b/src/shared/qtpropertybrowser/qtpropertybrowser.h index b9a4a7e72..697ee4c7d 100644 --- a/src/shared/qtpropertybrowser/qtpropertybrowser.h +++ b/src/shared/qtpropertybrowser/qtpropertybrowser.h @@ -53,7 +53,7 @@ class QtProperty public: virtual ~QtProperty(); - QVector<QtProperty *> subProperties() const; + QList<QtProperty *> subProperties() const; QtAbstractPropertyManager *propertyManager() const; @@ -224,7 +224,7 @@ class QtBrowserItem public: QtProperty *property() const; QtBrowserItem *parent() const; - QVector<QtBrowserItem *> children() const; + QList<QtBrowserItem *> children() const; QtAbstractPropertyBrowser *browser() const; private: explicit QtBrowserItem(QtAbstractPropertyBrowser *browser, QtProperty *property, QtBrowserItem *parent); @@ -243,10 +243,10 @@ public: explicit QtAbstractPropertyBrowser(QWidget *parent = 0); ~QtAbstractPropertyBrowser(); - QVector<QtProperty *> properties() const; - QVector<QtBrowserItem *> items(QtProperty *property) const; + QList<QtProperty *> properties() const; + QList<QtBrowserItem *> items(QtProperty *property) const; QtBrowserItem *topLevelItem(QtProperty *property) const; - QVector<QtBrowserItem *> topLevelItems() const; + QList<QtBrowserItem *> topLevelItems() const; void clear(); template <class PropertyManager> diff --git a/src/shared/qtpropertybrowser/qtpropertymanager.cpp b/src/shared/qtpropertybrowser/qtpropertymanager.cpp index a364eb717..2d5269415 100644 --- a/src/shared/qtpropertybrowser/qtpropertymanager.cpp +++ b/src/shared/qtpropertybrowser/qtpropertymanager.cpp @@ -407,7 +407,7 @@ private: QMetaEnum m_policyEnum; }; -static QVector<QLocale::Country> sortCountries(const QVector<QLocale::Country> &countries) +static QList<QLocale::Country> sortCountries(const QList<QLocale::Country> &countries) { QMultiMap<QString, QLocale::Country> nameToCountry; for (QLocale::Country country : countries) @@ -431,7 +431,7 @@ void QtMetaEnumProvider::initLocale() const auto languages = nameToLanguage.values(); for (QLocale::Language language : languages) { - QVector<QLocale::Country> countries; + QList<QLocale::Country> countries; countries = QLocale::countriesForLanguage(language); if (countries.isEmpty() && language == system.language()) countries << system.country(); @@ -4880,7 +4880,7 @@ public: QtBoolPropertyManager *m_boolPropertyManager; - QMap<const QtProperty *, QVector<QtProperty *> > m_propertyToFlags; + QMap<const QtProperty *, QList<QtProperty *> > m_propertyToFlags; QMap<const QtProperty *, QtProperty *> m_flagToProperty; }; @@ -5165,7 +5165,7 @@ void QtFlagPropertyManager::initializeProperty(QtProperty *property) { d_ptr->m_values[property] = QtFlagPropertyManagerPrivate::Data(); - d_ptr->m_propertyToFlags[property] = QVector<QtProperty *>(); + d_ptr->m_propertyToFlags[property] = QList<QtProperty *>(); } /*! diff --git a/src/shared/qttoolbardialog/qttoolbardialog.cpp b/src/shared/qttoolbardialog/qttoolbardialog.cpp index d81a1f1fb..3e069602c 100644 --- a/src/shared/qttoolbardialog/qttoolbardialog.cpp +++ b/src/shared/qttoolbardialog/qttoolbardialog.cpp @@ -69,7 +69,7 @@ public: void addCategory(const QString &category); bool hasCategory(const QString &category) const; QStringList categories() const; - QVector<QAction *> categoryActions(const QString &category) const; + QList<QAction *> categoryActions(const QString &category) const; QString actionCategory(QAction *action) const; // only non-separator @@ -88,18 +88,18 @@ public: void removeDefaultToolBar(QToolBar *toolBar); // NULL on action list means separator. - QMap<QToolBar *, QVector<QAction *> > defaultToolBars() const; + QMap<QToolBar *, QList<QAction *> > defaultToolBars() const; bool isDefaultToolBar(QToolBar *toolBar) const; QToolBar *createToolBar(const QString &toolBarName); void deleteToolBar(QToolBar *toolBar); // only those which were created, not added - QVector<QAction *> actions(QToolBar *toolBar) const; + QList<QAction *> actions(QToolBar *toolBar) const; - void setToolBars(const QMap<QToolBar *, QVector<QAction *> > &actions); - void setToolBar(QToolBar *toolBar, const QVector<QAction *> &actions); + void setToolBars(const QMap<QToolBar *, QList<QAction *> > &actions); + void setToolBar(QToolBar *toolBar, const QList<QAction *> &actions); - QMap<QToolBar *, QVector<QAction *> > toolBarsActions() const; + QMap<QToolBar *, QList<QAction *> > toolBarsActions() const; QByteArray saveState(int version = 0) const; bool restoreState(const QByteArray &state, int version = 0); @@ -118,7 +118,7 @@ signals: that action. (Another approach may be that user first must call setToolBar without that action for old tool bar) */ - void toolBarChanged(QToolBar *toolBar, const QVector<QAction *> &actions); + void toolBarChanged(QToolBar *toolBar, const QList<QAction *> &actions); private: QScopedPointer<QtFullToolBarManagerPrivate> d_ptr; @@ -134,7 +134,7 @@ class QtFullToolBarManagerPrivate public: QToolBar *toolBarWidgetAction(QAction *action) const; - void removeWidgetActions(const QMap<QToolBar *, QVector<QAction *> > &actions); + void removeWidgetActions(const QMap<QToolBar *, QList<QAction *> > &actions); enum { VersionMarker = 0xff, @@ -149,18 +149,18 @@ public: QToolBar *toolBarByName(const QString &toolBarName) const; - QMap<QString, QVector<QAction *> > categoryToActions; + QMap<QString, QList<QAction *> > categoryToActions; QMap<QAction *, QString> actionToCategory; QSet<QAction *> allActions; QMap<QAction *, QToolBar *> widgetActions; QSet<QAction *> regularActions; - QMap<QAction *, QVector<QToolBar *> > actionToToolBars; + QMap<QAction *, QList<QToolBar *> > actionToToolBars; - QMap<QToolBar *, QVector<QAction *> > toolBars; - QMap<QToolBar *, QVector<QAction *> > toolBarsWithSeparators; - QMap<QToolBar *, QVector<QAction *> > defaultToolBars; - QVector<QToolBar *> customToolBars; + QMap<QToolBar *, QList<QAction *> > toolBars; + QMap<QToolBar *, QList<QAction *> > toolBarsWithSeparators; + QMap<QToolBar *, QList<QAction *> > defaultToolBars; + QList<QToolBar *> customToolBars; QMainWindow *theMainWindow{nullptr}; }; @@ -172,7 +172,7 @@ QToolBar *QtFullToolBarManagerPrivate::toolBarWidgetAction(QAction *action) cons return 0; } -void QtFullToolBarManagerPrivate::removeWidgetActions(const QMap<QToolBar *, QVector<QAction *> > +void QtFullToolBarManagerPrivate::removeWidgetActions(const QMap<QToolBar *, QList<QAction *> > &actions) { auto itToolBar = actions.constBegin(); @@ -181,7 +181,7 @@ void QtFullToolBarManagerPrivate::removeWidgetActions(const QMap<QToolBar *, QVe auto newActions = toolBars.value(toolBar); auto newActionsWithSeparators = toolBarsWithSeparators.value(toolBar); - QVector<QAction *> removedActions; + QList<QAction *> removedActions; const auto actionList = itToolBar.value(); for (QAction *action : actionList) { if (newActions.contains(action) && toolBarWidgetAction(action) == toolBar) { @@ -285,7 +285,7 @@ bool QtFullToolBarManagerPrivate::restoreState(QDataStream &stream) const stream >> objectName; int actionCount; stream >> actionCount; - QVector<QAction *> actions; + QList<QAction *> actions; for (int j = 0; j < actionCount; j++) { QString actionName; stream >> actionName; @@ -321,7 +321,7 @@ bool QtFullToolBarManagerPrivate::restoreState(QDataStream &stream) const stream >> objectName; stream >> toolBarName; stream >> actionCount; - QVector<QAction *> actions; + QList<QAction *> actions; for (int j = 0; j < actionCount; j++) { QString actionName; stream >> actionName; @@ -441,7 +441,7 @@ QMainWindow *QtFullToolBarManager::mainWindow() const void QtFullToolBarManager::addCategory(const QString &category) { - d_ptr->categoryToActions[category] = QVector<QAction *>(); + d_ptr->categoryToActions[category] = QList<QAction *>(); } bool QtFullToolBarManager::hasCategory(const QString &category) const @@ -454,7 +454,7 @@ QStringList QtFullToolBarManager::categories() const return d_ptr->categoryToActions.keys(); } -QVector<QAction *> QtFullToolBarManager::categoryActions(const QString &category) const +QList<QAction *> QtFullToolBarManager::categoryActions(const QString &category) const { const auto it = d_ptr->categoryToActions.constFind(category); if (it != d_ptr->categoryToActions.constEnd()) @@ -542,8 +542,8 @@ void QtFullToolBarManager::addDefaultToolBar(QToolBar *toolBar, const QString &c return; // could be also checked if toolBar belongs to mainwindow - QVector<QAction *> newActionsWithSeparators; - QVector<QAction *> newActions; + QList<QAction *> newActionsWithSeparators; + QList<QAction *> newActions; const auto actions = toolBar->actions(); for (QAction *action : actions) { addAction(action, category); @@ -568,7 +568,7 @@ void QtFullToolBarManager::removeDefaultToolBar(QToolBar *toolBar) return; const auto defaultActions = d_ptr->defaultToolBars[toolBar]; - setToolBar(toolBar, QVector<QAction *>()); + setToolBar(toolBar, QList<QAction *>()); for (QAction *action : defaultActions) removeAction(action); @@ -584,7 +584,7 @@ void QtFullToolBarManager::removeDefaultToolBar(QToolBar *toolBar) } } -QMap<QToolBar *, QVector<QAction *> > QtFullToolBarManager::defaultToolBars() const +QMap<QToolBar *, QList<QAction *> > QtFullToolBarManager::defaultToolBars() const { return d_ptr->defaultToolBars; } @@ -609,8 +609,8 @@ QToolBar *QtFullToolBarManager::createToolBar(const QString &toolBarName) toolBar->setObjectName(name); mainWindow()->addToolBar(toolBar); d_ptr->customToolBars.append(toolBar); - d_ptr->toolBars.insert(toolBar, QVector<QAction *>()); - d_ptr->toolBarsWithSeparators.insert(toolBar, QVector<QAction *>()); + d_ptr->toolBars.insert(toolBar, QList<QAction *>()); + d_ptr->toolBarsWithSeparators.insert(toolBar, QList<QAction *>()); return toolBar; } @@ -620,21 +620,21 @@ void QtFullToolBarManager::deleteToolBar(QToolBar *toolBar) return; if (d_ptr->defaultToolBars.contains(toolBar)) return; - setToolBar(toolBar, QVector<QAction *>()); + setToolBar(toolBar, QList<QAction *>()); d_ptr->customToolBars.removeAll(toolBar); d_ptr->toolBars.remove(toolBar); d_ptr->toolBarsWithSeparators.remove(toolBar); delete toolBar; } -QVector<QAction *> QtFullToolBarManager::actions(QToolBar *toolBar) const +QList<QAction *> QtFullToolBarManager::actions(QToolBar *toolBar) const { if (d_ptr->toolBars.contains(toolBar)) return d_ptr->toolBars.value(toolBar); - return QVector<QAction *>(); + return QList<QAction *>(); } -void QtFullToolBarManager::setToolBars(const QMap<QToolBar *, QVector<QAction *> > &actions) +void QtFullToolBarManager::setToolBars(const QMap<QToolBar *, QList<QAction *> > &actions) { auto it = actions.constBegin(); while (it != actions.constEnd()) { @@ -643,7 +643,7 @@ void QtFullToolBarManager::setToolBars(const QMap<QToolBar *, QVector<QAction *> } } -void QtFullToolBarManager::setToolBar(QToolBar *toolBar, const QVector<QAction *> &actions) +void QtFullToolBarManager::setToolBar(QToolBar *toolBar, const QList<QAction *> &actions) { if (!toolBar) return; @@ -653,9 +653,9 @@ void QtFullToolBarManager::setToolBar(QToolBar *toolBar, const QVector<QAction * if (actions == d_ptr->toolBars[toolBar]) return; - QMap<QToolBar *, QVector<QAction *> > toRemove; + QMap<QToolBar *, QList<QAction *> > toRemove; - QVector<QAction *> newActions; + QList<QAction *> newActions; for (QAction *action : actions) { if (!action || (!newActions.contains(action) && d_ptr->allActions.contains(action))) newActions.append(action); @@ -682,7 +682,7 @@ void QtFullToolBarManager::setToolBar(QToolBar *toolBar, const QVector<QAction * d_ptr->actionToToolBars[action].removeAll(toolBar); } - QVector<QAction *> newActionsWithSeparators; + QList<QAction *> newActionsWithSeparators; for (QAction *action : qAsConst(newActions)) { QAction *newAction = 0; if (!action) @@ -698,7 +698,7 @@ void QtFullToolBarManager::setToolBar(QToolBar *toolBar, const QVector<QAction * d_ptr->toolBarsWithSeparators.insert(toolBar, newActionsWithSeparators); } -QMap<QToolBar *, QVector<QAction *> > QtFullToolBarManager::toolBarsActions() const +QMap<QToolBar *, QList<QAction *> > QtFullToolBarManager::toolBarsActions() const { return d_ptr->toolBars; } @@ -879,7 +879,7 @@ void QtToolBarManager::removeToolBar(QToolBar *toolBar) /*! Returns the manager's toolbar list. */ -QVector<QToolBar *> QtToolBarManager::toolBars() const +QList<QToolBar *> QtToolBarManager::toolBars() const { return d_ptr->manager->toolBarsActions().keys(); } @@ -996,7 +996,7 @@ public: void clearOld(); void fillNew(); QtFullToolBarManager *toolBarManager; - QMap<ToolBarItem *, QVector<QAction *> > currentState; + QMap<ToolBarItem *, QList<QAction *> > currentState; QMap<QToolBar *, ToolBarItem *> toolBarItems; QSet<ToolBarItem *> createdItems; QSet<ToolBarItem *> removedItems; @@ -1191,7 +1191,7 @@ void QtToolBarDialogPrivate::newClicked() QString toolBarName = QtToolBarDialog::tr("Custom Toolbar"); // = QInputDialog::getString(); // produce unique name ToolBarItem *item = createItem(toolBarName); - currentState.insert(item, QVector<QAction *>()); + currentState.insert(item, QList<QAction *>()); createdItems.insert(item); QListWidgetItem *i = new QListWidgetItem(toolBarName, ui.toolBarList); i->setFlags(i->flags() | Qt::ItemIsEditable); diff --git a/src/shared/qttoolbardialog/qttoolbardialog.h b/src/shared/qttoolbardialog/qttoolbardialog.h index 2f937bc19..28e08dd4e 100644 --- a/src/shared/qttoolbardialog/qttoolbardialog.h +++ b/src/shared/qttoolbardialog/qttoolbardialog.h @@ -78,7 +78,7 @@ public: void addToolBar(QToolBar *toolBar, const QString &category); void removeToolBar(QToolBar *toolBar); - QVector<QToolBar *> toolBars() const; + QList<QToolBar *> toolBars() const; QByteArray saveState(int version = 0) const; bool restoreState(const QByteArray &state, int version = 0); |