From 46458ce3ef4aeb01fef97348dcd317f0edd7e5fb Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 22 Mar 2017 11:04:42 +0100 Subject: uic: Port Ui classes to QVector Regenerate the ui4* files after a change in qttools replacing QList by QVector in the Dom* classes with the exception of QList since that affects the public interfaces of QAbstractFormBuilder. Change-Id: I0922127fb911a5abc125d93ef97a0b22ff94788a Reviewed-by: Jarek Kobus --- src/tools/uic/cpp/cppwriteinitialization.cpp | 30 +- src/tools/uic/cpp/cppwriteinitialization.h | 2 +- src/tools/uic/treewalker.cpp | 11 +- src/tools/uic/treewalker.h | 4 +- src/tools/uic/ui4.cpp | 54 ++-- src/tools/uic/ui4.h | 427 ++++++++++----------------- 6 files changed, 197 insertions(+), 331 deletions(-) (limited to 'src') diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index bbef010a9c..1e4a963698 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -590,15 +590,15 @@ void WriteInitialization::addWizardPage(const QString &pageVarName, const DomWid /* If the node has a (free-format) string "pageId" attribute (which could * an integer or an enumeration value), use setPage(), else addPage(). */ QString id; - const DomPropertyList attributes = page->elementAttribute(); + const auto &attributes = page->elementAttribute(); if (!attributes.empty()) { - const DomPropertyList::const_iterator acend = attributes.constEnd(); - for (DomPropertyList::const_iterator it = attributes.constBegin(); it != acend; ++it) - if ((*it)->attributeName() == QLatin1String("pageId")) { - if (const DomString *ds = (*it)->elementString()) + for (const DomProperty *p : attributes) { + if (p->attributeName() == QLatin1String("pageId")) { + if (const DomString *ds = p->elementString()) id = ds->text(); break; } + } } if (id.isEmpty()) { m_output << m_indent << parentWidget << "->addPage(" << pageVarName << ");\n"; @@ -1707,7 +1707,7 @@ void WriteInitialization::writeColorGroup(DomColorGroup *colorGroup, const QStri return; // old format - const QList colors = colorGroup->elementColor(); + const auto &colors = colorGroup->elementColor(); for (int i=0; i colorRoles = colorGroup->elementColorRole(); + const auto &colorRoles = colorGroup->elementColorRole(); for (const DomColorRole *colorRole : colorRoles) { if (colorRole->hasAttributeRole()) { const QString brushName = writeBrushInitialization(colorRole->elementBrush()); @@ -1795,7 +1795,7 @@ void WriteInitialization::writeBrush(const DomBrush *brush, const QString &brush << gradient->attributeCoordinateMode() << ");\n"; } - const QList stops = gradient->elementGradientStop(); + const auto &stops = gradient->elementGradientStop(); for (const DomGradientStop *stop : stops) { const DomColor *color = stop->elementColor(); m_output << m_indent << gradientName << ".setColorAt(" @@ -1928,7 +1928,7 @@ void WriteInitialization::initializeComboBox(DomWidget *w) const QString varName = m_driver->findOrInsertWidget(w); const QString className = w->attributeClass(); - const QList items = w->elementItem(); + const auto &items = w->elementItem(); if (items.isEmpty()) return; @@ -2119,7 +2119,7 @@ void WriteInitialization::initializeListWidget(DomWidget *w) const QString varName = m_driver->findOrInsertWidget(w); const QString className = w->attributeClass(); - const QList items = w->elementItem(); + const auto &items = w->elementItem(); if (items.isEmpty()) return; @@ -2149,7 +2149,7 @@ void WriteInitialization::initializeTreeWidget(DomWidget *w) // columns Item item(QLatin1String("QTreeWidgetItem"), m_indent, m_output, m_refreshOut, m_driver); - const QList columns = w->elementColumn(); + const auto &columns = w->elementColumn(); for (int i = 0; i < columns.size(); ++i) { const DomColumn *column = columns.at(i); @@ -2192,7 +2192,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. */ -QList WriteInitialization::initializeTreeWidgetItems(const QList &domItems) +QList WriteInitialization::initializeTreeWidgetItems(const QVector &domItems) { // items QList items; @@ -2236,7 +2236,7 @@ void WriteInitialization::initializeTableWidget(DomWidget *w) const QString varName = m_driver->findOrInsertWidget(w); // columns - const QList columns = w->elementColumn(); + const auto &columns = w->elementColumn(); if (columns.size() != 0) { m_output << m_indent << "if (" << varName << "->columnCount() < " << columns.size() << ")\n" @@ -2258,7 +2258,7 @@ void WriteInitialization::initializeTableWidget(DomWidget *w) } // rows - const QList rows = w->elementRow(); + const auto &rows = w->elementRow(); if (rows.size() != 0) { m_output << m_indent << "if (" << varName << "->rowCount() < " << rows.size() << ")\n" @@ -2282,7 +2282,7 @@ void WriteInitialization::initializeTableWidget(DomWidget *w) // items QString tempName = disableSorting(w, varName); - const QList items = w->elementItem(); + const auto &items = w->elementItem(); for (int i = 0; i < items.size(); ++i) { const DomItem *cell = items.at(i); diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h index a9691e1de4..5e7ec200b7 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.h +++ b/src/tools/uic/cpp/cppwriteinitialization.h @@ -221,7 +221,7 @@ private: void initializeComboBox(DomWidget *w); void initializeListWidget(DomWidget *w); void initializeTreeWidget(DomWidget *w); - QList initializeTreeWidgetItems(const QList &domItems); + QList initializeTreeWidgetItems(const QVector &domItems); void initializeTableWidget(DomWidget *w); QString disableSorting(DomWidget *w, const QString &varName); diff --git a/src/tools/uic/treewalker.cpp b/src/tools/uic/treewalker.cpp index eb9f1c02f8..044d0f0228 100644 --- a/src/tools/uic/treewalker.cpp +++ b/src/tools/uic/treewalker.cpp @@ -113,8 +113,7 @@ void TreeWalker::acceptWidget(DomWidget *widget) if (!widget->elementLayout().isEmpty()) acceptLayout(widget->elementLayout().at(0)); - const DomScripts scripts(widget->elementScript()); - acceptWidgetScripts(scripts, widget, childWidgets); + acceptWidgetScripts(widget->elementScript(), widget, childWidgets); } void TreeWalker::acceptSpacer(DomSpacer *spacer) @@ -301,11 +300,9 @@ void TreeWalker::acceptWidgetScripts(const DomScripts &, DomWidget *, const Dom void TreeWalker::acceptButtonGroups(const DomButtonGroups *domButtonGroups) { - typedef QList DomButtonGroupList; - const DomButtonGroupList domGroups = domButtonGroups->elementButtonGroup(); - const DomButtonGroupList::const_iterator cend = domGroups.constEnd(); - for (DomButtonGroupList::const_iterator it = domGroups.constBegin(); it != cend; ++it) - acceptButtonGroup(*it); + const auto &domGroups = domButtonGroups->elementButtonGroup(); + for (const DomButtonGroup *g : domGroups) + acceptButtonGroup(g); } void TreeWalker::acceptButtonGroup(const DomButtonGroup *) diff --git a/src/tools/uic/treewalker.h b/src/tools/uic/treewalker.h index 0739f5138c..8f80880dd0 100644 --- a/src/tools/uic/treewalker.h +++ b/src/tools/uic/treewalker.h @@ -101,8 +101,8 @@ struct TreeWalker virtual void acceptTime(DomTime *time); virtual void acceptDateTime(DomDateTime *dateTime); virtual void acceptProperty(DomProperty *property); - typedef QList DomScripts; - typedef QList DomWidgets; + typedef QVector DomScripts; + typedef QVector DomWidgets; virtual void acceptWidgetScripts(const DomScripts &, DomWidget *node, const DomWidgets &childWidgets); virtual void acceptImages(DomImages *images); virtual void acceptImage(DomImage *image); diff --git a/src/tools/uic/ui4.cpp b/src/tools/uic/ui4.cpp index 5a609ef42b..c9cc79725f 100644 --- a/src/tools/uic/ui4.cpp +++ b/src/tools/uic/ui4.cpp @@ -740,7 +740,7 @@ void DomIncludes::write(QXmlStreamWriter &writer, const QString &tagName) const writer.writeEndElement(); } -void DomIncludes::setElementInclude(const QList& a) +void DomIncludes::setElementInclude(const QVector& a) { m_children |= Include; m_include = a; @@ -904,7 +904,7 @@ void DomResources::write(QXmlStreamWriter &writer, const QString &tagName) const writer.writeEndElement(); } -void DomResources::setElementInclude(const QList& a) +void DomResources::setElementInclude(const QVector& a) { m_children |= Include; m_include = a; @@ -1100,13 +1100,13 @@ void DomActionGroup::write(QXmlStreamWriter &writer, const QString &tagName) con writer.writeEndElement(); } -void DomActionGroup::setElementAction(const QList& a) +void DomActionGroup::setElementAction(const QVector& a) { m_children |= Action; m_action = a; } -void DomActionGroup::setElementActionGroup(const QList& a) +void DomActionGroup::setElementActionGroup(const QVector& a) { m_children |= ActionGroup; m_actionGroup = a; @@ -1480,7 +1480,7 @@ void DomButtonGroups::write(QXmlStreamWriter &writer, const QString &tagName) co writer.writeEndElement(); } -void DomButtonGroups::setElementButtonGroup(const QList& a) +void DomButtonGroups::setElementButtonGroup(const QVector& a) { m_children |= ButtonGroup; m_buttonGroup = a; @@ -1552,7 +1552,7 @@ void DomImages::write(QXmlStreamWriter &writer, const QString &tagName) const writer.writeEndElement(); } -void DomImages::setElementImage(const QList& a) +void DomImages::setElementImage(const QVector& a) { m_children |= Image; m_image = a; @@ -1806,7 +1806,7 @@ void DomCustomWidgets::write(QXmlStreamWriter &writer, const QString &tagName) c writer.writeEndElement(); } -void DomCustomWidgets::setElementCustomWidget(const QList& a) +void DomCustomWidgets::setElementCustomWidget(const QVector& a) { m_children |= CustomWidget; m_customWidget = a; @@ -2347,7 +2347,7 @@ void DomProperties::write(QXmlStreamWriter &writer, const QString &tagName) cons writer.writeEndElement(); } -void DomProperties::setElementProperty(const QList& a) +void DomProperties::setElementProperty(const QVector& a) { m_children |= Property; m_property = a; @@ -2913,7 +2913,7 @@ void DomLayout::setElementAttribute(const QList& a) m_attribute = a; } -void DomLayout::setElementItem(const QList& a) +void DomLayout::setElementItem(const QVector& a) { m_children |= Item; m_item = a; @@ -3387,7 +3387,7 @@ void DomItem::setElementProperty(const QList& a) m_property = a; } -void DomItem::setElementItem(const QList& a) +void DomItem::setElementItem(const QVector& a) { m_children |= Item; m_item = a; @@ -3680,13 +3680,13 @@ void DomWidget::setElementProperty(const QList& a) m_property = a; } -void DomWidget::setElementScript(const QList& a) +void DomWidget::setElementScript(const QVector& a) { m_children |= Script; m_script = a; } -void DomWidget::setElementWidgetData(const QList& a) +void DomWidget::setElementWidgetData(const QVector& a) { m_children |= WidgetData; m_widgetData = a; @@ -3698,49 +3698,49 @@ void DomWidget::setElementAttribute(const QList& a) m_attribute = a; } -void DomWidget::setElementRow(const QList& a) +void DomWidget::setElementRow(const QVector& a) { m_children |= Row; m_row = a; } -void DomWidget::setElementColumn(const QList& a) +void DomWidget::setElementColumn(const QVector& a) { m_children |= Column; m_column = a; } -void DomWidget::setElementItem(const QList& a) +void DomWidget::setElementItem(const QVector& a) { m_children |= Item; m_item = a; } -void DomWidget::setElementLayout(const QList& a) +void DomWidget::setElementLayout(const QVector& a) { m_children |= Layout; m_layout = a; } -void DomWidget::setElementWidget(const QList& a) +void DomWidget::setElementWidget(const QVector& a) { m_children |= Widget; m_widget = a; } -void DomWidget::setElementAction(const QList& a) +void DomWidget::setElementAction(const QVector& a) { m_children |= Action; m_action = a; } -void DomWidget::setElementActionGroup(const QList& a) +void DomWidget::setElementActionGroup(const QVector& a) { m_children |= ActionGroup; m_actionGroup = a; } -void DomWidget::setElementAddAction(const QList& a) +void DomWidget::setElementAddAction(const QVector& a) { m_children |= AddAction; m_addAction = a; @@ -4285,7 +4285,7 @@ void DomGradient::write(QXmlStreamWriter &writer, const QString &tagName) const writer.writeEndElement(); } -void DomGradient::setElementGradientStop(const QList& a) +void DomGradient::setElementGradientStop(const QVector& a) { m_children |= GradientStop; m_gradientStop = a; @@ -4640,13 +4640,13 @@ void DomColorGroup::write(QXmlStreamWriter &writer, const QString &tagName) cons writer.writeEndElement(); } -void DomColorGroup::setElementColorRole(const QList& a) +void DomColorGroup::setElementColorRole(const QVector& a) { m_children |= ColorRole; m_colorRole = a; } -void DomColorGroup::setElementColor(const QList& a) +void DomColorGroup::setElementColor(const QVector& a) { m_children |= Color; m_color = a; @@ -8147,7 +8147,7 @@ void DomConnections::write(QXmlStreamWriter &writer, const QString &tagName) con writer.writeEndElement(); } -void DomConnections::setElementConnection(const QList& a) +void DomConnections::setElementConnection(const QVector& a) { m_children |= Connection; m_connection = a; @@ -8383,7 +8383,7 @@ void DomConnectionHints::write(QXmlStreamWriter &writer, const QString &tagName) writer.writeEndElement(); } -void DomConnectionHints::setElementHint(const QList& a) +void DomConnectionHints::setElementHint(const QVector& a) { m_children |= Hint; m_hint = a; @@ -8882,13 +8882,13 @@ void DomPropertySpecifications::write(QXmlStreamWriter &writer, const QString &t writer.writeEndElement(); } -void DomPropertySpecifications::setElementTooltip(const QList& a) +void DomPropertySpecifications::setElementTooltip(const QVector& a) { m_children |= Tooltip; m_tooltip = a; } -void DomPropertySpecifications::setElementStringpropertyspecification(const QList& a) +void DomPropertySpecifications::setElementStringpropertyspecification(const QVector& a) { m_children |= Stringpropertyspecification; m_stringpropertyspecification = a; diff --git a/src/tools/uic/ui4.h b/src/tools/uic/ui4.h index 820d2c5f8c..8d784faca2 100644 --- a/src/tools/uic/ui4.h +++ b/src/tools/uic/ui4.h @@ -45,6 +45,7 @@ #include #include #include +#include #include #include @@ -147,6 +148,7 @@ class DomStringPropertySpecification; */ class QDESIGNER_UILIB_EXPORT DomUI { + Q_DISABLE_COPY(DomUI) public: DomUI(); ~DomUI(); @@ -338,12 +340,10 @@ private: Slots = 32768, ButtonGroups = 65536 }; - - DomUI(const DomUI &other); - void operator = (const DomUI&other); }; class QDESIGNER_UILIB_EXPORT DomIncludes { + Q_DISABLE_COPY(DomIncludes) public: DomIncludes(); ~DomIncludes(); @@ -355,8 +355,8 @@ public: // attribute accessors // child element accessors - inline QList elementInclude() const { return m_include; } - void setElementInclude(const QList& a); + inline QVector elementInclude() const { return m_include; } + void setElementInclude(const QVector& a); private: QString m_text; @@ -365,16 +365,14 @@ private: // attribute data // child element data uint m_children; - QList m_include; + QVector m_include; enum Child { Include = 1 }; - - DomIncludes(const DomIncludes &other); - void operator = (const DomIncludes&other); }; class QDESIGNER_UILIB_EXPORT DomInclude { + Q_DISABLE_COPY(DomInclude) public: DomInclude(); ~DomInclude(); @@ -409,12 +407,10 @@ private: // child element data uint m_children; - - DomInclude(const DomInclude &other); - void operator = (const DomInclude&other); }; class QDESIGNER_UILIB_EXPORT DomResources { + Q_DISABLE_COPY(DomResources) public: DomResources(); ~DomResources(); @@ -431,8 +427,8 @@ public: inline void clearAttributeName() { m_has_attr_name = false; } // child element accessors - inline QList elementInclude() const { return m_include; } - void setElementInclude(const QList& a); + inline QVector elementInclude() const { return m_include; } + void setElementInclude(const QVector& a); private: QString m_text; @@ -444,16 +440,14 @@ private: // child element data uint m_children; - QList m_include; + QVector m_include; enum Child { Include = 1 }; - - DomResources(const DomResources &other); - void operator = (const DomResources&other); }; class QDESIGNER_UILIB_EXPORT DomResource { + Q_DISABLE_COPY(DomResource) public: DomResource(); ~DomResource(); @@ -480,12 +474,10 @@ private: // child element data uint m_children; - - DomResource(const DomResource &other); - void operator = (const DomResource&other); }; class QDESIGNER_UILIB_EXPORT DomActionGroup { + Q_DISABLE_COPY(DomActionGroup) public: DomActionGroup(); ~DomActionGroup(); @@ -502,11 +494,11 @@ public: inline void clearAttributeName() { m_has_attr_name = false; } // child element accessors - inline QList elementAction() const { return m_action; } - void setElementAction(const QList& a); + inline QVector elementAction() const { return m_action; } + void setElementAction(const QVector& a); - inline QList elementActionGroup() const { return m_actionGroup; } - void setElementActionGroup(const QList& a); + inline QVector elementActionGroup() const { return m_actionGroup; } + void setElementActionGroup(const QVector& a); inline QList elementProperty() const { return m_property; } void setElementProperty(const QList& a); @@ -524,8 +516,8 @@ private: // child element data uint m_children; - QList m_action; - QList m_actionGroup; + QVector m_action; + QVector m_actionGroup; QList m_property; QList m_attribute; enum Child { @@ -534,12 +526,10 @@ private: Property = 4, Attribute = 8 }; - - DomActionGroup(const DomActionGroup &other); - void operator = (const DomActionGroup&other); }; class QDESIGNER_UILIB_EXPORT DomAction { + Q_DISABLE_COPY(DomAction) public: DomAction(); ~DomAction(); @@ -586,12 +576,10 @@ private: Property = 1, Attribute = 2 }; - - DomAction(const DomAction &other); - void operator = (const DomAction&other); }; class QDESIGNER_UILIB_EXPORT DomActionRef { + Q_DISABLE_COPY(DomActionRef) public: DomActionRef(); ~DomActionRef(); @@ -618,12 +606,10 @@ private: // child element data uint m_children; - - DomActionRef(const DomActionRef &other); - void operator = (const DomActionRef&other); }; class QDESIGNER_UILIB_EXPORT DomButtonGroup { + Q_DISABLE_COPY(DomButtonGroup) public: DomButtonGroup(); ~DomButtonGroup(); @@ -662,12 +648,10 @@ private: Property = 1, Attribute = 2 }; - - DomButtonGroup(const DomButtonGroup &other); - void operator = (const DomButtonGroup&other); }; class QDESIGNER_UILIB_EXPORT DomButtonGroups { + Q_DISABLE_COPY(DomButtonGroups) public: DomButtonGroups(); ~DomButtonGroups(); @@ -679,8 +663,8 @@ public: // attribute accessors // child element accessors - inline QList elementButtonGroup() const { return m_buttonGroup; } - void setElementButtonGroup(const QList& a); + inline QVector elementButtonGroup() const { return m_buttonGroup; } + void setElementButtonGroup(const QVector& a); private: QString m_text; @@ -689,16 +673,14 @@ private: // attribute data // child element data uint m_children; - QList m_buttonGroup; + QVector m_buttonGroup; enum Child { ButtonGroup = 1 }; - - DomButtonGroups(const DomButtonGroups &other); - void operator = (const DomButtonGroups&other); }; class QDESIGNER_UILIB_EXPORT DomImages { + Q_DISABLE_COPY(DomImages) public: DomImages(); ~DomImages(); @@ -710,8 +692,8 @@ public: // attribute accessors // child element accessors - inline QList elementImage() const { return m_image; } - void setElementImage(const QList& a); + inline QVector elementImage() const { return m_image; } + void setElementImage(const QVector& a); private: QString m_text; @@ -720,16 +702,14 @@ private: // attribute data // child element data uint m_children; - QList m_image; + QVector m_image; enum Child { Image = 1 }; - - DomImages(const DomImages &other); - void operator = (const DomImages&other); }; class QDESIGNER_UILIB_EXPORT DomImage { + Q_DISABLE_COPY(DomImage) public: DomImage(); ~DomImage(); @@ -766,12 +746,10 @@ private: enum Child { Data = 1 }; - - DomImage(const DomImage &other); - void operator = (const DomImage&other); }; class QDESIGNER_UILIB_EXPORT DomImageData { + Q_DISABLE_COPY(DomImageData) public: DomImageData(); ~DomImageData(); @@ -806,12 +784,10 @@ private: // child element data uint m_children; - - DomImageData(const DomImageData &other); - void operator = (const DomImageData&other); }; class QDESIGNER_UILIB_EXPORT DomCustomWidgets { + Q_DISABLE_COPY(DomCustomWidgets) public: DomCustomWidgets(); ~DomCustomWidgets(); @@ -823,8 +799,8 @@ public: // attribute accessors // child element accessors - inline QList elementCustomWidget() const { return m_customWidget; } - void setElementCustomWidget(const QList& a); + inline QVector elementCustomWidget() const { return m_customWidget; } + void setElementCustomWidget(const QVector& a); private: QString m_text; @@ -833,16 +809,14 @@ private: // attribute data // child element data uint m_children; - QList m_customWidget; + QVector m_customWidget; enum Child { CustomWidget = 1 }; - - DomCustomWidgets(const DomCustomWidgets &other); - void operator = (const DomCustomWidgets&other); }; class QDESIGNER_UILIB_EXPORT DomHeader { + Q_DISABLE_COPY(DomHeader) public: DomHeader(); ~DomHeader(); @@ -869,12 +843,10 @@ private: // child element data uint m_children; - - DomHeader(const DomHeader &other); - void operator = (const DomHeader&other); }; class QDESIGNER_UILIB_EXPORT DomCustomWidget { + Q_DISABLE_COPY(DomCustomWidget) public: DomCustomWidget(); ~DomCustomWidget(); @@ -986,12 +958,10 @@ private: Slots = 1024, Propertyspecifications = 2048 }; - - DomCustomWidget(const DomCustomWidget &other); - void operator = (const DomCustomWidget&other); }; class QDESIGNER_UILIB_EXPORT DomProperties { + Q_DISABLE_COPY(DomProperties) public: DomProperties(); ~DomProperties(); @@ -1003,8 +973,8 @@ public: // attribute accessors // child element accessors - inline QList elementProperty() const { return m_property; } - void setElementProperty(const QList& a); + inline QVector elementProperty() const { return m_property; } + void setElementProperty(const QVector& a); private: QString m_text; @@ -1013,16 +983,14 @@ private: // attribute data // child element data uint m_children; - QList m_property; + QVector m_property; enum Child { Property = 1 }; - - DomProperties(const DomProperties &other); - void operator = (const DomProperties&other); }; class QDESIGNER_UILIB_EXPORT DomPropertyData { + Q_DISABLE_COPY(DomPropertyData) public: DomPropertyData(); ~DomPropertyData(); @@ -1049,12 +1017,10 @@ private: // child element data uint m_children; - - DomPropertyData(const DomPropertyData &other); - void operator = (const DomPropertyData&other); }; class QDESIGNER_UILIB_EXPORT DomSizePolicyData { + Q_DISABLE_COPY(DomSizePolicyData) public: DomSizePolicyData(); ~DomSizePolicyData(); @@ -1089,12 +1055,10 @@ private: HorData = 1, VerData = 2 }; - - DomSizePolicyData(const DomSizePolicyData &other); - void operator = (const DomSizePolicyData&other); }; class QDESIGNER_UILIB_EXPORT DomLayoutDefault { + Q_DISABLE_COPY(DomLayoutDefault) public: DomLayoutDefault(); ~DomLayoutDefault(); @@ -1129,12 +1093,10 @@ private: // child element data uint m_children; - - DomLayoutDefault(const DomLayoutDefault &other); - void operator = (const DomLayoutDefault&other); }; class QDESIGNER_UILIB_EXPORT DomLayoutFunction { + Q_DISABLE_COPY(DomLayoutFunction) public: DomLayoutFunction(); ~DomLayoutFunction(); @@ -1169,12 +1131,10 @@ private: // child element data uint m_children; - - DomLayoutFunction(const DomLayoutFunction &other); - void operator = (const DomLayoutFunction&other); }; class QDESIGNER_UILIB_EXPORT DomTabStops { + Q_DISABLE_COPY(DomTabStops) public: DomTabStops(); ~DomTabStops(); @@ -1200,12 +1160,10 @@ private: enum Child { TabStop = 1 }; - - DomTabStops(const DomTabStops &other); - void operator = (const DomTabStops&other); }; class QDESIGNER_UILIB_EXPORT DomLayout { + Q_DISABLE_COPY(DomLayout) public: DomLayout(); ~DomLayout(); @@ -1258,8 +1216,8 @@ public: inline QList elementAttribute() const { return m_attribute; } void setElementAttribute(const QList& a); - inline QList elementItem() const { return m_item; } - void setElementItem(const QList& a); + inline QVector elementItem() const { return m_item; } + void setElementItem(const QVector& a); private: QString m_text; @@ -1291,18 +1249,16 @@ private: uint m_children; QList m_property; QList m_attribute; - QList m_item; + QVector m_item; enum Child { Property = 1, Attribute = 2, Item = 4 }; - - DomLayout(const DomLayout &other); - void operator = (const DomLayout&other); }; class QDESIGNER_UILIB_EXPORT DomLayoutItem { + Q_DISABLE_COPY(DomLayoutItem) public: DomLayoutItem(); ~DomLayoutItem(); @@ -1379,12 +1335,10 @@ private: DomWidget* m_widget; DomLayout* m_layout; DomSpacer* m_spacer; - - DomLayoutItem(const DomLayoutItem &other); - void operator = (const DomLayoutItem&other); }; class QDESIGNER_UILIB_EXPORT DomRow { + Q_DISABLE_COPY(DomRow) public: DomRow(); ~DomRow(); @@ -1410,12 +1364,10 @@ private: enum Child { Property = 1 }; - - DomRow(const DomRow &other); - void operator = (const DomRow&other); }; class QDESIGNER_UILIB_EXPORT DomColumn { + Q_DISABLE_COPY(DomColumn) public: DomColumn(); ~DomColumn(); @@ -1441,12 +1393,10 @@ private: enum Child { Property = 1 }; - - DomColumn(const DomColumn &other); - void operator = (const DomColumn&other); }; class QDESIGNER_UILIB_EXPORT DomItem { + Q_DISABLE_COPY(DomItem) public: DomItem(); ~DomItem(); @@ -1471,8 +1421,8 @@ public: inline QList elementProperty() const { return m_property; } void setElementProperty(const QList& a); - inline QList elementItem() const { return m_item; } - void setElementItem(const QList& a); + inline QVector elementItem() const { return m_item; } + void setElementItem(const QVector& a); private: QString m_text; @@ -1488,17 +1438,15 @@ private: // child element data uint m_children; QList m_property; - QList m_item; + QVector m_item; enum Child { Property = 1, Item = 2 }; - - DomItem(const DomItem &other); - void operator = (const DomItem&other); }; class QDESIGNER_UILIB_EXPORT DomWidget { + Q_DISABLE_COPY(DomWidget) public: DomWidget(); ~DomWidget(); @@ -1531,38 +1479,38 @@ public: inline QList elementProperty() const { return m_property; } void setElementProperty(const QList& a); - inline QList elementScript() const { return m_script; } - void setElementScript(const QList& a); + inline QVector elementScript() const { return m_script; } + void setElementScript(const QVector& a); - inline QList elementWidgetData() const { return m_widgetData; } - void setElementWidgetData(const QList& a); + inline QVector elementWidgetData() const { return m_widgetData; } + void setElementWidgetData(const QVector& a); inline QList elementAttribute() const { return m_attribute; } void setElementAttribute(const QList& a); - inline QList elementRow() const { return m_row; } - void setElementRow(const QList& a); + inline QVector elementRow() const { return m_row; } + void setElementRow(const QVector& a); - inline QList elementColumn() const { return m_column; } - void setElementColumn(const QList& a); + inline QVector elementColumn() const { return m_column; } + void setElementColumn(const QVector& a); - inline QList elementItem() const { return m_item; } - void setElementItem(const QList& a); + inline QVector elementItem() const { return m_item; } + void setElementItem(const QVector& a); - inline QList elementLayout() const { return m_layout; } - void setElementLayout(const QList& a); + inline QVector elementLayout() const { return m_layout; } + void setElementLayout(const QVector& a); - inline QList elementWidget() const { return m_widget; } - void setElementWidget(const QList& a); + inline QVector elementWidget() const { return m_widget; } + void setElementWidget(const QVector& a); - inline QList elementAction() const { return m_action; } - void setElementAction(const QList& a); + inline QVector elementAction() const { return m_action; } + void setElementAction(const QVector& a); - inline QList elementActionGroup() const { return m_actionGroup; } - void setElementActionGroup(const QList& a); + inline QVector elementActionGroup() const { return m_actionGroup; } + void setElementActionGroup(const QVector& a); - inline QList elementAddAction() const { return m_addAction; } - void setElementAddAction(const QList& a); + inline QVector elementAddAction() const { return m_addAction; } + void setElementAddAction(const QVector& a); inline QStringList elementZOrder() const { return m_zOrder; } void setElementZOrder(const QStringList& a); @@ -1585,17 +1533,17 @@ private: uint m_children; QStringList m_class; QList m_property; - QList m_script; - QList m_widgetData; + QVector m_script; + QVector m_widgetData; QList m_attribute; - QList m_row; - QList m_column; - QList m_item; - QList m_layout; - QList m_widget; - QList m_action; - QList m_actionGroup; - QList m_addAction; + QVector m_row; + QVector m_column; + QVector m_item; + QVector m_layout; + QVector m_widget; + QVector m_action; + QVector m_actionGroup; + QVector m_addAction; QStringList m_zOrder; enum Child { Class = 1, @@ -1613,12 +1561,10 @@ private: AddAction = 4096, ZOrder = 8192 }; - - DomWidget(const DomWidget &other); - void operator = (const DomWidget&other); }; class QDESIGNER_UILIB_EXPORT DomSpacer { + Q_DISABLE_COPY(DomSpacer) public: DomSpacer(); ~DomSpacer(); @@ -1652,12 +1598,10 @@ private: enum Child { Property = 1 }; - - DomSpacer(const DomSpacer &other); - void operator = (const DomSpacer&other); }; class QDESIGNER_UILIB_EXPORT DomColor { + Q_DISABLE_COPY(DomColor) public: DomColor(); ~DomColor(); @@ -1707,12 +1651,10 @@ private: Green = 2, Blue = 4 }; - - DomColor(const DomColor &other); - void operator = (const DomColor&other); }; class QDESIGNER_UILIB_EXPORT DomGradientStop { + Q_DISABLE_COPY(DomGradientStop) public: DomGradientStop(); ~DomGradientStop(); @@ -1749,12 +1691,10 @@ private: enum Child { Color = 1 }; - - DomGradientStop(const DomGradientStop &other); - void operator = (const DomGradientStop&other); }; class QDESIGNER_UILIB_EXPORT DomGradient { + Q_DISABLE_COPY(DomGradient) public: DomGradient(); ~DomGradient(); @@ -1831,8 +1771,8 @@ public: inline void clearAttributeCoordinateMode() { m_has_attr_coordinateMode = false; } // child element accessors - inline QList elementGradientStop() const { return m_gradientStop; } - void setElementGradientStop(const QList& a); + inline QVector elementGradientStop() const { return m_gradientStop; } + void setElementGradientStop(const QVector& a); private: QString m_text; @@ -1880,16 +1820,14 @@ private: // child element data uint m_children; - QList m_gradientStop; + QVector m_gradientStop; enum Child { GradientStop = 1 }; - - DomGradient(const DomGradient &other); - void operator = (const DomGradient&other); }; class QDESIGNER_UILIB_EXPORT DomBrush { + Q_DISABLE_COPY(DomBrush) public: DomBrush(); ~DomBrush(); @@ -1934,12 +1872,10 @@ private: DomColor* m_color; DomProperty* m_texture; DomGradient* m_gradient; - - DomBrush(const DomBrush &other); - void operator = (const DomBrush&other); }; class QDESIGNER_UILIB_EXPORT DomColorRole { + Q_DISABLE_COPY(DomColorRole) public: DomColorRole(); ~DomColorRole(); @@ -1976,12 +1912,10 @@ private: enum Child { Brush = 1 }; - - DomColorRole(const DomColorRole &other); - void operator = (const DomColorRole&other); }; class QDESIGNER_UILIB_EXPORT DomColorGroup { + Q_DISABLE_COPY(DomColorGroup) public: DomColorGroup(); ~DomColorGroup(); @@ -1993,11 +1927,11 @@ public: // attribute accessors // child element accessors - inline QList elementColorRole() const { return m_colorRole; } - void setElementColorRole(const QList& a); + inline QVector elementColorRole() const { return m_colorRole; } + void setElementColorRole(const QVector& a); - inline QList elementColor() const { return m_color; } - void setElementColor(const QList& a); + inline QVector elementColor() const { return m_color; } + void setElementColor(const QVector& a); private: QString m_text; @@ -2006,18 +1940,16 @@ private: // attribute data // child element data uint m_children; - QList m_colorRole; - QList m_color; + QVector m_colorRole; + QVector m_color; enum Child { ColorRole = 1, Color = 2 }; - - DomColorGroup(const DomColorGroup &other); - void operator = (const DomColorGroup&other); }; class QDESIGNER_UILIB_EXPORT DomPalette { + Q_DISABLE_COPY(DomPalette) public: DomPalette(); ~DomPalette(); @@ -2062,12 +1994,10 @@ private: Inactive = 2, Disabled = 4 }; - - DomPalette(const DomPalette &other); - void operator = (const DomPalette&other); }; class QDESIGNER_UILIB_EXPORT DomFont { + Q_DISABLE_COPY(DomFont) public: DomFont(); ~DomFont(); @@ -2158,12 +2088,10 @@ private: StyleStrategy = 256, Kerning = 512 }; - - DomFont(const DomFont &other); - void operator = (const DomFont&other); }; class QDESIGNER_UILIB_EXPORT DomPoint { + Q_DISABLE_COPY(DomPoint) public: DomPoint(); ~DomPoint(); @@ -2198,12 +2126,10 @@ private: X = 1, Y = 2 }; - - DomPoint(const DomPoint &other); - void operator = (const DomPoint&other); }; class QDESIGNER_UILIB_EXPORT DomRect { + Q_DISABLE_COPY(DomRect) public: DomRect(); ~DomRect(); @@ -2252,12 +2178,10 @@ private: Width = 4, Height = 8 }; - - DomRect(const DomRect &other); - void operator = (const DomRect&other); }; class QDESIGNER_UILIB_EXPORT DomLocale { + Q_DISABLE_COPY(DomLocale) public: DomLocale(); ~DomLocale(); @@ -2292,12 +2216,10 @@ private: // child element data uint m_children; - - DomLocale(const DomLocale &other); - void operator = (const DomLocale&other); }; class QDESIGNER_UILIB_EXPORT DomSizePolicy { + Q_DISABLE_COPY(DomSizePolicy) public: DomSizePolicy(); ~DomSizePolicy(); @@ -2362,12 +2284,10 @@ private: HorStretch = 4, VerStretch = 8 }; - - DomSizePolicy(const DomSizePolicy &other); - void operator = (const DomSizePolicy&other); }; class QDESIGNER_UILIB_EXPORT DomSize { + Q_DISABLE_COPY(DomSize) public: DomSize(); ~DomSize(); @@ -2402,12 +2322,10 @@ private: Width = 1, Height = 2 }; - - DomSize(const DomSize &other); - void operator = (const DomSize&other); }; class QDESIGNER_UILIB_EXPORT DomDate { + Q_DISABLE_COPY(DomDate) public: DomDate(); ~DomDate(); @@ -2449,12 +2367,10 @@ private: Month = 2, Day = 4 }; - - DomDate(const DomDate &other); - void operator = (const DomDate&other); }; class QDESIGNER_UILIB_EXPORT DomTime { + Q_DISABLE_COPY(DomTime) public: DomTime(); ~DomTime(); @@ -2496,12 +2412,10 @@ private: Minute = 2, Second = 4 }; - - DomTime(const DomTime &other); - void operator = (const DomTime&other); }; class QDESIGNER_UILIB_EXPORT DomDateTime { + Q_DISABLE_COPY(DomDateTime) public: DomDateTime(); ~DomDateTime(); @@ -2564,12 +2478,10 @@ private: Month = 16, Day = 32 }; - - DomDateTime(const DomDateTime &other); - void operator = (const DomDateTime&other); }; class QDESIGNER_UILIB_EXPORT DomStringList { + Q_DISABLE_COPY(DomStringList) public: DomStringList(); ~DomStringList(); @@ -2619,12 +2531,10 @@ private: enum Child { String = 1 }; - - DomStringList(const DomStringList &other); - void operator = (const DomStringList&other); }; class QDESIGNER_UILIB_EXPORT DomResourcePixmap { + Q_DISABLE_COPY(DomResourcePixmap) public: DomResourcePixmap(); ~DomResourcePixmap(); @@ -2659,12 +2569,10 @@ private: // child element data uint m_children; - - DomResourcePixmap(const DomResourcePixmap &other); - void operator = (const DomResourcePixmap&other); }; class QDESIGNER_UILIB_EXPORT DomResourceIcon { + Q_DISABLE_COPY(DomResourceIcon) public: DomResourceIcon(); ~DomResourceIcon(); @@ -2765,12 +2673,10 @@ private: SelectedOff = 64, SelectedOn = 128 }; - - DomResourceIcon(const DomResourceIcon &other); - void operator = (const DomResourceIcon&other); }; class QDESIGNER_UILIB_EXPORT DomString { + Q_DISABLE_COPY(DomString) public: DomString(); ~DomString(); @@ -2813,12 +2719,10 @@ private: // child element data uint m_children; - - DomString(const DomString &other); - void operator = (const DomString&other); }; class QDESIGNER_UILIB_EXPORT DomPointF { + Q_DISABLE_COPY(DomPointF) public: DomPointF(); ~DomPointF(); @@ -2853,12 +2757,10 @@ private: X = 1, Y = 2 }; - - DomPointF(const DomPointF &other); - void operator = (const DomPointF&other); }; class QDESIGNER_UILIB_EXPORT DomRectF { + Q_DISABLE_COPY(DomRectF) public: DomRectF(); ~DomRectF(); @@ -2907,12 +2809,10 @@ private: Width = 4, Height = 8 }; - - DomRectF(const DomRectF &other); - void operator = (const DomRectF&other); }; class QDESIGNER_UILIB_EXPORT DomSizeF { + Q_DISABLE_COPY(DomSizeF) public: DomSizeF(); ~DomSizeF(); @@ -2947,12 +2847,10 @@ private: Width = 1, Height = 2 }; - - DomSizeF(const DomSizeF &other); - void operator = (const DomSizeF&other); }; class QDESIGNER_UILIB_EXPORT DomChar { + Q_DISABLE_COPY(DomChar) public: DomChar(); ~DomChar(); @@ -2980,12 +2878,10 @@ private: enum Child { Unicode = 1 }; - - DomChar(const DomChar &other); - void operator = (const DomChar&other); }; class QDESIGNER_UILIB_EXPORT DomUrl { + Q_DISABLE_COPY(DomUrl) public: DomUrl(); ~DomUrl(); @@ -3014,12 +2910,10 @@ private: enum Child { String = 1 }; - - DomUrl(const DomUrl &other); - void operator = (const DomUrl&other); }; class QDESIGNER_UILIB_EXPORT DomProperty { + Q_DISABLE_COPY(DomProperty) public: DomProperty(); ~DomProperty(); @@ -3210,12 +3104,10 @@ private: uint m_UInt; qulonglong m_uLongLong; DomBrush* m_brush; - - DomProperty(const DomProperty &other); - void operator = (const DomProperty&other); }; class QDESIGNER_UILIB_EXPORT DomConnections { + Q_DISABLE_COPY(DomConnections) public: DomConnections(); ~DomConnections(); @@ -3227,8 +3119,8 @@ public: // attribute accessors // child element accessors - inline QList elementConnection() const { return m_connection; } - void setElementConnection(const QList& a); + inline QVector elementConnection() const { return m_connection; } + void setElementConnection(const QVector& a); private: QString m_text; @@ -3237,16 +3129,14 @@ private: // attribute data // child element data uint m_children; - QList m_connection; + QVector m_connection; enum Child { Connection = 1 }; - - DomConnections(const DomConnections &other); - void operator = (const DomConnections&other); }; class QDESIGNER_UILIB_EXPORT DomConnection { + Q_DISABLE_COPY(DomConnection) public: DomConnection(); ~DomConnection(); @@ -3303,12 +3193,10 @@ private: Slot = 8, Hints = 16 }; - - DomConnection(const DomConnection &other); - void operator = (const DomConnection&other); }; class QDESIGNER_UILIB_EXPORT DomConnectionHints { + Q_DISABLE_COPY(DomConnectionHints) public: DomConnectionHints(); ~DomConnectionHints(); @@ -3320,8 +3208,8 @@ public: // attribute accessors // child element accessors - inline QList elementHint() const { return m_hint; } - void setElementHint(const QList& a); + inline QVector elementHint() const { return m_hint; } + void setElementHint(const QVector& a); private: QString m_text; @@ -3330,16 +3218,14 @@ private: // attribute data // child element data uint m_children; - QList m_hint; + QVector m_hint; enum Child { Hint = 1 }; - - DomConnectionHints(const DomConnectionHints &other); - void operator = (const DomConnectionHints&other); }; class QDESIGNER_UILIB_EXPORT DomConnectionHint { + Q_DISABLE_COPY(DomConnectionHint) public: DomConnectionHint(); ~DomConnectionHint(); @@ -3382,12 +3268,10 @@ private: X = 1, Y = 2 }; - - DomConnectionHint(const DomConnectionHint &other); - void operator = (const DomConnectionHint&other); }; class QDESIGNER_UILIB_EXPORT DomScript { + Q_DISABLE_COPY(DomScript) public: DomScript(); ~DomScript(); @@ -3422,12 +3306,10 @@ private: // child element data uint m_children; - - DomScript(const DomScript &other); - void operator = (const DomScript&other); }; class QDESIGNER_UILIB_EXPORT DomWidgetData { + Q_DISABLE_COPY(DomWidgetData) public: DomWidgetData(); ~DomWidgetData(); @@ -3453,12 +3335,10 @@ private: enum Child { Property = 1 }; - - DomWidgetData(const DomWidgetData &other); - void operator = (const DomWidgetData&other); }; class QDESIGNER_UILIB_EXPORT DomDesignerData { + Q_DISABLE_COPY(DomDesignerData) public: DomDesignerData(); ~DomDesignerData(); @@ -3484,12 +3364,10 @@ private: enum Child { Property = 1 }; - - DomDesignerData(const DomDesignerData &other); - void operator = (const DomDesignerData&other); }; class QDESIGNER_UILIB_EXPORT DomSlots { + Q_DISABLE_COPY(DomSlots) public: DomSlots(); ~DomSlots(); @@ -3520,12 +3398,10 @@ private: Signal = 1, Slot = 2 }; - - DomSlots(const DomSlots &other); - void operator = (const DomSlots&other); }; class QDESIGNER_UILIB_EXPORT DomPropertySpecifications { + Q_DISABLE_COPY(DomPropertySpecifications) public: DomPropertySpecifications(); ~DomPropertySpecifications(); @@ -3537,11 +3413,11 @@ public: // attribute accessors // child element accessors - inline QList elementTooltip() const { return m_tooltip; } - void setElementTooltip(const QList& a); + inline QVector elementTooltip() const { return m_tooltip; } + void setElementTooltip(const QVector& a); - inline QList elementStringpropertyspecification() const { return m_stringpropertyspecification; } - void setElementStringpropertyspecification(const QList& a); + inline QVector elementStringpropertyspecification() const { return m_stringpropertyspecification; } + void setElementStringpropertyspecification(const QVector& a); private: QString m_text; @@ -3550,18 +3426,16 @@ private: // attribute data // child element data uint m_children; - QList m_tooltip; - QList m_stringpropertyspecification; + QVector m_tooltip; + QVector m_stringpropertyspecification; enum Child { Tooltip = 1, Stringpropertyspecification = 2 }; - - DomPropertySpecifications(const DomPropertySpecifications &other); - void operator = (const DomPropertySpecifications&other); }; class QDESIGNER_UILIB_EXPORT DomPropertyToolTip { + Q_DISABLE_COPY(DomPropertyToolTip) public: DomPropertyToolTip(); ~DomPropertyToolTip(); @@ -3588,12 +3462,10 @@ private: // child element data uint m_children; - - DomPropertyToolTip(const DomPropertyToolTip &other); - void operator = (const DomPropertyToolTip&other); }; class QDESIGNER_UILIB_EXPORT DomStringPropertySpecification { + Q_DISABLE_COPY(DomStringPropertySpecification) public: DomStringPropertySpecification(); ~DomStringPropertySpecification(); @@ -3636,9 +3508,6 @@ private: // child element data uint m_children; - - DomStringPropertySpecification(const DomStringPropertySpecification &other); - void operator = (const DomStringPropertySpecification&other); }; -- cgit v1.2.3