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