diff options
Diffstat (limited to 'src/designer/src/components')
49 files changed, 125 insertions, 125 deletions
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; |