diff options
Diffstat (limited to 'src/tools/uic/ui4.cpp')
| -rw-r--r-- | src/tools/uic/ui4.cpp | 1646 |
1 files changed, 49 insertions, 1597 deletions
diff --git a/src/tools/uic/ui4.cpp b/src/tools/uic/ui4.cpp index 49e7f21633..57400c1e3c 100644 --- a/src/tools/uic/ui4.cpp +++ b/src/tools/uic/ui4.cpp @@ -39,31 +39,6 @@ using namespace QFormInternal; /******************************************************************************* ** Implementations */ - -DomUI::DomUI() -{ - m_children = 0; - m_has_attr_version = false; - m_has_attr_language = false; - m_has_attr_displayname = false; - m_has_attr_stdsetdef = false; - m_attr_stdsetdef = 0; - m_has_attr_stdSetDef = false; - m_attr_stdSetDef = 0; - m_widget = 0; - m_layoutDefault = 0; - m_layoutFunction = 0; - m_customWidgets = 0; - m_tabStops = 0; - m_images = 0; - m_includes = 0; - m_resources = 0; - m_connections = 0; - m_designerdata = 0; - m_slots = 0; - m_buttonGroups = 0; -} - DomUI::~DomUI() { delete m_widget; @@ -71,7 +46,6 @@ DomUI::~DomUI() delete m_layoutFunction; delete m_customWidgets; delete m_tabStops; - delete m_images; delete m_includes; delete m_resources; delete m_connections; @@ -162,12 +136,6 @@ void DomUI::read(QXmlStreamReader &reader) setElementTabStops(v); continue; } - if (!tag.compare(QLatin1String("images"), Qt::CaseInsensitive)) { - DomImages *v = new DomImages(); - v->read(reader); - setElementImages(v); - continue; - } if (!tag.compare(QLatin1String("includes"), Qt::CaseInsensitive)) { DomIncludes *v = new DomIncludes(); v->read(reader); @@ -209,10 +177,6 @@ void DomUI::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -268,9 +232,6 @@ void DomUI::write(QXmlStreamWriter &writer, const QString &tagName) const if (m_children & TabStops) m_tabStops->write(writer, QStringLiteral("tabstops")); - if (m_children & Images) - m_images->write(writer, QStringLiteral("images")); - if (m_children & Includes) m_includes->write(writer, QStringLiteral("includes")); @@ -289,9 +250,6 @@ void DomUI::write(QXmlStreamWriter &writer, const QString &tagName) const if (m_children & ButtonGroups) m_buttonGroups->write(writer, QStringLiteral("buttongroups")); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -400,21 +358,6 @@ void DomUI::setElementTabStops(DomTabStops *a) m_tabStops = a; } -DomImages *DomUI::takeElementImages() -{ - DomImages *a = m_images; - m_images = 0; - m_children ^= Images; - return a; -} - -void DomUI::setElementImages(DomImages *a) -{ - delete m_images; - m_children |= Images; - m_images = a; -} - DomIncludes *DomUI::takeElementIncludes() { DomIncludes *a = m_includes; @@ -565,13 +508,6 @@ void DomUI::clearElementTabStops() m_children &= ~TabStops; } -void DomUI::clearElementImages() -{ - delete m_images; - m_images = 0; - m_children &= ~Images; -} - void DomUI::clearElementIncludes() { delete m_includes; @@ -614,11 +550,6 @@ void DomUI::clearElementButtonGroups() m_children &= ~ButtonGroups; } -DomIncludes::DomIncludes() -{ - m_children = 0; -} - DomIncludes::~DomIncludes() { qDeleteAll(m_include); @@ -642,10 +573,6 @@ void DomIncludes::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -659,9 +586,6 @@ void DomIncludes::write(QXmlStreamWriter &writer, const QString &tagName) const for (DomInclude *v : m_include) v->write(writer, QStringLiteral("include")); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -671,13 +595,6 @@ void DomIncludes::setElementInclude(const QVector<DomInclude *> &a) m_include = a; } -DomInclude::DomInclude() -{ - m_has_attr_location = false; - m_has_attr_impldecl = false; - m_text.clear(); -} - DomInclude::~DomInclude() { } @@ -733,12 +650,6 @@ void DomInclude::write(QXmlStreamWriter &writer, const QString &tagName) const writer.writeEndElement(); } -DomResources::DomResources() -{ - m_children = 0; - m_has_attr_name = false; -} - DomResources::~DomResources() { qDeleteAll(m_include); @@ -772,10 +683,6 @@ void DomResources::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -792,9 +699,6 @@ void DomResources::write(QXmlStreamWriter &writer, const QString &tagName) const for (DomResource *v : m_include) v->write(writer, QStringLiteral("include")); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -804,11 +708,6 @@ void DomResources::setElementInclude(const QVector<DomResource *> &a) m_include = a; } -DomResource::DomResource() -{ - m_has_attr_location = false; -} - DomResource::~DomResource() { } @@ -834,10 +733,6 @@ void DomResource::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -851,18 +746,9 @@ void DomResource::write(QXmlStreamWriter &writer, const QString &tagName) const if (hasAttributeLocation()) writer.writeAttribute(QStringLiteral("location"), attributeLocation()); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } -DomActionGroup::DomActionGroup() -{ - m_children = 0; - m_has_attr_name = false; -} - DomActionGroup::~DomActionGroup() { qDeleteAll(m_action); @@ -920,10 +806,6 @@ void DomActionGroup::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -949,9 +831,6 @@ void DomActionGroup::write(QXmlStreamWriter &writer, const QString &tagName) con for (DomProperty *v : m_attribute) v->write(writer, QStringLiteral("attribute")); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -979,13 +858,6 @@ void DomActionGroup::setElementAttribute(const QList<DomProperty *> &a) m_attribute = a; } -DomAction::DomAction() -{ - m_children = 0; - m_has_attr_name = false; - m_has_attr_menu = false; -} - DomAction::~DomAction() { qDeleteAll(m_property); @@ -1031,10 +903,6 @@ void DomAction::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -1057,9 +925,6 @@ void DomAction::write(QXmlStreamWriter &writer, const QString &tagName) const for (DomProperty *v : m_attribute) v->write(writer, QStringLiteral("attribute")); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -1075,11 +940,6 @@ void DomAction::setElementAttribute(const QList<DomProperty *> &a) m_attribute = a; } -DomActionRef::DomActionRef() -{ - m_has_attr_name = false; -} - DomActionRef::~DomActionRef() { } @@ -1105,10 +965,6 @@ void DomActionRef::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -1122,18 +978,9 @@ void DomActionRef::write(QXmlStreamWriter &writer, const QString &tagName) const if (hasAttributeName()) writer.writeAttribute(QStringLiteral("name"), attributeName()); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } -DomButtonGroup::DomButtonGroup() -{ - m_children = 0; - m_has_attr_name = false; -} - DomButtonGroup::~DomButtonGroup() { qDeleteAll(m_property); @@ -1175,10 +1022,6 @@ void DomButtonGroup::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -1198,9 +1041,6 @@ void DomButtonGroup::write(QXmlStreamWriter &writer, const QString &tagName) con for (DomProperty *v : m_attribute) v->write(writer, QStringLiteral("attribute")); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -1216,11 +1056,6 @@ void DomButtonGroup::setElementAttribute(const QList<DomProperty *> &a) m_attribute = a; } -DomButtonGroups::DomButtonGroups() -{ - m_children = 0; -} - DomButtonGroups::~DomButtonGroups() { qDeleteAll(m_buttonGroup); @@ -1244,10 +1079,6 @@ void DomButtonGroups::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -1261,9 +1092,6 @@ void DomButtonGroups::write(QXmlStreamWriter &writer, const QString &tagName) co for (DomButtonGroup *v : m_buttonGroup) v->write(writer, QStringLiteral("buttongroup")); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -1273,218 +1101,6 @@ void DomButtonGroups::setElementButtonGroup(const QVector<DomButtonGroup *> &a) m_buttonGroup = a; } -DomImages::DomImages() -{ - m_children = 0; -} - -DomImages::~DomImages() -{ - qDeleteAll(m_image); - m_image.clear(); -} - -void DomImages::read(QXmlStreamReader &reader) -{ - while (!reader.hasError()) { - switch (reader.readNext()) { - case QXmlStreamReader::StartElement : { - const QStringRef tag = reader.name(); - if (!tag.compare(QLatin1String("image"), Qt::CaseInsensitive)) { - DomImage *v = new DomImage(); - v->read(reader); - m_image.append(v); - continue; - } - reader.raiseError(QLatin1String("Unexpected element ") + tag); - } - break; - case QXmlStreamReader::EndElement : - return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; - default : - break; - } - } -} - -void DomImages::write(QXmlStreamWriter &writer, const QString &tagName) const -{ - writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("images") : tagName.toLower()); - - for (DomImage *v : m_image) - v->write(writer, QStringLiteral("image")); - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - - writer.writeEndElement(); -} - -void DomImages::setElementImage(const QVector<DomImage *> &a) -{ - m_children |= Image; - m_image = a; -} - -DomImage::DomImage() -{ - m_children = 0; - m_has_attr_name = false; - m_data = 0; -} - -DomImage::~DomImage() -{ - delete m_data; -} - -void DomImage::read(QXmlStreamReader &reader) -{ - const QXmlStreamAttributes &attributes = reader.attributes(); - for (const QXmlStreamAttribute &attribute : attributes) { - const QStringRef name = attribute.name(); - if (name == QLatin1String("name")) { - setAttributeName(attribute.value().toString()); - continue; - } - reader.raiseError(QLatin1String("Unexpected attribute ") + name); - } - - while (!reader.hasError()) { - switch (reader.readNext()) { - case QXmlStreamReader::StartElement : { - const QStringRef tag = reader.name(); - if (!tag.compare(QLatin1String("data"), Qt::CaseInsensitive)) { - DomImageData *v = new DomImageData(); - v->read(reader); - setElementData(v); - continue; - } - reader.raiseError(QLatin1String("Unexpected element ") + tag); - } - break; - case QXmlStreamReader::EndElement : - return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; - default : - break; - } - } -} - -void DomImage::write(QXmlStreamWriter &writer, const QString &tagName) const -{ - writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("image") : tagName.toLower()); - - if (hasAttributeName()) - writer.writeAttribute(QStringLiteral("name"), attributeName()); - - if (m_children & Data) - m_data->write(writer, QStringLiteral("data")); - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - - writer.writeEndElement(); -} - -DomImageData *DomImage::takeElementData() -{ - DomImageData *a = m_data; - m_data = 0; - m_children ^= Data; - return a; -} - -void DomImage::setElementData(DomImageData *a) -{ - delete m_data; - m_children |= Data; - m_data = a; -} - -void DomImage::clearElementData() -{ - delete m_data; - m_data = 0; - m_children &= ~Data; -} - -DomImageData::DomImageData() -{ - m_has_attr_format = false; - m_has_attr_length = false; - m_attr_length = 0; - m_text.clear(); -} - -DomImageData::~DomImageData() -{ -} - -void DomImageData::read(QXmlStreamReader &reader) -{ - const QXmlStreamAttributes &attributes = reader.attributes(); - for (const QXmlStreamAttribute &attribute : attributes) { - const QStringRef name = attribute.name(); - if (name == QLatin1String("format")) { - setAttributeFormat(attribute.value().toString()); - continue; - } - if (name == QLatin1String("length")) { - setAttributeLength(attribute.value().toInt()); - continue; - } - reader.raiseError(QLatin1String("Unexpected attribute ") + name); - } - - while (!reader.hasError()) { - switch (reader.readNext()) { - case QXmlStreamReader::StartElement : { - const QStringRef tag = reader.name(); - reader.raiseError(QLatin1String("Unexpected element ") + tag); - } - break; - case QXmlStreamReader::EndElement : - return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; - default : - break; - } - } -} - -void DomImageData::write(QXmlStreamWriter &writer, const QString &tagName) const -{ - writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("imagedata") : tagName.toLower()); - - if (hasAttributeFormat()) - writer.writeAttribute(QStringLiteral("format"), attributeFormat()); - - if (hasAttributeLength()) - writer.writeAttribute(QStringLiteral("length"), QString::number(attributeLength())); - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - - writer.writeEndElement(); -} - -DomCustomWidgets::DomCustomWidgets() -{ - m_children = 0; -} - DomCustomWidgets::~DomCustomWidgets() { qDeleteAll(m_customWidget); @@ -1508,10 +1124,6 @@ void DomCustomWidgets::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -1525,9 +1137,6 @@ void DomCustomWidgets::write(QXmlStreamWriter &writer, const QString &tagName) c for (DomCustomWidget *v : m_customWidget) v->write(writer, QStringLiteral("customwidget")); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -1537,12 +1146,6 @@ void DomCustomWidgets::setElementCustomWidget(const QVector<DomCustomWidget *> & m_customWidget = a; } -DomHeader::DomHeader() -{ - m_has_attr_location = false; - m_text.clear(); -} - DomHeader::~DomHeader() { } @@ -1591,26 +1194,10 @@ void DomHeader::write(QXmlStreamWriter &writer, const QString &tagName) const writer.writeEndElement(); } -DomCustomWidget::DomCustomWidget() -{ - m_children = 0; - m_header = 0; - m_sizeHint = 0; - m_container = 0; - m_sizePolicy = 0; - m_script = 0; - m_properties = 0; - m_slots = 0; - m_propertyspecifications = 0; -} - DomCustomWidget::~DomCustomWidget() { delete m_header; delete m_sizeHint; - delete m_sizePolicy; - delete m_script; - delete m_properties; delete m_slots; delete m_propertyspecifications; } @@ -1649,28 +1236,10 @@ void DomCustomWidget::read(QXmlStreamReader &reader) setElementContainer(reader.readElementText().toInt()); continue; } - if (!tag.compare(QLatin1String("sizepolicy"), Qt::CaseInsensitive)) { - DomSizePolicyData *v = new DomSizePolicyData(); - v->read(reader); - setElementSizePolicy(v); - continue; - } if (!tag.compare(QLatin1String("pixmap"), Qt::CaseInsensitive)) { setElementPixmap(reader.readElementText()); continue; } - if (!tag.compare(QLatin1String("script"), Qt::CaseInsensitive)) { - DomScript *v = new DomScript(); - v->read(reader); - setElementScript(v); - continue; - } - if (!tag.compare(QLatin1String("properties"), Qt::CaseInsensitive)) { - DomProperties *v = new DomProperties(); - v->read(reader); - setElementProperties(v); - continue; - } if (!tag.compare(QLatin1String("slots"), Qt::CaseInsensitive)) { DomSlots *v = new DomSlots(); v->read(reader); @@ -1688,10 +1257,6 @@ void DomCustomWidget::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -1720,27 +1285,15 @@ void DomCustomWidget::write(QXmlStreamWriter &writer, const QString &tagName) co if (m_children & Container) writer.writeTextElement(QStringLiteral("container"), QString::number(m_container)); - if (m_children & SizePolicy) - m_sizePolicy->write(writer, QStringLiteral("sizepolicy")); - if (m_children & Pixmap) writer.writeTextElement(QStringLiteral("pixmap"), m_pixmap); - if (m_children & Script) - m_script->write(writer, QStringLiteral("script")); - - if (m_children & Properties) - m_properties->write(writer, QStringLiteral("properties")); - if (m_children & Slots) m_slots->write(writer, QStringLiteral("slots")); if (m_children & Propertyspecifications) m_propertyspecifications->write(writer, QStringLiteral("propertyspecifications")); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -1798,57 +1351,12 @@ void DomCustomWidget::setElementContainer(int a) m_container = a; } -DomSizePolicyData *DomCustomWidget::takeElementSizePolicy() -{ - DomSizePolicyData *a = m_sizePolicy; - m_sizePolicy = 0; - m_children ^= SizePolicy; - return a; -} - -void DomCustomWidget::setElementSizePolicy(DomSizePolicyData *a) -{ - delete m_sizePolicy; - m_children |= SizePolicy; - m_sizePolicy = a; -} - void DomCustomWidget::setElementPixmap(const QString &a) { m_children |= Pixmap; m_pixmap = a; } -DomScript *DomCustomWidget::takeElementScript() -{ - DomScript *a = m_script; - m_script = 0; - m_children ^= Script; - return a; -} - -void DomCustomWidget::setElementScript(DomScript *a) -{ - delete m_script; - m_children |= Script; - m_script = a; -} - -DomProperties *DomCustomWidget::takeElementProperties() -{ - DomProperties *a = m_properties; - m_properties = 0; - m_children ^= Properties; - return a; -} - -void DomCustomWidget::setElementProperties(DomProperties *a) -{ - delete m_properties; - m_children |= Properties; - m_properties = a; -} - DomSlots *DomCustomWidget::takeElementSlots() { DomSlots *a = m_slots; @@ -1913,32 +1421,11 @@ void DomCustomWidget::clearElementContainer() m_children &= ~Container; } -void DomCustomWidget::clearElementSizePolicy() -{ - delete m_sizePolicy; - m_sizePolicy = 0; - m_children &= ~SizePolicy; -} - void DomCustomWidget::clearElementPixmap() { m_children &= ~Pixmap; } -void DomCustomWidget::clearElementScript() -{ - delete m_script; - m_script = 0; - m_children &= ~Script; -} - -void DomCustomWidget::clearElementProperties() -{ - delete m_properties; - m_properties = 0; - m_children &= ~Properties; -} - void DomCustomWidget::clearElementSlots() { delete m_slots; @@ -1953,202 +1440,6 @@ void DomCustomWidget::clearElementPropertyspecifications() m_children &= ~Propertyspecifications; } -DomProperties::DomProperties() -{ - m_children = 0; -} - -DomProperties::~DomProperties() -{ - qDeleteAll(m_property); - m_property.clear(); -} - -void DomProperties::read(QXmlStreamReader &reader) -{ - while (!reader.hasError()) { - switch (reader.readNext()) { - case QXmlStreamReader::StartElement : { - const QStringRef tag = reader.name(); - if (!tag.compare(QLatin1String("property"), Qt::CaseInsensitive)) { - DomPropertyData *v = new DomPropertyData(); - v->read(reader); - m_property.append(v); - continue; - } - reader.raiseError(QLatin1String("Unexpected element ") + tag); - } - break; - case QXmlStreamReader::EndElement : - return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; - default : - break; - } - } -} - -void DomProperties::write(QXmlStreamWriter &writer, const QString &tagName) const -{ - writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("properties") : tagName.toLower()); - - for (DomPropertyData *v : m_property) - v->write(writer, QStringLiteral("property")); - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - - writer.writeEndElement(); -} - -void DomProperties::setElementProperty(const QVector<DomPropertyData *> &a) -{ - m_children |= Property; - m_property = a; -} - -DomPropertyData::DomPropertyData() -{ - m_has_attr_type = false; -} - -DomPropertyData::~DomPropertyData() -{ -} - -void DomPropertyData::read(QXmlStreamReader &reader) -{ - const QXmlStreamAttributes &attributes = reader.attributes(); - for (const QXmlStreamAttribute &attribute : attributes) { - const QStringRef name = attribute.name(); - if (name == QLatin1String("type")) { - setAttributeType(attribute.value().toString()); - continue; - } - reader.raiseError(QLatin1String("Unexpected attribute ") + name); - } - - while (!reader.hasError()) { - switch (reader.readNext()) { - case QXmlStreamReader::StartElement : { - const QStringRef tag = reader.name(); - reader.raiseError(QLatin1String("Unexpected element ") + tag); - } - break; - case QXmlStreamReader::EndElement : - return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; - default : - break; - } - } -} - -void DomPropertyData::write(QXmlStreamWriter &writer, const QString &tagName) const -{ - writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("propertydata") : tagName.toLower()); - - if (hasAttributeType()) - writer.writeAttribute(QStringLiteral("type"), attributeType()); - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - - writer.writeEndElement(); -} - -DomSizePolicyData::DomSizePolicyData() -{ - m_children = 0; - m_horData = 0; - m_verData = 0; -} - -DomSizePolicyData::~DomSizePolicyData() -{ -} - -void DomSizePolicyData::read(QXmlStreamReader &reader) -{ - while (!reader.hasError()) { - switch (reader.readNext()) { - case QXmlStreamReader::StartElement : { - const QStringRef tag = reader.name(); - if (!tag.compare(QLatin1String("hordata"), Qt::CaseInsensitive)) { - setElementHorData(reader.readElementText().toInt()); - continue; - } - if (!tag.compare(QLatin1String("verdata"), Qt::CaseInsensitive)) { - setElementVerData(reader.readElementText().toInt()); - continue; - } - reader.raiseError(QLatin1String("Unexpected element ") + tag); - } - break; - case QXmlStreamReader::EndElement : - return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; - default : - break; - } - } -} - -void DomSizePolicyData::write(QXmlStreamWriter &writer, const QString &tagName) const -{ - writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("sizepolicydata") : tagName.toLower()); - - if (m_children & HorData) - writer.writeTextElement(QStringLiteral("hordata"), QString::number(m_horData)); - - if (m_children & VerData) - writer.writeTextElement(QStringLiteral("verdata"), QString::number(m_verData)); - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - - writer.writeEndElement(); -} - -void DomSizePolicyData::setElementHorData(int a) -{ - m_children |= HorData; - m_horData = a; -} - -void DomSizePolicyData::setElementVerData(int a) -{ - m_children |= VerData; - m_verData = a; -} - -void DomSizePolicyData::clearElementHorData() -{ - m_children &= ~HorData; -} - -void DomSizePolicyData::clearElementVerData() -{ - m_children &= ~VerData; -} - -DomLayoutDefault::DomLayoutDefault() -{ - m_has_attr_spacing = false; - m_attr_spacing = 0; - m_has_attr_margin = false; - m_attr_margin = 0; -} - DomLayoutDefault::~DomLayoutDefault() { } @@ -2178,10 +1469,6 @@ void DomLayoutDefault::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -2198,18 +1485,9 @@ void DomLayoutDefault::write(QXmlStreamWriter &writer, const QString &tagName) c if (hasAttributeMargin()) writer.writeAttribute(QStringLiteral("margin"), QString::number(attributeMargin())); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } -DomLayoutFunction::DomLayoutFunction() -{ - m_has_attr_spacing = false; - m_has_attr_margin = false; -} - DomLayoutFunction::~DomLayoutFunction() { } @@ -2239,10 +1517,6 @@ void DomLayoutFunction::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -2259,17 +1533,9 @@ void DomLayoutFunction::write(QXmlStreamWriter &writer, const QString &tagName) if (hasAttributeMargin()) writer.writeAttribute(QStringLiteral("margin"), attributeMargin()); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } -DomTabStops::DomTabStops() -{ - m_children = 0; -} - DomTabStops::~DomTabStops() { m_tabStop.clear(); @@ -2290,10 +1556,6 @@ void DomTabStops::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -2307,9 +1569,6 @@ void DomTabStops::write(QXmlStreamWriter &writer, const QString &tagName) const for (const QString &v : m_tabStop) writer.writeTextElement(QStringLiteral("tabstop"), v); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -2319,18 +1578,6 @@ void DomTabStops::setElementTabStop(const QStringList &a) m_tabStop = a; } -DomLayout::DomLayout() -{ - m_children = 0; - m_has_attr_class = false; - m_has_attr_name = false; - m_has_attr_stretch = false; - m_has_attr_rowStretch = false; - m_has_attr_columnStretch = false; - m_has_attr_rowMinimumHeight = false; - m_has_attr_columnMinimumWidth = false; -} - DomLayout::~DomLayout() { qDeleteAll(m_property); @@ -2404,10 +1651,6 @@ void DomLayout::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -2448,9 +1691,6 @@ void DomLayout::write(QXmlStreamWriter &writer, const QString &tagName) const for (DomLayoutItem *v : m_item) v->write(writer, QStringLiteral("item")); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -2472,42 +1712,24 @@ void DomLayout::setElementItem(const QVector<DomLayoutItem *> &a) m_item = a; } -void DomLayoutItem::clear() +DomLayoutItem::~DomLayoutItem() { delete m_widget; delete m_layout; delete m_spacer; - - m_kind = Unknown; - - m_widget = 0; - m_layout = 0; - m_spacer = 0; -} - -DomLayoutItem::DomLayoutItem() -{ - m_kind = Unknown; - - m_has_attr_row = false; - m_attr_row = 0; - m_has_attr_column = false; - m_attr_column = 0; - m_has_attr_rowSpan = false; - m_attr_rowSpan = 0; - m_has_attr_colSpan = false; - m_attr_colSpan = 0; - m_has_attr_alignment = false; - m_widget = 0; - m_layout = 0; - m_spacer = 0; } -DomLayoutItem::~DomLayoutItem() +void DomLayoutItem::clear() { delete m_widget; delete m_layout; delete m_spacer; + + m_kind = Unknown; + + m_widget = nullptr; + m_layout = nullptr; + m_spacer = nullptr; } void DomLayoutItem::read(QXmlStreamReader &reader) @@ -2565,10 +1787,6 @@ void DomLayoutItem::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -2616,9 +1834,6 @@ void DomLayoutItem::write(QXmlStreamWriter &writer, const QString &tagName) cons default: break; } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -2664,11 +1879,6 @@ void DomLayoutItem::setElementSpacer(DomSpacer *a) m_spacer = a; } -DomRow::DomRow() -{ - m_children = 0; -} - DomRow::~DomRow() { qDeleteAll(m_property); @@ -2692,10 +1902,6 @@ void DomRow::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -2709,9 +1915,6 @@ void DomRow::write(QXmlStreamWriter &writer, const QString &tagName) const for (DomProperty *v : m_property) v->write(writer, QStringLiteral("property")); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -2721,11 +1924,6 @@ void DomRow::setElementProperty(const QList<DomProperty *> &a) m_property = a; } -DomColumn::DomColumn() -{ - m_children = 0; -} - DomColumn::~DomColumn() { qDeleteAll(m_property); @@ -2749,10 +1947,6 @@ void DomColumn::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -2766,9 +1960,6 @@ void DomColumn::write(QXmlStreamWriter &writer, const QString &tagName) const for (DomProperty *v : m_property) v->write(writer, QStringLiteral("property")); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -2778,15 +1969,6 @@ void DomColumn::setElementProperty(const QList<DomProperty *> &a) m_property = a; } -DomItem::DomItem() -{ - m_children = 0; - m_has_attr_row = false; - m_attr_row = 0; - m_has_attr_column = false; - m_attr_column = 0; -} - DomItem::~DomItem() { qDeleteAll(m_property); @@ -2832,10 +2014,6 @@ void DomItem::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -2858,9 +2036,6 @@ void DomItem::write(QXmlStreamWriter &writer, const QString &tagName) const for (DomItem *v : m_item) v->write(writer, QStringLiteral("item")); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -2876,24 +2051,11 @@ void DomItem::setElementItem(const QVector<DomItem *> &a) m_item = a; } -DomWidget::DomWidget() -{ - m_children = 0; - m_has_attr_class = false; - m_has_attr_name = false; - m_has_attr_native = false; - m_attr_native = false; -} - DomWidget::~DomWidget() { m_class.clear(); qDeleteAll(m_property); m_property.clear(); - qDeleteAll(m_script); - m_script.clear(); - qDeleteAll(m_widgetData); - m_widgetData.clear(); qDeleteAll(m_attribute); m_attribute.clear(); qDeleteAll(m_row); @@ -2949,18 +2111,6 @@ void DomWidget::read(QXmlStreamReader &reader) m_property.append(v); continue; } - if (!tag.compare(QLatin1String("script"), Qt::CaseInsensitive)) { - DomScript *v = new DomScript(); - v->read(reader); - m_script.append(v); - continue; - } - if (!tag.compare(QLatin1String("widgetdata"), Qt::CaseInsensitive)) { - DomWidgetData *v = new DomWidgetData(); - v->read(reader); - m_widgetData.append(v); - continue; - } if (!tag.compare(QLatin1String("attribute"), Qt::CaseInsensitive)) { DomProperty *v = new DomProperty(); v->read(reader); @@ -3024,10 +2174,6 @@ void DomWidget::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -3053,12 +2199,6 @@ void DomWidget::write(QXmlStreamWriter &writer, const QString &tagName) const for (DomProperty *v : m_property) v->write(writer, QStringLiteral("property")); - for (DomScript *v : m_script) - v->write(writer, QStringLiteral("script")); - - for (DomWidgetData *v : m_widgetData) - v->write(writer, QStringLiteral("widgetdata")); - for (DomProperty *v : m_attribute) v->write(writer, QStringLiteral("attribute")); @@ -3089,9 +2229,6 @@ void DomWidget::write(QXmlStreamWriter &writer, const QString &tagName) const for (const QString &v : m_zOrder) writer.writeTextElement(QStringLiteral("zorder"), v); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -3107,18 +2244,6 @@ void DomWidget::setElementProperty(const QList<DomProperty *> &a) m_property = a; } -void DomWidget::setElementScript(const QVector<DomScript *> &a) -{ - m_children |= Script; - m_script = a; -} - -void DomWidget::setElementWidgetData(const QVector<DomWidgetData *> &a) -{ - m_children |= WidgetData; - m_widgetData = a; -} - void DomWidget::setElementAttribute(const QList<DomProperty *> &a) { m_children |= Attribute; @@ -3179,12 +2304,6 @@ void DomWidget::setElementZOrder(const QStringList &a) m_zOrder = a; } -DomSpacer::DomSpacer() -{ - m_children = 0; - m_has_attr_name = false; -} - DomSpacer::~DomSpacer() { qDeleteAll(m_property); @@ -3218,10 +2337,6 @@ void DomSpacer::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -3238,9 +2353,6 @@ void DomSpacer::write(QXmlStreamWriter &writer, const QString &tagName) const for (DomProperty *v : m_property) v->write(writer, QStringLiteral("property")); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -3250,16 +2362,6 @@ void DomSpacer::setElementProperty(const QList<DomProperty *> &a) m_property = a; } -DomColor::DomColor() -{ - m_children = 0; - m_has_attr_alpha = false; - m_attr_alpha = 0; - m_red = 0; - m_green = 0; - m_blue = 0; -} - DomColor::~DomColor() { } @@ -3297,10 +2399,6 @@ void DomColor::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -3323,9 +2421,6 @@ void DomColor::write(QXmlStreamWriter &writer, const QString &tagName) const if (m_children & Blue) writer.writeTextElement(QStringLiteral("blue"), QString::number(m_blue)); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -3362,14 +2457,6 @@ void DomColor::clearElementBlue() m_children &= ~Blue; } -DomGradientStop::DomGradientStop() -{ - m_children = 0; - m_has_attr_position = false; - m_attr_position = 0.0; - m_color = 0; -} - DomGradientStop::~DomGradientStop() { delete m_color; @@ -3402,10 +2489,6 @@ void DomGradientStop::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -3422,9 +2505,6 @@ void DomGradientStop::write(QXmlStreamWriter &writer, const QString &tagName) co if (m_children & Color) m_color->write(writer, QStringLiteral("color")); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -3450,34 +2530,6 @@ void DomGradientStop::clearElementColor() m_children &= ~Color; } -DomGradient::DomGradient() -{ - m_children = 0; - m_has_attr_startX = false; - m_attr_startX = 0.0; - m_has_attr_startY = false; - m_attr_startY = 0.0; - m_has_attr_endX = false; - m_attr_endX = 0.0; - m_has_attr_endY = false; - m_attr_endY = 0.0; - m_has_attr_centralX = false; - m_attr_centralX = 0.0; - m_has_attr_centralY = false; - m_attr_centralY = 0.0; - m_has_attr_focalX = false; - m_attr_focalX = 0.0; - m_has_attr_focalY = false; - m_attr_focalY = 0.0; - m_has_attr_radius = false; - m_attr_radius = 0.0; - m_has_attr_angle = false; - m_attr_angle = 0.0; - m_has_attr_type = false; - m_has_attr_spread = false; - m_has_attr_coordinateMode = false; -} - DomGradient::~DomGradient() { qDeleteAll(m_gradientStop); @@ -3559,10 +2611,6 @@ void DomGradient::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -3615,9 +2663,6 @@ void DomGradient::write(QXmlStreamWriter &writer, const QString &tagName) const for (DomGradientStop *v : m_gradientStop) v->write(writer, QStringLiteral("gradientstop")); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -3627,34 +2672,24 @@ void DomGradient::setElementGradientStop(const QVector<DomGradientStop *> &a) m_gradientStop = a; } -void DomBrush::clear() +DomBrush::~DomBrush() { delete m_color; delete m_texture; delete m_gradient; - - m_kind = Unknown; - - m_color = 0; - m_texture = 0; - m_gradient = 0; -} - -DomBrush::DomBrush() -{ - m_kind = Unknown; - - m_has_attr_brushStyle = false; - m_color = 0; - m_texture = 0; - m_gradient = 0; } -DomBrush::~DomBrush() +void DomBrush::clear() { delete m_color; delete m_texture; delete m_gradient; + + m_kind = Unknown; + + m_color = nullptr; + m_texture = nullptr; + m_gradient = nullptr; } void DomBrush::read(QXmlStreamReader &reader) @@ -3696,10 +2731,6 @@ void DomBrush::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -3735,9 +2766,6 @@ void DomBrush::write(QXmlStreamWriter &writer, const QString &tagName) const default: break; } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -3783,13 +2811,6 @@ void DomBrush::setElementGradient(DomGradient *a) m_gradient = a; } -DomColorRole::DomColorRole() -{ - m_children = 0; - m_has_attr_role = false; - m_brush = 0; -} - DomColorRole::~DomColorRole() { delete m_brush; @@ -3822,10 +2843,6 @@ void DomColorRole::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -3842,9 +2859,6 @@ void DomColorRole::write(QXmlStreamWriter &writer, const QString &tagName) const if (m_children & Brush) m_brush->write(writer, QStringLiteral("brush")); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -3870,11 +2884,6 @@ void DomColorRole::clearElementBrush() m_children &= ~Brush; } -DomColorGroup::DomColorGroup() -{ - m_children = 0; -} - DomColorGroup::~DomColorGroup() { qDeleteAll(m_colorRole); @@ -3906,10 +2915,6 @@ void DomColorGroup::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -3926,9 +2931,6 @@ void DomColorGroup::write(QXmlStreamWriter &writer, const QString &tagName) cons for (DomColor *v : m_color) v->write(writer, QStringLiteral("color")); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -3944,14 +2946,6 @@ void DomColorGroup::setElementColor(const QVector<DomColor *> &a) m_color = a; } -DomPalette::DomPalette() -{ - m_children = 0; - m_active = 0; - m_inactive = 0; - m_disabled = 0; -} - DomPalette::~DomPalette() { delete m_active; @@ -3988,10 +2982,6 @@ void DomPalette::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -4011,9 +3001,6 @@ void DomPalette::write(QXmlStreamWriter &writer, const QString &tagName) const if (m_children & Disabled) m_disabled->write(writer, QStringLiteral("disabled")); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -4083,19 +3070,6 @@ void DomPalette::clearElementDisabled() m_children &= ~Disabled; } -DomFont::DomFont() -{ - m_children = 0; - m_pointSize = 0; - m_weight = 0; - m_italic = false; - m_bold = false; - m_underline = false; - m_strikeOut = false; - m_antialiasing = false; - m_kerning = false; -} - DomFont::~DomFont() { } @@ -4151,10 +3125,6 @@ void DomFont::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -4195,9 +3165,6 @@ void DomFont::write(QXmlStreamWriter &writer, const QString &tagName) const if (m_children & Kerning) writer.writeTextElement(QStringLiteral("kerning"), (m_kerning ? QLatin1String("true") : QLatin1String("false"))); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -4311,13 +3278,6 @@ void DomFont::clearElementKerning() m_children &= ~Kerning; } -DomPoint::DomPoint() -{ - m_children = 0; - m_x = 0; - m_y = 0; -} - DomPoint::~DomPoint() { } @@ -4341,10 +3301,6 @@ void DomPoint::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -4361,9 +3317,6 @@ void DomPoint::write(QXmlStreamWriter &writer, const QString &tagName) const if (m_children & Y) writer.writeTextElement(QString(QLatin1Char('y')), QString::number(m_y)); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -4389,15 +3342,6 @@ void DomPoint::clearElementY() m_children &= ~Y; } -DomRect::DomRect() -{ - m_children = 0; - m_x = 0; - m_y = 0; - m_width = 0; - m_height = 0; -} - DomRect::~DomRect() { } @@ -4429,10 +3373,6 @@ void DomRect::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -4455,9 +3395,6 @@ void DomRect::write(QXmlStreamWriter &writer, const QString &tagName) const if (m_children & Height) writer.writeTextElement(QStringLiteral("height"), QString::number(m_height)); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -4505,12 +3442,6 @@ void DomRect::clearElementHeight() m_children &= ~Height; } -DomLocale::DomLocale() -{ - m_has_attr_language = false; - m_has_attr_country = false; -} - DomLocale::~DomLocale() { } @@ -4540,10 +3471,6 @@ void DomLocale::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -4560,23 +3487,9 @@ void DomLocale::write(QXmlStreamWriter &writer, const QString &tagName) const if (hasAttributeCountry()) writer.writeAttribute(QStringLiteral("country"), attributeCountry()); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } -DomSizePolicy::DomSizePolicy() -{ - m_children = 0; - m_has_attr_hSizeType = false; - m_has_attr_vSizeType = false; - m_hSizeType = 0; - m_vSizeType = 0; - m_horStretch = 0; - m_verStretch = 0; -} - DomSizePolicy::~DomSizePolicy() { } @@ -4622,10 +3535,6 @@ void DomSizePolicy::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -4654,9 +3563,6 @@ void DomSizePolicy::write(QXmlStreamWriter &writer, const QString &tagName) cons if (m_children & VerStretch) writer.writeTextElement(QStringLiteral("verstretch"), QString::number(m_verStretch)); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -4704,13 +3610,6 @@ void DomSizePolicy::clearElementVerStretch() m_children &= ~VerStretch; } -DomSize::DomSize() -{ - m_children = 0; - m_width = 0; - m_height = 0; -} - DomSize::~DomSize() { } @@ -4734,10 +3633,6 @@ void DomSize::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -4754,9 +3649,6 @@ void DomSize::write(QXmlStreamWriter &writer, const QString &tagName) const if (m_children & Height) writer.writeTextElement(QStringLiteral("height"), QString::number(m_height)); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -4782,14 +3674,6 @@ void DomSize::clearElementHeight() m_children &= ~Height; } -DomDate::DomDate() -{ - m_children = 0; - m_year = 0; - m_month = 0; - m_day = 0; -} - DomDate::~DomDate() { } @@ -4817,10 +3701,6 @@ void DomDate::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -4840,9 +3720,6 @@ void DomDate::write(QXmlStreamWriter &writer, const QString &tagName) const if (m_children & Day) writer.writeTextElement(QStringLiteral("day"), QString::number(m_day)); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -4879,14 +3756,6 @@ void DomDate::clearElementDay() m_children &= ~Day; } -DomTime::DomTime() -{ - m_children = 0; - m_hour = 0; - m_minute = 0; - m_second = 0; -} - DomTime::~DomTime() { } @@ -4914,10 +3783,6 @@ void DomTime::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -4937,9 +3802,6 @@ void DomTime::write(QXmlStreamWriter &writer, const QString &tagName) const if (m_children & Second) writer.writeTextElement(QStringLiteral("second"), QString::number(m_second)); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -4976,17 +3838,6 @@ void DomTime::clearElementSecond() m_children &= ~Second; } -DomDateTime::DomDateTime() -{ - m_children = 0; - m_hour = 0; - m_minute = 0; - m_second = 0; - m_year = 0; - m_month = 0; - m_day = 0; -} - DomDateTime::~DomDateTime() { } @@ -5026,10 +3877,6 @@ void DomDateTime::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -5058,9 +3905,6 @@ void DomDateTime::write(QXmlStreamWriter &writer, const QString &tagName) const if (m_children & Day) writer.writeTextElement(QStringLiteral("day"), QString::number(m_day)); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -5130,14 +3974,6 @@ void DomDateTime::clearElementDay() m_children &= ~Day; } -DomStringList::DomStringList() -{ - m_children = 0; - m_has_attr_notr = false; - m_has_attr_comment = false; - m_has_attr_extraComment = false; -} - DomStringList::~DomStringList() { m_string.clear(); @@ -5176,10 +4012,6 @@ void DomStringList::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -5202,9 +4034,6 @@ void DomStringList::write(QXmlStreamWriter &writer, const QString &tagName) cons for (const QString &v : m_string) writer.writeTextElement(QStringLiteral("string"), v); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -5214,13 +4043,6 @@ void DomStringList::setElementString(const QStringList &a) m_string = a; } -DomResourcePixmap::DomResourcePixmap() -{ - m_has_attr_resource = false; - m_has_attr_alias = false; - m_text.clear(); -} - DomResourcePixmap::~DomResourcePixmap() { } @@ -5276,22 +4098,6 @@ void DomResourcePixmap::write(QXmlStreamWriter &writer, const QString &tagName) writer.writeEndElement(); } -DomResourceIcon::DomResourceIcon() -{ - m_children = 0; - m_has_attr_theme = false; - m_has_attr_resource = false; - m_text.clear(); - m_normalOff = 0; - m_normalOn = 0; - m_disabledOff = 0; - m_disabledOn = 0; - m_activeOff = 0; - m_activeOn = 0; - m_selectedOff = 0; - m_selectedOn = 0; -} - DomResourceIcon::~DomResourceIcon() { delete m_normalOff; @@ -5603,14 +4409,6 @@ void DomResourceIcon::clearElementSelectedOn() m_children &= ~SelectedOn; } -DomString::DomString() -{ - m_has_attr_notr = false; - m_has_attr_comment = false; - m_has_attr_extraComment = false; - m_text.clear(); -} - DomString::~DomString() { } @@ -5673,13 +4471,6 @@ void DomString::write(QXmlStreamWriter &writer, const QString &tagName) const writer.writeEndElement(); } -DomPointF::DomPointF() -{ - m_children = 0; - m_x = 0; - m_y = 0; -} - DomPointF::~DomPointF() { } @@ -5703,10 +4494,6 @@ void DomPointF::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -5723,9 +4510,6 @@ void DomPointF::write(QXmlStreamWriter &writer, const QString &tagName) const if (m_children & Y) writer.writeTextElement(QString(QLatin1Char('y')), QString::number(m_y, 'f', 15)); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -5751,15 +4535,6 @@ void DomPointF::clearElementY() m_children &= ~Y; } -DomRectF::DomRectF() -{ - m_children = 0; - m_x = 0; - m_y = 0; - m_width = 0; - m_height = 0; -} - DomRectF::~DomRectF() { } @@ -5791,10 +4566,6 @@ void DomRectF::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -5817,9 +4588,6 @@ void DomRectF::write(QXmlStreamWriter &writer, const QString &tagName) const if (m_children & Height) writer.writeTextElement(QStringLiteral("height"), QString::number(m_height, 'f', 15)); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -5867,13 +4635,6 @@ void DomRectF::clearElementHeight() m_children &= ~Height; } -DomSizeF::DomSizeF() -{ - m_children = 0; - m_width = 0; - m_height = 0; -} - DomSizeF::~DomSizeF() { } @@ -5897,10 +4658,6 @@ void DomSizeF::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -5917,9 +4674,6 @@ void DomSizeF::write(QXmlStreamWriter &writer, const QString &tagName) const if (m_children & Height) writer.writeTextElement(QStringLiteral("height"), QString::number(m_height, 'f', 15)); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -5945,12 +4699,6 @@ void DomSizeF::clearElementHeight() m_children &= ~Height; } -DomChar::DomChar() -{ - m_children = 0; - m_unicode = 0; -} - DomChar::~DomChar() { } @@ -5970,10 +4718,6 @@ void DomChar::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -5987,9 +4731,6 @@ void DomChar::write(QXmlStreamWriter &writer, const QString &tagName) const if (m_children & Unicode) writer.writeTextElement(QStringLiteral("unicode"), QString::number(m_unicode)); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -6004,12 +4745,6 @@ void DomChar::clearElementUnicode() m_children &= ~Unicode; } -DomUrl::DomUrl() -{ - m_children = 0; - m_string = 0; -} - DomUrl::~DomUrl() { delete m_string; @@ -6032,10 +4767,6 @@ void DomUrl::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -6049,9 +4780,6 @@ void DomUrl::write(QXmlStreamWriter &writer, const QString &tagName) const if (m_children & String) m_string->write(writer, QStringLiteral("string")); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -6077,7 +4805,7 @@ void DomUrl::clearElementString() m_children &= ~String; } -void DomProperty::clear() +DomProperty::~DomProperty() { delete m_color; delete m_font; @@ -6100,77 +4828,9 @@ void DomProperty::clear() delete m_char; delete m_url; delete m_brush; - - m_kind = Unknown; - - m_color = 0; - m_cursor = 0; - m_font = 0; - m_iconSet = 0; - m_pixmap = 0; - m_palette = 0; - m_point = 0; - m_rect = 0; - m_locale = 0; - m_sizePolicy = 0; - m_size = 0; - m_string = 0; - m_stringList = 0; - m_number = 0; - m_float = 0.0; - m_double = 0; - m_date = 0; - m_time = 0; - m_dateTime = 0; - m_pointF = 0; - m_rectF = 0; - m_sizeF = 0; - m_longLong = 0; - m_char = 0; - m_url = 0; - m_UInt = 0; - m_uLongLong = 0; - m_brush = 0; } -DomProperty::DomProperty() -{ - m_kind = Unknown; - - m_has_attr_name = false; - m_has_attr_stdset = false; - m_attr_stdset = 0; - m_color = 0; - m_cursor = 0; - m_font = 0; - m_iconSet = 0; - m_pixmap = 0; - m_palette = 0; - m_point = 0; - m_rect = 0; - m_locale = 0; - m_sizePolicy = 0; - m_size = 0; - m_string = 0; - m_stringList = 0; - m_number = 0; - m_float = 0.0; - m_double = 0; - m_date = 0; - m_time = 0; - m_dateTime = 0; - m_pointF = 0; - m_rectF = 0; - m_sizeF = 0; - m_longLong = 0; - m_char = 0; - m_url = 0; - m_UInt = 0; - m_uLongLong = 0; - m_brush = 0; -} - -DomProperty::~DomProperty() +void DomProperty::clear() { delete m_color; delete m_font; @@ -6193,6 +4853,37 @@ DomProperty::~DomProperty() delete m_char; delete m_url; delete m_brush; + + m_kind = Unknown; + + m_color = nullptr; + m_cursor = 0; + m_font = nullptr; + m_iconSet = nullptr; + m_pixmap = nullptr; + m_palette = nullptr; + m_point = nullptr; + m_rect = nullptr; + m_locale = nullptr; + m_sizePolicy = nullptr; + m_size = nullptr; + m_string = nullptr; + m_stringList = nullptr; + m_number = 0; + m_float = 0.0; + m_double = 0.0; + m_date = nullptr; + m_time = nullptr; + m_dateTime = nullptr; + m_pointF = nullptr; + m_rectF = nullptr; + m_sizeF = nullptr; + m_longLong = 0; + m_char = nullptr; + m_url = nullptr; + m_UInt = 0; + m_uLongLong = 0; + m_brush = nullptr; } void DomProperty::read(QXmlStreamReader &reader) @@ -6394,10 +5085,6 @@ void DomProperty::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -6592,9 +5279,6 @@ void DomProperty::write(QXmlStreamWriter &writer, const QString &tagName) const default: break; } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -6976,11 +5660,6 @@ void DomProperty::setElementBrush(DomBrush *a) m_brush = a; } -DomConnections::DomConnections() -{ - m_children = 0; -} - DomConnections::~DomConnections() { qDeleteAll(m_connection); @@ -7004,10 +5683,6 @@ void DomConnections::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -7021,9 +5696,6 @@ void DomConnections::write(QXmlStreamWriter &writer, const QString &tagName) con for (DomConnection *v : m_connection) v->write(writer, QStringLiteral("connection")); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -7033,12 +5705,6 @@ void DomConnections::setElementConnection(const QVector<DomConnection *> &a) m_connection = a; } -DomConnection::DomConnection() -{ - m_children = 0; - m_hints = 0; -} - DomConnection::~DomConnection() { delete m_hints; @@ -7077,10 +5743,6 @@ void DomConnection::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -7106,9 +5768,6 @@ void DomConnection::write(QXmlStreamWriter &writer, const QString &tagName) cons if (m_children & Hints) m_hints->write(writer, QStringLiteral("hints")); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -7178,11 +5837,6 @@ void DomConnection::clearElementHints() m_children &= ~Hints; } -DomConnectionHints::DomConnectionHints() -{ - m_children = 0; -} - DomConnectionHints::~DomConnectionHints() { qDeleteAll(m_hint); @@ -7206,10 +5860,6 @@ void DomConnectionHints::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -7223,9 +5873,6 @@ void DomConnectionHints::write(QXmlStreamWriter &writer, const QString &tagName) for (DomConnectionHint *v : m_hint) v->write(writer, QStringLiteral("hint")); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -7235,14 +5882,6 @@ void DomConnectionHints::setElementHint(const QVector<DomConnectionHint *> &a) m_hint = a; } -DomConnectionHint::DomConnectionHint() -{ - m_children = 0; - m_has_attr_type = false; - m_x = 0; - m_y = 0; -} - DomConnectionHint::~DomConnectionHint() { } @@ -7276,10 +5915,6 @@ void DomConnectionHint::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -7299,9 +5934,6 @@ void DomConnectionHint::write(QXmlStreamWriter &writer, const QString &tagName) if (m_children & Y) writer.writeTextElement(QString(QLatin1Char('y')), QString::number(m_y)); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -7327,129 +5959,6 @@ void DomConnectionHint::clearElementY() m_children &= ~Y; } -DomScript::DomScript() -{ - m_has_attr_source = false; - m_has_attr_language = false; -} - -DomScript::~DomScript() -{ -} - -void DomScript::read(QXmlStreamReader &reader) -{ - const QXmlStreamAttributes &attributes = reader.attributes(); - for (const QXmlStreamAttribute &attribute : attributes) { - const QStringRef name = attribute.name(); - if (name == QLatin1String("source")) { - setAttributeSource(attribute.value().toString()); - continue; - } - if (name == QLatin1String("language")) { - setAttributeLanguage(attribute.value().toString()); - continue; - } - reader.raiseError(QLatin1String("Unexpected attribute ") + name); - } - - while (!reader.hasError()) { - switch (reader.readNext()) { - case QXmlStreamReader::StartElement : { - const QStringRef tag = reader.name(); - reader.raiseError(QLatin1String("Unexpected element ") + tag); - } - break; - case QXmlStreamReader::EndElement : - return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; - default : - break; - } - } -} - -void DomScript::write(QXmlStreamWriter &writer, const QString &tagName) const -{ - writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("script") : tagName.toLower()); - - if (hasAttributeSource()) - writer.writeAttribute(QStringLiteral("source"), attributeSource()); - - if (hasAttributeLanguage()) - writer.writeAttribute(QStringLiteral("language"), attributeLanguage()); - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - - writer.writeEndElement(); -} - -DomWidgetData::DomWidgetData() -{ - m_children = 0; -} - -DomWidgetData::~DomWidgetData() -{ - qDeleteAll(m_property); - m_property.clear(); -} - -void DomWidgetData::read(QXmlStreamReader &reader) -{ - while (!reader.hasError()) { - switch (reader.readNext()) { - case QXmlStreamReader::StartElement : { - const QStringRef tag = reader.name(); - if (!tag.compare(QLatin1String("property"), Qt::CaseInsensitive)) { - DomProperty *v = new DomProperty(); - v->read(reader); - m_property.append(v); - continue; - } - reader.raiseError(QLatin1String("Unexpected element ") + tag); - } - break; - case QXmlStreamReader::EndElement : - return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; - default : - break; - } - } -} - -void DomWidgetData::write(QXmlStreamWriter &writer, const QString &tagName) const -{ - writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("widgetdata") : tagName.toLower()); - - for (DomProperty *v : m_property) - v->write(writer, QStringLiteral("property")); - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - - writer.writeEndElement(); -} - -void DomWidgetData::setElementProperty(const QList<DomProperty *> &a) -{ - m_children |= Property; - m_property = a; -} - -DomDesignerData::DomDesignerData() -{ - m_children = 0; -} - DomDesignerData::~DomDesignerData() { qDeleteAll(m_property); @@ -7473,10 +5982,6 @@ void DomDesignerData::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -7490,9 +5995,6 @@ void DomDesignerData::write(QXmlStreamWriter &writer, const QString &tagName) co for (DomProperty *v : m_property) v->write(writer, QStringLiteral("property")); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -7502,11 +6004,6 @@ void DomDesignerData::setElementProperty(const QList<DomProperty *> &a) m_property = a; } -DomSlots::DomSlots() -{ - m_children = 0; -} - DomSlots::~DomSlots() { m_signal.clear(); @@ -7532,10 +6029,6 @@ void DomSlots::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -7552,9 +6045,6 @@ void DomSlots::write(QXmlStreamWriter &writer, const QString &tagName) const for (const QString &v : m_slot) writer.writeTextElement(QStringLiteral("slot"), v); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -7570,11 +6060,6 @@ void DomSlots::setElementSlot(const QStringList &a) m_slot = a; } -DomPropertySpecifications::DomPropertySpecifications() -{ - m_children = 0; -} - DomPropertySpecifications::~DomPropertySpecifications() { qDeleteAll(m_tooltip); @@ -7606,10 +6091,6 @@ void DomPropertySpecifications::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -7626,9 +6107,6 @@ void DomPropertySpecifications::write(QXmlStreamWriter &writer, const QString &t for (DomStringPropertySpecification *v : m_stringpropertyspecification) v->write(writer, QStringLiteral("stringpropertyspecification")); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } @@ -7644,11 +6122,6 @@ void DomPropertySpecifications::setElementStringpropertyspecification(const QVec m_stringpropertyspecification = a; } -DomPropertyToolTip::DomPropertyToolTip() -{ - m_has_attr_name = false; -} - DomPropertyToolTip::~DomPropertyToolTip() { } @@ -7674,10 +6147,6 @@ void DomPropertyToolTip::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -7691,19 +6160,9 @@ void DomPropertyToolTip::write(QXmlStreamWriter &writer, const QString &tagName) if (hasAttributeName()) writer.writeAttribute(QStringLiteral("name"), attributeName()); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } -DomStringPropertySpecification::DomStringPropertySpecification() -{ - m_has_attr_name = false; - m_has_attr_type = false; - m_has_attr_notr = false; -} - DomStringPropertySpecification::~DomStringPropertySpecification() { } @@ -7737,10 +6196,6 @@ void DomStringPropertySpecification::read(QXmlStreamReader &reader) break; case QXmlStreamReader::EndElement : return; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; default : break; } @@ -7760,9 +6215,6 @@ void DomStringPropertySpecification::write(QXmlStreamWriter &writer, const QStri if (hasAttributeNotr()) writer.writeAttribute(QStringLiteral("notr"), attributeNotr()); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } |