diff options
Diffstat (limited to 'src/tools/uic/ui4.cpp')
| -rw-r--r-- | src/tools/uic/ui4.cpp | 5165 |
1 files changed, 1184 insertions, 3981 deletions
diff --git a/src/tools/uic/ui4.cpp b/src/tools/uic/ui4.cpp index 5a609ef42b..bc1039871e 100644 --- a/src/tools/uic/ui4.cpp +++ b/src/tools/uic/ui4.cpp @@ -40,71 +40,6 @@ using namespace QFormInternal; ** Implementations */ -void DomUI::clear(bool clear_all) -{ - delete m_widget; - delete m_layoutDefault; - delete m_layoutFunction; - delete m_customWidgets; - delete m_tabStops; - delete m_images; - delete m_includes; - delete m_resources; - delete m_connections; - delete m_designerdata; - delete m_slots; - delete m_buttonGroups; - - if (clear_all) { - m_text.clear(); - 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_children = 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() -{ - 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; @@ -112,7 +47,6 @@ DomUI::~DomUI() delete m_layoutFunction; delete m_customWidgets; delete m_tabStops; - delete m_images; delete m_includes; delete m_resources; delete m_connections; @@ -123,10 +57,9 @@ DomUI::~DomUI() void DomUI::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("version")) { setAttributeVersion(attribute.value().toString()); continue; @@ -150,97 +83,96 @@ void DomUI::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("author")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("author"), Qt::CaseInsensitive)) { setElementAuthor(reader.readElementText()); continue; } - if (tag == QLatin1String("comment")) { + if (!tag.compare(QLatin1String("comment"), Qt::CaseInsensitive)) { setElementComment(reader.readElementText()); continue; } - if (tag == QLatin1String("exportmacro")) { + if (!tag.compare(QLatin1String("exportmacro"), Qt::CaseInsensitive)) { setElementExportMacro(reader.readElementText()); continue; } - if (tag == QLatin1String("class")) { + if (!tag.compare(QLatin1String("class"), Qt::CaseInsensitive)) { setElementClass(reader.readElementText()); continue; } - if (tag == QLatin1String("widget")) { + if (!tag.compare(QLatin1String("widget"), Qt::CaseInsensitive)) { DomWidget *v = new DomWidget(); v->read(reader); setElementWidget(v); continue; } - if (tag == QLatin1String("layoutdefault")) { + if (!tag.compare(QLatin1String("layoutdefault"), Qt::CaseInsensitive)) { DomLayoutDefault *v = new DomLayoutDefault(); v->read(reader); setElementLayoutDefault(v); continue; } - if (tag == QLatin1String("layoutfunction")) { + if (!tag.compare(QLatin1String("layoutfunction"), Qt::CaseInsensitive)) { DomLayoutFunction *v = new DomLayoutFunction(); v->read(reader); setElementLayoutFunction(v); continue; } - if (tag == QLatin1String("pixmapfunction")) { + if (!tag.compare(QLatin1String("pixmapfunction"), Qt::CaseInsensitive)) { setElementPixmapFunction(reader.readElementText()); continue; } - if (tag == QLatin1String("customwidgets")) { + if (!tag.compare(QLatin1String("customwidgets"), Qt::CaseInsensitive)) { DomCustomWidgets *v = new DomCustomWidgets(); v->read(reader); setElementCustomWidgets(v); continue; } - if (tag == QLatin1String("tabstops")) { + if (!tag.compare(QLatin1String("tabstops"), Qt::CaseInsensitive)) { DomTabStops *v = new DomTabStops(); v->read(reader); setElementTabStops(v); continue; } - if (tag == QLatin1String("images")) { - DomImages *v = new DomImages(); - v->read(reader); - setElementImages(v); + if (!tag.compare(QLatin1String("images"), Qt::CaseInsensitive)) { + qWarning("Omitting deprecated element <images>."); + reader.skipCurrentElement(); continue; } - if (tag == QLatin1String("includes")) { + if (!tag.compare(QLatin1String("includes"), Qt::CaseInsensitive)) { DomIncludes *v = new DomIncludes(); v->read(reader); setElementIncludes(v); continue; } - if (tag == QLatin1String("resources")) { + if (!tag.compare(QLatin1String("resources"), Qt::CaseInsensitive)) { DomResources *v = new DomResources(); v->read(reader); setElementResources(v); continue; } - if (tag == QLatin1String("connections")) { + if (!tag.compare(QLatin1String("connections"), Qt::CaseInsensitive)) { DomConnections *v = new DomConnections(); v->read(reader); setElementConnections(v); continue; } - if (tag == QLatin1String("designerdata")) { + if (!tag.compare(QLatin1String("designerdata"), Qt::CaseInsensitive)) { DomDesignerData *v = new DomDesignerData(); v->read(reader); setElementDesignerdata(v); continue; } - if (tag == QLatin1String("slots")) { + if (!tag.compare(QLatin1String("slots"), Qt::CaseInsensitive)) { DomSlots *v = new DomSlots(); v->read(reader); setElementSlots(v); continue; } - if (tag == QLatin1String("buttongroups")) { + if (!tag.compare(QLatin1String("buttongroups"), Qt::CaseInsensitive)) { DomButtonGroups *v = new DomButtonGroups(); v->read(reader); setElementButtonGroups(v); @@ -250,12 +182,7 @@ void DomUI::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -264,7 +191,7 @@ void DomUI::read(QXmlStreamReader &reader) void DomUI::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("ui") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("ui") : tagName.toLower()); if (hasAttributeVersion()) writer.writeAttribute(QStringLiteral("version"), attributeVersion()); @@ -281,284 +208,246 @@ void DomUI::write(QXmlStreamWriter &writer, const QString &tagName) const if (hasAttributeStdSetDef()) writer.writeAttribute(QStringLiteral("stdsetdef"), QString::number(attributeStdSetDef())); - if (m_children & Author) { + if (m_children & Author) writer.writeTextElement(QStringLiteral("author"), m_author); - } - if (m_children & Comment) { + if (m_children & Comment) writer.writeTextElement(QStringLiteral("comment"), m_comment); - } - if (m_children & ExportMacro) { + if (m_children & ExportMacro) writer.writeTextElement(QStringLiteral("exportmacro"), m_exportMacro); - } - if (m_children & Class) { + if (m_children & Class) writer.writeTextElement(QStringLiteral("class"), m_class); - } - if (m_children & Widget) { + if (m_children & Widget) m_widget->write(writer, QStringLiteral("widget")); - } - if (m_children & LayoutDefault) { + if (m_children & LayoutDefault) m_layoutDefault->write(writer, QStringLiteral("layoutdefault")); - } - if (m_children & LayoutFunction) { + if (m_children & LayoutFunction) m_layoutFunction->write(writer, QStringLiteral("layoutfunction")); - } - if (m_children & PixmapFunction) { + if (m_children & PixmapFunction) writer.writeTextElement(QStringLiteral("pixmapfunction"), m_pixmapFunction); - } - if (m_children & CustomWidgets) { + if (m_children & CustomWidgets) m_customWidgets->write(writer, QStringLiteral("customwidgets")); - } - if (m_children & TabStops) { + if (m_children & TabStops) m_tabStops->write(writer, QStringLiteral("tabstops")); - } - if (m_children & Images) { - m_images->write(writer, QStringLiteral("images")); - } - - if (m_children & Includes) { + if (m_children & Includes) m_includes->write(writer, QStringLiteral("includes")); - } - if (m_children & Resources) { + if (m_children & Resources) m_resources->write(writer, QStringLiteral("resources")); - } - if (m_children & Connections) { + if (m_children & Connections) m_connections->write(writer, QStringLiteral("connections")); - } - if (m_children & Designerdata) { + if (m_children & Designerdata) m_designerdata->write(writer, QStringLiteral("designerdata")); - } - if (m_children & Slots) { + if (m_children & Slots) m_slots->write(writer, QStringLiteral("slots")); - } - if (m_children & ButtonGroups) { + if (m_children & ButtonGroups) m_buttonGroups->write(writer, QStringLiteral("buttongroups")); - } - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomUI::setElementAuthor(const QString& a) +void DomUI::setElementAuthor(const QString &a) { m_children |= Author; m_author = a; } -void DomUI::setElementComment(const QString& a) +void DomUI::setElementComment(const QString &a) { m_children |= Comment; m_comment = a; } -void DomUI::setElementExportMacro(const QString& a) +void DomUI::setElementExportMacro(const QString &a) { m_children |= ExportMacro; m_exportMacro = a; } -void DomUI::setElementClass(const QString& a) +void DomUI::setElementClass(const QString &a) { m_children |= Class; m_class = a; } -DomWidget* DomUI::takeElementWidget() +DomWidget *DomUI::takeElementWidget() { - DomWidget* a = m_widget; + DomWidget *a = m_widget; m_widget = 0; m_children ^= Widget; return a; } -void DomUI::setElementWidget(DomWidget* a) +void DomUI::setElementWidget(DomWidget *a) { delete m_widget; m_children |= Widget; m_widget = a; } -DomLayoutDefault* DomUI::takeElementLayoutDefault() +DomLayoutDefault *DomUI::takeElementLayoutDefault() { - DomLayoutDefault* a = m_layoutDefault; + DomLayoutDefault *a = m_layoutDefault; m_layoutDefault = 0; m_children ^= LayoutDefault; return a; } -void DomUI::setElementLayoutDefault(DomLayoutDefault* a) +void DomUI::setElementLayoutDefault(DomLayoutDefault *a) { delete m_layoutDefault; m_children |= LayoutDefault; m_layoutDefault = a; } -DomLayoutFunction* DomUI::takeElementLayoutFunction() +DomLayoutFunction *DomUI::takeElementLayoutFunction() { - DomLayoutFunction* a = m_layoutFunction; + DomLayoutFunction *a = m_layoutFunction; m_layoutFunction = 0; m_children ^= LayoutFunction; return a; } -void DomUI::setElementLayoutFunction(DomLayoutFunction* a) +void DomUI::setElementLayoutFunction(DomLayoutFunction *a) { delete m_layoutFunction; m_children |= LayoutFunction; m_layoutFunction = a; } -void DomUI::setElementPixmapFunction(const QString& a) +void DomUI::setElementPixmapFunction(const QString &a) { m_children |= PixmapFunction; m_pixmapFunction = a; } -DomCustomWidgets* DomUI::takeElementCustomWidgets() +DomCustomWidgets *DomUI::takeElementCustomWidgets() { - DomCustomWidgets* a = m_customWidgets; + DomCustomWidgets *a = m_customWidgets; m_customWidgets = 0; m_children ^= CustomWidgets; return a; } -void DomUI::setElementCustomWidgets(DomCustomWidgets* a) +void DomUI::setElementCustomWidgets(DomCustomWidgets *a) { delete m_customWidgets; m_children |= CustomWidgets; m_customWidgets = a; } -DomTabStops* DomUI::takeElementTabStops() +DomTabStops *DomUI::takeElementTabStops() { - DomTabStops* a = m_tabStops; + DomTabStops *a = m_tabStops; m_tabStops = 0; m_children ^= TabStops; return a; } -void DomUI::setElementTabStops(DomTabStops* a) +void DomUI::setElementTabStops(DomTabStops *a) { delete m_tabStops; m_children |= TabStops; 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 *DomUI::takeElementIncludes() { - DomIncludes* a = m_includes; + DomIncludes *a = m_includes; m_includes = 0; m_children ^= Includes; return a; } -void DomUI::setElementIncludes(DomIncludes* a) +void DomUI::setElementIncludes(DomIncludes *a) { delete m_includes; m_children |= Includes; m_includes = a; } -DomResources* DomUI::takeElementResources() +DomResources *DomUI::takeElementResources() { - DomResources* a = m_resources; + DomResources *a = m_resources; m_resources = 0; m_children ^= Resources; return a; } -void DomUI::setElementResources(DomResources* a) +void DomUI::setElementResources(DomResources *a) { delete m_resources; m_children |= Resources; m_resources = a; } -DomConnections* DomUI::takeElementConnections() +DomConnections *DomUI::takeElementConnections() { - DomConnections* a = m_connections; + DomConnections *a = m_connections; m_connections = 0; m_children ^= Connections; return a; } -void DomUI::setElementConnections(DomConnections* a) +void DomUI::setElementConnections(DomConnections *a) { delete m_connections; m_children |= Connections; m_connections = a; } -DomDesignerData* DomUI::takeElementDesignerdata() +DomDesignerData *DomUI::takeElementDesignerdata() { - DomDesignerData* a = m_designerdata; + DomDesignerData *a = m_designerdata; m_designerdata = 0; m_children ^= Designerdata; return a; } -void DomUI::setElementDesignerdata(DomDesignerData* a) +void DomUI::setElementDesignerdata(DomDesignerData *a) { delete m_designerdata; m_children |= Designerdata; m_designerdata = a; } -DomSlots* DomUI::takeElementSlots() +DomSlots *DomUI::takeElementSlots() { - DomSlots* a = m_slots; + DomSlots *a = m_slots; m_slots = 0; m_children ^= Slots; return a; } -void DomUI::setElementSlots(DomSlots* a) +void DomUI::setElementSlots(DomSlots *a) { delete m_slots; m_children |= Slots; m_slots = a; } -DomButtonGroups* DomUI::takeElementButtonGroups() +DomButtonGroups *DomUI::takeElementButtonGroups() { - DomButtonGroups* a = m_buttonGroups; + DomButtonGroups *a = m_buttonGroups; m_buttonGroups = 0; m_children ^= ButtonGroups; return a; } -void DomUI::setElementButtonGroups(DomButtonGroups* a) +void DomUI::setElementButtonGroups(DomButtonGroups *a) { delete m_buttonGroups; m_children |= ButtonGroups; @@ -625,13 +514,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; @@ -674,23 +556,6 @@ void DomUI::clearElementButtonGroups() m_children &= ~ButtonGroups; } -void DomIncludes::clear(bool clear_all) -{ - qDeleteAll(m_include); - m_include.clear(); - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; -} - -DomIncludes::DomIncludes() -{ - m_children = 0; -} - DomIncludes::~DomIncludes() { qDeleteAll(m_include); @@ -699,12 +564,11 @@ DomIncludes::~DomIncludes() void DomIncludes::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("include")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("include"), Qt::CaseInsensitive)) { DomInclude *v = new DomInclude(); v->read(reader); m_include.append(v); @@ -714,12 +578,7 @@ void DomIncludes::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -728,54 +587,29 @@ void DomIncludes::read(QXmlStreamReader &reader) void DomIncludes::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("includes") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("includes") : tagName.toLower()); - for (int i = 0; i < m_include.size(); ++i) { - DomInclude* v = m_include[i]; + for (DomInclude *v : m_include) v->write(writer, QStringLiteral("include")); - } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomIncludes::setElementInclude(const QList<DomInclude*>& a) +void DomIncludes::setElementInclude(const QVector<DomInclude *> &a) { m_children |= Include; m_include = a; } -void DomInclude::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - m_has_attr_location = false; - m_has_attr_impldecl = false; - } - - m_children = 0; -} - -DomInclude::DomInclude() -{ - m_children = 0; - m_has_attr_location = false; - m_has_attr_impldecl = false; - m_text.clear(); -} - DomInclude::~DomInclude() { } void DomInclude::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("location")) { setAttributeLocation(attribute.value().toString()); continue; @@ -787,16 +621,15 @@ void DomInclude::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); + const QStringRef tag = reader.name(); reader.raiseError(QLatin1String("Unexpected element ") + tag); } break; case QXmlStreamReader::EndElement : - finished = true; - break; + return; case QXmlStreamReader::Characters : if (!reader.isWhitespace()) m_text.append(reader.text().toString()); @@ -809,7 +642,7 @@ void DomInclude::read(QXmlStreamReader &reader) void DomInclude::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("include") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("include") : tagName.toLower()); if (hasAttributeLocation()) writer.writeAttribute(QStringLiteral("location"), attributeLocation()); @@ -823,25 +656,6 @@ void DomInclude::write(QXmlStreamWriter &writer, const QString &tagName) const writer.writeEndElement(); } -void DomResources::clear(bool clear_all) -{ - qDeleteAll(m_include); - m_include.clear(); - - if (clear_all) { - m_text.clear(); - m_has_attr_name = false; - } - - m_children = 0; -} - -DomResources::DomResources() -{ - m_children = 0; - m_has_attr_name = false; -} - DomResources::~DomResources() { qDeleteAll(m_include); @@ -850,10 +664,9 @@ DomResources::~DomResources() void DomResources::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("name")) { setAttributeName(attribute.value().toString()); continue; @@ -861,11 +674,11 @@ void DomResources::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("include")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("include"), Qt::CaseInsensitive)) { DomResource *v = new DomResource(); v->read(reader); m_include.append(v); @@ -875,12 +688,7 @@ void DomResources::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -889,54 +697,32 @@ void DomResources::read(QXmlStreamReader &reader) void DomResources::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("resources") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("resources") : tagName.toLower()); if (hasAttributeName()) writer.writeAttribute(QStringLiteral("name"), attributeName()); - for (int i = 0; i < m_include.size(); ++i) { - DomResource* v = m_include[i]; + for (DomResource *v : m_include) v->write(writer, QStringLiteral("include")); - } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomResources::setElementInclude(const QList<DomResource*>& a) +void DomResources::setElementInclude(const QVector<DomResource *> &a) { m_children |= Include; m_include = a; } -void DomResource::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - m_has_attr_location = false; - } - - m_children = 0; -} - -DomResource::DomResource() -{ - m_children = 0; - m_has_attr_location = false; -} - DomResource::~DomResource() { } void DomResource::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("location")) { setAttributeLocation(attribute.value().toString()); continue; @@ -944,20 +730,15 @@ void DomResource::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); + const QStringRef tag = reader.name(); reader.raiseError(QLatin1String("Unexpected element ") + tag); } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -966,42 +747,14 @@ void DomResource::read(QXmlStreamReader &reader) void DomResource::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("resource") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("resource") : tagName.toLower()); if (hasAttributeLocation()) writer.writeAttribute(QStringLiteral("location"), attributeLocation()); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } -void DomActionGroup::clear(bool clear_all) -{ - qDeleteAll(m_action); - m_action.clear(); - qDeleteAll(m_actionGroup); - m_actionGroup.clear(); - qDeleteAll(m_property); - m_property.clear(); - qDeleteAll(m_attribute); - m_attribute.clear(); - - if (clear_all) { - m_text.clear(); - m_has_attr_name = false; - } - - m_children = 0; -} - -DomActionGroup::DomActionGroup() -{ - m_children = 0; - m_has_attr_name = false; -} - DomActionGroup::~DomActionGroup() { qDeleteAll(m_action); @@ -1016,10 +769,9 @@ DomActionGroup::~DomActionGroup() void DomActionGroup::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("name")) { setAttributeName(attribute.value().toString()); continue; @@ -1027,29 +779,29 @@ void DomActionGroup::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("action")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("action"), Qt::CaseInsensitive)) { DomAction *v = new DomAction(); v->read(reader); m_action.append(v); continue; } - if (tag == QLatin1String("actiongroup")) { + if (!tag.compare(QLatin1String("actiongroup"), Qt::CaseInsensitive)) { DomActionGroup *v = new DomActionGroup(); v->read(reader); m_actionGroup.append(v); continue; } - if (tag == QLatin1String("property")) { + if (!tag.compare(QLatin1String("property"), Qt::CaseInsensitive)) { DomProperty *v = new DomProperty(); v->read(reader); m_property.append(v); continue; } - if (tag == QLatin1String("attribute")) { + if (!tag.compare(QLatin1String("attribute"), Qt::CaseInsensitive)) { DomProperty *v = new DomProperty(); v->read(reader); m_attribute.append(v); @@ -1059,12 +811,7 @@ void DomActionGroup::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -1073,80 +820,50 @@ void DomActionGroup::read(QXmlStreamReader &reader) void DomActionGroup::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("actiongroup") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("actiongroup") : tagName.toLower()); if (hasAttributeName()) writer.writeAttribute(QStringLiteral("name"), attributeName()); - for (int i = 0; i < m_action.size(); ++i) { - DomAction* v = m_action[i]; + for (DomAction *v : m_action) v->write(writer, QStringLiteral("action")); - } - for (int i = 0; i < m_actionGroup.size(); ++i) { - DomActionGroup* v = m_actionGroup[i]; + + for (DomActionGroup *v : m_actionGroup) v->write(writer, QStringLiteral("actiongroup")); - } - for (int i = 0; i < m_property.size(); ++i) { - DomProperty* v = m_property[i]; + + for (DomProperty *v : m_property) v->write(writer, QStringLiteral("property")); - } - for (int i = 0; i < m_attribute.size(); ++i) { - DomProperty* v = m_attribute[i]; + + for (DomProperty *v : m_attribute) v->write(writer, QStringLiteral("attribute")); - } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomActionGroup::setElementAction(const QList<DomAction*>& a) +void DomActionGroup::setElementAction(const QVector<DomAction *> &a) { m_children |= Action; m_action = a; } -void DomActionGroup::setElementActionGroup(const QList<DomActionGroup*>& a) +void DomActionGroup::setElementActionGroup(const QVector<DomActionGroup *> &a) { m_children |= ActionGroup; m_actionGroup = a; } -void DomActionGroup::setElementProperty(const QList<DomProperty*>& a) +void DomActionGroup::setElementProperty(const QList<DomProperty *> &a) { m_children |= Property; m_property = a; } -void DomActionGroup::setElementAttribute(const QList<DomProperty*>& a) +void DomActionGroup::setElementAttribute(const QList<DomProperty *> &a) { m_children |= Attribute; m_attribute = a; } -void DomAction::clear(bool clear_all) -{ - qDeleteAll(m_property); - m_property.clear(); - qDeleteAll(m_attribute); - m_attribute.clear(); - - if (clear_all) { - m_text.clear(); - m_has_attr_name = false; - m_has_attr_menu = false; - } - - m_children = 0; -} - -DomAction::DomAction() -{ - m_children = 0; - m_has_attr_name = false; - m_has_attr_menu = false; -} - DomAction::~DomAction() { qDeleteAll(m_property); @@ -1157,10 +874,9 @@ DomAction::~DomAction() void DomAction::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("name")) { setAttributeName(attribute.value().toString()); continue; @@ -1172,17 +888,17 @@ void DomAction::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("property")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("property"), Qt::CaseInsensitive)) { DomProperty *v = new DomProperty(); v->read(reader); m_property.append(v); continue; } - if (tag == QLatin1String("attribute")) { + if (!tag.compare(QLatin1String("attribute"), Qt::CaseInsensitive)) { DomProperty *v = new DomProperty(); v->read(reader); m_attribute.append(v); @@ -1192,12 +908,7 @@ void DomAction::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -1206,7 +917,7 @@ void DomAction::read(QXmlStreamReader &reader) void DomAction::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("action") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("action") : tagName.toLower()); if (hasAttributeName()) writer.writeAttribute(QStringLiteral("name"), attributeName()); @@ -1214,59 +925,36 @@ void DomAction::write(QXmlStreamWriter &writer, const QString &tagName) const if (hasAttributeMenu()) writer.writeAttribute(QStringLiteral("menu"), attributeMenu()); - for (int i = 0; i < m_property.size(); ++i) { - DomProperty* v = m_property[i]; + for (DomProperty *v : m_property) v->write(writer, QStringLiteral("property")); - } - for (int i = 0; i < m_attribute.size(); ++i) { - DomProperty* v = m_attribute[i]; + + for (DomProperty *v : m_attribute) v->write(writer, QStringLiteral("attribute")); - } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomAction::setElementProperty(const QList<DomProperty*>& a) +void DomAction::setElementProperty(const QList<DomProperty *> &a) { m_children |= Property; m_property = a; } -void DomAction::setElementAttribute(const QList<DomProperty*>& a) +void DomAction::setElementAttribute(const QList<DomProperty *> &a) { m_children |= Attribute; m_attribute = a; } -void DomActionRef::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - m_has_attr_name = false; - } - - m_children = 0; -} - -DomActionRef::DomActionRef() -{ - m_children = 0; - m_has_attr_name = false; -} - DomActionRef::~DomActionRef() { } void DomActionRef::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("name")) { setAttributeName(attribute.value().toString()); continue; @@ -1274,20 +962,15 @@ void DomActionRef::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); + const QStringRef tag = reader.name(); reader.raiseError(QLatin1String("Unexpected element ") + tag); } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -1296,38 +979,14 @@ void DomActionRef::read(QXmlStreamReader &reader) void DomActionRef::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("actionref") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("actionref") : tagName.toLower()); if (hasAttributeName()) writer.writeAttribute(QStringLiteral("name"), attributeName()); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } -void DomButtonGroup::clear(bool clear_all) -{ - qDeleteAll(m_property); - m_property.clear(); - qDeleteAll(m_attribute); - m_attribute.clear(); - - if (clear_all) { - m_text.clear(); - m_has_attr_name = false; - } - - m_children = 0; -} - -DomButtonGroup::DomButtonGroup() -{ - m_children = 0; - m_has_attr_name = false; -} - DomButtonGroup::~DomButtonGroup() { qDeleteAll(m_property); @@ -1338,10 +997,9 @@ DomButtonGroup::~DomButtonGroup() void DomButtonGroup::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("name")) { setAttributeName(attribute.value().toString()); continue; @@ -1349,17 +1007,17 @@ void DomButtonGroup::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("property")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("property"), Qt::CaseInsensitive)) { DomProperty *v = new DomProperty(); v->read(reader); m_property.append(v); continue; } - if (tag == QLatin1String("attribute")) { + if (!tag.compare(QLatin1String("attribute"), Qt::CaseInsensitive)) { DomProperty *v = new DomProperty(); v->read(reader); m_attribute.append(v); @@ -1369,12 +1027,7 @@ void DomButtonGroup::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -1383,54 +1036,32 @@ void DomButtonGroup::read(QXmlStreamReader &reader) void DomButtonGroup::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("buttongroup") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("buttongroup") : tagName.toLower()); if (hasAttributeName()) writer.writeAttribute(QStringLiteral("name"), attributeName()); - for (int i = 0; i < m_property.size(); ++i) { - DomProperty* v = m_property[i]; + for (DomProperty *v : m_property) v->write(writer, QStringLiteral("property")); - } - for (int i = 0; i < m_attribute.size(); ++i) { - DomProperty* v = m_attribute[i]; + + for (DomProperty *v : m_attribute) v->write(writer, QStringLiteral("attribute")); - } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomButtonGroup::setElementProperty(const QList<DomProperty*>& a) +void DomButtonGroup::setElementProperty(const QList<DomProperty *> &a) { m_children |= Property; m_property = a; } -void DomButtonGroup::setElementAttribute(const QList<DomProperty*>& a) +void DomButtonGroup::setElementAttribute(const QList<DomProperty *> &a) { m_children |= Attribute; m_attribute = a; } -void DomButtonGroups::clear(bool clear_all) -{ - qDeleteAll(m_buttonGroup); - m_buttonGroup.clear(); - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; -} - -DomButtonGroups::DomButtonGroups() -{ - m_children = 0; -} - DomButtonGroups::~DomButtonGroups() { qDeleteAll(m_buttonGroup); @@ -1439,12 +1070,11 @@ DomButtonGroups::~DomButtonGroups() void DomButtonGroups::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("buttongroup")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("buttongroup"), Qt::CaseInsensitive)) { DomButtonGroup *v = new DomButtonGroup(); v->read(reader); m_buttonGroup.append(v); @@ -1454,12 +1084,7 @@ void DomButtonGroups::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -1468,295 +1093,20 @@ void DomButtonGroups::read(QXmlStreamReader &reader) void DomButtonGroups::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("buttongroups") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("buttongroups") : tagName.toLower()); - for (int i = 0; i < m_buttonGroup.size(); ++i) { - DomButtonGroup* v = m_buttonGroup[i]; + for (DomButtonGroup *v : m_buttonGroup) v->write(writer, QStringLiteral("buttongroup")); - } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomButtonGroups::setElementButtonGroup(const QList<DomButtonGroup*>& a) +void DomButtonGroups::setElementButtonGroup(const QVector<DomButtonGroup *> &a) { m_children |= ButtonGroup; m_buttonGroup = a; } -void DomImages::clear(bool clear_all) -{ - qDeleteAll(m_image); - m_image.clear(); - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; -} - -DomImages::DomImages() -{ - m_children = 0; -} - -DomImages::~DomImages() -{ - qDeleteAll(m_image); - m_image.clear(); -} - -void DomImages::read(QXmlStreamReader &reader) -{ - - for (bool finished = false; !finished && !reader.hasError();) { - switch (reader.readNext()) { - case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("image")) { - DomImage *v = new DomImage(); - v->read(reader); - m_image.append(v); - continue; - } - reader.raiseError(QLatin1String("Unexpected element ") + tag); - } - break; - case QXmlStreamReader::EndElement : - finished = true; - break; - 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() ? QString::fromUtf8("images") : tagName.toLower()); - - for (int i = 0; i < m_image.size(); ++i) { - DomImage* v = m_image[i]; - v->write(writer, QStringLiteral("image")); - } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - - writer.writeEndElement(); -} - -void DomImages::setElementImage(const QList<DomImage*>& a) -{ - m_children |= Image; - m_image = a; -} - -void DomImage::clear(bool clear_all) -{ - delete m_data; - - if (clear_all) { - m_text.clear(); - m_has_attr_name = false; - } - - m_children = 0; - m_data = 0; -} - -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) { - QStringRef name = attribute.name(); - if (name == QLatin1String("name")) { - setAttributeName(attribute.value().toString()); - continue; - } - reader.raiseError(QLatin1String("Unexpected attribute ") + name); - } - - for (bool finished = false; !finished && !reader.hasError();) { - switch (reader.readNext()) { - case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("data")) { - DomImageData *v = new DomImageData(); - v->read(reader); - setElementData(v); - continue; - } - reader.raiseError(QLatin1String("Unexpected element ") + tag); - } - break; - case QXmlStreamReader::EndElement : - finished = true; - break; - 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() ? QString::fromUtf8("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; -} - -void DomImageData::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - m_has_attr_format = false; - m_has_attr_length = false; - m_attr_length = 0; - } - - m_children = 0; -} - -DomImageData::DomImageData() -{ - m_children = 0; - 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) { - 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); - } - - for (bool finished = false; !finished && !reader.hasError();) { - switch (reader.readNext()) { - case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - reader.raiseError(QLatin1String("Unexpected element ") + tag); - } - break; - case QXmlStreamReader::EndElement : - finished = true; - break; - 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() ? QString::fromUtf8("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(); -} - -void DomCustomWidgets::clear(bool clear_all) -{ - qDeleteAll(m_customWidget); - m_customWidget.clear(); - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; -} - -DomCustomWidgets::DomCustomWidgets() -{ - m_children = 0; -} - DomCustomWidgets::~DomCustomWidgets() { qDeleteAll(m_customWidget); @@ -1765,12 +1115,11 @@ DomCustomWidgets::~DomCustomWidgets() void DomCustomWidgets::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("customwidget")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("customwidget"), Qt::CaseInsensitive)) { DomCustomWidget *v = new DomCustomWidget(); v->read(reader); m_customWidget.append(v); @@ -1780,12 +1129,7 @@ void DomCustomWidgets::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -1794,52 +1138,29 @@ void DomCustomWidgets::read(QXmlStreamReader &reader) void DomCustomWidgets::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("customwidgets") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("customwidgets") : tagName.toLower()); - for (int i = 0; i < m_customWidget.size(); ++i) { - DomCustomWidget* v = m_customWidget[i]; + for (DomCustomWidget *v : m_customWidget) v->write(writer, QStringLiteral("customwidget")); - } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomCustomWidgets::setElementCustomWidget(const QList<DomCustomWidget*>& a) +void DomCustomWidgets::setElementCustomWidget(const QVector<DomCustomWidget *> &a) { m_children |= CustomWidget; m_customWidget = a; } -void DomHeader::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - m_has_attr_location = false; - } - - m_children = 0; -} - -DomHeader::DomHeader() -{ - m_children = 0; - m_has_attr_location = false; - m_text.clear(); -} - DomHeader::~DomHeader() { } void DomHeader::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("location")) { setAttributeLocation(attribute.value().toString()); continue; @@ -1847,16 +1168,15 @@ void DomHeader::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); + const QStringRef tag = reader.name(); reader.raiseError(QLatin1String("Unexpected element ") + tag); } break; case QXmlStreamReader::EndElement : - finished = true; - break; + return; case QXmlStreamReader::Characters : if (!reader.isWhitespace()) m_text.append(reader.text().toString()); @@ -1869,7 +1189,7 @@ void DomHeader::read(QXmlStreamReader &reader) void DomHeader::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("header") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("header") : tagName.toLower()); if (hasAttributeLocation()) writer.writeAttribute(QStringLiteral("location"), attributeLocation()); @@ -1880,119 +1200,74 @@ void DomHeader::write(QXmlStreamWriter &writer, const QString &tagName) const writer.writeEndElement(); } -void DomCustomWidget::clear(bool clear_all) -{ - delete m_header; - delete m_sizeHint; - delete m_sizePolicy; - delete m_script; - delete m_properties; - delete m_slots; - delete m_propertyspecifications; - - if (clear_all) { - m_text.clear(); - } - - 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() -{ - 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; } void DomCustomWidget::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("class")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("class"), Qt::CaseInsensitive)) { setElementClass(reader.readElementText()); continue; } - if (tag == QLatin1String("extends")) { + if (!tag.compare(QLatin1String("extends"), Qt::CaseInsensitive)) { setElementExtends(reader.readElementText()); continue; } - if (tag == QLatin1String("header")) { + if (!tag.compare(QLatin1String("header"), Qt::CaseInsensitive)) { DomHeader *v = new DomHeader(); v->read(reader); setElementHeader(v); continue; } - if (tag == QLatin1String("sizehint")) { + if (!tag.compare(QLatin1String("sizehint"), Qt::CaseInsensitive)) { DomSize *v = new DomSize(); v->read(reader); setElementSizeHint(v); continue; } - if (tag == QLatin1String("addpagemethod")) { + if (!tag.compare(QLatin1String("addpagemethod"), Qt::CaseInsensitive)) { setElementAddPageMethod(reader.readElementText()); continue; } - if (tag == QLatin1String("container")) { + if (!tag.compare(QLatin1String("container"), Qt::CaseInsensitive)) { setElementContainer(reader.readElementText().toInt()); continue; } - if (tag == QLatin1String("sizepolicy")) { - DomSizePolicyData *v = new DomSizePolicyData(); - v->read(reader); - setElementSizePolicy(v); + if (!tag.compare(QLatin1String("sizepolicy"), Qt::CaseInsensitive)) { + qWarning("Omitting deprecated element <sizepolicy>."); + reader.skipCurrentElement(); continue; } - if (tag == QLatin1String("pixmap")) { + if (!tag.compare(QLatin1String("pixmap"), Qt::CaseInsensitive)) { setElementPixmap(reader.readElementText()); continue; } - if (tag == QLatin1String("script")) { - DomScript *v = new DomScript(); - v->read(reader); - setElementScript(v); + if (!tag.compare(QLatin1String("script"), Qt::CaseInsensitive)) { + qWarning("Omitting deprecated element <script>."); + reader.skipCurrentElement(); continue; } - if (tag == QLatin1String("properties")) { - DomProperties *v = new DomProperties(); - v->read(reader); - setElementProperties(v); + if (!tag.compare(QLatin1String("properties"), Qt::CaseInsensitive)) { + qWarning("Omitting deprecated element <properties>."); + reader.skipCurrentElement(); continue; } - if (tag == QLatin1String("slots")) { + if (!tag.compare(QLatin1String("slots"), Qt::CaseInsensitive)) { DomSlots *v = new DomSlots(); v->read(reader); setElementSlots(v); continue; } - if (tag == QLatin1String("propertyspecifications")) { + if (!tag.compare(QLatin1String("propertyspecifications"), Qt::CaseInsensitive)) { DomPropertySpecifications *v = new DomPropertySpecifications(); v->read(reader); setElementPropertyspecifications(v); @@ -2002,12 +1277,7 @@ void DomCustomWidget::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -2016,105 +1286,81 @@ void DomCustomWidget::read(QXmlStreamReader &reader) void DomCustomWidget::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("customwidget") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("customwidget") : tagName.toLower()); - if (m_children & Class) { + if (m_children & Class) writer.writeTextElement(QStringLiteral("class"), m_class); - } - if (m_children & Extends) { + if (m_children & Extends) writer.writeTextElement(QStringLiteral("extends"), m_extends); - } - if (m_children & Header) { + if (m_children & Header) m_header->write(writer, QStringLiteral("header")); - } - if (m_children & SizeHint) { + if (m_children & SizeHint) m_sizeHint->write(writer, QStringLiteral("sizehint")); - } - if (m_children & AddPageMethod) { + if (m_children & AddPageMethod) writer.writeTextElement(QStringLiteral("addpagemethod"), m_addPageMethod); - } - if (m_children & Container) { + 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) { + 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) { + if (m_children & Slots) m_slots->write(writer, QStringLiteral("slots")); - } - if (m_children & Propertyspecifications) { + if (m_children & Propertyspecifications) m_propertyspecifications->write(writer, QStringLiteral("propertyspecifications")); - } - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomCustomWidget::setElementClass(const QString& a) +void DomCustomWidget::setElementClass(const QString &a) { m_children |= Class; m_class = a; } -void DomCustomWidget::setElementExtends(const QString& a) +void DomCustomWidget::setElementExtends(const QString &a) { m_children |= Extends; m_extends = a; } -DomHeader* DomCustomWidget::takeElementHeader() +DomHeader *DomCustomWidget::takeElementHeader() { - DomHeader* a = m_header; + DomHeader *a = m_header; m_header = 0; m_children ^= Header; return a; } -void DomCustomWidget::setElementHeader(DomHeader* a) +void DomCustomWidget::setElementHeader(DomHeader *a) { delete m_header; m_children |= Header; m_header = a; } -DomSize* DomCustomWidget::takeElementSizeHint() +DomSize *DomCustomWidget::takeElementSizeHint() { - DomSize* a = m_sizeHint; + DomSize *a = m_sizeHint; m_sizeHint = 0; m_children ^= SizeHint; return a; } -void DomCustomWidget::setElementSizeHint(DomSize* a) +void DomCustomWidget::setElementSizeHint(DomSize *a) { delete m_sizeHint; m_children |= SizeHint; m_sizeHint = a; } -void DomCustomWidget::setElementAddPageMethod(const QString& a) +void DomCustomWidget::setElementAddPageMethod(const QString &a) { m_children |= AddPageMethod; m_addPageMethod = a; @@ -2126,81 +1372,36 @@ 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) +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() +DomSlots *DomCustomWidget::takeElementSlots() { - 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; + DomSlots *a = m_slots; m_slots = 0; m_children ^= Slots; return a; } -void DomCustomWidget::setElementSlots(DomSlots* a) +void DomCustomWidget::setElementSlots(DomSlots *a) { delete m_slots; m_children |= Slots; m_slots = a; } -DomPropertySpecifications* DomCustomWidget::takeElementPropertyspecifications() +DomPropertySpecifications *DomCustomWidget::takeElementPropertyspecifications() { - DomPropertySpecifications* a = m_propertyspecifications; + DomPropertySpecifications *a = m_propertyspecifications; m_propertyspecifications = 0; m_children ^= Propertyspecifications; return a; } -void DomCustomWidget::setElementPropertyspecifications(DomPropertySpecifications* a) +void DomCustomWidget::setElementPropertyspecifications(DomPropertySpecifications *a) { delete m_propertyspecifications; m_children |= Propertyspecifications; @@ -2241,32 +1442,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; @@ -2281,272 +1461,15 @@ void DomCustomWidget::clearElementPropertyspecifications() m_children &= ~Propertyspecifications; } -void DomProperties::clear(bool clear_all) -{ - qDeleteAll(m_property); - m_property.clear(); - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; -} - -DomProperties::DomProperties() -{ - m_children = 0; -} - -DomProperties::~DomProperties() -{ - qDeleteAll(m_property); - m_property.clear(); -} - -void DomProperties::read(QXmlStreamReader &reader) -{ - - for (bool finished = false; !finished && !reader.hasError();) { - switch (reader.readNext()) { - case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("property")) { - DomPropertyData *v = new DomPropertyData(); - v->read(reader); - m_property.append(v); - continue; - } - reader.raiseError(QLatin1String("Unexpected element ") + tag); - } - break; - case QXmlStreamReader::EndElement : - finished = true; - break; - 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() ? QString::fromUtf8("properties") : tagName.toLower()); - - for (int i = 0; i < m_property.size(); ++i) { - DomPropertyData* v = m_property[i]; - v->write(writer, QStringLiteral("property")); - } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - - writer.writeEndElement(); -} - -void DomProperties::setElementProperty(const QList<DomPropertyData*>& a) -{ - m_children |= Property; - m_property = a; -} - -void DomPropertyData::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - m_has_attr_type = false; - } - - m_children = 0; -} - -DomPropertyData::DomPropertyData() -{ - m_children = 0; - m_has_attr_type = false; -} - -DomPropertyData::~DomPropertyData() -{ -} - -void DomPropertyData::read(QXmlStreamReader &reader) -{ - - const QXmlStreamAttributes attributes = reader.attributes(); - for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); - if (name == QLatin1String("type")) { - setAttributeType(attribute.value().toString()); - continue; - } - reader.raiseError(QLatin1String("Unexpected attribute ") + name); - } - - for (bool finished = false; !finished && !reader.hasError();) { - switch (reader.readNext()) { - case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - reader.raiseError(QLatin1String("Unexpected element ") + tag); - } - break; - case QXmlStreamReader::EndElement : - finished = true; - break; - 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() ? QString::fromUtf8("propertydata") : tagName.toLower()); - - if (hasAttributeType()) - writer.writeAttribute(QStringLiteral("type"), attributeType()); - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - - writer.writeEndElement(); -} - -void DomSizePolicyData::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; - m_horData = 0; - m_verData = 0; -} - -DomSizePolicyData::DomSizePolicyData() -{ - m_children = 0; - m_horData = 0; - m_verData = 0; -} - -DomSizePolicyData::~DomSizePolicyData() -{ -} - -void DomSizePolicyData::read(QXmlStreamReader &reader) -{ - - for (bool finished = false; !finished && !reader.hasError();) { - switch (reader.readNext()) { - case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("hordata")) { - setElementHorData(reader.readElementText().toInt()); - continue; - } - if (tag == QLatin1String("verdata")) { - setElementVerData(reader.readElementText().toInt()); - continue; - } - reader.raiseError(QLatin1String("Unexpected element ") + tag); - } - break; - case QXmlStreamReader::EndElement : - finished = true; - break; - 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() ? QString::fromUtf8("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; -} - -void DomLayoutDefault::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - m_has_attr_spacing = false; - m_attr_spacing = 0; - m_has_attr_margin = false; - m_attr_margin = 0; - } - - m_children = 0; -} - -DomLayoutDefault::DomLayoutDefault() -{ - m_children = 0; - m_has_attr_spacing = false; - m_attr_spacing = 0; - m_has_attr_margin = false; - m_attr_margin = 0; -} - DomLayoutDefault::~DomLayoutDefault() { } void DomLayoutDefault::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("spacing")) { setAttributeSpacing(attribute.value().toInt()); continue; @@ -2558,20 +1481,15 @@ void DomLayoutDefault::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); + const QStringRef tag = reader.name(); reader.raiseError(QLatin1String("Unexpected element ") + tag); } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -2580,7 +1498,7 @@ void DomLayoutDefault::read(QXmlStreamReader &reader) void DomLayoutDefault::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("layoutdefault") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("layoutdefault") : tagName.toLower()); if (hasAttributeSpacing()) writer.writeAttribute(QStringLiteral("spacing"), QString::number(attributeSpacing())); @@ -2588,41 +1506,18 @@ 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(); } -void DomLayoutFunction::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - m_has_attr_spacing = false; - m_has_attr_margin = false; - } - - m_children = 0; -} - -DomLayoutFunction::DomLayoutFunction() -{ - m_children = 0; - m_has_attr_spacing = false; - m_has_attr_margin = false; -} - DomLayoutFunction::~DomLayoutFunction() { } void DomLayoutFunction::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("spacing")) { setAttributeSpacing(attribute.value().toString()); continue; @@ -2634,20 +1529,15 @@ void DomLayoutFunction::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); + const QStringRef tag = reader.name(); reader.raiseError(QLatin1String("Unexpected element ") + tag); } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -2656,7 +1546,7 @@ void DomLayoutFunction::read(QXmlStreamReader &reader) void DomLayoutFunction::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("layoutfunction") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("layoutfunction") : tagName.toLower()); if (hasAttributeSpacing()) writer.writeAttribute(QStringLiteral("spacing"), attributeSpacing()); @@ -2664,28 +1554,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(); } -void DomTabStops::clear(bool clear_all) -{ - m_tabStop.clear(); - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; -} - -DomTabStops::DomTabStops() -{ - m_children = 0; -} - DomTabStops::~DomTabStops() { m_tabStop.clear(); @@ -2693,12 +1564,11 @@ DomTabStops::~DomTabStops() void DomTabStops::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("tabstop")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("tabstop"), Qt::CaseInsensitive)) { m_tabStop.append(reader.readElementText()); continue; } @@ -2706,12 +1576,7 @@ void DomTabStops::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -2720,59 +1585,20 @@ void DomTabStops::read(QXmlStreamReader &reader) void DomTabStops::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("tabstops") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("tabstops") : tagName.toLower()); - for (int i = 0; i < m_tabStop.size(); ++i) { - QString v = m_tabStop[i]; + for (const QString &v : m_tabStop) writer.writeTextElement(QStringLiteral("tabstop"), v); - } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomTabStops::setElementTabStop(const QStringList& a) +void DomTabStops::setElementTabStop(const QStringList &a) { m_children |= TabStop; m_tabStop = a; } -void DomLayout::clear(bool clear_all) -{ - qDeleteAll(m_property); - m_property.clear(); - qDeleteAll(m_attribute); - m_attribute.clear(); - qDeleteAll(m_item); - m_item.clear(); - - if (clear_all) { - m_text.clear(); - 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; - } - - m_children = 0; -} - -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); @@ -2785,10 +1611,9 @@ DomLayout::~DomLayout() void DomLayout::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("class")) { setAttributeClass(attribute.value().toString()); continue; @@ -2820,23 +1645,23 @@ void DomLayout::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("property")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("property"), Qt::CaseInsensitive)) { DomProperty *v = new DomProperty(); v->read(reader); m_property.append(v); continue; } - if (tag == QLatin1String("attribute")) { + if (!tag.compare(QLatin1String("attribute"), Qt::CaseInsensitive)) { DomProperty *v = new DomProperty(); v->read(reader); m_attribute.append(v); continue; } - if (tag == QLatin1String("item")) { + if (!tag.compare(QLatin1String("item"), Qt::CaseInsensitive)) { DomLayoutItem *v = new DomLayoutItem(); v->read(reader); m_item.append(v); @@ -2846,12 +1671,7 @@ void DomLayout::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -2860,7 +1680,7 @@ void DomLayout::read(QXmlStreamReader &reader) void DomLayout::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("layout") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("layout") : tagName.toLower()); if (hasAttributeClass()) writer.writeAttribute(QStringLiteral("class"), attributeClass()); @@ -2883,99 +1703,61 @@ void DomLayout::write(QXmlStreamWriter &writer, const QString &tagName) const if (hasAttributeColumnMinimumWidth()) writer.writeAttribute(QStringLiteral("columnminimumwidth"), attributeColumnMinimumWidth()); - for (int i = 0; i < m_property.size(); ++i) { - DomProperty* v = m_property[i]; + for (DomProperty *v : m_property) v->write(writer, QStringLiteral("property")); - } - for (int i = 0; i < m_attribute.size(); ++i) { - DomProperty* v = m_attribute[i]; + + for (DomProperty *v : m_attribute) v->write(writer, QStringLiteral("attribute")); - } - for (int i = 0; i < m_item.size(); ++i) { - DomLayoutItem* v = m_item[i]; + + for (DomLayoutItem *v : m_item) v->write(writer, QStringLiteral("item")); - } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomLayout::setElementProperty(const QList<DomProperty*>& a) +void DomLayout::setElementProperty(const QList<DomProperty *> &a) { m_children |= Property; m_property = a; } -void DomLayout::setElementAttribute(const QList<DomProperty*>& a) +void DomLayout::setElementAttribute(const QList<DomProperty *> &a) { m_children |= Attribute; m_attribute = a; } -void DomLayout::setElementItem(const QList<DomLayoutItem*>& a) +void DomLayout::setElementItem(const QVector<DomLayoutItem *> &a) { m_children |= Item; m_item = a; } -void DomLayoutItem::clear(bool clear_all) +DomLayoutItem::~DomLayoutItem() { delete m_widget; delete m_layout; delete m_spacer; - - if (clear_all) { - m_text.clear(); - 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_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) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("row")) { setAttributeRow(attribute.value().toInt()); continue; @@ -2999,23 +1781,23 @@ void DomLayoutItem::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("widget")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("widget"), Qt::CaseInsensitive)) { DomWidget *v = new DomWidget(); v->read(reader); setElementWidget(v); continue; } - if (tag == QLatin1String("layout")) { + if (!tag.compare(QLatin1String("layout"), Qt::CaseInsensitive)) { DomLayout *v = new DomLayout(); v->read(reader); setElementLayout(v); continue; } - if (tag == QLatin1String("spacer")) { + if (!tag.compare(QLatin1String("spacer"), Qt::CaseInsensitive)) { DomSpacer *v = new DomSpacer(); v->read(reader); setElementSpacer(v); @@ -3025,12 +1807,7 @@ void DomLayoutItem::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -3039,7 +1816,7 @@ void DomLayoutItem::read(QXmlStreamReader &reader) void DomLayoutItem::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("layoutitem") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("layoutitem") : tagName.toLower()); if (hasAttributeRow()) writer.writeAttribute(QStringLiteral("row"), QString::number(attributeRow())); @@ -3057,95 +1834,72 @@ void DomLayoutItem::write(QXmlStreamWriter &writer, const QString &tagName) cons writer.writeAttribute(QStringLiteral("alignment"), attributeAlignment()); switch (kind()) { - case Widget: { - DomWidget* v = elementWidget(); - if (v != 0) { - v->write(writer, QStringLiteral("widget")); - } - break; - } - case Layout: { - DomLayout* v = elementLayout(); - if (v != 0) { - v->write(writer, QStringLiteral("layout")); - } - break; - } - case Spacer: { - DomSpacer* v = elementSpacer(); - if (v != 0) { - v->write(writer, QStringLiteral("spacer")); - } - break; - } - default: - break; + case Widget: { + DomWidget *v = elementWidget(); + if (v != 0) + v->write(writer, QStringLiteral("widget")); + break; + } + case Layout: { + DomLayout *v = elementLayout(); + if (v != 0) + v->write(writer, QStringLiteral("layout")); + break; + } + case Spacer: { + DomSpacer *v = elementSpacer(); + if (v != 0) + v->write(writer, QStringLiteral("spacer")); + break; + } + default: + break; } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } -DomWidget* DomLayoutItem::takeElementWidget() +DomWidget *DomLayoutItem::takeElementWidget() { - DomWidget* a = m_widget; + DomWidget *a = m_widget; m_widget = 0; return a; } -void DomLayoutItem::setElementWidget(DomWidget* a) +void DomLayoutItem::setElementWidget(DomWidget *a) { - clear(false); + clear(); m_kind = Widget; m_widget = a; } -DomLayout* DomLayoutItem::takeElementLayout() +DomLayout *DomLayoutItem::takeElementLayout() { - DomLayout* a = m_layout; + DomLayout *a = m_layout; m_layout = 0; return a; } -void DomLayoutItem::setElementLayout(DomLayout* a) +void DomLayoutItem::setElementLayout(DomLayout *a) { - clear(false); + clear(); m_kind = Layout; m_layout = a; } -DomSpacer* DomLayoutItem::takeElementSpacer() +DomSpacer *DomLayoutItem::takeElementSpacer() { - DomSpacer* a = m_spacer; + DomSpacer *a = m_spacer; m_spacer = 0; return a; } -void DomLayoutItem::setElementSpacer(DomSpacer* a) +void DomLayoutItem::setElementSpacer(DomSpacer *a) { - clear(false); + clear(); m_kind = Spacer; m_spacer = a; } -void DomRow::clear(bool clear_all) -{ - qDeleteAll(m_property); - m_property.clear(); - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; -} - -DomRow::DomRow() -{ - m_children = 0; -} - DomRow::~DomRow() { qDeleteAll(m_property); @@ -3154,12 +1908,11 @@ DomRow::~DomRow() void DomRow::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("property")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("property"), Qt::CaseInsensitive)) { DomProperty *v = new DomProperty(); v->read(reader); m_property.append(v); @@ -3169,12 +1922,7 @@ void DomRow::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -3183,41 +1931,20 @@ void DomRow::read(QXmlStreamReader &reader) void DomRow::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("row") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("row") : tagName.toLower()); - for (int i = 0; i < m_property.size(); ++i) { - DomProperty* v = m_property[i]; + for (DomProperty *v : m_property) v->write(writer, QStringLiteral("property")); - } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomRow::setElementProperty(const QList<DomProperty*>& a) +void DomRow::setElementProperty(const QList<DomProperty *> &a) { m_children |= Property; m_property = a; } -void DomColumn::clear(bool clear_all) -{ - qDeleteAll(m_property); - m_property.clear(); - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; -} - -DomColumn::DomColumn() -{ - m_children = 0; -} - DomColumn::~DomColumn() { qDeleteAll(m_property); @@ -3226,12 +1953,11 @@ DomColumn::~DomColumn() void DomColumn::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("property")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("property"), Qt::CaseInsensitive)) { DomProperty *v = new DomProperty(); v->read(reader); m_property.append(v); @@ -3241,12 +1967,7 @@ void DomColumn::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -3255,51 +1976,20 @@ void DomColumn::read(QXmlStreamReader &reader) void DomColumn::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("column") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("column") : tagName.toLower()); - for (int i = 0; i < m_property.size(); ++i) { - DomProperty* v = m_property[i]; + for (DomProperty *v : m_property) v->write(writer, QStringLiteral("property")); - } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomColumn::setElementProperty(const QList<DomProperty*>& a) +void DomColumn::setElementProperty(const QList<DomProperty *> &a) { m_children |= Property; m_property = a; } -void DomItem::clear(bool clear_all) -{ - qDeleteAll(m_property); - m_property.clear(); - qDeleteAll(m_item); - m_item.clear(); - - if (clear_all) { - m_text.clear(); - m_has_attr_row = false; - m_attr_row = 0; - m_has_attr_column = false; - m_attr_column = 0; - } - - m_children = 0; -} - -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); @@ -3310,10 +2000,9 @@ DomItem::~DomItem() void DomItem::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("row")) { setAttributeRow(attribute.value().toInt()); continue; @@ -3325,17 +2014,17 @@ void DomItem::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("property")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("property"), Qt::CaseInsensitive)) { DomProperty *v = new DomProperty(); v->read(reader); m_property.append(v); continue; } - if (tag == QLatin1String("item")) { + if (!tag.compare(QLatin1String("item"), Qt::CaseInsensitive)) { DomItem *v = new DomItem(); v->read(reader); m_item.append(v); @@ -3345,12 +2034,7 @@ void DomItem::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -3359,7 +2043,7 @@ void DomItem::read(QXmlStreamReader &reader) void DomItem::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("item") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("item") : tagName.toLower()); if (hasAttributeRow()) writer.writeAttribute(QStringLiteral("row"), QString::number(attributeRow())); @@ -3367,90 +2051,32 @@ void DomItem::write(QXmlStreamWriter &writer, const QString &tagName) const if (hasAttributeColumn()) writer.writeAttribute(QStringLiteral("column"), QString::number(attributeColumn())); - for (int i = 0; i < m_property.size(); ++i) { - DomProperty* v = m_property[i]; + for (DomProperty *v : m_property) v->write(writer, QStringLiteral("property")); - } - for (int i = 0; i < m_item.size(); ++i) { - DomItem* v = m_item[i]; + + for (DomItem *v : m_item) v->write(writer, QStringLiteral("item")); - } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomItem::setElementProperty(const QList<DomProperty*>& a) +void DomItem::setElementProperty(const QList<DomProperty *> &a) { m_children |= Property; m_property = a; } -void DomItem::setElementItem(const QList<DomItem*>& a) +void DomItem::setElementItem(const QVector<DomItem *> &a) { m_children |= Item; m_item = a; } -void DomWidget::clear(bool clear_all) -{ - 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); - m_row.clear(); - qDeleteAll(m_column); - m_column.clear(); - qDeleteAll(m_item); - m_item.clear(); - qDeleteAll(m_layout); - m_layout.clear(); - qDeleteAll(m_widget); - m_widget.clear(); - qDeleteAll(m_action); - m_action.clear(); - qDeleteAll(m_actionGroup); - m_actionGroup.clear(); - qDeleteAll(m_addAction); - m_addAction.clear(); - m_zOrder.clear(); - - if (clear_all) { - m_text.clear(); - m_has_attr_class = false; - m_has_attr_name = false; - m_has_attr_native = false; - m_attr_native = false; - } - - m_children = 0; -} - -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); @@ -3474,10 +2100,9 @@ DomWidget::~DomWidget() void DomWidget::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("class")) { setAttributeClass(attribute.value().toString()); continue; @@ -3493,87 +2118,85 @@ void DomWidget::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("class")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("class"), Qt::CaseInsensitive)) { m_class.append(reader.readElementText()); continue; } - if (tag == QLatin1String("property")) { + if (!tag.compare(QLatin1String("property"), Qt::CaseInsensitive)) { DomProperty *v = new DomProperty(); v->read(reader); m_property.append(v); continue; } - if (tag == QLatin1String("script")) { - DomScript *v = new DomScript(); - v->read(reader); - m_script.append(v); + if (!tag.compare(QLatin1String("script"), Qt::CaseInsensitive)) { + qWarning("Omitting deprecated element <script>."); + reader.skipCurrentElement(); continue; } - if (tag == QLatin1String("widgetdata")) { - DomWidgetData *v = new DomWidgetData(); - v->read(reader); - m_widgetData.append(v); + if (!tag.compare(QLatin1String("widgetdata"), Qt::CaseInsensitive)) { + qWarning("Omitting deprecated element <widgetdata>."); + reader.skipCurrentElement(); continue; } - if (tag == QLatin1String("attribute")) { + if (!tag.compare(QLatin1String("attribute"), Qt::CaseInsensitive)) { DomProperty *v = new DomProperty(); v->read(reader); m_attribute.append(v); continue; } - if (tag == QLatin1String("row")) { + if (!tag.compare(QLatin1String("row"), Qt::CaseInsensitive)) { DomRow *v = new DomRow(); v->read(reader); m_row.append(v); continue; } - if (tag == QLatin1String("column")) { + if (!tag.compare(QLatin1String("column"), Qt::CaseInsensitive)) { DomColumn *v = new DomColumn(); v->read(reader); m_column.append(v); continue; } - if (tag == QLatin1String("item")) { + if (!tag.compare(QLatin1String("item"), Qt::CaseInsensitive)) { DomItem *v = new DomItem(); v->read(reader); m_item.append(v); continue; } - if (tag == QLatin1String("layout")) { + if (!tag.compare(QLatin1String("layout"), Qt::CaseInsensitive)) { DomLayout *v = new DomLayout(); v->read(reader); m_layout.append(v); continue; } - if (tag == QLatin1String("widget")) { + if (!tag.compare(QLatin1String("widget"), Qt::CaseInsensitive)) { DomWidget *v = new DomWidget(); v->read(reader); m_widget.append(v); continue; } - if (tag == QLatin1String("action")) { + if (!tag.compare(QLatin1String("action"), Qt::CaseInsensitive)) { DomAction *v = new DomAction(); v->read(reader); m_action.append(v); continue; } - if (tag == QLatin1String("actiongroup")) { + if (!tag.compare(QLatin1String("actiongroup"), Qt::CaseInsensitive)) { DomActionGroup *v = new DomActionGroup(); v->read(reader); m_actionGroup.append(v); continue; } - if (tag == QLatin1String("addaction")) { + if (!tag.compare(QLatin1String("addaction"), Qt::CaseInsensitive)) { DomActionRef *v = new DomActionRef(); v->read(reader); m_addAction.append(v); continue; } - if (tag == QLatin1String("zorder")) { + if (!tag.compare(QLatin1String("zorder"), Qt::CaseInsensitive)) { m_zOrder.append(reader.readElementText()); continue; } @@ -3581,12 +2204,7 @@ void DomWidget::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -3595,7 +2213,7 @@ void DomWidget::read(QXmlStreamReader &reader) void DomWidget::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("widget") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("widget") : tagName.toLower()); if (hasAttributeClass()) writer.writeAttribute(QStringLiteral("class"), attributeClass()); @@ -3606,171 +2224,117 @@ void DomWidget::write(QXmlStreamWriter &writer, const QString &tagName) const if (hasAttributeNative()) writer.writeAttribute(QStringLiteral("native"), (attributeNative() ? QLatin1String("true") : QLatin1String("false"))); - for (int i = 0; i < m_class.size(); ++i) { - QString v = m_class[i]; + for (const QString &v : m_class) writer.writeTextElement(QStringLiteral("class"), v); - } - for (int i = 0; i < m_property.size(); ++i) { - DomProperty* v = m_property[i]; + + for (DomProperty *v : m_property) v->write(writer, QStringLiteral("property")); - } - for (int i = 0; i < m_script.size(); ++i) { - DomScript* v = m_script[i]; - v->write(writer, QStringLiteral("script")); - } - for (int i = 0; i < m_widgetData.size(); ++i) { - DomWidgetData* v = m_widgetData[i]; - v->write(writer, QStringLiteral("widgetdata")); - } - for (int i = 0; i < m_attribute.size(); ++i) { - DomProperty* v = m_attribute[i]; + + for (DomProperty *v : m_attribute) v->write(writer, QStringLiteral("attribute")); - } - for (int i = 0; i < m_row.size(); ++i) { - DomRow* v = m_row[i]; + + for (DomRow *v : m_row) v->write(writer, QStringLiteral("row")); - } - for (int i = 0; i < m_column.size(); ++i) { - DomColumn* v = m_column[i]; + + for (DomColumn *v : m_column) v->write(writer, QStringLiteral("column")); - } - for (int i = 0; i < m_item.size(); ++i) { - DomItem* v = m_item[i]; + + for (DomItem *v : m_item) v->write(writer, QStringLiteral("item")); - } - for (int i = 0; i < m_layout.size(); ++i) { - DomLayout* v = m_layout[i]; + + for (DomLayout *v : m_layout) v->write(writer, QStringLiteral("layout")); - } - for (int i = 0; i < m_widget.size(); ++i) { - DomWidget* v = m_widget[i]; + + for (DomWidget *v : m_widget) v->write(writer, QStringLiteral("widget")); - } - for (int i = 0; i < m_action.size(); ++i) { - DomAction* v = m_action[i]; + + for (DomAction *v : m_action) v->write(writer, QStringLiteral("action")); - } - for (int i = 0; i < m_actionGroup.size(); ++i) { - DomActionGroup* v = m_actionGroup[i]; + + for (DomActionGroup *v : m_actionGroup) v->write(writer, QStringLiteral("actiongroup")); - } - for (int i = 0; i < m_addAction.size(); ++i) { - DomActionRef* v = m_addAction[i]; + + for (DomActionRef *v : m_addAction) v->write(writer, QStringLiteral("addaction")); - } - for (int i = 0; i < m_zOrder.size(); ++i) { - QString v = m_zOrder[i]; + + for (const QString &v : m_zOrder) writer.writeTextElement(QStringLiteral("zorder"), v); - } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomWidget::setElementClass(const QStringList& a) +void DomWidget::setElementClass(const QStringList &a) { m_children |= Class; m_class = a; } -void DomWidget::setElementProperty(const QList<DomProperty*>& a) +void DomWidget::setElementProperty(const QList<DomProperty *> &a) { m_children |= Property; m_property = a; } -void DomWidget::setElementScript(const QList<DomScript*>& a) -{ - m_children |= Script; - m_script = a; -} - -void DomWidget::setElementWidgetData(const QList<DomWidgetData*>& a) -{ - m_children |= WidgetData; - m_widgetData = a; -} - -void DomWidget::setElementAttribute(const QList<DomProperty*>& a) +void DomWidget::setElementAttribute(const QList<DomProperty *> &a) { m_children |= Attribute; m_attribute = a; } -void DomWidget::setElementRow(const QList<DomRow*>& a) +void DomWidget::setElementRow(const QVector<DomRow *> &a) { m_children |= Row; m_row = a; } -void DomWidget::setElementColumn(const QList<DomColumn*>& a) +void DomWidget::setElementColumn(const QVector<DomColumn *> &a) { m_children |= Column; m_column = a; } -void DomWidget::setElementItem(const QList<DomItem*>& a) +void DomWidget::setElementItem(const QVector<DomItem *> &a) { m_children |= Item; m_item = a; } -void DomWidget::setElementLayout(const QList<DomLayout*>& a) +void DomWidget::setElementLayout(const QVector<DomLayout *> &a) { m_children |= Layout; m_layout = a; } -void DomWidget::setElementWidget(const QList<DomWidget*>& a) +void DomWidget::setElementWidget(const QVector<DomWidget *> &a) { m_children |= Widget; m_widget = a; } -void DomWidget::setElementAction(const QList<DomAction*>& a) +void DomWidget::setElementAction(const QVector<DomAction *> &a) { m_children |= Action; m_action = a; } -void DomWidget::setElementActionGroup(const QList<DomActionGroup*>& a) +void DomWidget::setElementActionGroup(const QVector<DomActionGroup *> &a) { m_children |= ActionGroup; m_actionGroup = a; } -void DomWidget::setElementAddAction(const QList<DomActionRef*>& a) +void DomWidget::setElementAddAction(const QVector<DomActionRef *> &a) { m_children |= AddAction; m_addAction = a; } -void DomWidget::setElementZOrder(const QStringList& a) +void DomWidget::setElementZOrder(const QStringList &a) { m_children |= ZOrder; m_zOrder = a; } -void DomSpacer::clear(bool clear_all) -{ - qDeleteAll(m_property); - m_property.clear(); - - if (clear_all) { - m_text.clear(); - m_has_attr_name = false; - } - - m_children = 0; -} - -DomSpacer::DomSpacer() -{ - m_children = 0; - m_has_attr_name = false; -} - DomSpacer::~DomSpacer() { qDeleteAll(m_property); @@ -3779,10 +2343,9 @@ DomSpacer::~DomSpacer() void DomSpacer::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("name")) { setAttributeName(attribute.value().toString()); continue; @@ -3790,11 +2353,11 @@ void DomSpacer::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("property")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("property"), Qt::CaseInsensitive)) { DomProperty *v = new DomProperty(); v->read(reader); m_property.append(v); @@ -3804,12 +2367,7 @@ void DomSpacer::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -3818,62 +2376,32 @@ void DomSpacer::read(QXmlStreamReader &reader) void DomSpacer::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("spacer") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("spacer") : tagName.toLower()); if (hasAttributeName()) writer.writeAttribute(QStringLiteral("name"), attributeName()); - for (int i = 0; i < m_property.size(); ++i) { - DomProperty* v = m_property[i]; + for (DomProperty *v : m_property) v->write(writer, QStringLiteral("property")); - } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomSpacer::setElementProperty(const QList<DomProperty*>& a) +void DomSpacer::setElementProperty(const QList<DomProperty *> &a) { m_children |= Property; m_property = a; } -void DomColor::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - m_has_attr_alpha = false; - m_attr_alpha = 0; - } - - m_children = 0; - m_red = 0; - m_green = 0; - m_blue = 0; -} - -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() { } void DomColor::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("alpha")) { setAttributeAlpha(attribute.value().toInt()); continue; @@ -3881,19 +2409,19 @@ void DomColor::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("red")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("red"), Qt::CaseInsensitive)) { setElementRed(reader.readElementText().toInt()); continue; } - if (tag == QLatin1String("green")) { + if (!tag.compare(QLatin1String("green"), Qt::CaseInsensitive)) { setElementGreen(reader.readElementText().toInt()); continue; } - if (tag == QLatin1String("blue")) { + if (!tag.compare(QLatin1String("blue"), Qt::CaseInsensitive)) { setElementBlue(reader.readElementText().toInt()); continue; } @@ -3901,12 +2429,7 @@ void DomColor::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -3915,25 +2438,19 @@ void DomColor::read(QXmlStreamReader &reader) void DomColor::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("color") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("color") : tagName.toLower()); if (hasAttributeAlpha()) writer.writeAttribute(QStringLiteral("alpha"), QString::number(attributeAlpha())); - if (m_children & Red) { + if (m_children & Red) writer.writeTextElement(QStringLiteral("red"), QString::number(m_red)); - } - if (m_children & Green) { + if (m_children & Green) writer.writeTextElement(QStringLiteral("green"), QString::number(m_green)); - } - if (m_children & Blue) { + if (m_children & Blue) writer.writeTextElement(QStringLiteral("blue"), QString::number(m_blue)); - } - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } @@ -3971,28 +2488,6 @@ void DomColor::clearElementBlue() m_children &= ~Blue; } -void DomGradientStop::clear(bool clear_all) -{ - delete m_color; - - if (clear_all) { - m_text.clear(); - m_has_attr_position = false; - m_attr_position = 0.0; - } - - m_children = 0; - m_color = 0; -} - -DomGradientStop::DomGradientStop() -{ - m_children = 0; - m_has_attr_position = false; - m_attr_position = 0.0; - m_color = 0; -} - DomGradientStop::~DomGradientStop() { delete m_color; @@ -4000,10 +2495,9 @@ DomGradientStop::~DomGradientStop() void DomGradientStop::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("position")) { setAttributePosition(attribute.value().toDouble()); continue; @@ -4011,11 +2505,11 @@ void DomGradientStop::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("color")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("color"), Qt::CaseInsensitive)) { DomColor *v = new DomColor(); v->read(reader); setElementColor(v); @@ -4025,12 +2519,7 @@ void DomGradientStop::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -4039,30 +2528,26 @@ void DomGradientStop::read(QXmlStreamReader &reader) void DomGradientStop::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("gradientstop") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("gradientstop") : tagName.toLower()); if (hasAttributePosition()) writer.writeAttribute(QStringLiteral("position"), QString::number(attributePosition(), 'f', 15)); - if (m_children & Color) { + if (m_children & Color) m_color->write(writer, QStringLiteral("color")); - } - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -DomColor* DomGradientStop::takeElementColor() +DomColor *DomGradientStop::takeElementColor() { - DomColor* a = m_color; + DomColor *a = m_color; m_color = 0; m_children ^= Color; return a; } -void DomGradientStop::setElementColor(DomColor* a) +void DomGradientStop::setElementColor(DomColor *a) { delete m_color; m_children |= Color; @@ -4076,69 +2561,6 @@ void DomGradientStop::clearElementColor() m_children &= ~Color; } -void DomGradient::clear(bool clear_all) -{ - qDeleteAll(m_gradientStop); - m_gradientStop.clear(); - - if (clear_all) { - m_text.clear(); - 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; - } - - m_children = 0; -} - -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); @@ -4147,10 +2569,9 @@ DomGradient::~DomGradient() void DomGradient::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("startx")) { setAttributeStartX(attribute.value().toDouble()); continue; @@ -4206,11 +2627,11 @@ void DomGradient::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("gradientstop")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("gradientstop"), Qt::CaseInsensitive)) { DomGradientStop *v = new DomGradientStop(); v->read(reader); m_gradientStop.append(v); @@ -4220,12 +2641,7 @@ void DomGradient::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -4234,7 +2650,7 @@ void DomGradient::read(QXmlStreamReader &reader) void DomGradient::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("gradient") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("gradient") : tagName.toLower()); if (hasAttributeStartX()) writer.writeAttribute(QStringLiteral("startx"), QString::number(attributeStartX(), 'f', 15)); @@ -4275,63 +2691,43 @@ void DomGradient::write(QXmlStreamWriter &writer, const QString &tagName) const if (hasAttributeCoordinateMode()) writer.writeAttribute(QStringLiteral("coordinatemode"), attributeCoordinateMode()); - for (int i = 0; i < m_gradientStop.size(); ++i) { - DomGradientStop* v = m_gradientStop[i]; + for (DomGradientStop *v : m_gradientStop) v->write(writer, QStringLiteral("gradientstop")); - } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomGradient::setElementGradientStop(const QList<DomGradientStop*>& a) +void DomGradient::setElementGradientStop(const QVector<DomGradientStop *> &a) { m_children |= GradientStop; m_gradientStop = a; } -void DomBrush::clear(bool clear_all) +DomBrush::~DomBrush() { delete m_color; delete m_texture; delete m_gradient; - - if (clear_all) { - m_text.clear(); - m_has_attr_brushStyle = false; - } - - 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) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("brushstyle")) { setAttributeBrushStyle(attribute.value().toString()); continue; @@ -4339,23 +2735,23 @@ void DomBrush::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("color")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("color"), Qt::CaseInsensitive)) { DomColor *v = new DomColor(); v->read(reader); setElementColor(v); continue; } - if (tag == QLatin1String("texture")) { + if (!tag.compare(QLatin1String("texture"), Qt::CaseInsensitive)) { DomProperty *v = new DomProperty(); v->read(reader); setElementTexture(v); continue; } - if (tag == QLatin1String("gradient")) { + if (!tag.compare(QLatin1String("gradient"), Qt::CaseInsensitive)) { DomGradient *v = new DomGradient(); v->read(reader); setElementGradient(v); @@ -4365,12 +2761,7 @@ void DomBrush::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -4379,104 +2770,78 @@ void DomBrush::read(QXmlStreamReader &reader) void DomBrush::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("brush") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("brush") : tagName.toLower()); if (hasAttributeBrushStyle()) writer.writeAttribute(QStringLiteral("brushstyle"), attributeBrushStyle()); switch (kind()) { - case Color: { - DomColor* v = elementColor(); - if (v != 0) { - v->write(writer, QStringLiteral("color")); - } - break; - } - case Texture: { - DomProperty* v = elementTexture(); - if (v != 0) { - v->write(writer, QStringLiteral("texture")); - } - break; - } - case Gradient: { - DomGradient* v = elementGradient(); - if (v != 0) { - v->write(writer, QStringLiteral("gradient")); - } - break; - } - default: - break; + case Color: { + DomColor *v = elementColor(); + if (v != 0) + v->write(writer, QStringLiteral("color")); + break; + } + case Texture: { + DomProperty *v = elementTexture(); + if (v != 0) + v->write(writer, QStringLiteral("texture")); + break; + } + case Gradient: { + DomGradient *v = elementGradient(); + if (v != 0) + v->write(writer, QStringLiteral("gradient")); + break; + } + default: + break; } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } -DomColor* DomBrush::takeElementColor() +DomColor *DomBrush::takeElementColor() { - DomColor* a = m_color; + DomColor *a = m_color; m_color = 0; return a; } -void DomBrush::setElementColor(DomColor* a) +void DomBrush::setElementColor(DomColor *a) { - clear(false); + clear(); m_kind = Color; m_color = a; } -DomProperty* DomBrush::takeElementTexture() +DomProperty *DomBrush::takeElementTexture() { - DomProperty* a = m_texture; + DomProperty *a = m_texture; m_texture = 0; return a; } -void DomBrush::setElementTexture(DomProperty* a) +void DomBrush::setElementTexture(DomProperty *a) { - clear(false); + clear(); m_kind = Texture; m_texture = a; } -DomGradient* DomBrush::takeElementGradient() +DomGradient *DomBrush::takeElementGradient() { - DomGradient* a = m_gradient; + DomGradient *a = m_gradient; m_gradient = 0; return a; } -void DomBrush::setElementGradient(DomGradient* a) +void DomBrush::setElementGradient(DomGradient *a) { - clear(false); + clear(); m_kind = Gradient; m_gradient = a; } -void DomColorRole::clear(bool clear_all) -{ - delete m_brush; - - if (clear_all) { - m_text.clear(); - m_has_attr_role = false; - } - - m_children = 0; - m_brush = 0; -} - -DomColorRole::DomColorRole() -{ - m_children = 0; - m_has_attr_role = false; - m_brush = 0; -} - DomColorRole::~DomColorRole() { delete m_brush; @@ -4484,10 +2849,9 @@ DomColorRole::~DomColorRole() void DomColorRole::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("role")) { setAttributeRole(attribute.value().toString()); continue; @@ -4495,11 +2859,11 @@ void DomColorRole::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("brush")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("brush"), Qt::CaseInsensitive)) { DomBrush *v = new DomBrush(); v->read(reader); setElementBrush(v); @@ -4509,12 +2873,7 @@ void DomColorRole::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -4523,30 +2882,26 @@ void DomColorRole::read(QXmlStreamReader &reader) void DomColorRole::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("colorrole") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("colorrole") : tagName.toLower()); if (hasAttributeRole()) writer.writeAttribute(QStringLiteral("role"), attributeRole()); - if (m_children & Brush) { + if (m_children & Brush) m_brush->write(writer, QStringLiteral("brush")); - } - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -DomBrush* DomColorRole::takeElementBrush() +DomBrush *DomColorRole::takeElementBrush() { - DomBrush* a = m_brush; + DomBrush *a = m_brush; m_brush = 0; m_children ^= Brush; return a; } -void DomColorRole::setElementBrush(DomBrush* a) +void DomColorRole::setElementBrush(DomBrush *a) { delete m_brush; m_children |= Brush; @@ -4560,25 +2915,6 @@ void DomColorRole::clearElementBrush() m_children &= ~Brush; } -void DomColorGroup::clear(bool clear_all) -{ - qDeleteAll(m_colorRole); - m_colorRole.clear(); - qDeleteAll(m_color); - m_color.clear(); - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; -} - -DomColorGroup::DomColorGroup() -{ - m_children = 0; -} - DomColorGroup::~DomColorGroup() { qDeleteAll(m_colorRole); @@ -4589,18 +2925,17 @@ DomColorGroup::~DomColorGroup() void DomColorGroup::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("colorrole")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("colorrole"), Qt::CaseInsensitive)) { DomColorRole *v = new DomColorRole(); v->read(reader); m_colorRole.append(v); continue; } - if (tag == QLatin1String("color")) { + if (!tag.compare(QLatin1String("color"), Qt::CaseInsensitive)) { DomColor *v = new DomColor(); v->read(reader); m_color.append(v); @@ -4610,12 +2945,7 @@ void DomColorGroup::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -4624,58 +2954,29 @@ void DomColorGroup::read(QXmlStreamReader &reader) void DomColorGroup::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("colorgroup") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("colorgroup") : tagName.toLower()); - for (int i = 0; i < m_colorRole.size(); ++i) { - DomColorRole* v = m_colorRole[i]; + for (DomColorRole *v : m_colorRole) v->write(writer, QStringLiteral("colorrole")); - } - for (int i = 0; i < m_color.size(); ++i) { - DomColor* v = m_color[i]; + + for (DomColor *v : m_color) v->write(writer, QStringLiteral("color")); - } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomColorGroup::setElementColorRole(const QList<DomColorRole*>& a) +void DomColorGroup::setElementColorRole(const QVector<DomColorRole *> &a) { m_children |= ColorRole; m_colorRole = a; } -void DomColorGroup::setElementColor(const QList<DomColor*>& a) +void DomColorGroup::setElementColor(const QVector<DomColor *> &a) { m_children |= Color; m_color = a; } -void DomPalette::clear(bool clear_all) -{ - delete m_active; - delete m_inactive; - delete m_disabled; - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; - m_active = 0; - m_inactive = 0; - m_disabled = 0; -} - -DomPalette::DomPalette() -{ - m_children = 0; - m_active = 0; - m_inactive = 0; - m_disabled = 0; -} - DomPalette::~DomPalette() { delete m_active; @@ -4685,24 +2986,23 @@ DomPalette::~DomPalette() void DomPalette::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("active")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("active"), Qt::CaseInsensitive)) { DomColorGroup *v = new DomColorGroup(); v->read(reader); setElementActive(v); continue; } - if (tag == QLatin1String("inactive")) { + if (!tag.compare(QLatin1String("inactive"), Qt::CaseInsensitive)) { DomColorGroup *v = new DomColorGroup(); v->read(reader); setElementInactive(v); continue; } - if (tag == QLatin1String("disabled")) { + if (!tag.compare(QLatin1String("disabled"), Qt::CaseInsensitive)) { DomColorGroup *v = new DomColorGroup(); v->read(reader); setElementDisabled(v); @@ -4712,12 +3012,7 @@ void DomPalette::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -4726,65 +3021,59 @@ void DomPalette::read(QXmlStreamReader &reader) void DomPalette::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("palette") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("palette") : tagName.toLower()); - if (m_children & Active) { + if (m_children & Active) m_active->write(writer, QStringLiteral("active")); - } - if (m_children & Inactive) { + if (m_children & Inactive) m_inactive->write(writer, QStringLiteral("inactive")); - } - if (m_children & Disabled) { + if (m_children & Disabled) m_disabled->write(writer, QStringLiteral("disabled")); - } - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -DomColorGroup* DomPalette::takeElementActive() +DomColorGroup *DomPalette::takeElementActive() { - DomColorGroup* a = m_active; + DomColorGroup *a = m_active; m_active = 0; m_children ^= Active; return a; } -void DomPalette::setElementActive(DomColorGroup* a) +void DomPalette::setElementActive(DomColorGroup *a) { delete m_active; m_children |= Active; m_active = a; } -DomColorGroup* DomPalette::takeElementInactive() +DomColorGroup *DomPalette::takeElementInactive() { - DomColorGroup* a = m_inactive; + DomColorGroup *a = m_inactive; m_inactive = 0; m_children ^= Inactive; return a; } -void DomPalette::setElementInactive(DomColorGroup* a) +void DomPalette::setElementInactive(DomColorGroup *a) { delete m_inactive; m_children |= Inactive; m_inactive = a; } -DomColorGroup* DomPalette::takeElementDisabled() +DomColorGroup *DomPalette::takeElementDisabled() { - DomColorGroup* a = m_disabled; + DomColorGroup *a = m_disabled; m_disabled = 0; m_children ^= Disabled; return a; } -void DomPalette::setElementDisabled(DomColorGroup* a) +void DomPalette::setElementDisabled(DomColorGroup *a) { delete m_disabled; m_children |= Disabled; @@ -4812,85 +3101,53 @@ void DomPalette::clearElementDisabled() m_children &= ~Disabled; } -void DomFont::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - } - - 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() -{ - 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() { } void DomFont::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("family")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("family"), Qt::CaseInsensitive)) { setElementFamily(reader.readElementText()); continue; } - if (tag == QLatin1String("pointsize")) { + if (!tag.compare(QLatin1String("pointsize"), Qt::CaseInsensitive)) { setElementPointSize(reader.readElementText().toInt()); continue; } - if (tag == QLatin1String("weight")) { + if (!tag.compare(QLatin1String("weight"), Qt::CaseInsensitive)) { setElementWeight(reader.readElementText().toInt()); continue; } - if (tag == QLatin1String("italic")) { + if (!tag.compare(QLatin1String("italic"), Qt::CaseInsensitive)) { setElementItalic(reader.readElementText() == QLatin1String("true")); continue; } - if (tag == QLatin1String("bold")) { + if (!tag.compare(QLatin1String("bold"), Qt::CaseInsensitive)) { setElementBold(reader.readElementText() == QLatin1String("true")); continue; } - if (tag == QLatin1String("underline")) { + if (!tag.compare(QLatin1String("underline"), Qt::CaseInsensitive)) { setElementUnderline(reader.readElementText() == QLatin1String("true")); continue; } - if (tag == QLatin1String("strikeout")) { + if (!tag.compare(QLatin1String("strikeout"), Qt::CaseInsensitive)) { setElementStrikeOut(reader.readElementText() == QLatin1String("true")); continue; } - if (tag == QLatin1String("antialiasing")) { + if (!tag.compare(QLatin1String("antialiasing"), Qt::CaseInsensitive)) { setElementAntialiasing(reader.readElementText() == QLatin1String("true")); continue; } - if (tag == QLatin1String("stylestrategy")) { + if (!tag.compare(QLatin1String("stylestrategy"), Qt::CaseInsensitive)) { setElementStyleStrategy(reader.readElementText()); continue; } - if (tag == QLatin1String("kerning")) { + if (!tag.compare(QLatin1String("kerning"), Qt::CaseInsensitive)) { setElementKerning(reader.readElementText() == QLatin1String("true")); continue; } @@ -4898,12 +3155,7 @@ void DomFont::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -4912,55 +3164,42 @@ void DomFont::read(QXmlStreamReader &reader) void DomFont::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("font") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("font") : tagName.toLower()); - if (m_children & Family) { + if (m_children & Family) writer.writeTextElement(QStringLiteral("family"), m_family); - } - if (m_children & PointSize) { + if (m_children & PointSize) writer.writeTextElement(QStringLiteral("pointsize"), QString::number(m_pointSize)); - } - if (m_children & Weight) { + if (m_children & Weight) writer.writeTextElement(QStringLiteral("weight"), QString::number(m_weight)); - } - if (m_children & Italic) { + if (m_children & Italic) writer.writeTextElement(QStringLiteral("italic"), (m_italic ? QLatin1String("true") : QLatin1String("false"))); - } - if (m_children & Bold) { + if (m_children & Bold) writer.writeTextElement(QStringLiteral("bold"), (m_bold ? QLatin1String("true") : QLatin1String("false"))); - } - if (m_children & Underline) { + if (m_children & Underline) writer.writeTextElement(QStringLiteral("underline"), (m_underline ? QLatin1String("true") : QLatin1String("false"))); - } - if (m_children & StrikeOut) { + if (m_children & StrikeOut) writer.writeTextElement(QStringLiteral("strikeout"), (m_strikeOut ? QLatin1String("true") : QLatin1String("false"))); - } - if (m_children & Antialiasing) { + if (m_children & Antialiasing) writer.writeTextElement(QStringLiteral("antialiasing"), (m_antialiasing ? QLatin1String("true") : QLatin1String("false"))); - } - if (m_children & StyleStrategy) { + if (m_children & StyleStrategy) writer.writeTextElement(QStringLiteral("stylestrategy"), m_styleStrategy); - } - if (m_children & Kerning) { + if (m_children & Kerning) writer.writeTextElement(QStringLiteral("kerning"), (m_kerning ? QLatin1String("true") : QLatin1String("false"))); - } - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomFont::setElementFamily(const QString& a) +void DomFont::setElementFamily(const QString &a) { m_children |= Family; m_family = a; @@ -5008,7 +3247,7 @@ void DomFont::setElementAntialiasing(bool a) m_antialiasing = a; } -void DomFont::setElementStyleStrategy(const QString& a) +void DomFont::setElementStyleStrategy(const QString &a) { m_children |= StyleStrategy; m_styleStrategy = a; @@ -5070,41 +3309,21 @@ void DomFont::clearElementKerning() m_children &= ~Kerning; } -void DomPoint::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; - m_x = 0; - m_y = 0; -} - -DomPoint::DomPoint() -{ - m_children = 0; - m_x = 0; - m_y = 0; -} - DomPoint::~DomPoint() { } void DomPoint::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("x")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("x"), Qt::CaseInsensitive)) { setElementX(reader.readElementText().toInt()); continue; } - if (tag == QLatin1String("y")) { + if (!tag.compare(QLatin1String("y"), Qt::CaseInsensitive)) { setElementY(reader.readElementText().toInt()); continue; } @@ -5112,12 +3331,7 @@ void DomPoint::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -5126,18 +3340,13 @@ void DomPoint::read(QXmlStreamReader &reader) void DomPoint::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("point") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("point") : tagName.toLower()); - if (m_children & X) { + if (m_children & X) writer.writeTextElement(QString(QLatin1Char('x')), QString::number(m_x)); - } - if (m_children & Y) { + if (m_children & Y) writer.writeTextElement(QString(QLatin1Char('y')), QString::number(m_y)); - } - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } @@ -5164,53 +3373,29 @@ void DomPoint::clearElementY() m_children &= ~Y; } -void DomRect::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; - m_x = 0; - m_y = 0; - m_width = 0; - m_height = 0; -} - -DomRect::DomRect() -{ - m_children = 0; - m_x = 0; - m_y = 0; - m_width = 0; - m_height = 0; -} - DomRect::~DomRect() { } void DomRect::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("x")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("x"), Qt::CaseInsensitive)) { setElementX(reader.readElementText().toInt()); continue; } - if (tag == QLatin1String("y")) { + if (!tag.compare(QLatin1String("y"), Qt::CaseInsensitive)) { setElementY(reader.readElementText().toInt()); continue; } - if (tag == QLatin1String("width")) { + if (!tag.compare(QLatin1String("width"), Qt::CaseInsensitive)) { setElementWidth(reader.readElementText().toInt()); continue; } - if (tag == QLatin1String("height")) { + if (!tag.compare(QLatin1String("height"), Qt::CaseInsensitive)) { setElementHeight(reader.readElementText().toInt()); continue; } @@ -5218,12 +3403,7 @@ void DomRect::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -5232,26 +3412,19 @@ void DomRect::read(QXmlStreamReader &reader) void DomRect::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("rect") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("rect") : tagName.toLower()); - if (m_children & X) { + if (m_children & X) writer.writeTextElement(QString(QLatin1Char('x')), QString::number(m_x)); - } - if (m_children & Y) { + if (m_children & Y) writer.writeTextElement(QString(QLatin1Char('y')), QString::number(m_y)); - } - if (m_children & Width) { + if (m_children & Width) writer.writeTextElement(QStringLiteral("width"), QString::number(m_width)); - } - if (m_children & Height) { + if (m_children & Height) writer.writeTextElement(QStringLiteral("height"), QString::number(m_height)); - } - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } @@ -5300,35 +3473,15 @@ void DomRect::clearElementHeight() m_children &= ~Height; } -void DomLocale::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - m_has_attr_language = false; - m_has_attr_country = false; - } - - m_children = 0; -} - -DomLocale::DomLocale() -{ - m_children = 0; - m_has_attr_language = false; - m_has_attr_country = false; -} - DomLocale::~DomLocale() { } void DomLocale::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("language")) { setAttributeLanguage(attribute.value().toString()); continue; @@ -5340,20 +3493,15 @@ void DomLocale::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); + const QStringRef tag = reader.name(); reader.raiseError(QLatin1String("Unexpected element ") + tag); } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -5362,7 +3510,7 @@ void DomLocale::read(QXmlStreamReader &reader) void DomLocale::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("locale") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("locale") : tagName.toLower()); if (hasAttributeLanguage()) writer.writeAttribute(QStringLiteral("language"), attributeLanguage()); @@ -5370,49 +3518,18 @@ 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(); } -void DomSizePolicy::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - m_has_attr_hSizeType = false; - m_has_attr_vSizeType = false; - } - - m_children = 0; - m_hSizeType = 0; - m_vSizeType = 0; - m_horStretch = 0; - m_verStretch = 0; -} - -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() { } void DomSizePolicy::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("hsizetype")) { setAttributeHSizeType(attribute.value().toString()); continue; @@ -5424,23 +3541,23 @@ void DomSizePolicy::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("hsizetype")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("hsizetype"), Qt::CaseInsensitive)) { setElementHSizeType(reader.readElementText().toInt()); continue; } - if (tag == QLatin1String("vsizetype")) { + if (!tag.compare(QLatin1String("vsizetype"), Qt::CaseInsensitive)) { setElementVSizeType(reader.readElementText().toInt()); continue; } - if (tag == QLatin1String("horstretch")) { + if (!tag.compare(QLatin1String("horstretch"), Qt::CaseInsensitive)) { setElementHorStretch(reader.readElementText().toInt()); continue; } - if (tag == QLatin1String("verstretch")) { + if (!tag.compare(QLatin1String("verstretch"), Qt::CaseInsensitive)) { setElementVerStretch(reader.readElementText().toInt()); continue; } @@ -5448,12 +3565,7 @@ void DomSizePolicy::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -5462,7 +3574,7 @@ void DomSizePolicy::read(QXmlStreamReader &reader) void DomSizePolicy::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("sizepolicy") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("sizepolicy") : tagName.toLower()); if (hasAttributeHSizeType()) writer.writeAttribute(QStringLiteral("hsizetype"), attributeHSizeType()); @@ -5470,24 +3582,17 @@ void DomSizePolicy::write(QXmlStreamWriter &writer, const QString &tagName) cons if (hasAttributeVSizeType()) writer.writeAttribute(QStringLiteral("vsizetype"), attributeVSizeType()); - if (m_children & HSizeType) { + if (m_children & HSizeType) writer.writeTextElement(QStringLiteral("hsizetype"), QString::number(m_hSizeType)); - } - if (m_children & VSizeType) { + if (m_children & VSizeType) writer.writeTextElement(QStringLiteral("vsizetype"), QString::number(m_vSizeType)); - } - if (m_children & HorStretch) { + if (m_children & HorStretch) writer.writeTextElement(QStringLiteral("horstretch"), QString::number(m_horStretch)); - } - if (m_children & VerStretch) { + if (m_children & VerStretch) writer.writeTextElement(QStringLiteral("verstretch"), QString::number(m_verStretch)); - } - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } @@ -5536,41 +3641,21 @@ void DomSizePolicy::clearElementVerStretch() m_children &= ~VerStretch; } -void DomSize::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; - m_width = 0; - m_height = 0; -} - -DomSize::DomSize() -{ - m_children = 0; - m_width = 0; - m_height = 0; -} - DomSize::~DomSize() { } void DomSize::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("width")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("width"), Qt::CaseInsensitive)) { setElementWidth(reader.readElementText().toInt()); continue; } - if (tag == QLatin1String("height")) { + if (!tag.compare(QLatin1String("height"), Qt::CaseInsensitive)) { setElementHeight(reader.readElementText().toInt()); continue; } @@ -5578,12 +3663,7 @@ void DomSize::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -5592,18 +3672,13 @@ void DomSize::read(QXmlStreamReader &reader) void DomSize::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("size") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("size") : tagName.toLower()); - if (m_children & Width) { + if (m_children & Width) writer.writeTextElement(QStringLiteral("width"), QString::number(m_width)); - } - if (m_children & Height) { + if (m_children & Height) writer.writeTextElement(QStringLiteral("height"), QString::number(m_height)); - } - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } @@ -5630,47 +3705,25 @@ void DomSize::clearElementHeight() m_children &= ~Height; } -void DomDate::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; - m_year = 0; - m_month = 0; - m_day = 0; -} - -DomDate::DomDate() -{ - m_children = 0; - m_year = 0; - m_month = 0; - m_day = 0; -} - DomDate::~DomDate() { } void DomDate::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("year")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("year"), Qt::CaseInsensitive)) { setElementYear(reader.readElementText().toInt()); continue; } - if (tag == QLatin1String("month")) { + if (!tag.compare(QLatin1String("month"), Qt::CaseInsensitive)) { setElementMonth(reader.readElementText().toInt()); continue; } - if (tag == QLatin1String("day")) { + if (!tag.compare(QLatin1String("day"), Qt::CaseInsensitive)) { setElementDay(reader.readElementText().toInt()); continue; } @@ -5678,12 +3731,7 @@ void DomDate::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -5692,22 +3740,16 @@ void DomDate::read(QXmlStreamReader &reader) void DomDate::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("date") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("date") : tagName.toLower()); - if (m_children & Year) { + if (m_children & Year) writer.writeTextElement(QStringLiteral("year"), QString::number(m_year)); - } - if (m_children & Month) { + if (m_children & Month) writer.writeTextElement(QStringLiteral("month"), QString::number(m_month)); - } - if (m_children & Day) { + if (m_children & Day) writer.writeTextElement(QStringLiteral("day"), QString::number(m_day)); - } - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } @@ -5745,47 +3787,25 @@ void DomDate::clearElementDay() m_children &= ~Day; } -void DomTime::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; - m_hour = 0; - m_minute = 0; - m_second = 0; -} - -DomTime::DomTime() -{ - m_children = 0; - m_hour = 0; - m_minute = 0; - m_second = 0; -} - DomTime::~DomTime() { } void DomTime::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("hour")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("hour"), Qt::CaseInsensitive)) { setElementHour(reader.readElementText().toInt()); continue; } - if (tag == QLatin1String("minute")) { + if (!tag.compare(QLatin1String("minute"), Qt::CaseInsensitive)) { setElementMinute(reader.readElementText().toInt()); continue; } - if (tag == QLatin1String("second")) { + if (!tag.compare(QLatin1String("second"), Qt::CaseInsensitive)) { setElementSecond(reader.readElementText().toInt()); continue; } @@ -5793,12 +3813,7 @@ void DomTime::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -5807,22 +3822,16 @@ void DomTime::read(QXmlStreamReader &reader) void DomTime::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("time") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("time") : tagName.toLower()); - if (m_children & Hour) { + if (m_children & Hour) writer.writeTextElement(QStringLiteral("hour"), QString::number(m_hour)); - } - if (m_children & Minute) { + if (m_children & Minute) writer.writeTextElement(QStringLiteral("minute"), QString::number(m_minute)); - } - if (m_children & Second) { + if (m_children & Second) writer.writeTextElement(QStringLiteral("second"), QString::number(m_second)); - } - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } @@ -5860,65 +3869,37 @@ void DomTime::clearElementSecond() m_children &= ~Second; } -void DomDateTime::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; - m_hour = 0; - m_minute = 0; - m_second = 0; - m_year = 0; - m_month = 0; - m_day = 0; -} - -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() { } void DomDateTime::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("hour")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("hour"), Qt::CaseInsensitive)) { setElementHour(reader.readElementText().toInt()); continue; } - if (tag == QLatin1String("minute")) { + if (!tag.compare(QLatin1String("minute"), Qt::CaseInsensitive)) { setElementMinute(reader.readElementText().toInt()); continue; } - if (tag == QLatin1String("second")) { + if (!tag.compare(QLatin1String("second"), Qt::CaseInsensitive)) { setElementSecond(reader.readElementText().toInt()); continue; } - if (tag == QLatin1String("year")) { + if (!tag.compare(QLatin1String("year"), Qt::CaseInsensitive)) { setElementYear(reader.readElementText().toInt()); continue; } - if (tag == QLatin1String("month")) { + if (!tag.compare(QLatin1String("month"), Qt::CaseInsensitive)) { setElementMonth(reader.readElementText().toInt()); continue; } - if (tag == QLatin1String("day")) { + if (!tag.compare(QLatin1String("day"), Qt::CaseInsensitive)) { setElementDay(reader.readElementText().toInt()); continue; } @@ -5926,12 +3907,7 @@ void DomDateTime::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -5940,34 +3916,25 @@ void DomDateTime::read(QXmlStreamReader &reader) void DomDateTime::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("datetime") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("datetime") : tagName.toLower()); - if (m_children & Hour) { + if (m_children & Hour) writer.writeTextElement(QStringLiteral("hour"), QString::number(m_hour)); - } - if (m_children & Minute) { + if (m_children & Minute) writer.writeTextElement(QStringLiteral("minute"), QString::number(m_minute)); - } - if (m_children & Second) { + if (m_children & Second) writer.writeTextElement(QStringLiteral("second"), QString::number(m_second)); - } - if (m_children & Year) { + if (m_children & Year) writer.writeTextElement(QStringLiteral("year"), QString::number(m_year)); - } - if (m_children & Month) { + if (m_children & Month) writer.writeTextElement(QStringLiteral("month"), QString::number(m_month)); - } - if (m_children & Day) { + if (m_children & Day) writer.writeTextElement(QStringLiteral("day"), QString::number(m_day)); - } - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } @@ -6038,28 +4005,6 @@ void DomDateTime::clearElementDay() m_children &= ~Day; } -void DomStringList::clear(bool clear_all) -{ - m_string.clear(); - - if (clear_all) { - m_text.clear(); - m_has_attr_notr = false; - m_has_attr_comment = false; - m_has_attr_extraComment = false; - } - - m_children = 0; -} - -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(); @@ -6067,10 +4012,9 @@ DomStringList::~DomStringList() void DomStringList::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("notr")) { setAttributeNotr(attribute.value().toString()); continue; @@ -6086,11 +4030,11 @@ void DomStringList::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("string")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("string"), Qt::CaseInsensitive)) { m_string.append(reader.readElementText()); continue; } @@ -6098,12 +4042,7 @@ void DomStringList::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -6112,7 +4051,7 @@ void DomStringList::read(QXmlStreamReader &reader) void DomStringList::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("stringlist") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("stringlist") : tagName.toLower()); if (hasAttributeNotr()) writer.writeAttribute(QStringLiteral("notr"), attributeNotr()); @@ -6123,52 +4062,27 @@ void DomStringList::write(QXmlStreamWriter &writer, const QString &tagName) cons if (hasAttributeExtraComment()) writer.writeAttribute(QStringLiteral("extracomment"), attributeExtraComment()); - for (int i = 0; i < m_string.size(); ++i) { - QString v = m_string[i]; + for (const QString &v : m_string) writer.writeTextElement(QStringLiteral("string"), v); - } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomStringList::setElementString(const QStringList& a) +void DomStringList::setElementString(const QStringList &a) { m_children |= String; m_string = a; } -void DomResourcePixmap::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - m_has_attr_resource = false; - m_has_attr_alias = false; - } - - m_children = 0; -} - -DomResourcePixmap::DomResourcePixmap() -{ - m_children = 0; - m_has_attr_resource = false; - m_has_attr_alias = false; - m_text.clear(); -} - DomResourcePixmap::~DomResourcePixmap() { } void DomResourcePixmap::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("resource")) { setAttributeResource(attribute.value().toString()); continue; @@ -6180,16 +4094,15 @@ void DomResourcePixmap::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); + const QStringRef tag = reader.name(); reader.raiseError(QLatin1String("Unexpected element ") + tag); } break; case QXmlStreamReader::EndElement : - finished = true; - break; + return; case QXmlStreamReader::Characters : if (!reader.isWhitespace()) m_text.append(reader.text().toString()); @@ -6202,7 +4115,7 @@ void DomResourcePixmap::read(QXmlStreamReader &reader) void DomResourcePixmap::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("resourcepixmap") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("resourcepixmap") : tagName.toLower()); if (hasAttributeResource()) writer.writeAttribute(QStringLiteral("resource"), attributeResource()); @@ -6216,50 +4129,6 @@ void DomResourcePixmap::write(QXmlStreamWriter &writer, const QString &tagName) writer.writeEndElement(); } -void DomResourceIcon::clear(bool clear_all) -{ - delete m_normalOff; - delete m_normalOn; - delete m_disabledOff; - delete m_disabledOn; - delete m_activeOff; - delete m_activeOn; - delete m_selectedOff; - delete m_selectedOn; - - if (clear_all) { - m_text.clear(); - m_has_attr_theme = false; - m_has_attr_resource = false; - } - - m_children = 0; - 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() -{ - 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; @@ -6274,10 +4143,9 @@ DomResourceIcon::~DomResourceIcon() void DomResourceIcon::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("theme")) { setAttributeTheme(attribute.value().toString()); continue; @@ -6289,53 +4157,53 @@ void DomResourceIcon::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("normaloff")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("normaloff"), Qt::CaseInsensitive)) { DomResourcePixmap *v = new DomResourcePixmap(); v->read(reader); setElementNormalOff(v); continue; } - if (tag == QLatin1String("normalon")) { + if (!tag.compare(QLatin1String("normalon"), Qt::CaseInsensitive)) { DomResourcePixmap *v = new DomResourcePixmap(); v->read(reader); setElementNormalOn(v); continue; } - if (tag == QLatin1String("disabledoff")) { + if (!tag.compare(QLatin1String("disabledoff"), Qt::CaseInsensitive)) { DomResourcePixmap *v = new DomResourcePixmap(); v->read(reader); setElementDisabledOff(v); continue; } - if (tag == QLatin1String("disabledon")) { + if (!tag.compare(QLatin1String("disabledon"), Qt::CaseInsensitive)) { DomResourcePixmap *v = new DomResourcePixmap(); v->read(reader); setElementDisabledOn(v); continue; } - if (tag == QLatin1String("activeoff")) { + if (!tag.compare(QLatin1String("activeoff"), Qt::CaseInsensitive)) { DomResourcePixmap *v = new DomResourcePixmap(); v->read(reader); setElementActiveOff(v); continue; } - if (tag == QLatin1String("activeon")) { + if (!tag.compare(QLatin1String("activeon"), Qt::CaseInsensitive)) { DomResourcePixmap *v = new DomResourcePixmap(); v->read(reader); setElementActiveOn(v); continue; } - if (tag == QLatin1String("selectedoff")) { + if (!tag.compare(QLatin1String("selectedoff"), Qt::CaseInsensitive)) { DomResourcePixmap *v = new DomResourcePixmap(); v->read(reader); setElementSelectedOff(v); continue; } - if (tag == QLatin1String("selectedon")) { + if (!tag.compare(QLatin1String("selectedon"), Qt::CaseInsensitive)) { DomResourcePixmap *v = new DomResourcePixmap(); v->read(reader); setElementSelectedOn(v); @@ -6345,8 +4213,7 @@ void DomResourceIcon::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; + return; case QXmlStreamReader::Characters : if (!reader.isWhitespace()) m_text.append(reader.text().toString()); @@ -6359,7 +4226,7 @@ void DomResourceIcon::read(QXmlStreamReader &reader) void DomResourceIcon::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("resourceicon") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("resourceicon") : tagName.toLower()); if (hasAttributeTheme()) writer.writeAttribute(QStringLiteral("theme"), attributeTheme()); @@ -6367,37 +4234,29 @@ void DomResourceIcon::write(QXmlStreamWriter &writer, const QString &tagName) co if (hasAttributeResource()) writer.writeAttribute(QStringLiteral("resource"), attributeResource()); - if (m_children & NormalOff) { + if (m_children & NormalOff) m_normalOff->write(writer, QStringLiteral("normaloff")); - } - if (m_children & NormalOn) { + if (m_children & NormalOn) m_normalOn->write(writer, QStringLiteral("normalon")); - } - if (m_children & DisabledOff) { + if (m_children & DisabledOff) m_disabledOff->write(writer, QStringLiteral("disabledoff")); - } - if (m_children & DisabledOn) { + if (m_children & DisabledOn) m_disabledOn->write(writer, QStringLiteral("disabledon")); - } - if (m_children & ActiveOff) { + if (m_children & ActiveOff) m_activeOff->write(writer, QStringLiteral("activeoff")); - } - if (m_children & ActiveOn) { + if (m_children & ActiveOn) m_activeOn->write(writer, QStringLiteral("activeon")); - } - if (m_children & SelectedOff) { + if (m_children & SelectedOff) m_selectedOff->write(writer, QStringLiteral("selectedoff")); - } - if (m_children & SelectedOn) { + if (m_children & SelectedOn) m_selectedOn->write(writer, QStringLiteral("selectedon")); - } if (!m_text.isEmpty()) writer.writeCharacters(m_text); @@ -6405,120 +4264,120 @@ void DomResourceIcon::write(QXmlStreamWriter &writer, const QString &tagName) co writer.writeEndElement(); } -DomResourcePixmap* DomResourceIcon::takeElementNormalOff() +DomResourcePixmap *DomResourceIcon::takeElementNormalOff() { - DomResourcePixmap* a = m_normalOff; + DomResourcePixmap *a = m_normalOff; m_normalOff = 0; m_children ^= NormalOff; return a; } -void DomResourceIcon::setElementNormalOff(DomResourcePixmap* a) +void DomResourceIcon::setElementNormalOff(DomResourcePixmap *a) { delete m_normalOff; m_children |= NormalOff; m_normalOff = a; } -DomResourcePixmap* DomResourceIcon::takeElementNormalOn() +DomResourcePixmap *DomResourceIcon::takeElementNormalOn() { - DomResourcePixmap* a = m_normalOn; + DomResourcePixmap *a = m_normalOn; m_normalOn = 0; m_children ^= NormalOn; return a; } -void DomResourceIcon::setElementNormalOn(DomResourcePixmap* a) +void DomResourceIcon::setElementNormalOn(DomResourcePixmap *a) { delete m_normalOn; m_children |= NormalOn; m_normalOn = a; } -DomResourcePixmap* DomResourceIcon::takeElementDisabledOff() +DomResourcePixmap *DomResourceIcon::takeElementDisabledOff() { - DomResourcePixmap* a = m_disabledOff; + DomResourcePixmap *a = m_disabledOff; m_disabledOff = 0; m_children ^= DisabledOff; return a; } -void DomResourceIcon::setElementDisabledOff(DomResourcePixmap* a) +void DomResourceIcon::setElementDisabledOff(DomResourcePixmap *a) { delete m_disabledOff; m_children |= DisabledOff; m_disabledOff = a; } -DomResourcePixmap* DomResourceIcon::takeElementDisabledOn() +DomResourcePixmap *DomResourceIcon::takeElementDisabledOn() { - DomResourcePixmap* a = m_disabledOn; + DomResourcePixmap *a = m_disabledOn; m_disabledOn = 0; m_children ^= DisabledOn; return a; } -void DomResourceIcon::setElementDisabledOn(DomResourcePixmap* a) +void DomResourceIcon::setElementDisabledOn(DomResourcePixmap *a) { delete m_disabledOn; m_children |= DisabledOn; m_disabledOn = a; } -DomResourcePixmap* DomResourceIcon::takeElementActiveOff() +DomResourcePixmap *DomResourceIcon::takeElementActiveOff() { - DomResourcePixmap* a = m_activeOff; + DomResourcePixmap *a = m_activeOff; m_activeOff = 0; m_children ^= ActiveOff; return a; } -void DomResourceIcon::setElementActiveOff(DomResourcePixmap* a) +void DomResourceIcon::setElementActiveOff(DomResourcePixmap *a) { delete m_activeOff; m_children |= ActiveOff; m_activeOff = a; } -DomResourcePixmap* DomResourceIcon::takeElementActiveOn() +DomResourcePixmap *DomResourceIcon::takeElementActiveOn() { - DomResourcePixmap* a = m_activeOn; + DomResourcePixmap *a = m_activeOn; m_activeOn = 0; m_children ^= ActiveOn; return a; } -void DomResourceIcon::setElementActiveOn(DomResourcePixmap* a) +void DomResourceIcon::setElementActiveOn(DomResourcePixmap *a) { delete m_activeOn; m_children |= ActiveOn; m_activeOn = a; } -DomResourcePixmap* DomResourceIcon::takeElementSelectedOff() +DomResourcePixmap *DomResourceIcon::takeElementSelectedOff() { - DomResourcePixmap* a = m_selectedOff; + DomResourcePixmap *a = m_selectedOff; m_selectedOff = 0; m_children ^= SelectedOff; return a; } -void DomResourceIcon::setElementSelectedOff(DomResourcePixmap* a) +void DomResourceIcon::setElementSelectedOff(DomResourcePixmap *a) { delete m_selectedOff; m_children |= SelectedOff; m_selectedOff = a; } -DomResourcePixmap* DomResourceIcon::takeElementSelectedOn() +DomResourcePixmap *DomResourceIcon::takeElementSelectedOn() { - DomResourcePixmap* a = m_selectedOn; + DomResourcePixmap *a = m_selectedOn; m_selectedOn = 0; m_children ^= SelectedOn; return a; } -void DomResourceIcon::setElementSelectedOn(DomResourcePixmap* a) +void DomResourceIcon::setElementSelectedOn(DomResourcePixmap *a) { delete m_selectedOn; m_children |= SelectedOn; @@ -6581,38 +4440,15 @@ void DomResourceIcon::clearElementSelectedOn() m_children &= ~SelectedOn; } -void DomString::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - m_has_attr_notr = false; - m_has_attr_comment = false; - m_has_attr_extraComment = false; - } - - m_children = 0; -} - -DomString::DomString() -{ - m_children = 0; - m_has_attr_notr = false; - m_has_attr_comment = false; - m_has_attr_extraComment = false; - m_text.clear(); -} - DomString::~DomString() { } void DomString::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("notr")) { setAttributeNotr(attribute.value().toString()); continue; @@ -6628,16 +4464,15 @@ void DomString::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); + const QStringRef tag = reader.name(); reader.raiseError(QLatin1String("Unexpected element ") + tag); } break; case QXmlStreamReader::EndElement : - finished = true; - break; + return; case QXmlStreamReader::Characters : if (!reader.isWhitespace()) m_text.append(reader.text().toString()); @@ -6650,7 +4485,7 @@ void DomString::read(QXmlStreamReader &reader) void DomString::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("string") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("string") : tagName.toLower()); if (hasAttributeNotr()) writer.writeAttribute(QStringLiteral("notr"), attributeNotr()); @@ -6667,41 +4502,21 @@ void DomString::write(QXmlStreamWriter &writer, const QString &tagName) const writer.writeEndElement(); } -void DomPointF::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; - m_x = 0; - m_y = 0; -} - -DomPointF::DomPointF() -{ - m_children = 0; - m_x = 0; - m_y = 0; -} - DomPointF::~DomPointF() { } void DomPointF::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("x")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("x"), Qt::CaseInsensitive)) { setElementX(reader.readElementText().toDouble()); continue; } - if (tag == QLatin1String("y")) { + if (!tag.compare(QLatin1String("y"), Qt::CaseInsensitive)) { setElementY(reader.readElementText().toDouble()); continue; } @@ -6709,12 +4524,7 @@ void DomPointF::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -6723,18 +4533,13 @@ void DomPointF::read(QXmlStreamReader &reader) void DomPointF::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("pointf") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("pointf") : tagName.toLower()); - if (m_children & X) { + if (m_children & X) writer.writeTextElement(QString(QLatin1Char('x')), QString::number(m_x, 'f', 15)); - } - if (m_children & Y) { + 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(); } @@ -6761,53 +4566,29 @@ void DomPointF::clearElementY() m_children &= ~Y; } -void DomRectF::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; - m_x = 0; - m_y = 0; - m_width = 0; - m_height = 0; -} - -DomRectF::DomRectF() -{ - m_children = 0; - m_x = 0; - m_y = 0; - m_width = 0; - m_height = 0; -} - DomRectF::~DomRectF() { } void DomRectF::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("x")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("x"), Qt::CaseInsensitive)) { setElementX(reader.readElementText().toDouble()); continue; } - if (tag == QLatin1String("y")) { + if (!tag.compare(QLatin1String("y"), Qt::CaseInsensitive)) { setElementY(reader.readElementText().toDouble()); continue; } - if (tag == QLatin1String("width")) { + if (!tag.compare(QLatin1String("width"), Qt::CaseInsensitive)) { setElementWidth(reader.readElementText().toDouble()); continue; } - if (tag == QLatin1String("height")) { + if (!tag.compare(QLatin1String("height"), Qt::CaseInsensitive)) { setElementHeight(reader.readElementText().toDouble()); continue; } @@ -6815,12 +4596,7 @@ void DomRectF::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -6829,26 +4605,19 @@ void DomRectF::read(QXmlStreamReader &reader) void DomRectF::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("rectf") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("rectf") : tagName.toLower()); - if (m_children & X) { + if (m_children & X) writer.writeTextElement(QString(QLatin1Char('x')), QString::number(m_x, 'f', 15)); - } - if (m_children & Y) { + if (m_children & Y) writer.writeTextElement(QString(QLatin1Char('y')), QString::number(m_y, 'f', 15)); - } - if (m_children & Width) { + if (m_children & Width) writer.writeTextElement(QStringLiteral("width"), QString::number(m_width, 'f', 15)); - } - if (m_children & Height) { + if (m_children & Height) writer.writeTextElement(QStringLiteral("height"), QString::number(m_height, 'f', 15)); - } - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } @@ -6897,41 +4666,21 @@ void DomRectF::clearElementHeight() m_children &= ~Height; } -void DomSizeF::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; - m_width = 0; - m_height = 0; -} - -DomSizeF::DomSizeF() -{ - m_children = 0; - m_width = 0; - m_height = 0; -} - DomSizeF::~DomSizeF() { } void DomSizeF::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("width")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("width"), Qt::CaseInsensitive)) { setElementWidth(reader.readElementText().toDouble()); continue; } - if (tag == QLatin1String("height")) { + if (!tag.compare(QLatin1String("height"), Qt::CaseInsensitive)) { setElementHeight(reader.readElementText().toDouble()); continue; } @@ -6939,12 +4688,7 @@ void DomSizeF::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -6953,18 +4697,13 @@ void DomSizeF::read(QXmlStreamReader &reader) void DomSizeF::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("sizef") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("sizef") : tagName.toLower()); - if (m_children & Width) { + if (m_children & Width) writer.writeTextElement(QStringLiteral("width"), QString::number(m_width, 'f', 15)); - } - if (m_children & Height) { + if (m_children & Height) writer.writeTextElement(QStringLiteral("height"), QString::number(m_height, 'f', 15)); - } - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } @@ -6991,35 +4730,17 @@ void DomSizeF::clearElementHeight() m_children &= ~Height; } -void DomChar::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; - m_unicode = 0; -} - -DomChar::DomChar() -{ - m_children = 0; - m_unicode = 0; -} - DomChar::~DomChar() { } void DomChar::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("unicode")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("unicode"), Qt::CaseInsensitive)) { setElementUnicode(reader.readElementText().toInt()); continue; } @@ -7027,12 +4748,7 @@ void DomChar::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -7041,14 +4757,10 @@ void DomChar::read(QXmlStreamReader &reader) void DomChar::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("char") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("char") : tagName.toLower()); - if (m_children & Unicode) { + if (m_children & Unicode) writer.writeTextElement(QStringLiteral("unicode"), QString::number(m_unicode)); - } - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } @@ -7064,24 +4776,6 @@ void DomChar::clearElementUnicode() m_children &= ~Unicode; } -void DomUrl::clear(bool clear_all) -{ - delete m_string; - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; - m_string = 0; -} - -DomUrl::DomUrl() -{ - m_children = 0; - m_string = 0; -} - DomUrl::~DomUrl() { delete m_string; @@ -7089,12 +4783,11 @@ DomUrl::~DomUrl() void DomUrl::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("string")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("string"), Qt::CaseInsensitive)) { DomString *v = new DomString(); v->read(reader); setElementString(v); @@ -7104,12 +4797,7 @@ void DomUrl::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -7118,27 +4806,23 @@ void DomUrl::read(QXmlStreamReader &reader) void DomUrl::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("url") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("url") : tagName.toLower()); - if (m_children & String) { + if (m_children & String) m_string->write(writer, QStringLiteral("string")); - } - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -DomString* DomUrl::takeElementString() +DomString *DomUrl::takeElementString() { - DomString* a = m_string; + DomString *a = m_string; m_string = 0; m_children ^= String; return a; } -void DomUrl::setElementString(DomString* a) +void DomUrl::setElementString(DomString *a) { delete m_string; m_children |= String; @@ -7152,7 +4836,7 @@ void DomUrl::clearElementString() m_children &= ~String; } -void DomProperty::clear(bool clear_all) +DomProperty::~DomProperty() { delete m_color; delete m_font; @@ -7175,84 +4859,9 @@ void DomProperty::clear(bool clear_all) delete m_char; delete m_url; delete m_brush; - - if (clear_all) { - m_text.clear(); - m_has_attr_name = false; - m_has_attr_stdset = false; - m_attr_stdset = 0; - } - - 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; @@ -7275,14 +4884,44 @@ 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) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("name")) { setAttributeName(attribute.value().toString()); continue; @@ -7294,179 +4933,179 @@ void DomProperty::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("bool")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("bool"), Qt::CaseInsensitive)) { setElementBool(reader.readElementText()); continue; } - if (tag == QLatin1String("color")) { + if (!tag.compare(QLatin1String("color"), Qt::CaseInsensitive)) { DomColor *v = new DomColor(); v->read(reader); setElementColor(v); continue; } - if (tag == QLatin1String("cstring")) { + if (!tag.compare(QLatin1String("cstring"), Qt::CaseInsensitive)) { setElementCstring(reader.readElementText()); continue; } - if (tag == QLatin1String("cursor")) { + if (!tag.compare(QLatin1String("cursor"), Qt::CaseInsensitive)) { setElementCursor(reader.readElementText().toInt()); continue; } - if (tag == QLatin1String("cursorshape")) { + if (!tag.compare(QLatin1String("cursorshape"), Qt::CaseInsensitive)) { setElementCursorShape(reader.readElementText()); continue; } - if (tag == QLatin1String("enum")) { + if (!tag.compare(QLatin1String("enum"), Qt::CaseInsensitive)) { setElementEnum(reader.readElementText()); continue; } - if (tag == QLatin1String("font")) { + if (!tag.compare(QLatin1String("font"), Qt::CaseInsensitive)) { DomFont *v = new DomFont(); v->read(reader); setElementFont(v); continue; } - if (tag == QLatin1String("iconset")) { + if (!tag.compare(QLatin1String("iconset"), Qt::CaseInsensitive)) { DomResourceIcon *v = new DomResourceIcon(); v->read(reader); setElementIconSet(v); continue; } - if (tag == QLatin1String("pixmap")) { + if (!tag.compare(QLatin1String("pixmap"), Qt::CaseInsensitive)) { DomResourcePixmap *v = new DomResourcePixmap(); v->read(reader); setElementPixmap(v); continue; } - if (tag == QLatin1String("palette")) { + if (!tag.compare(QLatin1String("palette"), Qt::CaseInsensitive)) { DomPalette *v = new DomPalette(); v->read(reader); setElementPalette(v); continue; } - if (tag == QLatin1String("point")) { + if (!tag.compare(QLatin1String("point"), Qt::CaseInsensitive)) { DomPoint *v = new DomPoint(); v->read(reader); setElementPoint(v); continue; } - if (tag == QLatin1String("rect")) { + if (!tag.compare(QLatin1String("rect"), Qt::CaseInsensitive)) { DomRect *v = new DomRect(); v->read(reader); setElementRect(v); continue; } - if (tag == QLatin1String("set")) { + if (!tag.compare(QLatin1String("set"), Qt::CaseInsensitive)) { setElementSet(reader.readElementText()); continue; } - if (tag == QLatin1String("locale")) { + if (!tag.compare(QLatin1String("locale"), Qt::CaseInsensitive)) { DomLocale *v = new DomLocale(); v->read(reader); setElementLocale(v); continue; } - if (tag == QLatin1String("sizepolicy")) { + if (!tag.compare(QLatin1String("sizepolicy"), Qt::CaseInsensitive)) { DomSizePolicy *v = new DomSizePolicy(); v->read(reader); setElementSizePolicy(v); continue; } - if (tag == QLatin1String("size")) { + if (!tag.compare(QLatin1String("size"), Qt::CaseInsensitive)) { DomSize *v = new DomSize(); v->read(reader); setElementSize(v); continue; } - if (tag == QLatin1String("string")) { + if (!tag.compare(QLatin1String("string"), Qt::CaseInsensitive)) { DomString *v = new DomString(); v->read(reader); setElementString(v); continue; } - if (tag == QLatin1String("stringlist")) { + if (!tag.compare(QLatin1String("stringlist"), Qt::CaseInsensitive)) { DomStringList *v = new DomStringList(); v->read(reader); setElementStringList(v); continue; } - if (tag == QLatin1String("number")) { + if (!tag.compare(QLatin1String("number"), Qt::CaseInsensitive)) { setElementNumber(reader.readElementText().toInt()); continue; } - if (tag == QLatin1String("float")) { + if (!tag.compare(QLatin1String("float"), Qt::CaseInsensitive)) { setElementFloat(reader.readElementText().toFloat()); continue; } - if (tag == QLatin1String("double")) { + if (!tag.compare(QLatin1String("double"), Qt::CaseInsensitive)) { setElementDouble(reader.readElementText().toDouble()); continue; } - if (tag == QLatin1String("date")) { + if (!tag.compare(QLatin1String("date"), Qt::CaseInsensitive)) { DomDate *v = new DomDate(); v->read(reader); setElementDate(v); continue; } - if (tag == QLatin1String("time")) { + if (!tag.compare(QLatin1String("time"), Qt::CaseInsensitive)) { DomTime *v = new DomTime(); v->read(reader); setElementTime(v); continue; } - if (tag == QLatin1String("datetime")) { + if (!tag.compare(QLatin1String("datetime"), Qt::CaseInsensitive)) { DomDateTime *v = new DomDateTime(); v->read(reader); setElementDateTime(v); continue; } - if (tag == QLatin1String("pointf")) { + if (!tag.compare(QLatin1String("pointf"), Qt::CaseInsensitive)) { DomPointF *v = new DomPointF(); v->read(reader); setElementPointF(v); continue; } - if (tag == QLatin1String("rectf")) { + if (!tag.compare(QLatin1String("rectf"), Qt::CaseInsensitive)) { DomRectF *v = new DomRectF(); v->read(reader); setElementRectF(v); continue; } - if (tag == QLatin1String("sizef")) { + if (!tag.compare(QLatin1String("sizef"), Qt::CaseInsensitive)) { DomSizeF *v = new DomSizeF(); v->read(reader); setElementSizeF(v); continue; } - if (tag == QLatin1String("longlong")) { + if (!tag.compare(QLatin1String("longlong"), Qt::CaseInsensitive)) { setElementLongLong(reader.readElementText().toLongLong()); continue; } - if (tag == QLatin1String("char")) { + if (!tag.compare(QLatin1String("char"), Qt::CaseInsensitive)) { DomChar *v = new DomChar(); v->read(reader); setElementChar(v); continue; } - if (tag == QLatin1String("url")) { + if (!tag.compare(QLatin1String("url"), Qt::CaseInsensitive)) { DomUrl *v = new DomUrl(); v->read(reader); setElementUrl(v); continue; } - if (tag == QLatin1String("uint")) { + if (!tag.compare(QLatin1String("uint"), Qt::CaseInsensitive)) { setElementUInt(reader.readElementText().toUInt()); continue; } - if (tag == QLatin1String("ulonglong")) { + if (!tag.compare(QLatin1String("ulonglong"), Qt::CaseInsensitive)) { setElementULongLong(reader.readElementText().toULongLong()); continue; } - if (tag == QLatin1String("brush")) { + if (!tag.compare(QLatin1String("brush"), Qt::CaseInsensitive)) { DomBrush *v = new DomBrush(); v->read(reader); setElementBrush(v); @@ -7476,12 +5115,7 @@ void DomProperty::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -7490,7 +5124,7 @@ void DomProperty::read(QXmlStreamReader &reader) void DomProperty::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("property") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("property") : tagName.toLower()); if (hasAttributeName()) writer.writeAttribute(QStringLiteral("name"), attributeName()); @@ -7499,605 +5133,564 @@ void DomProperty::write(QXmlStreamWriter &writer, const QString &tagName) const writer.writeAttribute(QStringLiteral("stdset"), QString::number(attributeStdset())); switch (kind()) { - case Bool: { - writer.writeTextElement(QStringLiteral("bool"), elementBool()); - break; - } - case Color: { - DomColor* v = elementColor(); - if (v != 0) { - v->write(writer, QStringLiteral("color")); - } - break; - } - case Cstring: { - writer.writeTextElement(QStringLiteral("cstring"), elementCstring()); - break; - } - case Cursor: { - writer.writeTextElement(QStringLiteral("cursor"), QString::number(elementCursor())); - break; - } - case CursorShape: { - writer.writeTextElement(QStringLiteral("cursorShape"), elementCursorShape()); - break; - } - case Enum: { - writer.writeTextElement(QStringLiteral("enum"), elementEnum()); - break; - } - case Font: { - DomFont* v = elementFont(); - if (v != 0) { - v->write(writer, QStringLiteral("font")); - } - break; - } - case IconSet: { - DomResourceIcon* v = elementIconSet(); - if (v != 0) { - v->write(writer, QStringLiteral("iconset")); - } - break; - } - case Pixmap: { - DomResourcePixmap* v = elementPixmap(); - if (v != 0) { - v->write(writer, QStringLiteral("pixmap")); - } - break; - } - case Palette: { - DomPalette* v = elementPalette(); - if (v != 0) { - v->write(writer, QStringLiteral("palette")); - } - break; - } - case Point: { - DomPoint* v = elementPoint(); - if (v != 0) { - v->write(writer, QStringLiteral("point")); - } - break; - } - case Rect: { - DomRect* v = elementRect(); - if (v != 0) { - v->write(writer, QStringLiteral("rect")); - } - break; - } - case Set: { - writer.writeTextElement(QStringLiteral("set"), elementSet()); - break; - } - case Locale: { - DomLocale* v = elementLocale(); - if (v != 0) { - v->write(writer, QStringLiteral("locale")); - } - break; - } - case SizePolicy: { - DomSizePolicy* v = elementSizePolicy(); - if (v != 0) { - v->write(writer, QStringLiteral("sizepolicy")); - } - break; - } - case Size: { - DomSize* v = elementSize(); - if (v != 0) { - v->write(writer, QStringLiteral("size")); - } - break; - } - case String: { - DomString* v = elementString(); - if (v != 0) { - v->write(writer, QStringLiteral("string")); - } - break; - } - case StringList: { - DomStringList* v = elementStringList(); - if (v != 0) { - v->write(writer, QStringLiteral("stringlist")); - } - break; - } - case Number: { - writer.writeTextElement(QStringLiteral("number"), QString::number(elementNumber())); - break; - } - case Float: { - writer.writeTextElement(QStringLiteral("float"), QString::number(elementFloat(), 'f', 8)); - break; - } - case Double: { - writer.writeTextElement(QStringLiteral("double"), QString::number(elementDouble(), 'f', 15)); - break; - } - case Date: { - DomDate* v = elementDate(); - if (v != 0) { - v->write(writer, QStringLiteral("date")); - } - break; - } - case Time: { - DomTime* v = elementTime(); - if (v != 0) { - v->write(writer, QStringLiteral("time")); - } - break; - } - case DateTime: { - DomDateTime* v = elementDateTime(); - if (v != 0) { - v->write(writer, QStringLiteral("datetime")); - } - break; - } - case PointF: { - DomPointF* v = elementPointF(); - if (v != 0) { - v->write(writer, QStringLiteral("pointf")); - } - break; - } - case RectF: { - DomRectF* v = elementRectF(); - if (v != 0) { - v->write(writer, QStringLiteral("rectf")); - } - break; - } - case SizeF: { - DomSizeF* v = elementSizeF(); - if (v != 0) { - v->write(writer, QStringLiteral("sizef")); - } - break; - } - case LongLong: { - writer.writeTextElement(QStringLiteral("longLong"), QString::number(elementLongLong())); - break; - } - case Char: { - DomChar* v = elementChar(); - if (v != 0) { - v->write(writer, QStringLiteral("char")); - } - break; - } - case Url: { - DomUrl* v = elementUrl(); - if (v != 0) { - v->write(writer, QStringLiteral("url")); - } - break; - } - case UInt: { - writer.writeTextElement(QStringLiteral("UInt"), QString::number(elementUInt())); - break; - } - case ULongLong: { - writer.writeTextElement(QStringLiteral("uLongLong"), QString::number(elementULongLong())); - break; - } - case Brush: { - DomBrush* v = elementBrush(); - if (v != 0) { - v->write(writer, QStringLiteral("brush")); - } - break; - } - default: - break; + case Bool: { + writer.writeTextElement(QStringLiteral("bool"), elementBool()); + break; + } + case Color: { + DomColor *v = elementColor(); + if (v != 0) + v->write(writer, QStringLiteral("color")); + break; + } + case Cstring: { + writer.writeTextElement(QStringLiteral("cstring"), elementCstring()); + break; + } + case Cursor: { + writer.writeTextElement(QStringLiteral("cursor"), QString::number(elementCursor())); + break; + } + case CursorShape: { + writer.writeTextElement(QStringLiteral("cursorShape"), elementCursorShape()); + break; + } + case Enum: { + writer.writeTextElement(QStringLiteral("enum"), elementEnum()); + break; + } + case Font: { + DomFont *v = elementFont(); + if (v != 0) + v->write(writer, QStringLiteral("font")); + break; + } + case IconSet: { + DomResourceIcon *v = elementIconSet(); + if (v != 0) + v->write(writer, QStringLiteral("iconset")); + break; + } + case Pixmap: { + DomResourcePixmap *v = elementPixmap(); + if (v != 0) + v->write(writer, QStringLiteral("pixmap")); + break; + } + case Palette: { + DomPalette *v = elementPalette(); + if (v != 0) + v->write(writer, QStringLiteral("palette")); + break; + } + case Point: { + DomPoint *v = elementPoint(); + if (v != 0) + v->write(writer, QStringLiteral("point")); + break; + } + case Rect: { + DomRect *v = elementRect(); + if (v != 0) + v->write(writer, QStringLiteral("rect")); + break; + } + case Set: { + writer.writeTextElement(QStringLiteral("set"), elementSet()); + break; + } + case Locale: { + DomLocale *v = elementLocale(); + if (v != 0) + v->write(writer, QStringLiteral("locale")); + break; + } + case SizePolicy: { + DomSizePolicy *v = elementSizePolicy(); + if (v != 0) + v->write(writer, QStringLiteral("sizepolicy")); + break; + } + case Size: { + DomSize *v = elementSize(); + if (v != 0) + v->write(writer, QStringLiteral("size")); + break; + } + case String: { + DomString *v = elementString(); + if (v != 0) + v->write(writer, QStringLiteral("string")); + break; + } + case StringList: { + DomStringList *v = elementStringList(); + if (v != 0) + v->write(writer, QStringLiteral("stringlist")); + break; + } + case Number: { + writer.writeTextElement(QStringLiteral("number"), QString::number(elementNumber())); + break; + } + case Float: { + writer.writeTextElement(QStringLiteral("float"), QString::number(elementFloat(), 'f', 8)); + break; + } + case Double: { + writer.writeTextElement(QStringLiteral("double"), QString::number(elementDouble(), 'f', 15)); + break; + } + case Date: { + DomDate *v = elementDate(); + if (v != 0) + v->write(writer, QStringLiteral("date")); + break; + } + case Time: { + DomTime *v = elementTime(); + if (v != 0) + v->write(writer, QStringLiteral("time")); + break; + } + case DateTime: { + DomDateTime *v = elementDateTime(); + if (v != 0) + v->write(writer, QStringLiteral("datetime")); + break; + } + case PointF: { + DomPointF *v = elementPointF(); + if (v != 0) + v->write(writer, QStringLiteral("pointf")); + break; + } + case RectF: { + DomRectF *v = elementRectF(); + if (v != 0) + v->write(writer, QStringLiteral("rectf")); + break; + } + case SizeF: { + DomSizeF *v = elementSizeF(); + if (v != 0) + v->write(writer, QStringLiteral("sizef")); + break; + } + case LongLong: { + writer.writeTextElement(QStringLiteral("longLong"), QString::number(elementLongLong())); + break; + } + case Char: { + DomChar *v = elementChar(); + if (v != 0) + v->write(writer, QStringLiteral("char")); + break; + } + case Url: { + DomUrl *v = elementUrl(); + if (v != 0) + v->write(writer, QStringLiteral("url")); + break; + } + case UInt: { + writer.writeTextElement(QStringLiteral("UInt"), QString::number(elementUInt())); + break; + } + case ULongLong: { + writer.writeTextElement(QStringLiteral("uLongLong"), QString::number(elementULongLong())); + break; + } + case Brush: { + DomBrush *v = elementBrush(); + if (v != 0) + v->write(writer, QStringLiteral("brush")); + break; + } + default: + break; } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } -void DomProperty::setElementBool(const QString& a) +void DomProperty::setElementBool(const QString &a) { - clear(false); + clear(); m_kind = Bool; m_bool = a; } -DomColor* DomProperty::takeElementColor() +DomColor *DomProperty::takeElementColor() { - DomColor* a = m_color; + DomColor *a = m_color; m_color = 0; return a; } -void DomProperty::setElementColor(DomColor* a) +void DomProperty::setElementColor(DomColor *a) { - clear(false); + clear(); m_kind = Color; m_color = a; } -void DomProperty::setElementCstring(const QString& a) +void DomProperty::setElementCstring(const QString &a) { - clear(false); + clear(); m_kind = Cstring; m_cstring = a; } void DomProperty::setElementCursor(int a) { - clear(false); + clear(); m_kind = Cursor; m_cursor = a; } -void DomProperty::setElementCursorShape(const QString& a) +void DomProperty::setElementCursorShape(const QString &a) { - clear(false); + clear(); m_kind = CursorShape; m_cursorShape = a; } -void DomProperty::setElementEnum(const QString& a) +void DomProperty::setElementEnum(const QString &a) { - clear(false); + clear(); m_kind = Enum; m_enum = a; } -DomFont* DomProperty::takeElementFont() +DomFont *DomProperty::takeElementFont() { - DomFont* a = m_font; + DomFont *a = m_font; m_font = 0; return a; } -void DomProperty::setElementFont(DomFont* a) +void DomProperty::setElementFont(DomFont *a) { - clear(false); + clear(); m_kind = Font; m_font = a; } -DomResourceIcon* DomProperty::takeElementIconSet() +DomResourceIcon *DomProperty::takeElementIconSet() { - DomResourceIcon* a = m_iconSet; + DomResourceIcon *a = m_iconSet; m_iconSet = 0; return a; } -void DomProperty::setElementIconSet(DomResourceIcon* a) +void DomProperty::setElementIconSet(DomResourceIcon *a) { - clear(false); + clear(); m_kind = IconSet; m_iconSet = a; } -DomResourcePixmap* DomProperty::takeElementPixmap() +DomResourcePixmap *DomProperty::takeElementPixmap() { - DomResourcePixmap* a = m_pixmap; + DomResourcePixmap *a = m_pixmap; m_pixmap = 0; return a; } -void DomProperty::setElementPixmap(DomResourcePixmap* a) +void DomProperty::setElementPixmap(DomResourcePixmap *a) { - clear(false); + clear(); m_kind = Pixmap; m_pixmap = a; } -DomPalette* DomProperty::takeElementPalette() +DomPalette *DomProperty::takeElementPalette() { - DomPalette* a = m_palette; + DomPalette *a = m_palette; m_palette = 0; return a; } -void DomProperty::setElementPalette(DomPalette* a) +void DomProperty::setElementPalette(DomPalette *a) { - clear(false); + clear(); m_kind = Palette; m_palette = a; } -DomPoint* DomProperty::takeElementPoint() +DomPoint *DomProperty::takeElementPoint() { - DomPoint* a = m_point; + DomPoint *a = m_point; m_point = 0; return a; } -void DomProperty::setElementPoint(DomPoint* a) +void DomProperty::setElementPoint(DomPoint *a) { - clear(false); + clear(); m_kind = Point; m_point = a; } -DomRect* DomProperty::takeElementRect() +DomRect *DomProperty::takeElementRect() { - DomRect* a = m_rect; + DomRect *a = m_rect; m_rect = 0; return a; } -void DomProperty::setElementRect(DomRect* a) +void DomProperty::setElementRect(DomRect *a) { - clear(false); + clear(); m_kind = Rect; m_rect = a; } -void DomProperty::setElementSet(const QString& a) +void DomProperty::setElementSet(const QString &a) { - clear(false); + clear(); m_kind = Set; m_set = a; } -DomLocale* DomProperty::takeElementLocale() +DomLocale *DomProperty::takeElementLocale() { - DomLocale* a = m_locale; + DomLocale *a = m_locale; m_locale = 0; return a; } -void DomProperty::setElementLocale(DomLocale* a) +void DomProperty::setElementLocale(DomLocale *a) { - clear(false); + clear(); m_kind = Locale; m_locale = a; } -DomSizePolicy* DomProperty::takeElementSizePolicy() +DomSizePolicy *DomProperty::takeElementSizePolicy() { - DomSizePolicy* a = m_sizePolicy; + DomSizePolicy *a = m_sizePolicy; m_sizePolicy = 0; return a; } -void DomProperty::setElementSizePolicy(DomSizePolicy* a) +void DomProperty::setElementSizePolicy(DomSizePolicy *a) { - clear(false); + clear(); m_kind = SizePolicy; m_sizePolicy = a; } -DomSize* DomProperty::takeElementSize() +DomSize *DomProperty::takeElementSize() { - DomSize* a = m_size; + DomSize *a = m_size; m_size = 0; return a; } -void DomProperty::setElementSize(DomSize* a) +void DomProperty::setElementSize(DomSize *a) { - clear(false); + clear(); m_kind = Size; m_size = a; } -DomString* DomProperty::takeElementString() +DomString *DomProperty::takeElementString() { - DomString* a = m_string; + DomString *a = m_string; m_string = 0; return a; } -void DomProperty::setElementString(DomString* a) +void DomProperty::setElementString(DomString *a) { - clear(false); + clear(); m_kind = String; m_string = a; } -DomStringList* DomProperty::takeElementStringList() +DomStringList *DomProperty::takeElementStringList() { - DomStringList* a = m_stringList; + DomStringList *a = m_stringList; m_stringList = 0; return a; } -void DomProperty::setElementStringList(DomStringList* a) +void DomProperty::setElementStringList(DomStringList *a) { - clear(false); + clear(); m_kind = StringList; m_stringList = a; } void DomProperty::setElementNumber(int a) { - clear(false); + clear(); m_kind = Number; m_number = a; } void DomProperty::setElementFloat(float a) { - clear(false); + clear(); m_kind = Float; m_float = a; } void DomProperty::setElementDouble(double a) { - clear(false); + clear(); m_kind = Double; m_double = a; } -DomDate* DomProperty::takeElementDate() +DomDate *DomProperty::takeElementDate() { - DomDate* a = m_date; + DomDate *a = m_date; m_date = 0; return a; } -void DomProperty::setElementDate(DomDate* a) +void DomProperty::setElementDate(DomDate *a) { - clear(false); + clear(); m_kind = Date; m_date = a; } -DomTime* DomProperty::takeElementTime() +DomTime *DomProperty::takeElementTime() { - DomTime* a = m_time; + DomTime *a = m_time; m_time = 0; return a; } -void DomProperty::setElementTime(DomTime* a) +void DomProperty::setElementTime(DomTime *a) { - clear(false); + clear(); m_kind = Time; m_time = a; } -DomDateTime* DomProperty::takeElementDateTime() +DomDateTime *DomProperty::takeElementDateTime() { - DomDateTime* a = m_dateTime; + DomDateTime *a = m_dateTime; m_dateTime = 0; return a; } -void DomProperty::setElementDateTime(DomDateTime* a) +void DomProperty::setElementDateTime(DomDateTime *a) { - clear(false); + clear(); m_kind = DateTime; m_dateTime = a; } -DomPointF* DomProperty::takeElementPointF() +DomPointF *DomProperty::takeElementPointF() { - DomPointF* a = m_pointF; + DomPointF *a = m_pointF; m_pointF = 0; return a; } -void DomProperty::setElementPointF(DomPointF* a) +void DomProperty::setElementPointF(DomPointF *a) { - clear(false); + clear(); m_kind = PointF; m_pointF = a; } -DomRectF* DomProperty::takeElementRectF() +DomRectF *DomProperty::takeElementRectF() { - DomRectF* a = m_rectF; + DomRectF *a = m_rectF; m_rectF = 0; return a; } -void DomProperty::setElementRectF(DomRectF* a) +void DomProperty::setElementRectF(DomRectF *a) { - clear(false); + clear(); m_kind = RectF; m_rectF = a; } -DomSizeF* DomProperty::takeElementSizeF() +DomSizeF *DomProperty::takeElementSizeF() { - DomSizeF* a = m_sizeF; + DomSizeF *a = m_sizeF; m_sizeF = 0; return a; } -void DomProperty::setElementSizeF(DomSizeF* a) +void DomProperty::setElementSizeF(DomSizeF *a) { - clear(false); + clear(); m_kind = SizeF; m_sizeF = a; } void DomProperty::setElementLongLong(qlonglong a) { - clear(false); + clear(); m_kind = LongLong; m_longLong = a; } -DomChar* DomProperty::takeElementChar() +DomChar *DomProperty::takeElementChar() { - DomChar* a = m_char; + DomChar *a = m_char; m_char = 0; return a; } -void DomProperty::setElementChar(DomChar* a) +void DomProperty::setElementChar(DomChar *a) { - clear(false); + clear(); m_kind = Char; m_char = a; } -DomUrl* DomProperty::takeElementUrl() +DomUrl *DomProperty::takeElementUrl() { - DomUrl* a = m_url; + DomUrl *a = m_url; m_url = 0; return a; } -void DomProperty::setElementUrl(DomUrl* a) +void DomProperty::setElementUrl(DomUrl *a) { - clear(false); + clear(); m_kind = Url; m_url = a; } void DomProperty::setElementUInt(uint a) { - clear(false); + clear(); m_kind = UInt; m_UInt = a; } void DomProperty::setElementULongLong(qulonglong a) { - clear(false); + clear(); m_kind = ULongLong; m_uLongLong = a; } -DomBrush* DomProperty::takeElementBrush() +DomBrush *DomProperty::takeElementBrush() { - DomBrush* a = m_brush; + DomBrush *a = m_brush; m_brush = 0; return a; } -void DomProperty::setElementBrush(DomBrush* a) +void DomProperty::setElementBrush(DomBrush *a) { - clear(false); + clear(); m_kind = Brush; m_brush = a; } -void DomConnections::clear(bool clear_all) -{ - qDeleteAll(m_connection); - m_connection.clear(); - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; -} - -DomConnections::DomConnections() -{ - m_children = 0; -} - DomConnections::~DomConnections() { qDeleteAll(m_connection); @@ -8106,12 +5699,11 @@ DomConnections::~DomConnections() void DomConnections::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("connection")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("connection"), Qt::CaseInsensitive)) { DomConnection *v = new DomConnection(); v->read(reader); m_connection.append(v); @@ -8121,12 +5713,7 @@ void DomConnections::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -8135,42 +5722,20 @@ void DomConnections::read(QXmlStreamReader &reader) void DomConnections::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("connections") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("connections") : tagName.toLower()); - for (int i = 0; i < m_connection.size(); ++i) { - DomConnection* v = m_connection[i]; + for (DomConnection *v : m_connection) v->write(writer, QStringLiteral("connection")); - } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomConnections::setElementConnection(const QList<DomConnection*>& a) +void DomConnections::setElementConnection(const QVector<DomConnection *> &a) { m_children |= Connection; m_connection = a; } -void DomConnection::clear(bool clear_all) -{ - delete m_hints; - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; - m_hints = 0; -} - -DomConnection::DomConnection() -{ - m_children = 0; - m_hints = 0; -} - DomConnection::~DomConnection() { delete m_hints; @@ -8178,28 +5743,27 @@ DomConnection::~DomConnection() void DomConnection::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("sender")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("sender"), Qt::CaseInsensitive)) { setElementSender(reader.readElementText()); continue; } - if (tag == QLatin1String("signal")) { + if (!tag.compare(QLatin1String("signal"), Qt::CaseInsensitive)) { setElementSignal(reader.readElementText()); continue; } - if (tag == QLatin1String("receiver")) { + if (!tag.compare(QLatin1String("receiver"), Qt::CaseInsensitive)) { setElementReceiver(reader.readElementText()); continue; } - if (tag == QLatin1String("slot")) { + if (!tag.compare(QLatin1String("slot"), Qt::CaseInsensitive)) { setElementSlot(reader.readElementText()); continue; } - if (tag == QLatin1String("hints")) { + if (!tag.compare(QLatin1String("hints"), Qt::CaseInsensitive)) { DomConnectionHints *v = new DomConnectionHints(); v->read(reader); setElementHints(v); @@ -8209,12 +5773,7 @@ void DomConnection::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -8223,67 +5782,59 @@ void DomConnection::read(QXmlStreamReader &reader) void DomConnection::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("connection") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("connection") : tagName.toLower()); - if (m_children & Sender) { + if (m_children & Sender) writer.writeTextElement(QStringLiteral("sender"), m_sender); - } - if (m_children & Signal) { + if (m_children & Signal) writer.writeTextElement(QStringLiteral("signal"), m_signal); - } - if (m_children & Receiver) { + if (m_children & Receiver) writer.writeTextElement(QStringLiteral("receiver"), m_receiver); - } - if (m_children & Slot) { + if (m_children & Slot) writer.writeTextElement(QStringLiteral("slot"), m_slot); - } - if (m_children & Hints) { + if (m_children & Hints) m_hints->write(writer, QStringLiteral("hints")); - } - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomConnection::setElementSender(const QString& a) +void DomConnection::setElementSender(const QString &a) { m_children |= Sender; m_sender = a; } -void DomConnection::setElementSignal(const QString& a) +void DomConnection::setElementSignal(const QString &a) { m_children |= Signal; m_signal = a; } -void DomConnection::setElementReceiver(const QString& a) +void DomConnection::setElementReceiver(const QString &a) { m_children |= Receiver; m_receiver = a; } -void DomConnection::setElementSlot(const QString& a) +void DomConnection::setElementSlot(const QString &a) { m_children |= Slot; m_slot = a; } -DomConnectionHints* DomConnection::takeElementHints() +DomConnectionHints *DomConnection::takeElementHints() { - DomConnectionHints* a = m_hints; + DomConnectionHints *a = m_hints; m_hints = 0; m_children ^= Hints; return a; } -void DomConnection::setElementHints(DomConnectionHints* a) +void DomConnection::setElementHints(DomConnectionHints *a) { delete m_hints; m_children |= Hints; @@ -8317,23 +5868,6 @@ void DomConnection::clearElementHints() m_children &= ~Hints; } -void DomConnectionHints::clear(bool clear_all) -{ - qDeleteAll(m_hint); - m_hint.clear(); - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; -} - -DomConnectionHints::DomConnectionHints() -{ - m_children = 0; -} - DomConnectionHints::~DomConnectionHints() { qDeleteAll(m_hint); @@ -8342,12 +5876,11 @@ DomConnectionHints::~DomConnectionHints() void DomConnectionHints::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("hint")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("hint"), Qt::CaseInsensitive)) { DomConnectionHint *v = new DomConnectionHint(); v->read(reader); m_hint.append(v); @@ -8357,12 +5890,7 @@ void DomConnectionHints::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -8371,55 +5899,29 @@ void DomConnectionHints::read(QXmlStreamReader &reader) void DomConnectionHints::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("connectionhints") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("connectionhints") : tagName.toLower()); - for (int i = 0; i < m_hint.size(); ++i) { - DomConnectionHint* v = m_hint[i]; + for (DomConnectionHint *v : m_hint) v->write(writer, QStringLiteral("hint")); - } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomConnectionHints::setElementHint(const QList<DomConnectionHint*>& a) +void DomConnectionHints::setElementHint(const QVector<DomConnectionHint *> &a) { m_children |= Hint; m_hint = a; } -void DomConnectionHint::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - m_has_attr_type = false; - } - - m_children = 0; - m_x = 0; - m_y = 0; -} - -DomConnectionHint::DomConnectionHint() -{ - m_children = 0; - m_has_attr_type = false; - m_x = 0; - m_y = 0; -} - DomConnectionHint::~DomConnectionHint() { } void DomConnectionHint::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("type")) { setAttributeType(attribute.value().toString()); continue; @@ -8427,15 +5929,15 @@ void DomConnectionHint::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("x")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("x"), Qt::CaseInsensitive)) { setElementX(reader.readElementText().toInt()); continue; } - if (tag == QLatin1String("y")) { + if (!tag.compare(QLatin1String("y"), Qt::CaseInsensitive)) { setElementY(reader.readElementText().toInt()); continue; } @@ -8443,12 +5945,7 @@ void DomConnectionHint::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -8457,21 +5954,16 @@ void DomConnectionHint::read(QXmlStreamReader &reader) void DomConnectionHint::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("connectionhint") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("connectionhint") : tagName.toLower()); if (hasAttributeType()) writer.writeAttribute(QStringLiteral("type"), attributeType()); - if (m_children & X) { + if (m_children & X) writer.writeTextElement(QString(QLatin1Char('x')), QString::number(m_x)); - } - if (m_children & Y) { + if (m_children & Y) writer.writeTextElement(QString(QLatin1Char('y')), QString::number(m_y)); - } - - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } @@ -8498,171 +5990,6 @@ void DomConnectionHint::clearElementY() m_children &= ~Y; } -void DomScript::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - m_has_attr_source = false; - m_has_attr_language = false; - } - - m_children = 0; -} - -DomScript::DomScript() -{ - m_children = 0; - 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) { - 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); - } - - for (bool finished = false; !finished && !reader.hasError();) { - switch (reader.readNext()) { - case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - reader.raiseError(QLatin1String("Unexpected element ") + tag); - } - break; - case QXmlStreamReader::EndElement : - finished = true; - break; - 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() ? QString::fromUtf8("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(); -} - -void DomWidgetData::clear(bool clear_all) -{ - qDeleteAll(m_property); - m_property.clear(); - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; -} - -DomWidgetData::DomWidgetData() -{ - m_children = 0; -} - -DomWidgetData::~DomWidgetData() -{ - qDeleteAll(m_property); - m_property.clear(); -} - -void DomWidgetData::read(QXmlStreamReader &reader) -{ - - for (bool finished = false; !finished && !reader.hasError();) { - switch (reader.readNext()) { - case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("property")) { - DomProperty *v = new DomProperty(); - v->read(reader); - m_property.append(v); - continue; - } - reader.raiseError(QLatin1String("Unexpected element ") + tag); - } - break; - case QXmlStreamReader::EndElement : - finished = true; - break; - 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() ? QString::fromUtf8("widgetdata") : tagName.toLower()); - - for (int i = 0; i < m_property.size(); ++i) { - DomProperty* v = m_property[i]; - 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; -} - -void DomDesignerData::clear(bool clear_all) -{ - qDeleteAll(m_property); - m_property.clear(); - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; -} - -DomDesignerData::DomDesignerData() -{ - m_children = 0; -} - DomDesignerData::~DomDesignerData() { qDeleteAll(m_property); @@ -8671,12 +5998,11 @@ DomDesignerData::~DomDesignerData() void DomDesignerData::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("property")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("property"), Qt::CaseInsensitive)) { DomProperty *v = new DomProperty(); v->read(reader); m_property.append(v); @@ -8686,12 +6012,7 @@ void DomDesignerData::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -8700,41 +6021,20 @@ void DomDesignerData::read(QXmlStreamReader &reader) void DomDesignerData::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("designerdata") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("designerdata") : tagName.toLower()); - for (int i = 0; i < m_property.size(); ++i) { - DomProperty* v = m_property[i]; + for (DomProperty *v : m_property) v->write(writer, QStringLiteral("property")); - } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomDesignerData::setElementProperty(const QList<DomProperty*>& a) +void DomDesignerData::setElementProperty(const QList<DomProperty *> &a) { m_children |= Property; m_property = a; } -void DomSlots::clear(bool clear_all) -{ - m_signal.clear(); - m_slot.clear(); - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; -} - -DomSlots::DomSlots() -{ - m_children = 0; -} - DomSlots::~DomSlots() { m_signal.clear(); @@ -8743,16 +6043,15 @@ DomSlots::~DomSlots() void DomSlots::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("signal")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("signal"), Qt::CaseInsensitive)) { m_signal.append(reader.readElementText()); continue; } - if (tag == QLatin1String("slot")) { + if (!tag.compare(QLatin1String("slot"), Qt::CaseInsensitive)) { m_slot.append(reader.readElementText()); continue; } @@ -8760,12 +6059,7 @@ void DomSlots::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -8774,53 +6068,29 @@ void DomSlots::read(QXmlStreamReader &reader) void DomSlots::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("slots") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("slots") : tagName.toLower()); - for (int i = 0; i < m_signal.size(); ++i) { - QString v = m_signal[i]; + for (const QString &v : m_signal) writer.writeTextElement(QStringLiteral("signal"), v); - } - for (int i = 0; i < m_slot.size(); ++i) { - QString v = m_slot[i]; + + for (const QString &v : m_slot) writer.writeTextElement(QStringLiteral("slot"), v); - } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomSlots::setElementSignal(const QStringList& a) +void DomSlots::setElementSignal(const QStringList &a) { m_children |= Signal; m_signal = a; } -void DomSlots::setElementSlot(const QStringList& a) +void DomSlots::setElementSlot(const QStringList &a) { m_children |= Slot; m_slot = a; } -void DomPropertySpecifications::clear(bool clear_all) -{ - qDeleteAll(m_tooltip); - m_tooltip.clear(); - qDeleteAll(m_stringpropertyspecification); - m_stringpropertyspecification.clear(); - - if (clear_all) { - m_text.clear(); - } - - m_children = 0; -} - -DomPropertySpecifications::DomPropertySpecifications() -{ - m_children = 0; -} - DomPropertySpecifications::~DomPropertySpecifications() { qDeleteAll(m_tooltip); @@ -8831,18 +6101,17 @@ DomPropertySpecifications::~DomPropertySpecifications() void DomPropertySpecifications::read(QXmlStreamReader &reader) { - - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); - if (tag == QLatin1String("tooltip")) { + const QStringRef tag = reader.name(); + if (!tag.compare(QLatin1String("tooltip"), Qt::CaseInsensitive)) { DomPropertyToolTip *v = new DomPropertyToolTip(); v->read(reader); m_tooltip.append(v); continue; } - if (tag == QLatin1String("stringpropertyspecification")) { + if (!tag.compare(QLatin1String("stringpropertyspecification"), Qt::CaseInsensitive)) { DomStringPropertySpecification *v = new DomStringPropertySpecification(); v->read(reader); m_stringpropertyspecification.append(v); @@ -8852,12 +6121,7 @@ void DomPropertySpecifications::read(QXmlStreamReader &reader) } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -8866,61 +6130,38 @@ void DomPropertySpecifications::read(QXmlStreamReader &reader) void DomPropertySpecifications::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("propertyspecifications") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("propertyspecifications") : tagName.toLower()); - for (int i = 0; i < m_tooltip.size(); ++i) { - DomPropertyToolTip* v = m_tooltip[i]; + for (DomPropertyToolTip *v : m_tooltip) v->write(writer, QStringLiteral("tooltip")); - } - for (int i = 0; i < m_stringpropertyspecification.size(); ++i) { - DomStringPropertySpecification* v = m_stringpropertyspecification[i]; + + for (DomStringPropertySpecification *v : m_stringpropertyspecification) v->write(writer, QStringLiteral("stringpropertyspecification")); - } - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); writer.writeEndElement(); } -void DomPropertySpecifications::setElementTooltip(const QList<DomPropertyToolTip*>& a) +void DomPropertySpecifications::setElementTooltip(const QVector<DomPropertyToolTip *> &a) { m_children |= Tooltip; m_tooltip = a; } -void DomPropertySpecifications::setElementStringpropertyspecification(const QList<DomStringPropertySpecification*>& a) +void DomPropertySpecifications::setElementStringpropertyspecification(const QVector<DomStringPropertySpecification *> &a) { m_children |= Stringpropertyspecification; m_stringpropertyspecification = a; } -void DomPropertyToolTip::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - m_has_attr_name = false; - } - - m_children = 0; -} - -DomPropertyToolTip::DomPropertyToolTip() -{ - m_children = 0; - m_has_attr_name = false; -} - DomPropertyToolTip::~DomPropertyToolTip() { } void DomPropertyToolTip::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("name")) { setAttributeName(attribute.value().toString()); continue; @@ -8928,20 +6169,15 @@ void DomPropertyToolTip::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); + const QStringRef tag = reader.name(); reader.raiseError(QLatin1String("Unexpected element ") + tag); } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -8950,48 +6186,23 @@ void DomPropertyToolTip::read(QXmlStreamReader &reader) void DomPropertyToolTip::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("propertytooltip") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("propertytooltip") : tagName.toLower()); if (hasAttributeName()) writer.writeAttribute(QStringLiteral("name"), attributeName()); - if (!m_text.isEmpty()) - writer.writeCharacters(m_text); - writer.writeEndElement(); } -void DomStringPropertySpecification::clear(bool clear_all) -{ - - if (clear_all) { - m_text.clear(); - m_has_attr_name = false; - m_has_attr_type = false; - m_has_attr_notr = false; - } - - m_children = 0; -} - -DomStringPropertySpecification::DomStringPropertySpecification() -{ - m_children = 0; - m_has_attr_name = false; - m_has_attr_type = false; - m_has_attr_notr = false; -} - DomStringPropertySpecification::~DomStringPropertySpecification() { } void DomStringPropertySpecification::read(QXmlStreamReader &reader) { - - const QXmlStreamAttributes attributes = reader.attributes(); + const QXmlStreamAttributes &attributes = reader.attributes(); for (const QXmlStreamAttribute &attribute : attributes) { - QStringRef name = attribute.name(); + const QStringRef name = attribute.name(); if (name == QLatin1String("name")) { setAttributeName(attribute.value().toString()); continue; @@ -9007,20 +6218,15 @@ void DomStringPropertySpecification::read(QXmlStreamReader &reader) reader.raiseError(QLatin1String("Unexpected attribute ") + name); } - for (bool finished = false; !finished && !reader.hasError();) { + while (!reader.hasError()) { switch (reader.readNext()) { case QXmlStreamReader::StartElement : { - const QString tag = reader.name().toString().toLower(); + const QStringRef tag = reader.name(); reader.raiseError(QLatin1String("Unexpected element ") + tag); } break; case QXmlStreamReader::EndElement : - finished = true; - break; - case QXmlStreamReader::Characters : - if (!reader.isWhitespace()) - m_text.append(reader.text().toString()); - break; + return; default : break; } @@ -9029,7 +6235,7 @@ void DomStringPropertySpecification::read(QXmlStreamReader &reader) void DomStringPropertySpecification::write(QXmlStreamWriter &writer, const QString &tagName) const { - writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("stringpropertyspecification") : tagName.toLower()); + writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("stringpropertyspecification") : tagName.toLower()); if (hasAttributeName()) writer.writeAttribute(QStringLiteral("name"), attributeName()); @@ -9040,9 +6246,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(); } |