From ee87edebe6f934ec915b7cb4a0f5a28f73e9f221 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 26 Nov 2019 09:27:26 +0100 Subject: Qt Designer: Migrate from QList to QVector Change-Id: I75f6f4b7157616ba86bf520e1936536571a66ba5 Reviewed-by: Jarek Kobus --- .../src/components/formeditor/formeditor.cpp | 2 +- .../src/components/formeditor/formwindow.cpp | 4 +- .../src/components/formeditor/formwindow.h | 2 +- .../components/formeditor/formwindow_widgetstack.h | 2 +- .../components/formeditor/formwindowmanager.cpp | 2 +- .../src/components/formeditor/formwindowmanager.h | 4 +- .../components/formeditor/qdesigner_resource.cpp | 14 +++--- .../src/components/formeditor/qdesigner_resource.h | 6 +-- .../formeditor/qmainwindow_container.cpp | 2 +- .../objectinspector/objectinspectormodel_p.h | 4 +- .../propertyeditor/designerpropertymanager.cpp | 8 ++-- .../propertyeditor/designerpropertymanager.h | 50 +++++++++++----------- .../propertyeditor/fontpropertymanager.h | 2 +- .../components/propertyeditor/propertyeditor.cpp | 8 ++-- .../src/components/propertyeditor/propertyeditor.h | 8 ++-- .../signalsloteditor/signalslot_utils_p.h | 2 +- .../src/components/taskmenu/button_taskmenu.cpp | 8 ++-- .../src/components/taskmenu/button_taskmenu.h | 8 ++-- .../src/components/taskmenu/combobox_taskmenu.cpp | 2 +- .../src/components/taskmenu/combobox_taskmenu.h | 4 +- .../taskmenu/containerwidget_taskmenu.cpp | 6 +-- .../components/taskmenu/containerwidget_taskmenu.h | 10 ++--- .../src/components/taskmenu/groupbox_taskmenu.cpp | 2 +- .../src/components/taskmenu/groupbox_taskmenu.h | 4 +- .../src/components/taskmenu/itemlisteditor.h | 4 +- .../src/components/taskmenu/label_taskmenu.cpp | 2 +- .../src/components/taskmenu/label_taskmenu.h | 4 +- .../src/components/taskmenu/layouttaskmenu.cpp | 6 +-- .../src/components/taskmenu/layouttaskmenu.h | 4 +- .../src/components/taskmenu/lineedit_taskmenu.cpp | 2 +- .../src/components/taskmenu/lineedit_taskmenu.h | 4 +- .../components/taskmenu/listwidget_taskmenu.cpp | 2 +- .../src/components/taskmenu/listwidget_taskmenu.h | 4 +- .../src/components/taskmenu/menutaskmenu.cpp | 6 +-- .../src/components/taskmenu/menutaskmenu.h | 4 +- .../components/taskmenu/tablewidget_taskmenu.cpp | 2 +- .../src/components/taskmenu/tablewidget_taskmenu.h | 4 +- .../src/components/taskmenu/textedit_taskmenu.cpp | 2 +- .../src/components/taskmenu/textedit_taskmenu.h | 4 +- .../src/components/taskmenu/toolbar_taskmenu.cpp | 6 +-- .../src/components/taskmenu/toolbar_taskmenu.h | 4 +- .../components/taskmenu/treewidget_taskmenu.cpp | 2 +- .../src/components/taskmenu/treewidget_taskmenu.h | 4 +- .../src/components/taskmenu/treewidgeteditor.cpp | 4 +- .../src/components/widgetbox/widgetbox.cpp | 4 +- src/designer/src/components/widgetbox/widgetbox.h | 2 +- .../widgetbox/widgetboxcategorylistview.h | 2 +- .../components/widgetbox/widgetboxtreewidget.cpp | 2 +- .../src/components/widgetbox/widgetboxtreewidget.h | 2 +- 49 files changed, 125 insertions(+), 125 deletions(-) (limited to 'src/designer/src/components') diff --git a/src/designer/src/components/formeditor/formeditor.cpp b/src/designer/src/components/formeditor/formeditor.cpp index 05e7fc4ee..0e1db2501 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); - QList optionsPages; + QVector 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 84e065bcb..8285d84c5 100644 --- a/src/designer/src/components/formeditor/formwindow.cpp +++ b/src/designer/src/components/formeditor/formwindow.cpp @@ -723,7 +723,7 @@ bool FormWindow::handleMouseMoveEvent(QWidget *, QWidget *, QMouseEvent *e) sel.prepend(current); } - QList item_list; + QVector item_list; const QPoint globalPos = mapToGlobal(m_startPos); const QDesignerDnDItemInterface::DropType dropType = (mouseFlags(e->modifiers()) & CopyDragModifier) ? QDesignerDnDItemInterface::CopyDrop : QDesignerDnDItemInterface::MoveDrop; @@ -2827,7 +2827,7 @@ bool FormWindow::dropDockWidget(QDesignerDnDItemInterface *item, const QPoint &g return true; } -bool FormWindow::dropWidgets(const QList &item_list, QWidget *target, +bool FormWindow::dropWidgets(const QVector &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 abecc8252..cb5019d35 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 QList &item_list, QWidget *target, + bool dropWidgets(const QVector &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 01ee921fd..e1a5dd161 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: - QList m_tools; + QVector 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 692b20c54..ce3db6583 100644 --- a/src/designer/src/components/formeditor/formwindowmanager.cpp +++ b/src/designer/src/components/formeditor/formwindowmanager.cpp @@ -955,7 +955,7 @@ void FormWindowManager::deviceProfilesChanged() // DnD stuff -void FormWindowManager::dragItems(const QList &item_list) +void FormWindowManager::dragItems(const QVector &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 d9723cea6..cae24e407 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 QList &item_list) override; + void dragItems(const QVector &item_list) override; QUndoGroup *undoGroup() const; @@ -122,7 +122,7 @@ private: QDesignerFormEditorInterface *m_core; FormWindow *m_activeFormWindow; - QList m_formWindows; + QVector 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 ff4a42744..0725f9d1e 100644 --- a/src/designer/src/components/formeditor/qdesigner_resource.cpp +++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp @@ -108,7 +108,7 @@ Q_DECLARE_METATYPE(QWidgetList) QT_BEGIN_NAMESPACE namespace { - using DomPropertyList = QList; + using DomPropertyList = QVector; } static const char *currentUiVersion = "4.0"; @@ -939,7 +939,7 @@ static bool readDomEnumerationValue(const DomProperty *p, return false; } -void QDesignerResource::applyProperties(QObject *o, const QList &properties) +void QDesignerResource::applyProperties(QObject *o, const QVector &properties) { if (properties.isEmpty()) return; @@ -1387,7 +1387,7 @@ DomWidget *QDesignerResource::saveWidget(QTabWidget *widget, DomWidget *ui_paren designerWarning(msgUnmanagedPage(core(), widget, i, page)); continue; } - QList ui_attribute_list; + QVector ui_attribute_list; const QFormBuilderStrings &strings = QFormBuilderStrings::instance(); // attribute `icon' @@ -1456,7 +1456,7 @@ DomWidget *QDesignerResource::saveWidget(QToolBox *widget, DomWidget *ui_parentW } // attribute `label' - QList ui_attribute_list; + QVector ui_attribute_list; const QFormBuilderStrings &strings = QFormBuilderStrings::instance(); @@ -1889,13 +1889,13 @@ bool QDesignerResource::canCompressSpacings(QObject *object) const return false; } -QList QDesignerResource::computeProperties(QObject *object) +QVector QDesignerResource::computeProperties(QObject *object) { - QList properties; + QVector properties; if (QDesignerPropertySheetExtension *sheet = qt_extension(core()->extensionManager(), object)) { QDesignerDynamicPropertySheetExtension *dynamicSheet = qt_extension(core()->extensionManager(), object); const int count = sheet->count(); - QList spacingProperties; + QVector 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 d667f1372..78e4bacb6 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 QList &properties) override; - QList computeProperties(QObject *obj) override; + void applyProperties(QObject *o, const QVector &properties) override; + QVector 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 = QList; + using DomCustomWidgetList = QVector; 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 180c38e79..37b376115 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(me->parentWidget())) { // Make sure that me is actually managed by mw, otherwise // QMainWindow::dockWidgetArea() will be VERY upset - QList candidates; + QVector candidates; if (mw->layout()) { candidates.append(mw->layout()); candidates += mw->layout()->findChildren(); diff --git a/src/designer/src/components/objectinspector/objectinspectormodel_p.h b/src/designer/src/components/objectinspector/objectinspectormodel_p.h index 14bcf78cb..35446cc49 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 = QList; + using StandardItemList = QVector; 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 = QList; + using StandardItemList = QVector; 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 27d265696..94853da86 100644 --- a/src/designer/src/components/propertyeditor/designerpropertymanager.cpp +++ b/src/designer/src/components/propertyeditor/designerpropertymanager.cpp @@ -1291,7 +1291,7 @@ void DesignerPropertyManager::setAttribute(QtProperty *property, } pfit.value().clear(); - QList values; + QVector values; for (const QPair &pair : flags) { const QString flagName = pair.first; @@ -2040,7 +2040,7 @@ void DesignerPropertyManager::initializeProperty(QtProperty *property) default: if (type == designerFlagTypeId()) { m_flagValues[property] = FlagData(); - m_propertyToFlags[property] = QList(); + m_propertyToFlags[property] = QVector(); } else if (type == designerAlignmentTypeId()) { const uint align = Qt::AlignLeft | Qt::AlignVCenter; m_alignValues[property] = align; @@ -2266,7 +2266,7 @@ void DesignerEditorFactory::disconnectPropertyManager(QtVariantPropertyManager * } // A helper that calls a setter with a value on a pointer list of editor objects. -// Could use QList instead of EditorContainer/Editor, but that crashes VS 6. +// Could use QVector instead of EditorContainer/Editor, but that crashes VS 6. template static inline void applyToEditors(const EditorContainer &list, void (Editor::*setter)(SetterParameter), const Value &value) { @@ -2544,7 +2544,7 @@ QWidget *DesignerEditorFactory::createEditor(QtVariantPropertyManager *manager, template bool removeEditor(QObject *object, - QMap > *propertyToEditors, + QMap > *propertyToEditors, QMap *editorToProperty) { if (!propertyToEditors) diff --git a/src/designer/src/components/propertyeditor/designerpropertymanager.h b/src/designer/src/components/propertyeditor/designerpropertymanager.h index abc6e385c..85c183a31 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 DesignerIntPair; -using DesignerFlagList = QList; +using DesignerFlagList = QVector; class QDesignerFormEditorInterface; class QLineEdit; @@ -80,7 +80,7 @@ private slots: void slotPropertyChanged(QtProperty *property); void slotEditorDestroyed(QObject *object); private: - QMap > m_createdResetWidgets; + QMap > m_createdResetWidgets; QMap m_resetWidgetToProperty; int m_spacing; const QDesignerFormEditorInterface *m_core; @@ -180,11 +180,11 @@ private: { uint val{0}; DesignerFlagList flags; - QList values; + QVector values; }; typedef QMap PropertyFlagDataMap; PropertyFlagDataMap m_flagValues; - typedef QMap > PropertyToPropertyListMap; + typedef QMap > PropertyToPropertyListMap; PropertyToPropertyListMap m_propertyToFlags; QMap m_flagToProperty; @@ -290,28 +290,28 @@ private: int m_spacing; - QMap > m_stringPropertyToEditors; - QMap m_editorToStringProperty; - QMap > m_keySequencePropertyToEditors; + QMap > m_stringPropertyToEditors; + QMap m_editorToStringProperty; + QMap > m_keySequencePropertyToEditors; QMap m_editorToKeySequenceProperty; - QMap > m_palettePropertyToEditors; - QMap m_editorToPaletteProperty; - QMap > m_pixmapPropertyToEditors; - QMap m_editorToPixmapProperty; - QMap > m_iconPropertyToEditors; - QMap m_editorToIconProperty; - QMap > m_uintPropertyToEditors; - QMap m_editorToUintProperty; - QMap > m_longLongPropertyToEditors; - QMap m_editorToLongLongProperty; - QMap > m_uLongLongPropertyToEditors; - QMap m_editorToULongLongProperty; - QMap > m_urlPropertyToEditors; - QMap m_editorToUrlProperty; - QMap > m_byteArrayPropertyToEditors; - QMap m_editorToByteArrayProperty; - QMap > m_stringListPropertyToEditors; - QMap m_editorToStringListProperty; + QMap > m_palettePropertyToEditors; + QMap m_editorToPaletteProperty; + QMap > m_pixmapPropertyToEditors; + QMap m_editorToPixmapProperty; + QMap > m_iconPropertyToEditors; + QMap m_editorToIconProperty; + QMap > m_uintPropertyToEditors; + QMap m_editorToUintProperty; + QMap > m_longLongPropertyToEditors; + QMap m_editorToLongLongProperty; + QMap > m_uLongLongPropertyToEditors; + QMap m_editorToULongLongProperty; + QMap > m_urlPropertyToEditors; + QMap m_editorToUrlProperty; + QMap > m_byteArrayPropertyToEditors; + QMap m_editorToByteArrayProperty; + QMap > m_stringListPropertyToEditors; + QMap m_editorToStringListProperty; }; } // namespace qdesigner_internal diff --git a/src/designer/src/components/propertyeditor/fontpropertymanager.h b/src/designer/src/components/propertyeditor/fontpropertymanager.h index 1041cd357..fd6c5186f 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; - using PropertyList = QList; + using PropertyList = QVector; using PropertyToSubPropertiesMap = QMap; void removeAntialiasingProperty(QtProperty *); diff --git a/src/designer/src/components/propertyeditor/propertyeditor.cpp b/src/designer/src/components/propertyeditor/propertyeditor.cpp index 392f1c3f5..70bbcdb34 100644 --- a/src/designer/src/components/propertyeditor/propertyeditor.cpp +++ b/src/designer/src/components/propertyeditor/propertyeditor.cpp @@ -432,7 +432,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 QList &items) +void PropertyEditor::storePropertiesExpansionState(const QVector &items) { const QChar bar = QLatin1Char('|'); for (QtBrowserItem *propertyItem : items) { @@ -475,7 +475,7 @@ void PropertyEditor::collapseAll() setExpanded(group, false); } -void PropertyEditor::applyPropertiesExpansionState(const QList &items) +void PropertyEditor::applyPropertiesExpansionState(const QVector &items) { const QChar bar = QLatin1Char('|'); for (QtBrowserItem *propertyItem : items) { @@ -516,7 +516,7 @@ void PropertyEditor::applyExpansionState() } } -int PropertyEditor::applyPropertiesFilter(const QList &items) +int PropertyEditor::applyPropertiesFilter(const QVector &items) { int showCount = 0; const bool matchAll = m_filterPattern.isEmpty(); @@ -1011,7 +1011,7 @@ void PropertyEditor::setObject(QObject *object) m_updatingBrowser = false; } else if (type == DesignerPropertyManager::designerFlagTypeId()) { const PropertySheetFlagValue f = qvariant_cast(value); - QList > flags; + QVector > 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 993c4418d..0d5ade2d2 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 QList &items); - void applyPropertiesExpansionState(const QList &items); + void storePropertiesExpansionState(const QVector &items); + void applyPropertiesExpansionState(const QVector &items); void applyFilter(); - int applyPropertiesFilter(const QList &items); + int applyPropertiesFilter(const QVector &items); void setExpanded(QtBrowserItem *item, bool expanded); bool isExpanded(QtBrowserItem *item) const; void setItemVisible(QtBrowserItem *item, bool visible); @@ -157,7 +157,7 @@ private: QMap m_nameToProperty; QMap m_propertyToGroup; QMap m_nameToGroup; - QList m_groups; + QVector 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 7ab98c3d4..ef0c52a80 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 = QList; +using ClassesMemberFunctions = QVector; // 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 80e9d45c3..9940fcfdc 100644 --- a/src/designer/src/components/taskmenu/button_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/button_taskmenu.cpp @@ -56,8 +56,8 @@ namespace qdesigner_internal { enum { debugButtonMenu = 0 }; -using ButtonList = QList; -using ButtonGroupList = QList; +using ButtonList = QVector; +using ButtonGroupList = QVector; // ButtonGroupCommand: Base for commands handling button groups and button lists // addButtonsToGroup() and removeButtonsFromGroup() are low-level helpers for @@ -363,7 +363,7 @@ QAction *ButtonGroupTaskMenu::preferredEditAction() const return m_menu.selectGroupAction(); } -QList ButtonGroupTaskMenu::taskActions() const +QVector ButtonGroupTaskMenu::taskActions() const { m_menu.initialize(QDesignerFormWindowInterface::findFormWindow(m_buttonGroup), m_buttonGroup); return m_taskActions; @@ -509,7 +509,7 @@ bool ButtonTaskMenu::refreshAssignMenu(const QDesignerFormWindowInterface *fw, i return !m_assignGroupSubMenu->isEmpty(); } -QList ButtonTaskMenu::taskActions() const +QVector ButtonTaskMenu::taskActions() const { ButtonTaskMenu *ncThis = const_cast(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 ab58c0630..6123543a7 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; - QList taskActions() const override; + QVector taskActions() const override; private: QButtonGroup *m_buttonGroup; - QList m_taskActions; + QVector m_taskActions; mutable ButtonGroupMenu m_menu; }; @@ -102,7 +102,7 @@ public: ~ButtonTaskMenu() override; QAction *preferredEditAction() const override; - QList taskActions() const override; + QVector 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); - QList m_taskActions; + QVector 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 6d96e9795..dbf367529 100644 --- a/src/designer/src/components/taskmenu/combobox_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/combobox_taskmenu.cpp @@ -68,7 +68,7 @@ QAction *ComboBoxTaskMenu::preferredEditAction() const return m_editItemsAction; } -QList ComboBoxTaskMenu::taskActions() const +QVector 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 8ff36c1a8..6bb97398f 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; - QList taskActions() const override; + QVector taskActions() const override; private slots: void editItems(); @@ -61,7 +61,7 @@ private: QComboBox *m_comboBox; QPointer m_formWindow; QPointer m_editor; - mutable QList m_taskActions; + mutable QVector 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 b4cd1cb2b..47d03e794 100644 --- a/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp @@ -145,7 +145,7 @@ QString ContainerWidgetTaskMenu::pageMenuText(ContainerType ct, int index, int c return tr("Page %1 of %2").arg(index + 1).arg(count); } -QList ContainerWidgetTaskMenu::taskActions() const +QVector ContainerWidgetTaskMenu::taskActions() const { const QDesignerContainerExtension *ce = containerExtension(); const int index = ce->currentIndex(); @@ -231,7 +231,7 @@ WizardContainerWidgetTaskMenu::WizardContainerWidgetTaskMenu(QWizard *w, QObject l.push_front(createSeparator()); } -QList WizardContainerWidgetTaskMenu::taskActions() const +QVector WizardContainerWidgetTaskMenu::taskActions() const { // Enable const QDesignerContainerExtension *ce = containerExtension(); @@ -269,7 +269,7 @@ void MdiContainerWidgetTaskMenu::initializeActions() l.push_front(createSeparator()); } -QList MdiContainerWidgetTaskMenu::taskActions() const +QVector 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 b0f4127ee..5a96cf9ac 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; - QList taskActions() const override; + QVector taskActions() const override; private slots: void removeCurrentPage(); @@ -69,7 +69,7 @@ private slots: protected: QDesignerContainerExtension *containerExtension() const; - QList &containerActions() { return m_taskActions; } + QVector &containerActions() { return m_taskActions; } int pageCount() const; private: @@ -85,7 +85,7 @@ private: PromotionTaskMenu *m_pagePromotionTaskMenu; QAction *m_pageMenuAction; QMenu *m_pageMenu; - QList m_taskActions; + QVector 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); - QList taskActions() const override; + QVector taskActions() const override; private: QAction *m_nextAction; @@ -114,7 +114,7 @@ class MdiContainerWidgetTaskMenu : public ContainerWidgetTaskMenu { public: explicit MdiContainerWidgetTaskMenu(QMdiArea *m, QObject *parent = nullptr); - QList taskActions() const override; + QVector 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 3b7629908..c40f77468 100644 --- a/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp @@ -78,7 +78,7 @@ GroupBoxTaskMenu::GroupBoxTaskMenu(QGroupBox *groupbox, QObject *parent) m_taskActions.append(sep); } -QList GroupBoxTaskMenu::taskActions() const +QVector 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 e09a883a0..d963e44a8 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; - QList taskActions() const override; + QVector taskActions() const override; private: QAction *m_editTitleAction; - QList m_taskActions; + QVector m_taskActions; }; typedef ExtensionFactory GroupBoxTaskMenuFactory; diff --git a/src/designer/src/components/taskmenu/itemlisteditor.h b/src/designer/src/components/taskmenu/itemlisteditor.h index 97bcb19d9..ebdfa37b4 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; - QList m_properties; - QList m_rootProperties; + QVector m_properties; + QVector m_rootProperties; QHash 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 b46a2a64e..c446e5ab1 100644 --- a/src/designer/src/components/taskmenu/label_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/label_taskmenu.cpp @@ -90,7 +90,7 @@ QAction *LabelTaskMenu::preferredEditAction() const return Qt::mightBeRichText(m_label->text()) ? m_editRichTextAction : m_editPlainTextAction; } -QList LabelTaskMenu::taskActions() const +QVector 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 a1744b583..394243916 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; - QList taskActions() const override; + QVector taskActions() const override; private slots: void editRichText(); private: QLabel *m_label; - QList m_taskActions; + QVector 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 b69051212..82a1a9687 100644 --- a/src/designer/src/components/taskmenu/layouttaskmenu.cpp +++ b/src/designer/src/components/taskmenu/layouttaskmenu.cpp @@ -51,9 +51,9 @@ QAction *LayoutWidgetTaskMenu::preferredEditAction() const return m_formLayoutMenu->preferredEditAction(m_widget, m_widget->formWindow()); } -QList LayoutWidgetTaskMenu::taskActions() const +QVector LayoutWidgetTaskMenu::taskActions() const { - QList rc; + QVector rc; QDesignerFormWindowInterface *fw = m_widget->formWindow(); m_morphMenu->populate(m_widget, fw, rc); m_formLayoutMenu->populate(m_widget, fw, rc); @@ -71,7 +71,7 @@ QAction *SpacerTaskMenu::preferredEditAction() const return nullptr; } -QList SpacerTaskMenu::taskActions() const +QVector SpacerTaskMenu::taskActions() const { return {}; } diff --git a/src/designer/src/components/taskmenu/layouttaskmenu.h b/src/designer/src/components/taskmenu/layouttaskmenu.h index afd1afe0f..523477719 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; - QList taskActions() const override; + QVector taskActions() const override; private: QLayoutWidget *m_widget; @@ -68,7 +68,7 @@ public: explicit SpacerTaskMenu(Spacer *bar, QObject *parent = nullptr); QAction *preferredEditAction() const override; - QList taskActions() const override; + QVector taskActions() const override; }; diff --git a/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp b/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp index cbe2f3e2f..5315f59d8 100644 --- a/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp @@ -80,7 +80,7 @@ QAction *LineEditTaskMenu::preferredEditAction() const return m_editTextAction; } -QList LineEditTaskMenu::taskActions() const +QVector 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 e28ab7336..4c67c4884 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; - QList taskActions() const override; + QVector taskActions() const override; private: - QList m_taskActions; + QVector 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 74bff711d..323b3da7a 100644 --- a/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp @@ -67,7 +67,7 @@ QAction *ListWidgetTaskMenu::preferredEditAction() const return m_editItemsAction; } -QList ListWidgetTaskMenu::taskActions() const +QVector 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 63708be61..f28df59de 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; - QList taskActions() const override; + QVector taskActions() const override; private slots: void editItems(); @@ -60,7 +60,7 @@ private: QListWidget *m_listWidget; QPointer m_formWindow; QPointer m_editor; - mutable QList m_taskActions; + mutable QVector m_taskActions; QAction *m_editItemsAction; }; diff --git a/src/designer/src/components/taskmenu/menutaskmenu.cpp b/src/designer/src/components/taskmenu/menutaskmenu.cpp index 105c3eabd..73efae9d2 100644 --- a/src/designer/src/components/taskmenu/menutaskmenu.cpp +++ b/src/designer/src/components/taskmenu/menutaskmenu.cpp @@ -51,9 +51,9 @@ namespace qdesigner_internal { return nullptr; } - QList MenuTaskMenu::taskActions() const + QVector MenuTaskMenu::taskActions() const { - QList rc; + QVector rc; rc.push_back(m_removeAction); m_promotionTaskMenu->addActions(PromotionTaskMenu::LeadingSeparator, rc); return rc; @@ -84,7 +84,7 @@ namespace qdesigner_internal { return nullptr; } - QList MenuBarTaskMenu::taskActions() const + QVector 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 935836896..fa9e8ad32 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; - QList taskActions() const override; + QVector taskActions() const override; private slots: void removeMenu(); @@ -77,7 +77,7 @@ public: explicit MenuBarTaskMenu(QDesignerMenuBar *bar, QObject *parent = nullptr); QAction *preferredEditAction() const override; - QList taskActions() const override; + QVector 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 25bc6ce40..aad9aede0 100644 --- a/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp @@ -66,7 +66,7 @@ QAction *TableWidgetTaskMenu::preferredEditAction() const return m_editItemsAction; } -QList TableWidgetTaskMenu::taskActions() const +QVector 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 b4d5462f2..c68dd4afa 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; - QList taskActions() const override; + QVector taskActions() const override; private slots: void editItems(); @@ -60,7 +60,7 @@ private: QTableWidget *m_tableWidget; QPointer m_formWindow; QPointer m_editor; - mutable QList m_taskActions; + mutable QVector 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 ca5d5d526..b2c6f8e10 100644 --- a/src/designer/src/components/taskmenu/textedit_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/textedit_taskmenu.cpp @@ -76,7 +76,7 @@ QAction *TextEditTaskMenu::preferredEditAction() const return m_editTextAction; } -QList TextEditTaskMenu::taskActions() const +QVector 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 2e50b8ca1..77517c8da 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; - QList taskActions() const override; + QVector taskActions() const override; private slots: void editText(); @@ -63,7 +63,7 @@ private: const QString m_property; const QString m_windowTitle; - mutable QList m_taskActions; + mutable QVector 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 42f3b271a..6ac558546 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; } - QList ToolBarTaskMenu::taskActions() const + QVector ToolBarTaskMenu::taskActions() const { if (ToolBarEventFilter *ef = ToolBarEventFilter::eventFilterOf(m_toolBar)) return ef->contextMenuActions(); @@ -76,9 +76,9 @@ namespace qdesigner_internal { return nullptr; } - QList StatusBarTaskMenu::taskActions() const + QVector StatusBarTaskMenu::taskActions() const { - QList rc; + QVector 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 3e8d5909b..0c3f5592f 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; - QList taskActions() const override; + QVector taskActions() const override; private: QToolBar *m_toolBar; @@ -65,7 +65,7 @@ public: explicit StatusBarTaskMenu(QStatusBar *tb, QObject *parent = nullptr); QAction *preferredEditAction() const override; - QList taskActions() const override; + QVector 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 c4ffd4ca5..e0c14a4bc 100644 --- a/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp @@ -65,7 +65,7 @@ QAction *TreeWidgetTaskMenu::preferredEditAction() const return m_editItemsAction; } -QList TreeWidgetTaskMenu::taskActions() const +QVector 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 9a9c882df..b64401d76 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; - QList taskActions() const override; + QVector taskActions() const override; private slots: void editItems(); @@ -60,7 +60,7 @@ private: QTreeWidget *m_treeWidget; QPointer m_formWindow; QPointer m_editor; - mutable QList m_taskActions; + mutable QVector m_taskActions; QAction *m_editItemsAction; }; diff --git a/src/designer/src/components/taskmenu/treewidgeteditor.cpp b/src/designer/src/components/taskmenu/treewidgeteditor.cpp index 5e77939e5..8a70a7d33 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); - QList rootProperties; + QVector 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); - QList saveCol; + QVector 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 4415c4dbe..70c5923aa 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; - QList item_list; + QVector 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 QList &item_list, const QPoint&) +void WidgetBox::dropWidgets(const QVector &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 27e1b461a..aa687498e 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 QList &item_list, const QPoint &global_mouse_pos) override; + void dropWidgets(const QVector &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 657dad148..16e651dc2 100644 --- a/src/designer/src/components/widgetbox/widgetboxcategorylistview.h +++ b/src/designer/src/components/widgetbox/widgetboxcategorylistview.h @@ -58,7 +58,7 @@ public: explicit WidgetBoxCategoryListView(QDesignerFormEditorInterface *core, QWidget *parent = nullptr); void setViewMode(ViewMode vm); - void dropWidgets(const QList &item_list); + void dropWidgets(const QVector &item_list); using QListView::contentsSize; diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp index 054d622a0..fc28aa222 100644 --- a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp +++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp @@ -900,7 +900,7 @@ void WidgetBoxTreeWidget::contextMenuEvent(QContextMenuEvent *e) menu.exec(mapToGlobal(e->pos())); } -void WidgetBoxTreeWidget::dropWidgets(const QList &item_list) +void WidgetBoxTreeWidget::dropWidgets(const QVector &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 0961e658d..2262b50bd 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 QList &item_list); + void dropWidgets(const QVector &item_list); void setFileName(const QString &file_name); QString fileName() const; -- cgit v1.2.1 From 90f6b663a8cbbec92dd496508b77a7df7b6be8b8 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 2 Dec 2019 11:08:19 +0100 Subject: Qt Designer: No longer handle functions given for the DESIGNABLE property attribute Remove the parameter from the introspection interface and its handling. Change-Id: I1957563808811371f51c00312906f7f52da458f6 Reviewed-by: Jarek Kobus --- src/designer/src/components/formeditor/qdesigner_resource.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/designer/src/components') diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp index 0725f9d1e..2a1cdce3f 100644 --- a/src/designer/src/components/formeditor/qdesigner_resource.cpp +++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp @@ -1534,7 +1534,7 @@ bool QDesignerResource::checkProperty(QObject *obj, const QString &prop) const const QDesignerMetaObjectInterface *meta = core()->introspection()->metaObject(obj); const int pindex = meta->indexOfProperty(prop); - if (pindex != -1 && !(meta->property(pindex)->attributes(obj) & QDesignerMetaPropertyInterface::StoredAttribute)) + if (pindex != -1 && !meta->property(pindex)->attributes().testFlag(QDesignerMetaPropertyInterface::StoredAttribute)) return false; if (prop == QStringLiteral("objectName") || prop == QStringLiteral("spacerName")) // ### don't store the property objectName -- cgit v1.2.1 From 7fd5d435b76460e42cd25004056a39e05f376baa Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 8 Jan 2020 10:38:38 +0100 Subject: Qt Designer/Palette Editor: Improve the Preview Widget Add more widgets. Most importantly, add an item view with alternate colors to be able to view selection colors. Change-Id: I263ad4b5109e42b3e839892af5fd8d8d7066ca30 Reviewed-by: Jarek Kobus --- .../components/propertyeditor/previewwidget.cpp | 15 + .../src/components/propertyeditor/previewwidget.ui | 404 +++++++++++++-------- 2 files changed, 270 insertions(+), 149 deletions(-) (limited to 'src/designer/src/components') diff --git a/src/designer/src/components/propertyeditor/previewwidget.cpp b/src/designer/src/components/propertyeditor/previewwidget.cpp index cc5a3af31..d041ec9be 100644 --- a/src/designer/src/components/propertyeditor/previewwidget.cpp +++ b/src/designer/src/components/propertyeditor/previewwidget.cpp @@ -28,6 +28,11 @@ #include "previewwidget.h" +#include +#include + +#include + QT_BEGIN_NAMESPACE using namespace qdesigner_internal; @@ -36,6 +41,16 @@ PreviewWidget::PreviewWidget(QWidget *parent) : QWidget(parent) { ui.setupUi(this); + ui.treeWidget->expandAll(); + auto model = ui.treeWidget->model(); + ui.treeWidget->setCurrentIndex(model->index(0, 0, model->index(0, 0))); + auto toolButtonMenu = new QMenu(ui.menuToolButton); + toolButtonMenu->addAction(tr("Option 1")); + toolButtonMenu->addSeparator(); + auto checkable = toolButtonMenu->addAction(tr("Checkable")); + checkable->setCheckable(true); + ui.menuToolButton->setMenu(toolButtonMenu); + ui.menuToolButton->setPopupMode(QToolButton::InstantPopup); } PreviewWidget::~PreviewWidget() = default; diff --git a/src/designer/src/components/propertyeditor/previewwidget.ui b/src/designer/src/components/propertyeditor/previewwidget.ui index fc81c8b85..64c29229f 100644 --- a/src/designer/src/components/propertyeditor/previewwidget.ui +++ b/src/designer/src/components/propertyeditor/previewwidget.ui @@ -1,4 +1,5 @@ - + + ********************************************************************* ** ** Copyright (C) 2016 The Qt Company Ltd. @@ -27,191 +28,296 @@ ** ********************************************************************* qdesigner_internal::PreviewWidget - - + + 0 0 - 471 - 251 + 608 + 367 - - - 1 - 1 + + 0 0 - + Preview Window - - - 9 - - - 6 - - - - - 0 + + + + + Buttons - - 6 - - - - - LineEdit - - - - - - - - ComboBox - - - - - - - - 0 - - - 6 - - - - - - - - PushButton - - - - - - - - - Qt::Horizontal - - - - - - - Qt::Horizontal - - - - - - - - 32767 - 50 - - - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - Qt::Horizontal + + true + + + + + + + RadioButton1 + + + true + + + + + + + RadioButton2 + + + + + + + RadioButton3 + + + + + + + CheckBox1 + + + true + + + + + + + Tristate CheckBox + + + true + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + PushButton + + + + + + + ToggleButton + + + true + + + true + + + false + + + + + + + + + ToolButton + + + + + + + Menu + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + - - - - ButtonGroup2 + + + + Item Views + + + true - - - 9 - - - 6 - + - - - CheckBox1 - - + + true + + + Column 1 + + + + + Top Level 1 + + + + Nested Item 1 + + + + + Nested Item 2 + + + + + Nested Item 3 + + + + + + + + + + Simple Input Widgets + + + true + + + + + + + + LineEdit + + + true + + + + + + + + ComboBox + + + + + Item1 + + + + + Item2 + + + + + + - - - CheckBox2 - - + + + + + + + + Qt::Horizontal + + + + + + + Qt::Horizontal + + + + - - - - ButtonGroup + + + + Display Widgets - - - 9 - - - 6 - + - - - RadioButton1 + + + 50 - - true + + Qt::Horizontal - - - RadioButton2 + + + QLabel - - - RadioButton3 + + + QFrame::StyledPanel + + + QLabel with frame -- cgit v1.2.1 From e3f1d3fef117d6dbf7952995506ef1dec9423067 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 8 Jan 2020 10:06:04 +0100 Subject: Qt Designer/Palette Editor: Set preview palette on QMdiSubWindow Ensure the highlight color (which affects the subwindow border) has a visible effect. Change-Id: Ic4a3e9295aa85fb248546714fd29f02eca2ce2a5 Reviewed-by: Jarek Kobus --- src/designer/src/components/propertyeditor/previewframe.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/designer/src/components') diff --git a/src/designer/src/components/propertyeditor/previewframe.cpp b/src/designer/src/components/propertyeditor/previewframe.cpp index a97e46877..c093663e2 100644 --- a/src/designer/src/components/propertyeditor/previewframe.cpp +++ b/src/designer/src/components/propertyeditor/previewframe.cpp @@ -78,7 +78,7 @@ PreviewFrame::PreviewFrame(QWidget *parent) : void PreviewFrame::setPreviewPalette(const QPalette &pal) { - ensureMdiSubWindow()->widget()->setPalette(pal); + ensureMdiSubWindow()->setPalette(pal); } void PreviewFrame::setSubWindowActive(bool active) -- cgit v1.2.1 From d664b8f6b8689216b844d4716ee06c2cde7b9c2b Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 13 Feb 2020 12:41:32 +0100 Subject: Fix deprecation warnings about QComboBox: deprecate currentIndexChanged(QString) Fix warnings introduced qtbase/11dc7b35c8c3957bd19087a5e3ae7cfc4f1a3343. Task-number: QTBUG-81845 Change-Id: I49169c34ec9aaff3625bcb9dfaef1d29b7beae07 Reviewed-by: Vitaly Fanaskov --- src/designer/src/components/formeditor/dpi_chooser.cpp | 2 +- src/designer/src/components/formeditor/embeddedoptionspage.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/designer/src/components') diff --git a/src/designer/src/components/formeditor/dpi_chooser.cpp b/src/designer/src/components/formeditor/dpi_chooser.cpp index 5e2f9f605..a254bf12a 100644 --- a/src/designer/src/components/formeditor/dpi_chooser.cpp +++ b/src/designer/src/components/formeditor/dpi_chooser.cpp @@ -94,7 +94,7 @@ DPI_Chooser::DPI_Chooser(QWidget *parent) : setFocusProxy(m_predefinedCombo); m_predefinedCombo->setEditable(false); m_predefinedCombo->setCurrentIndex(0); - connect(m_predefinedCombo, QOverload::of(&QComboBox::currentIndexChanged), + connect(m_predefinedCombo, QOverload::of(&QComboBox::currentIndexChanged), this, &DPI_Chooser::syncSpinBoxes); // top row with predefined settings QVBoxLayout *vBoxLayout = new QVBoxLayout; diff --git a/src/designer/src/components/formeditor/embeddedoptionspage.cpp b/src/designer/src/components/formeditor/embeddedoptionspage.cpp index 85cc1f930..062fc6e4f 100644 --- a/src/designer/src/components/formeditor/embeddedoptionspage.cpp +++ b/src/designer/src/components/formeditor/embeddedoptionspage.cpp @@ -145,7 +145,7 @@ void EmbeddedOptionsControlPrivate::init(EmbeddedOptionsControl *q) m_profileCombo->setEditable(false); hLayout->addWidget(m_profileCombo); m_profileCombo->addItem(EmbeddedOptionsControl::tr("None")); - EmbeddedOptionsControl::connect(m_profileCombo, QOverload::of(&QComboBox::currentIndexChanged), + EmbeddedOptionsControl::connect(m_profileCombo, QOverload::of(&QComboBox::currentIndexChanged), m_q, &EmbeddedOptionsControl::slotProfileIndexChanged); m_addButton->setIcon(createIconSet(QString::fromUtf8("plus.png"))); -- cgit v1.2.1 From d15236d9af91b32a43f3b2321eb776f6c2f2bf9c Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 21 Feb 2020 10:08:00 +0100 Subject: Qt Designer: Add missing extra comments to strings from Palette Preview The comment was present on the existing strings. Amends 7fd5d435b76460e42cd25004056a39e05f376baa. Change-Id: Ic5a03c3b63a974956845ad2a3d1fb6c7d4df98a2 Reviewed-by: Jarek Kobus --- .../src/components/propertyeditor/previewwidget.ui | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/designer/src/components') diff --git a/src/designer/src/components/propertyeditor/previewwidget.ui b/src/designer/src/components/propertyeditor/previewwidget.ui index 64c29229f..077ff24b4 100644 --- a/src/designer/src/components/propertyeditor/previewwidget.ui +++ b/src/designer/src/components/propertyeditor/previewwidget.ui @@ -129,7 +129,7 @@ - ToggleButton + ToggleButton true @@ -147,14 +147,14 @@ - ToolButton + ToolButton - Menu + Menu @@ -181,7 +181,7 @@ - Item Views + Item Views true @@ -194,26 +194,26 @@ - Column 1 + Column 1 - Top Level 1 + Top Level 1 - Nested Item 1 + Nested Item 1 - Nested Item 2 + Nested Item 2 - Nested Item 3 + Nested Item 3 @@ -225,7 +225,7 @@ - Simple Input Widgets + Simple Input Widgets true @@ -252,12 +252,12 @@ - Item1 + Item1 - Item2 + Item2 @@ -291,7 +291,7 @@ - Display Widgets + Display Widgets @@ -307,7 +307,7 @@ - QLabel + QLabel @@ -317,7 +317,7 @@ QFrame::StyledPanel - QLabel with frame + QLabel with frame -- cgit v1.2.1 From 60be58eb314349862e09d3fc106bfa23feda170f Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 5 Mar 2020 13:48:14 +0100 Subject: Qt Designer: Fix warnings about deprecated style metrics MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use PM_LayoutLeftMargin, PM_LayoutHorizontalSpacing instead of PM_DefaultChildMargin, PM_DefaultLayoutSpacing, fixing: formeditor/formwindowsettings.cpp:11452: warning: ‘PM_DefaultChildMargin’ is deprecated [-Wdeprecated-declarations] formeditor/formwindowsettings.cpp:116:53: warning: ‘PM_DefaultLayoutSpacing’ is deprecated [-Wdeprecated-declarations] A child widget needs to be passed to PM_LayoutLeftMargin to correctly obtain the child margin. Change-Id: Ided8fb45d2372a56bae3a0304c35339fcc3b83ee Reviewed-by: Volker Hilsheimer --- src/designer/src/components/formeditor/formwindowsettings.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/designer/src/components') diff --git a/src/designer/src/components/formeditor/formwindowsettings.cpp b/src/designer/src/components/formeditor/formwindowsettings.cpp index de03c6792..3e24b7623 100644 --- a/src/designer/src/components/formeditor/formwindowsettings.cpp +++ b/src/designer/src/components/formeditor/formwindowsettings.cpp @@ -108,12 +108,13 @@ void FormWindowData::fromFormWindow(FormWindowBase* fw) defaultMargin = defaultSpacing = INT_MIN; fw->layoutDefault(&defaultMargin, &defaultSpacing); - QStyle *style = fw->formContainer()->style(); + auto container = fw->formContainer(); + QStyle *style = container->style(); layoutDefaultEnabled = defaultMargin != INT_MIN || defaultSpacing != INT_MIN; if (defaultMargin == INT_MIN) - defaultMargin = style->pixelMetric(QStyle::PM_DefaultChildMargin, nullptr); + defaultMargin = style->pixelMetric(QStyle::PM_LayoutLeftMargin, nullptr, container); if (defaultSpacing == INT_MIN) - defaultSpacing = style->pixelMetric(QStyle::PM_DefaultLayoutSpacing, nullptr); + defaultSpacing = style->pixelMetric(QStyle::PM_LayoutHorizontalSpacing, nullptr); marginFunction.clear(); -- cgit v1.2.1