diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-22 13:44:54 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-22 13:58:30 +0200 |
commit | a298a8ea54d5bfe86b64d1ea76eefdaed1786df3 (patch) | |
tree | 84e9437921bbe828fb7472dbfbed0ed435706c3b /src | |
parent | d9a260eabe4a3bd4f4e1e69f0430af2589d45a4f (diff) |
Use QList instead of QVector in uic
Task-number: QTBUG-84469
Change-Id: I2ce8ca51409c8e29a84d88bdda968e6dec419bea
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.cpp | 2 | ||||
-rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.h | 10 | ||||
-rw-r--r-- | src/tools/uic/treewalker.h | 2 | ||||
-rw-r--r-- | src/tools/uic/ui4.cpp | 78 | ||||
-rw-r--r-- | src/tools/uic/ui4.h | 230 | ||||
-rw-r--r-- | src/tools/uic/utils.h | 2 |
6 files changed, 162 insertions, 162 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index a0d6bade85..6d68dc0d78 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -2338,7 +2338,7 @@ void WriteInitialization::initializeTreeWidget(DomWidget *w) conditions an item is needed needs to be done bottom-up, the whole process makes two passes, storing the intermediate result in a recursive StringInitializerListMap. */ -WriteInitialization::Items WriteInitialization::initializeTreeWidgetItems(const QVector<DomItem *> &domItems) +WriteInitialization::Items WriteInitialization::initializeTreeWidgetItems(const QList<DomItem *> &domItems) { // items Items items; diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h index ed8f29d15c..784ef6fe3e 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.h +++ b/src/tools/uic/cpp/cppwriteinitialization.h @@ -88,7 +88,7 @@ namespace CPP { struct WriteInitialization : public TreeWalker { - using DomPropertyList = QVector<DomProperty*>; + using DomPropertyList = QList<DomProperty*>; using DomPropertyMap = QHash<QString, DomProperty*>; WriteInitialization(Uic *uic); @@ -190,7 +190,7 @@ private: }; ItemData m_setupUiData; ItemData m_retranslateUiData; - QVector<Item *> m_children; + QList<Item *> m_children; Item *m_parent = nullptr; const QString m_itemClassName; @@ -199,7 +199,7 @@ private: QTextStream &m_retranslateUiStream; Driver *m_driver; }; - using Items = QVector<Item *>; + using Items = QList<Item *>; void addInitializer(Item *item, const QString &name, int column, const QString &value, const QString &directive = QString(), bool translatable = false) const; @@ -218,7 +218,7 @@ private: void initializeComboBox(DomWidget *w); void initializeListWidget(DomWidget *w); void initializeTreeWidget(DomWidget *w); - Items initializeTreeWidgetItems(const QVector<DomItem *> &domItems); + Items initializeTreeWidgetItems(const QList<DomItem *> &domItems); void initializeTableWidget(DomWidget *w); QString disableSorting(DomWidget *w, const QString &varName); @@ -263,7 +263,7 @@ private: QStack<DomWidget*> m_widgetChain; QStack<DomLayout*> m_layoutChain; QStack<DomActionGroup*> m_actionGroupChain; - QVector<Buddy> m_buddies; + QList<Buddy> m_buddies; QSet<QString> m_buttonGroups; using ColorBrushHash = QHash<uint, QString>; diff --git a/src/tools/uic/treewalker.h b/src/tools/uic/treewalker.h index 6905d74fd9..05b5dbf9fc 100644 --- a/src/tools/uic/treewalker.h +++ b/src/tools/uic/treewalker.h @@ -104,7 +104,7 @@ struct TreeWalker virtual void acceptTime(DomTime *time); virtual void acceptDateTime(DomDateTime *dateTime); virtual void acceptProperty(DomProperty *property); - using DomWidgets = QVector<DomWidget *>; + using DomWidgets = QList<DomWidget *>; virtual void acceptIncludes(DomIncludes *includes); virtual void acceptInclude(DomInclude *incl); virtual void acceptAction(DomAction *action); diff --git a/src/tools/uic/ui4.cpp b/src/tools/uic/ui4.cpp index ed00e2c3fd..a155df9b6c 100644 --- a/src/tools/uic/ui4.cpp +++ b/src/tools/uic/ui4.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -609,7 +609,7 @@ void DomIncludes::write(QXmlStreamWriter &writer, const QString &tagName) const writer.writeEndElement(); } -void DomIncludes::setElementInclude(const QVector<DomInclude *> &a) +void DomIncludes::setElementInclude(const QList<DomInclude *> &a) { m_children |= Include; m_include = a; @@ -720,7 +720,7 @@ void DomResources::write(QXmlStreamWriter &writer, const QString &tagName) const writer.writeEndElement(); } -void DomResources::setElementInclude(const QVector<DomResource *> &a) +void DomResources::setElementInclude(const QList<DomResource *> &a) { m_children |= Include; m_include = a; @@ -850,25 +850,25 @@ void DomActionGroup::write(QXmlStreamWriter &writer, const QString &tagName) con writer.writeEndElement(); } -void DomActionGroup::setElementAction(const QVector<DomAction *> &a) +void DomActionGroup::setElementAction(const QList<DomAction *> &a) { m_children |= Action; m_action = a; } -void DomActionGroup::setElementActionGroup(const QVector<DomActionGroup *> &a) +void DomActionGroup::setElementActionGroup(const QList<DomActionGroup *> &a) { m_children |= ActionGroup; m_actionGroup = a; } -void DomActionGroup::setElementProperty(const QVector<DomProperty *> &a) +void DomActionGroup::setElementProperty(const QList<DomProperty *> &a) { m_children |= Property; m_property = a; } -void DomActionGroup::setElementAttribute(const QVector<DomProperty *> &a) +void DomActionGroup::setElementAttribute(const QList<DomProperty *> &a) { m_children |= Attribute; m_attribute = a; @@ -944,13 +944,13 @@ void DomAction::write(QXmlStreamWriter &writer, const QString &tagName) const writer.writeEndElement(); } -void DomAction::setElementProperty(const QVector<DomProperty *> &a) +void DomAction::setElementProperty(const QList<DomProperty *> &a) { m_children |= Property; m_property = a; } -void DomAction::setElementAttribute(const QVector<DomProperty *> &a) +void DomAction::setElementAttribute(const QList<DomProperty *> &a) { m_children |= Attribute; m_attribute = a; @@ -1058,13 +1058,13 @@ void DomButtonGroup::write(QXmlStreamWriter &writer, const QString &tagName) con writer.writeEndElement(); } -void DomButtonGroup::setElementProperty(const QVector<DomProperty *> &a) +void DomButtonGroup::setElementProperty(const QList<DomProperty *> &a) { m_children |= Property; m_property = a; } -void DomButtonGroup::setElementAttribute(const QVector<DomProperty *> &a) +void DomButtonGroup::setElementAttribute(const QList<DomProperty *> &a) { m_children |= Attribute; m_attribute = a; @@ -1109,7 +1109,7 @@ void DomButtonGroups::write(QXmlStreamWriter &writer, const QString &tagName) co writer.writeEndElement(); } -void DomButtonGroups::setElementButtonGroup(const QVector<DomButtonGroup *> &a) +void DomButtonGroups::setElementButtonGroup(const QList<DomButtonGroup *> &a) { m_children |= ButtonGroup; m_buttonGroup = a; @@ -1154,7 +1154,7 @@ void DomCustomWidgets::write(QXmlStreamWriter &writer, const QString &tagName) c writer.writeEndElement(); } -void DomCustomWidgets::setElementCustomWidget(const QVector<DomCustomWidget *> &a) +void DomCustomWidgets::setElementCustomWidget(const QList<DomCustomWidget *> &a) { m_children |= CustomWidget; m_customWidget = a; @@ -1717,19 +1717,19 @@ void DomLayout::write(QXmlStreamWriter &writer, const QString &tagName) const writer.writeEndElement(); } -void DomLayout::setElementProperty(const QVector<DomProperty *> &a) +void DomLayout::setElementProperty(const QList<DomProperty *> &a) { m_children |= Property; m_property = a; } -void DomLayout::setElementAttribute(const QVector<DomProperty *> &a) +void DomLayout::setElementAttribute(const QList<DomProperty *> &a) { m_children |= Attribute; m_attribute = a; } -void DomLayout::setElementItem(const QVector<DomLayoutItem *> &a) +void DomLayout::setElementItem(const QList<DomLayoutItem *> &a) { m_children |= Item; m_item = a; @@ -1938,7 +1938,7 @@ void DomRow::write(QXmlStreamWriter &writer, const QString &tagName) const writer.writeEndElement(); } -void DomRow::setElementProperty(const QVector<DomProperty *> &a) +void DomRow::setElementProperty(const QList<DomProperty *> &a) { m_children |= Property; m_property = a; @@ -1983,7 +1983,7 @@ void DomColumn::write(QXmlStreamWriter &writer, const QString &tagName) const writer.writeEndElement(); } -void DomColumn::setElementProperty(const QVector<DomProperty *> &a) +void DomColumn::setElementProperty(const QList<DomProperty *> &a) { m_children |= Property; m_property = a; @@ -2059,13 +2059,13 @@ void DomItem::write(QXmlStreamWriter &writer, const QString &tagName) const writer.writeEndElement(); } -void DomItem::setElementProperty(const QVector<DomProperty *> &a) +void DomItem::setElementProperty(const QList<DomProperty *> &a) { m_children |= Property; m_property = a; } -void DomItem::setElementItem(const QVector<DomItem *> &a) +void DomItem::setElementItem(const QList<DomItem *> &a) { m_children |= Item; m_item = a; @@ -2268,61 +2268,61 @@ void DomWidget::setElementClass(const QStringList &a) m_class = a; } -void DomWidget::setElementProperty(const QVector<DomProperty *> &a) +void DomWidget::setElementProperty(const QList<DomProperty *> &a) { m_children |= Property; m_property = a; } -void DomWidget::setElementAttribute(const QVector<DomProperty *> &a) +void DomWidget::setElementAttribute(const QList<DomProperty *> &a) { m_children |= Attribute; m_attribute = a; } -void DomWidget::setElementRow(const QVector<DomRow *> &a) +void DomWidget::setElementRow(const QList<DomRow *> &a) { m_children |= Row; m_row = a; } -void DomWidget::setElementColumn(const QVector<DomColumn *> &a) +void DomWidget::setElementColumn(const QList<DomColumn *> &a) { m_children |= Column; m_column = a; } -void DomWidget::setElementItem(const QVector<DomItem *> &a) +void DomWidget::setElementItem(const QList<DomItem *> &a) { m_children |= Item; m_item = a; } -void DomWidget::setElementLayout(const QVector<DomLayout *> &a) +void DomWidget::setElementLayout(const QList<DomLayout *> &a) { m_children |= Layout; m_layout = a; } -void DomWidget::setElementWidget(const QVector<DomWidget *> &a) +void DomWidget::setElementWidget(const QList<DomWidget *> &a) { m_children |= Widget; m_widget = a; } -void DomWidget::setElementAction(const QVector<DomAction *> &a) +void DomWidget::setElementAction(const QList<DomAction *> &a) { m_children |= Action; m_action = a; } -void DomWidget::setElementActionGroup(const QVector<DomActionGroup *> &a) +void DomWidget::setElementActionGroup(const QList<DomActionGroup *> &a) { m_children |= ActionGroup; m_actionGroup = a; } -void DomWidget::setElementAddAction(const QVector<DomActionRef *> &a) +void DomWidget::setElementAddAction(const QList<DomActionRef *> &a) { m_children |= AddAction; m_addAction = a; @@ -2386,7 +2386,7 @@ void DomSpacer::write(QXmlStreamWriter &writer, const QString &tagName) const writer.writeEndElement(); } -void DomSpacer::setElementProperty(const QVector<DomProperty *> &a) +void DomSpacer::setElementProperty(const QList<DomProperty *> &a) { m_children |= Property; m_property = a; @@ -2694,7 +2694,7 @@ void DomGradient::write(QXmlStreamWriter &writer, const QString &tagName) const writer.writeEndElement(); } -void DomGradient::setElementGradientStop(const QVector<DomGradientStop *> &a) +void DomGradient::setElementGradientStop(const QList<DomGradientStop *> &a) { m_children |= GradientStop; m_gradientStop = a; @@ -2959,13 +2959,13 @@ void DomColorGroup::write(QXmlStreamWriter &writer, const QString &tagName) cons writer.writeEndElement(); } -void DomColorGroup::setElementColorRole(const QVector<DomColorRole *> &a) +void DomColorGroup::setElementColorRole(const QList<DomColorRole *> &a) { m_children |= ColorRole; m_colorRole = a; } -void DomColorGroup::setElementColor(const QVector<DomColor *> &a) +void DomColorGroup::setElementColor(const QList<DomColor *> &a) { m_children |= Color; m_color = a; @@ -5687,7 +5687,7 @@ void DomConnections::write(QXmlStreamWriter &writer, const QString &tagName) con writer.writeEndElement(); } -void DomConnections::setElementConnection(const QVector<DomConnection *> &a) +void DomConnections::setElementConnection(const QList<DomConnection *> &a) { m_children |= Connection; m_connection = a; @@ -5864,7 +5864,7 @@ void DomConnectionHints::write(QXmlStreamWriter &writer, const QString &tagName) writer.writeEndElement(); } -void DomConnectionHints::setElementHint(const QVector<DomConnectionHint *> &a) +void DomConnectionHints::setElementHint(const QList<DomConnectionHint *> &a) { m_children |= Hint; m_hint = a; @@ -5984,7 +5984,7 @@ void DomDesignerData::write(QXmlStreamWriter &writer, const QString &tagName) co writer.writeEndElement(); } -void DomDesignerData::setElementProperty(const QVector<DomProperty *> &a) +void DomDesignerData::setElementProperty(const QList<DomProperty *> &a) { m_children |= Property; m_property = a; @@ -6096,13 +6096,13 @@ void DomPropertySpecifications::write(QXmlStreamWriter &writer, const QString &t writer.writeEndElement(); } -void DomPropertySpecifications::setElementTooltip(const QVector<DomPropertyToolTip *> &a) +void DomPropertySpecifications::setElementTooltip(const QList<DomPropertyToolTip *> &a) { m_children |= Tooltip; m_tooltip = a; } -void DomPropertySpecifications::setElementStringpropertyspecification(const QVector<DomStringPropertySpecification *> &a) +void DomPropertySpecifications::setElementStringpropertyspecification(const QList<DomStringPropertySpecification *> &a) { m_children |= Stringpropertyspecification; m_stringpropertyspecification = a; diff --git a/src/tools/uic/ui4.h b/src/tools/uic/ui4.h index 90b17f7027..3e0e09a4e0 100644 --- a/src/tools/uic/ui4.h +++ b/src/tools/uic/ui4.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. @@ -348,14 +348,14 @@ public: void write(QXmlStreamWriter &writer, const QString &tagName = QString()) const; // child element accessors - inline QVector<DomInclude *> elementInclude() const { return m_include; } - void setElementInclude(const QVector<DomInclude *> &a); + inline QList<DomInclude *> elementInclude() const { return m_include; } + void setElementInclude(const QList<DomInclude *> &a); private: // child element data uint m_children = 0; - QVector<DomInclude *> m_include; + QList<DomInclude *> m_include; enum Child { Include = 1 @@ -412,8 +412,8 @@ public: inline void clearAttributeName() { m_has_attr_name = false; } // child element accessors - inline QVector<DomResource *> elementInclude() const { return m_include; } - void setElementInclude(const QVector<DomResource *> &a); + inline QList<DomResource *> elementInclude() const { return m_include; } + void setElementInclude(const QList<DomResource *> &a); private: // attribute data @@ -422,7 +422,7 @@ private: // child element data uint m_children = 0; - QVector<DomResource *> m_include; + QList<DomResource *> m_include; enum Child { Include = 1 @@ -466,17 +466,17 @@ public: inline void clearAttributeName() { m_has_attr_name = false; } // child element accessors - inline QVector<DomAction *> elementAction() const { return m_action; } - void setElementAction(const QVector<DomAction *> &a); + inline QList<DomAction *> elementAction() const { return m_action; } + void setElementAction(const QList<DomAction *> &a); - inline QVector<DomActionGroup *> elementActionGroup() const { return m_actionGroup; } - void setElementActionGroup(const QVector<DomActionGroup *> &a); + inline QList<DomActionGroup *> elementActionGroup() const { return m_actionGroup; } + void setElementActionGroup(const QList<DomActionGroup *> &a); - inline QVector<DomProperty *> elementProperty() const { return m_property; } - void setElementProperty(const QVector<DomProperty *> &a); + inline QList<DomProperty *> elementProperty() const { return m_property; } + void setElementProperty(const QList<DomProperty *> &a); - inline QVector<DomProperty *> elementAttribute() const { return m_attribute; } - void setElementAttribute(const QVector<DomProperty *> &a); + inline QList<DomProperty *> elementAttribute() const { return m_attribute; } + void setElementAttribute(const QList<DomProperty *> &a); private: // attribute data @@ -485,10 +485,10 @@ private: // child element data uint m_children = 0; - QVector<DomAction *> m_action; - QVector<DomActionGroup *> m_actionGroup; - QVector<DomProperty *> m_property; - QVector<DomProperty *> m_attribute; + QList<DomAction *> m_action; + QList<DomActionGroup *> m_actionGroup; + QList<DomProperty *> m_property; + QList<DomProperty *> m_attribute; enum Child { Action = 1, @@ -519,11 +519,11 @@ public: inline void clearAttributeMenu() { m_has_attr_menu = false; } // child element accessors - inline QVector<DomProperty *> elementProperty() const { return m_property; } - void setElementProperty(const QVector<DomProperty *> &a); + inline QList<DomProperty *> elementProperty() const { return m_property; } + void setElementProperty(const QList<DomProperty *> &a); - inline QVector<DomProperty *> elementAttribute() const { return m_attribute; } - void setElementAttribute(const QVector<DomProperty *> &a); + inline QList<DomProperty *> elementAttribute() const { return m_attribute; } + void setElementAttribute(const QList<DomProperty *> &a); private: // attribute data @@ -535,8 +535,8 @@ private: // child element data uint m_children = 0; - QVector<DomProperty *> m_property; - QVector<DomProperty *> m_attribute; + QList<DomProperty *> m_property; + QList<DomProperty *> m_attribute; enum Child { Property = 1, @@ -581,11 +581,11 @@ public: inline void clearAttributeName() { m_has_attr_name = false; } // child element accessors - inline QVector<DomProperty *> elementProperty() const { return m_property; } - void setElementProperty(const QVector<DomProperty *> &a); + inline QList<DomProperty *> elementProperty() const { return m_property; } + void setElementProperty(const QList<DomProperty *> &a); - inline QVector<DomProperty *> elementAttribute() const { return m_attribute; } - void setElementAttribute(const QVector<DomProperty *> &a); + inline QList<DomProperty *> elementAttribute() const { return m_attribute; } + void setElementAttribute(const QList<DomProperty *> &a); private: // attribute data @@ -594,8 +594,8 @@ private: // child element data uint m_children = 0; - QVector<DomProperty *> m_property; - QVector<DomProperty *> m_attribute; + QList<DomProperty *> m_property; + QList<DomProperty *> m_attribute; enum Child { Property = 1, @@ -613,14 +613,14 @@ public: void write(QXmlStreamWriter &writer, const QString &tagName = QString()) const; // child element accessors - inline QVector<DomButtonGroup *> elementButtonGroup() const { return m_buttonGroup; } - void setElementButtonGroup(const QVector<DomButtonGroup *> &a); + inline QList<DomButtonGroup *> elementButtonGroup() const { return m_buttonGroup; } + void setElementButtonGroup(const QList<DomButtonGroup *> &a); private: // child element data uint m_children = 0; - QVector<DomButtonGroup *> m_buttonGroup; + QList<DomButtonGroup *> m_buttonGroup; enum Child { ButtonGroup = 1 @@ -637,14 +637,14 @@ public: void write(QXmlStreamWriter &writer, const QString &tagName = QString()) const; // child element accessors - inline QVector<DomCustomWidget *> elementCustomWidget() const { return m_customWidget; } - void setElementCustomWidget(const QVector<DomCustomWidget *> &a); + inline QList<DomCustomWidget *> elementCustomWidget() const { return m_customWidget; } + void setElementCustomWidget(const QList<DomCustomWidget *> &a); private: // child element data uint m_children = 0; - QVector<DomCustomWidget *> m_customWidget; + QList<DomCustomWidget *> m_customWidget; enum Child { CustomWidget = 1 @@ -891,14 +891,14 @@ public: inline void clearAttributeColumnMinimumWidth() { m_has_attr_columnMinimumWidth = false; } // child element accessors - inline QVector<DomProperty *> elementProperty() const { return m_property; } - void setElementProperty(const QVector<DomProperty *> &a); + inline QList<DomProperty *> elementProperty() const { return m_property; } + void setElementProperty(const QList<DomProperty *> &a); - inline QVector<DomProperty *> elementAttribute() const { return m_attribute; } - void setElementAttribute(const QVector<DomProperty *> &a); + inline QList<DomProperty *> elementAttribute() const { return m_attribute; } + void setElementAttribute(const QList<DomProperty *> &a); - inline QVector<DomLayoutItem *> elementItem() const { return m_item; } - void setElementItem(const QVector<DomLayoutItem *> &a); + inline QList<DomLayoutItem *> elementItem() const { return m_item; } + void setElementItem(const QList<DomLayoutItem *> &a); private: // attribute data @@ -925,9 +925,9 @@ private: // child element data uint m_children = 0; - QVector<DomProperty *> m_property; - QVector<DomProperty *> m_attribute; - QVector<DomLayoutItem *> m_item; + QList<DomProperty *> m_property; + QList<DomProperty *> m_attribute; + QList<DomLayoutItem *> m_item; enum Child { Property = 1, @@ -1023,14 +1023,14 @@ public: void write(QXmlStreamWriter &writer, const QString &tagName = QString()) const; // child element accessors - inline QVector<DomProperty *> elementProperty() const { return m_property; } - void setElementProperty(const QVector<DomProperty *> &a); + inline QList<DomProperty *> elementProperty() const { return m_property; } + void setElementProperty(const QList<DomProperty *> &a); private: // child element data uint m_children = 0; - QVector<DomProperty *> m_property; + QList<DomProperty *> m_property; enum Child { Property = 1 @@ -1047,14 +1047,14 @@ public: void write(QXmlStreamWriter &writer, const QString &tagName = QString()) const; // child element accessors - inline QVector<DomProperty *> elementProperty() const { return m_property; } - void setElementProperty(const QVector<DomProperty *> &a); + inline QList<DomProperty *> elementProperty() const { return m_property; } + void setElementProperty(const QList<DomProperty *> &a); private: // child element data uint m_children = 0; - QVector<DomProperty *> m_property; + QList<DomProperty *> m_property; enum Child { Property = 1 @@ -1082,11 +1082,11 @@ public: inline void clearAttributeColumn() { m_has_attr_column = false; } // child element accessors - inline QVector<DomProperty *> elementProperty() const { return m_property; } - void setElementProperty(const QVector<DomProperty *> &a); + inline QList<DomProperty *> elementProperty() const { return m_property; } + void setElementProperty(const QList<DomProperty *> &a); - inline QVector<DomItem *> elementItem() const { return m_item; } - void setElementItem(const QVector<DomItem *> &a); + inline QList<DomItem *> elementItem() const { return m_item; } + void setElementItem(const QList<DomItem *> &a); private: // attribute data @@ -1098,8 +1098,8 @@ private: // child element data uint m_children = 0; - QVector<DomProperty *> m_property; - QVector<DomItem *> m_item; + QList<DomProperty *> m_property; + QList<DomItem *> m_item; enum Child { Property = 1, @@ -1136,35 +1136,35 @@ public: inline QStringList elementClass() const { return m_class; } void setElementClass(const QStringList &a); - inline QVector<DomProperty *> elementProperty() const { return m_property; } - void setElementProperty(const QVector<DomProperty *> &a); + inline QList<DomProperty *> elementProperty() const { return m_property; } + void setElementProperty(const QList<DomProperty *> &a); - inline QVector<DomProperty *> elementAttribute() const { return m_attribute; } - void setElementAttribute(const QVector<DomProperty *> &a); + inline QList<DomProperty *> elementAttribute() const { return m_attribute; } + void setElementAttribute(const QList<DomProperty *> &a); - inline QVector<DomRow *> elementRow() const { return m_row; } - void setElementRow(const QVector<DomRow *> &a); + inline QList<DomRow *> elementRow() const { return m_row; } + void setElementRow(const QList<DomRow *> &a); - inline QVector<DomColumn *> elementColumn() const { return m_column; } - void setElementColumn(const QVector<DomColumn *> &a); + inline QList<DomColumn *> elementColumn() const { return m_column; } + void setElementColumn(const QList<DomColumn *> &a); - inline QVector<DomItem *> elementItem() const { return m_item; } - void setElementItem(const QVector<DomItem *> &a); + inline QList<DomItem *> elementItem() const { return m_item; } + void setElementItem(const QList<DomItem *> &a); - inline QVector<DomLayout *> elementLayout() const { return m_layout; } - void setElementLayout(const QVector<DomLayout *> &a); + inline QList<DomLayout *> elementLayout() const { return m_layout; } + void setElementLayout(const QList<DomLayout *> &a); - inline QVector<DomWidget *> elementWidget() const { return m_widget; } - void setElementWidget(const QVector<DomWidget *> &a); + inline QList<DomWidget *> elementWidget() const { return m_widget; } + void setElementWidget(const QList<DomWidget *> &a); - inline QVector<DomAction *> elementAction() const { return m_action; } - void setElementAction(const QVector<DomAction *> &a); + inline QList<DomAction *> elementAction() const { return m_action; } + void setElementAction(const QList<DomAction *> &a); - inline QVector<DomActionGroup *> elementActionGroup() const { return m_actionGroup; } - void setElementActionGroup(const QVector<DomActionGroup *> &a); + inline QList<DomActionGroup *> elementActionGroup() const { return m_actionGroup; } + void setElementActionGroup(const QList<DomActionGroup *> &a); - inline QVector<DomActionRef *> elementAddAction() const { return m_addAction; } - void setElementAddAction(const QVector<DomActionRef *> &a); + inline QList<DomActionRef *> elementAddAction() const { return m_addAction; } + void setElementAddAction(const QList<DomActionRef *> &a); inline QStringList elementZOrder() const { return m_zOrder; } void setElementZOrder(const QStringList &a); @@ -1183,16 +1183,16 @@ private: // child element data uint m_children = 0; QStringList m_class; - QVector<DomProperty *> m_property; - QVector<DomProperty *> m_attribute; - QVector<DomRow *> m_row; - QVector<DomColumn *> m_column; - QVector<DomItem *> m_item; - QVector<DomLayout *> m_layout; - QVector<DomWidget *> m_widget; - QVector<DomAction *> m_action; - QVector<DomActionGroup *> m_actionGroup; - QVector<DomActionRef *> m_addAction; + QList<DomProperty *> m_property; + QList<DomProperty *> m_attribute; + QList<DomRow *> m_row; + QList<DomColumn *> m_column; + QList<DomItem *> m_item; + QList<DomLayout *> m_layout; + QList<DomWidget *> m_widget; + QList<DomAction *> m_action; + QList<DomActionGroup *> m_actionGroup; + QList<DomActionRef *> m_addAction; QStringList m_zOrder; enum Child { @@ -1227,8 +1227,8 @@ public: inline void clearAttributeName() { m_has_attr_name = false; } // child element accessors - inline QVector<DomProperty *> elementProperty() const { return m_property; } - void setElementProperty(const QVector<DomProperty *> &a); + inline QList<DomProperty *> elementProperty() const { return m_property; } + void setElementProperty(const QList<DomProperty *> &a); private: // attribute data @@ -1237,7 +1237,7 @@ private: // child element data uint m_children = 0; - QVector<DomProperty *> m_property; + QList<DomProperty *> m_property; enum Child { Property = 1 @@ -1405,8 +1405,8 @@ public: inline void clearAttributeCoordinateMode() { m_has_attr_coordinateMode = false; } // child element accessors - inline QVector<DomGradientStop *> elementGradientStop() const { return m_gradientStop; } - void setElementGradientStop(const QVector<DomGradientStop *> &a); + inline QList<DomGradientStop *> elementGradientStop() const { return m_gradientStop; } + void setElementGradientStop(const QList<DomGradientStop *> &a); private: // attribute data @@ -1451,7 +1451,7 @@ private: // child element data uint m_children = 0; - QVector<DomGradientStop *> m_gradientStop; + QList<DomGradientStop *> m_gradientStop; enum Child { GradientStop = 1 @@ -1549,18 +1549,18 @@ public: void write(QXmlStreamWriter &writer, const QString &tagName = QString()) const; // child element accessors - inline QVector<DomColorRole *> elementColorRole() const { return m_colorRole; } - void setElementColorRole(const QVector<DomColorRole *> &a); + inline QList<DomColorRole *> elementColorRole() const { return m_colorRole; } + void setElementColorRole(const QList<DomColorRole *> &a); - inline QVector<DomColor *> elementColor() const { return m_color; } - void setElementColor(const QVector<DomColor *> &a); + inline QList<DomColor *> elementColor() const { return m_color; } + void setElementColor(const QList<DomColor *> &a); private: // child element data uint m_children = 0; - QVector<DomColorRole *> m_colorRole; - QVector<DomColor *> m_color; + QList<DomColorRole *> m_colorRole; + QList<DomColor *> m_color; enum Child { ColorRole = 1, @@ -2660,14 +2660,14 @@ public: void write(QXmlStreamWriter &writer, const QString &tagName = QString()) const; // child element accessors - inline QVector<DomConnection *> elementConnection() const { return m_connection; } - void setElementConnection(const QVector<DomConnection *> &a); + inline QList<DomConnection *> elementConnection() const { return m_connection; } + void setElementConnection(const QList<DomConnection *> &a); private: // child element data uint m_children = 0; - QVector<DomConnection *> m_connection; + QList<DomConnection *> m_connection; enum Child { Connection = 1 @@ -2739,14 +2739,14 @@ public: void write(QXmlStreamWriter &writer, const QString &tagName = QString()) const; // child element accessors - inline QVector<DomConnectionHint *> elementHint() const { return m_hint; } - void setElementHint(const QVector<DomConnectionHint *> &a); + inline QList<DomConnectionHint *> elementHint() const { return m_hint; } + void setElementHint(const QList<DomConnectionHint *> &a); private: // child element data uint m_children = 0; - QVector<DomConnectionHint *> m_hint; + QList<DomConnectionHint *> m_hint; enum Child { Hint = 1 @@ -2805,14 +2805,14 @@ public: void write(QXmlStreamWriter &writer, const QString &tagName = QString()) const; // child element accessors - inline QVector<DomProperty *> elementProperty() const { return m_property; } - void setElementProperty(const QVector<DomProperty *> &a); + inline QList<DomProperty *> elementProperty() const { return m_property; } + void setElementProperty(const QList<DomProperty *> &a); private: // child element data uint m_children = 0; - QVector<DomProperty *> m_property; + QList<DomProperty *> m_property; enum Child { Property = 1 @@ -2858,18 +2858,18 @@ public: void write(QXmlStreamWriter &writer, const QString &tagName = QString()) const; // child element accessors - inline QVector<DomPropertyToolTip *> elementTooltip() const { return m_tooltip; } - void setElementTooltip(const QVector<DomPropertyToolTip *> &a); + inline QList<DomPropertyToolTip *> elementTooltip() const { return m_tooltip; } + void setElementTooltip(const QList<DomPropertyToolTip *> &a); - inline QVector<DomStringPropertySpecification *> elementStringpropertyspecification() const { return m_stringpropertyspecification; } - void setElementStringpropertyspecification(const QVector<DomStringPropertySpecification *> &a); + inline QList<DomStringPropertySpecification *> elementStringpropertyspecification() const { return m_stringpropertyspecification; } + void setElementStringpropertyspecification(const QList<DomStringPropertySpecification *> &a); private: // child element data uint m_children = 0; - QVector<DomPropertyToolTip *> m_tooltip; - QVector<DomStringPropertySpecification *> m_stringpropertyspecification; + QList<DomPropertyToolTip *> m_tooltip; + QList<DomStringPropertySpecification *> m_stringpropertyspecification; enum Child { Tooltip = 1, diff --git a/src/tools/uic/utils.h b/src/tools/uic/utils.h index bd543c7bb7..34c4ab23d4 100644 --- a/src/tools/uic/utils.h +++ b/src/tools/uic/utils.h @@ -42,7 +42,7 @@ inline bool toBool(const QString &str) inline QString toString(const DomString *str) { return str ? str->text() : QString(); } -inline QHash<QString, DomProperty *> propertyMap(const QVector<DomProperty *> &properties) +inline QHash<QString, DomProperty *> propertyMap(const QList<DomProperty *> &properties) { QHash<QString, DomProperty *> map; for (DomProperty *p : properties) |