Keep in sync uic sources with qttools module

Change-Id: I680505b8d68f363e6dc86d090632ec9b021ee981
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

2 files changed, 1664 insertions, 3108 deletions

diff --git a/src/tools/uic/ui4.cpp b/src/tools/uic/ui4.cpp
index c9cc79725f..49e7f21633 100644
--- a/src/tools/uic/ui4.cpp
+++ b/src/tools/uic/ui4.cpp
@@ -40,47 +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;
@@ -123,10 +82,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 +108,97 @@ 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")) {
+            if (!tag.compare(QLatin1String("images"), Qt::CaseInsensitive)) {
                 DomImages *v = new DomImages();
                 v->read(reader);
                 setElementImages(v);
                 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,8 +208,7 @@ void DomUI::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -264,7 +221,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,73 +238,56 @@ 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) {
+    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);
@@ -355,210 +295,210 @@ void DomUI::write(QXmlStreamWriter &writer, const QString &tagName) const
     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 *DomUI::takeElementImages()
 {
-    DomImages* a = m_images;
+    DomImages *a = m_images;
     m_images = 0;
     m_children ^= Images;
     return a;
 }
 
-void DomUI::setElementImages(DomImages* 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;
@@ -674,18 +614,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;
@@ -699,12 +627,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,8 +641,7 @@ void DomIncludes::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -728,39 +654,25 @@ 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 QVector<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();
@@ -772,10 +684,9 @@ 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 +698,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 +719,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,19 +733,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;
@@ -850,10 +747,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 +757,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,8 +771,7 @@ void DomResources::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -889,41 +784,28 @@ 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 QVector<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;
 }
 
@@ -933,10 +815,9 @@ 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,16 +825,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;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -966,7 +846,7 @@ 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());
@@ -977,25 +857,6 @@ void DomResource::write(QXmlStreamWriter &writer, const QString &tagName) const
     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;
@@ -1016,10 +877,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 +887,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,8 +919,7 @@ void DomActionGroup::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -1073,73 +932,53 @@ 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 QVector<DomAction*>& a)
+void DomActionGroup::setElementAction(const QVector<DomAction *> &a)
 {
     m_children |= Action;
     m_action = a;
 }
 
-void DomActionGroup::setElementActionGroup(const QVector<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;
@@ -1157,10 +996,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 +1010,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,8 +1030,7 @@ void DomAction::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -1206,7 +1043,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,46 +1051,32 @@ 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;
 }
 
@@ -1263,10 +1086,9 @@ 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,16 +1096,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;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -1296,7 +1117,7 @@ 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());
@@ -1307,21 +1128,6 @@ void DomActionRef::write(QXmlStreamWriter &writer, const QString &tagName) const
     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;
@@ -1338,10 +1144,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 +1154,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,8 +1174,7 @@ void DomButtonGroup::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -1383,49 +1187,35 @@ 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;
@@ -1439,12 +1229,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,8 +1243,7 @@ void DomButtonGroups::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -1468,36 +1256,23 @@ 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 QVector<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;
@@ -1511,12 +1286,11 @@ DomImages::~DomImages()
 
 void DomImages::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("image")) {
+            const QStringRef tag = reader.name();
+            if (!tag.compare(QLatin1String("image"), Qt::CaseInsensitive)) {
                 DomImage *v = new DomImage();
                 v->read(reader);
                 m_image.append(v);
@@ -1526,8 +1300,7 @@ void DomImages::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -1540,37 +1313,23 @@ void DomImages::read(QXmlStreamReader &reader)
 
 void DomImages::write(QXmlStreamWriter &writer, const QString &tagName) const
 {
-    writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("images") : tagName.toLower());
+    writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("images") : tagName.toLower());
 
-    for (int i = 0; i < m_image.size(); ++i) {
-        DomImage* v = m_image[i];
+    for (DomImage *v : m_image)
         v->write(writer, QStringLiteral("image"));
-    }
+
     if (!m_text.isEmpty())
         writer.writeCharacters(m_text);
 
     writer.writeEndElement();
 }
 
-void DomImages::setElementImage(const QVector<DomImage*>& a)
+void DomImages::setElementImage(const QVector<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;
@@ -1585,10 +1344,9 @@ DomImage::~DomImage()
 
 void DomImage::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;
@@ -1596,11 +1354,11 @@ void DomImage::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("data")) {
+            const QStringRef tag = reader.name();
+            if (!tag.compare(QLatin1String("data"), Qt::CaseInsensitive)) {
                 DomImageData *v = new DomImageData();
                 v->read(reader);
                 setElementData(v);
@@ -1610,8 +1368,7 @@ void DomImage::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -1624,14 +1381,13 @@ void DomImage::read(QXmlStreamReader &reader)
 
 void DomImage::write(QXmlStreamWriter &writer, const QString &tagName) const
 {
-    writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("image") : tagName.toLower());
+    writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("image") : tagName.toLower());
 
     if (hasAttributeName())
         writer.writeAttribute(QStringLiteral("name"), attributeName());
 
-    if (m_children & Data) {
+    if (m_children & Data)
         m_data->write(writer, QStringLiteral("data"));
-    }
 
     if (!m_text.isEmpty())
         writer.writeCharacters(m_text);
@@ -1639,15 +1395,15 @@ void DomImage::write(QXmlStreamWriter &writer, const QString &tagName) const
     writer.writeEndElement();
 }
 
-DomImageData* DomImage::takeElementData()
+DomImageData *DomImage::takeElementData()
 {
-    DomImageData* a = m_data;
+    DomImageData *a = m_data;
     m_data = 0;
     m_children ^= Data;
     return a;
 }
 
-void DomImage::setElementData(DomImageData* a)
+void DomImage::setElementData(DomImageData *a)
 {
     delete m_data;
     m_children |= Data;
@@ -1661,22 +1417,8 @@ void DomImage::clearElementData()
     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;
@@ -1689,10 +1431,9 @@ DomImageData::~DomImageData()
 
 void DomImageData::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("format")) {
             setAttributeFormat(attribute.value().toString());
             continue;
@@ -1704,16 +1445,15 @@ void DomImageData::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());
@@ -1726,7 +1466,7 @@ void DomImageData::read(QXmlStreamReader &reader)
 
 void DomImageData::write(QXmlStreamWriter &writer, const QString &tagName) const
 {
-    writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("imagedata") : tagName.toLower());
+    writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("imagedata") : tagName.toLower());
 
     if (hasAttributeFormat())
         writer.writeAttribute(QStringLiteral("format"), attributeFormat());
@@ -1740,18 +1480,6 @@ void DomImageData::write(QXmlStreamWriter &writer, const QString &tagName) const
     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;
@@ -1765,12 +1493,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,8 +1507,7 @@ void DomCustomWidgets::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -1794,38 +1520,25 @@ 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 QVector<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();
 }
@@ -1836,10 +1549,9 @@ 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 +1559,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 +1580,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,31 +1591,6 @@ 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;
@@ -1931,68 +1617,67 @@ DomCustomWidget::~DomCustomWidget()
 
 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")) {
+            if (!tag.compare(QLatin1String("sizepolicy"), Qt::CaseInsensitive)) {
                 DomSizePolicyData *v = new DomSizePolicyData();
                 v->read(reader);
                 setElementSizePolicy(v);
                 continue;
             }
-            if (tag == QLatin1String("pixmap")) {
+            if (!tag.compare(QLatin1String("pixmap"), Qt::CaseInsensitive)) {
                 setElementPixmap(reader.readElementText());
                 continue;
             }
-            if (tag == QLatin1String("script")) {
+            if (!tag.compare(QLatin1String("script"), Qt::CaseInsensitive)) {
                 DomScript *v = new DomScript();
                 v->read(reader);
                 setElementScript(v);
                 continue;
             }
-            if (tag == QLatin1String("properties")) {
+            if (!tag.compare(QLatin1String("properties"), Qt::CaseInsensitive)) {
                 DomProperties *v = new DomProperties();
                 v->read(reader);
                 setElementProperties(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("propertyspecifications")) {
+            if (!tag.compare(QLatin1String("propertyspecifications"), Qt::CaseInsensitive)) {
                 DomPropertySpecifications *v = new DomPropertySpecifications();
                 v->read(reader);
                 setElementPropertyspecifications(v);
@@ -2002,8 +1687,7 @@ void DomCustomWidget::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -2016,55 +1700,43 @@ 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) {
+    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) {
+    if (m_children & Script)
         m_script->write(writer, QStringLiteral("script"));
-    }
 
-    if (m_children & Properties) {
+    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);
@@ -2072,49 +1744,49 @@ void DomCustomWidget::write(QXmlStreamWriter &writer, const QString &tagName) co
     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 +1798,81 @@ void DomCustomWidget::setElementContainer(int a)
     m_container = a;
 }
 
-DomSizePolicyData* DomCustomWidget::takeElementSizePolicy()
+DomSizePolicyData *DomCustomWidget::takeElementSizePolicy()
 {
-    DomSizePolicyData* a = m_sizePolicy;
+    DomSizePolicyData *a = m_sizePolicy;
     m_sizePolicy = 0;
     m_children ^= SizePolicy;
     return a;
 }
 
-void DomCustomWidget::setElementSizePolicy(DomSizePolicyData* 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 *DomCustomWidget::takeElementScript()
 {
-    DomScript* a = m_script;
+    DomScript *a = m_script;
     m_script = 0;
     m_children ^= Script;
     return a;
 }
 
-void DomCustomWidget::setElementScript(DomScript* a)
+void DomCustomWidget::setElementScript(DomScript *a)
 {
     delete m_script;
     m_children |= Script;
     m_script = a;
 }
 
-DomProperties* DomCustomWidget::takeElementProperties()
+DomProperties *DomCustomWidget::takeElementProperties()
 {
-    DomProperties* a = m_properties;
+    DomProperties *a = m_properties;
     m_properties = 0;
     m_children ^= Properties;
     return a;
 }
 
-void DomCustomWidget::setElementProperties(DomProperties* a)
+void DomCustomWidget::setElementProperties(DomProperties *a)
 {
     delete m_properties;
     m_children |= Properties;
     m_properties = a;
 }
 
-DomSlots* DomCustomWidget::takeElementSlots()
+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;
@@ -2281,18 +1953,6 @@ 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;
@@ -2306,12 +1966,11 @@ DomProperties::~DomProperties()
 
 void DomProperties::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)) {
                 DomPropertyData *v = new DomPropertyData();
                 v->read(reader);
                 m_property.append(v);
@@ -2321,8 +1980,7 @@ void DomProperties::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -2335,38 +1993,25 @@ void DomProperties::read(QXmlStreamReader &reader)
 
 void DomProperties::write(QXmlStreamWriter &writer, const QString &tagName) const
 {
-    writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("properties") : tagName.toLower());
+    writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("properties") : tagName.toLower());
 
-    for (int i = 0; i < m_property.size(); ++i) {
-        DomPropertyData* v = m_property[i];
+    for (DomPropertyData *v : m_property)
         v->write(writer, QStringLiteral("property"));
-    }
+
     if (!m_text.isEmpty())
         writer.writeCharacters(m_text);
 
     writer.writeEndElement();
 }
 
-void DomProperties::setElementProperty(const QVector<DomPropertyData*>& a)
+void DomProperties::setElementProperty(const QVector<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;
 }
 
@@ -2376,10 +2021,9 @@ DomPropertyData::~DomPropertyData()
 
 void DomPropertyData::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;
@@ -2387,16 +2031,15 @@ void DomPropertyData::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());
@@ -2409,7 +2052,7 @@ void DomPropertyData::read(QXmlStreamReader &reader)
 
 void DomPropertyData::write(QXmlStreamWriter &writer, const QString &tagName) const
 {
-    writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("propertydata") : tagName.toLower());
+    writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("propertydata") : tagName.toLower());
 
     if (hasAttributeType())
         writer.writeAttribute(QStringLiteral("type"), attributeType());
@@ -2420,18 +2063,6 @@ void DomPropertyData::write(QXmlStreamWriter &writer, const QString &tagName) co
     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;
@@ -2445,16 +2076,15 @@ DomSizePolicyData::~DomSizePolicyData()
 
 void DomSizePolicyData::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("hordata")) {
+            const QStringRef tag = reader.name();
+            if (!tag.compare(QLatin1String("hordata"), Qt::CaseInsensitive)) {
                 setElementHorData(reader.readElementText().toInt());
                 continue;
             }
-            if (tag == QLatin1String("verdata")) {
+            if (!tag.compare(QLatin1String("verdata"), Qt::CaseInsensitive)) {
                 setElementVerData(reader.readElementText().toInt());
                 continue;
             }
@@ -2462,8 +2092,7 @@ void DomSizePolicyData::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -2476,15 +2105,13 @@ void DomSizePolicyData::read(QXmlStreamReader &reader)
 
 void DomSizePolicyData::write(QXmlStreamWriter &writer, const QString &tagName) const
 {
-    writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("sizepolicydata") : tagName.toLower());
+    writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("sizepolicydata") : tagName.toLower());
 
-    if (m_children & HorData) {
+    if (m_children & HorData)
         writer.writeTextElement(QStringLiteral("hordata"), QString::number(m_horData));
-    }
 
-    if (m_children & VerData) {
+    if (m_children & VerData)
         writer.writeTextElement(QStringLiteral("verdata"), QString::number(m_verData));
-    }
 
     if (!m_text.isEmpty())
         writer.writeCharacters(m_text);
@@ -2514,23 +2141,8 @@ 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;
@@ -2543,10 +2155,9 @@ 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,16 +2169,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;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -2580,7 +2190,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()));
@@ -2594,21 +2204,8 @@ void DomLayoutDefault::write(QXmlStreamWriter &writer, const QString &tagName) c
     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;
 }
@@ -2619,10 +2216,9 @@ 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,16 +2230,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;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -2656,7 +2251,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());
@@ -2670,17 +2265,6 @@ void DomLayoutFunction::write(QXmlStreamWriter &writer, const QString &tagName)
     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;
@@ -2693,12 +2277,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,8 +2289,7 @@ void DomTabStops::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -2720,47 +2302,23 @@ 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;
@@ -2785,10 +2343,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 +2377,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,8 +2403,7 @@ void DomLayout::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -2860,7 +2416,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,61 +2439,45 @@ 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 QVector<DomLayoutItem*>& a)
+void DomLayout::setElementItem(const QVector<DomLayoutItem *> &a)
 {
     m_children |= Item;
     m_item = a;
 }
 
-void DomLayoutItem::clear(bool clear_all)
+void DomLayoutItem::clear()
 {
     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;
@@ -2972,10 +2512,9 @@ DomLayoutItem::~DomLayoutItem()
 
 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 +2538,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,8 +2564,7 @@ void DomLayoutItem::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -3039,7 +2577,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,29 +2595,26 @@ 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);
@@ -3087,60 +2622,48 @@ void DomLayoutItem::write(QXmlStreamWriter &writer, const QString &tagName) cons
     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;
@@ -3154,12 +2677,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,8 +2691,7 @@ void DomRow::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -3183,36 +2704,23 @@ 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;
@@ -3226,12 +2734,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,8 +2748,7 @@ void DomColumn::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -3255,42 +2761,23 @@ 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;
@@ -3310,10 +2797,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 +2811,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,8 +2831,7 @@ void DomItem::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -3359,7 +2844,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,72 +2852,30 @@ 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 QVector<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;
@@ -3474,10 +2917,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 +2935,87 @@ 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")) {
+            if (!tag.compare(QLatin1String("script"), Qt::CaseInsensitive)) {
                 DomScript *v = new DomScript();
                 v->read(reader);
                 m_script.append(v);
                 continue;
             }
-            if (tag == QLatin1String("widgetdata")) {
+            if (!tag.compare(QLatin1String("widgetdata"), Qt::CaseInsensitive)) {
                 DomWidgetData *v = new DomWidgetData();
                 v->read(reader);
                 m_widgetData.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("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,8 +3023,7 @@ void DomWidget::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -3595,7 +3036,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,165 +3047,138 @@ 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];
+
+    for (DomScript *v : m_script)
         v->write(writer, QStringLiteral("script"));
-    }
-    for (int i = 0; i < m_widgetData.size(); ++i) {
-        DomWidgetData* v = m_widgetData[i];
+
+    for (DomWidgetData *v : m_widgetData)
         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 QVector<DomScript*>& a)
+void DomWidget::setElementScript(const QVector<DomScript *> &a)
 {
     m_children |= Script;
     m_script = a;
 }
 
-void DomWidget::setElementWidgetData(const QVector<DomWidgetData*>& a)
+void DomWidget::setElementWidgetData(const QVector<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 QVector<DomRow*>& a)
+void DomWidget::setElementRow(const QVector<DomRow *> &a)
 {
     m_children |= Row;
     m_row = a;
 }
 
-void DomWidget::setElementColumn(const QVector<DomColumn*>& a)
+void DomWidget::setElementColumn(const QVector<DomColumn *> &a)
 {
     m_children |= Column;
     m_column = a;
 }
 
-void DomWidget::setElementItem(const QVector<DomItem*>& a)
+void DomWidget::setElementItem(const QVector<DomItem *> &a)
 {
     m_children |= Item;
     m_item = a;
 }
 
-void DomWidget::setElementLayout(const QVector<DomLayout*>& a)
+void DomWidget::setElementLayout(const QVector<DomLayout *> &a)
 {
     m_children |= Layout;
     m_layout = a;
 }
 
-void DomWidget::setElementWidget(const QVector<DomWidget*>& a)
+void DomWidget::setElementWidget(const QVector<DomWidget *> &a)
 {
     m_children |= Widget;
     m_widget = a;
 }
 
-void DomWidget::setElementAction(const QVector<DomAction*>& a)
+void DomWidget::setElementAction(const QVector<DomAction *> &a)
 {
     m_children |= Action;
     m_action = a;
 }
 
-void DomWidget::setElementActionGroup(const QVector<DomActionGroup*>& a)
+void DomWidget::setElementActionGroup(const QVector<DomActionGroup *> &a)
 {
     m_children |= ActionGroup;
     m_actionGroup = a;
 }
 
-void DomWidget::setElementAddAction(const QVector<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;
@@ -3779,10 +3193,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 +3203,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,8 +3217,7 @@ void DomSpacer::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -3818,42 +3230,26 @@ 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;
@@ -3870,10 +3266,9 @@ 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 +3276,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,8 +3296,7 @@ void DomColor::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -3915,22 +3309,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);
@@ -3971,20 +3362,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;
@@ -4000,10 +3377,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 +3387,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,8 +3401,7 @@ void DomGradientStop::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -4039,14 +3414,13 @@ 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);
@@ -4054,15 +3428,15 @@ void DomGradientStop::write(QXmlStreamWriter &writer, const QString &tagName) co
     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,41 +3450,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;
@@ -4147,10 +3486,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 +3544,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,8 +3558,7 @@ void DomGradient::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -4234,7 +3571,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,33 +3612,27 @@ 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 QVector<DomGradientStop*>& a)
+void DomGradient::setElementGradientStop(const QVector<DomGradientStop *> &a)
 {
     m_children |= GradientStop;
     m_gradientStop = a;
 }
 
-void DomBrush::clear(bool clear_all)
+void DomBrush::clear()
 {
     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;
@@ -4328,10 +3659,9 @@ DomBrush::~DomBrush()
 
 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 +3669,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,8 +3695,7 @@ void DomBrush::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -4379,35 +3708,32 @@ 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);
@@ -4415,61 +3741,48 @@ void DomBrush::write(QXmlStreamWriter &writer, const QString &tagName) const
     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;
@@ -4484,10 +3797,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 +3807,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,8 +3821,7 @@ void DomColorRole::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -4523,14 +3834,13 @@ 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);
@@ -4538,15 +3848,15 @@ void DomColorRole::write(QXmlStreamWriter &writer, const QString &tagName) const
     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,20 +3870,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;
@@ -4589,18 +3885,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,8 +3905,7 @@ void DomColorGroup::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -4624,50 +3918,32 @@ 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 QVector<DomColorRole*>& a)
+void DomColorGroup::setElementColorRole(const QVector<DomColorRole *> &a)
 {
     m_children |= ColorRole;
     m_colorRole = a;
 }
 
-void DomColorGroup::setElementColor(const QVector<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;
@@ -4685,24 +3961,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,8 +3987,7 @@ void DomPalette::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -4726,19 +4000,16 @@ 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);
@@ -4746,45 +4017,45 @@ void DomPalette::write(QXmlStreamWriter &writer, const QString &tagName) const
     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,24 +4083,6 @@ 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;
@@ -4849,48 +4102,47 @@ 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,8 +4150,7 @@ void DomFont::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -4912,47 +4163,37 @@ 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);
@@ -4960,7 +4201,7 @@ void DomFont::write(QXmlStreamWriter &writer, const QString &tagName) const
     writer.writeEndElement();
 }
 
-void DomFont::setElementFamily(const QString& a)
+void DomFont::setElementFamily(const QString &a)
 {
     m_children |= Family;
     m_family = a;
@@ -5008,7 +4249,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,18 +4311,6 @@ 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;
@@ -5095,16 +4324,15 @@ 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,8 +4340,7 @@ void DomPoint::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -5126,15 +4353,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);
@@ -5164,20 +4389,6 @@ 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;
@@ -5193,24 +4404,23 @@ 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,8 +4428,7 @@ void DomRect::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -5232,23 +4441,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);
@@ -5300,21 +4505,8 @@ 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;
 }
@@ -5325,10 +4517,9 @@ 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,16 +4531,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;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -5362,7 +4552,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());
@@ -5376,22 +4566,6 @@ void DomLocale::write(QXmlStreamWriter &writer, const QString &tagName) const
     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;
@@ -5409,10 +4583,9 @@ 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 +4597,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,8 +4621,7 @@ void DomSizePolicy::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -5462,7 +4634,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,21 +4642,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);
@@ -5536,18 +4704,6 @@ 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;
@@ -5561,16 +4717,15 @@ 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,8 +4733,7 @@ void DomSize::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -5592,15 +4746,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);
@@ -5630,19 +4782,6 @@ 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;
@@ -5657,20 +4796,19 @@ 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,8 +4816,7 @@ void DomDate::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -5692,19 +4829,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);
@@ -5745,19 +4879,6 @@ 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;
@@ -5772,20 +4893,19 @@ 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,8 +4913,7 @@ void DomTime::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -5807,19 +4926,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);
@@ -5860,22 +4976,6 @@ 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;
@@ -5893,32 +4993,31 @@ 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,8 +5025,7 @@ void DomDateTime::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -5940,31 +5038,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);
@@ -6038,20 +5130,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;
@@ -6067,10 +5145,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 +5163,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,8 +5175,7 @@ void DomStringList::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -6112,7 +5188,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,37 +5199,23 @@ 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();
@@ -6165,10 +5227,9 @@ 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 +5241,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 +5262,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,34 +5276,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;
@@ -6274,10 +5306,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 +5320,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 +5376,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 +5389,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 +5397,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 +5427,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,22 +5603,8 @@ 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;
@@ -6609,10 +5617,9 @@ 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 +5635,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 +5656,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,18 +5673,6 @@ 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;
@@ -6692,16 +5686,15 @@ 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,8 +5702,7 @@ void DomPointF::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -6723,15 +5715,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);
@@ -6761,20 +5751,6 @@ 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;
@@ -6790,24 +5766,23 @@ 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,8 +5790,7 @@ void DomRectF::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -6829,23 +5803,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);
@@ -6897,18 +5867,6 @@ 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;
@@ -6922,16 +5880,15 @@ 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,8 +5896,7 @@ void DomSizeF::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -6953,15 +5909,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);
@@ -6991,17 +5945,6 @@ 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;
@@ -7014,12 +5957,11 @@ 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,8 +5969,7 @@ void DomChar::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -7041,11 +5982,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);
@@ -7064,18 +6004,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;
@@ -7089,12 +6017,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,8 +6031,7 @@ void DomUrl::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -7118,11 +6044,10 @@ 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);
@@ -7130,15 +6055,15 @@ void DomUrl::write(QXmlStreamWriter &writer, const QString &tagName) const
     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 +6077,7 @@ void DomUrl::clearElementString()
     m_children &= ~String;
 }
 
-void DomProperty::clear(bool clear_all)
+void DomProperty::clear()
 {
     delete m_color;
     delete m_font;
@@ -7176,13 +6101,6 @@ void DomProperty::clear(bool clear_all)
     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;
@@ -7279,10 +6197,9 @@ DomProperty::~DomProperty()
 
 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 +6211,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,8 +6393,7 @@ void DomProperty::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -7490,7 +6406,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,203 +6415,182 @@ 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);
@@ -7703,396 +6598,384 @@ void DomProperty::write(QXmlStreamWriter &writer, const QString &tagName) const
     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;
@@ -8106,12 +6989,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,8 +7003,7 @@ void DomConnections::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -8135,36 +7016,23 @@ 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 QVector<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;
@@ -8178,28 +7046,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,8 +7076,7 @@ void DomConnection::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -8223,27 +7089,22 @@ 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);
@@ -8251,39 +7112,39 @@ void DomConnection::write(QXmlStreamWriter &writer, const QString &tagName) cons
     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,18 +7178,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;
@@ -8342,12 +7191,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,8 +7205,7 @@ void DomConnectionHints::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -8371,37 +7218,23 @@ 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 QVector<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;
@@ -8416,10 +7249,9 @@ 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 +7259,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,8 +7275,7 @@ void DomConnectionHint::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -8457,18 +7288,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);
@@ -8498,21 +7327,8 @@ 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;
 }
@@ -8523,10 +7339,9 @@ DomScript::~DomScript()
 
 void DomScript::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("source")) {
             setAttributeSource(attribute.value().toString());
             continue;
@@ -8538,16 +7353,15 @@ void DomScript::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());
@@ -8560,7 +7374,7 @@ void DomScript::read(QXmlStreamReader &reader)
 
 void DomScript::write(QXmlStreamWriter &writer, const QString &tagName) const
 {
-    writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("script") : tagName.toLower());
+    writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("script") : tagName.toLower());
 
     if (hasAttributeSource())
         writer.writeAttribute(QStringLiteral("source"), attributeSource());
@@ -8574,18 +7388,6 @@ void DomScript::write(QXmlStreamWriter &writer, const QString &tagName) const
     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;
@@ -8599,12 +7401,11 @@ DomWidgetData::~DomWidgetData()
 
 void DomWidgetData::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);
@@ -8614,8 +7415,7 @@ void DomWidgetData::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -8628,36 +7428,23 @@ void DomWidgetData::read(QXmlStreamReader &reader)
 
 void DomWidgetData::write(QXmlStreamWriter &writer, const QString &tagName) const
 {
-    writer.writeStartElement(tagName.isEmpty() ? QString::fromUtf8("widgetdata") : tagName.toLower());
+    writer.writeStartElement(tagName.isEmpty() ? QStringLiteral("widgetdata") : 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 DomWidgetData::setElementProperty(const QList<DomProperty*>& a)
+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;
@@ -8671,12 +7458,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,8 +7472,7 @@ void DomDesignerData::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -8700,36 +7485,23 @@ 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;
@@ -8743,16 +7515,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,8 +7531,7 @@ void DomSlots::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -8774,48 +7544,32 @@ 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;
@@ -8831,18 +7585,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,8 +7605,7 @@ void DomPropertySpecifications::read(QXmlStreamReader &reader)
         }
             break;
         case QXmlStreamReader::EndElement :
-            finished = true;
-            break;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -8866,48 +7618,34 @@ 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 QVector<DomPropertyToolTip*>& a)
+void DomPropertySpecifications::setElementTooltip(const QVector<DomPropertyToolTip *> &a)
 {
     m_children |= Tooltip;
     m_tooltip = a;
 }
 
-void DomPropertySpecifications::setElementStringpropertyspecification(const QVector<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;
 }
 
@@ -8917,10 +7655,9 @@ 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,16 +7665,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;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -8950,7 +7686,7 @@ 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());
@@ -8961,22 +7697,8 @@ void DomPropertyToolTip::write(QXmlStreamWriter &writer, const QString &tagName)
     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;
@@ -8988,10 +7710,9 @@ 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,16 +7728,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;
+            return;
         case QXmlStreamReader::Characters :
             if (!reader.isWhitespace())
                 m_text.append(reader.text().toString());
@@ -9029,7 +7749,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());
diff --git a/src/tools/uic/ui4.h b/src/tools/uic/ui4.h
index 8d784faca2..6b2de2decd 100644
--- a/src/tools/uic/ui4.h
+++ b/src/tools/uic/ui4.h
@@ -161,17 +161,17 @@ public:
     // attribute accessors
     inline bool hasAttributeVersion() const { return m_has_attr_version; }
     inline QString attributeVersion() const { return m_attr_version; }
-    inline void setAttributeVersion(const QString& a) { m_attr_version = a; m_has_attr_version = true; }
+    inline void setAttributeVersion(const QString &a) { m_attr_version = a; m_has_attr_version = true; }
     inline void clearAttributeVersion() { m_has_attr_version = false; }
 
     inline bool hasAttributeLanguage() const { return m_has_attr_language; }
     inline QString attributeLanguage() const { return m_attr_language; }
-    inline void setAttributeLanguage(const QString& a) { m_attr_language = a; m_has_attr_language = true; }
+    inline void setAttributeLanguage(const QString &a) { m_attr_language = a; m_has_attr_language = true; }
     inline void clearAttributeLanguage() { m_has_attr_language = false; }
 
     inline bool hasAttributeDisplayname() const { return m_has_attr_displayname; }
     inline QString attributeDisplayname() const { return m_attr_displayname; }
-    inline void setAttributeDisplayname(const QString& a) { m_attr_displayname = a; m_has_attr_displayname = true; }
+    inline void setAttributeDisplayname(const QString &a) { m_attr_displayname = a; m_has_attr_displayname = true; }
     inline void clearAttributeDisplayname() { m_has_attr_displayname = false; }
 
     inline bool hasAttributeStdsetdef() const { return m_has_attr_stdsetdef; }
@@ -186,105 +186,104 @@ public:
 
     // child element accessors
     inline QString elementAuthor() const { return m_author; }
-    void setElementAuthor(const QString& a);
+    void setElementAuthor(const QString &a);
     inline bool hasElementAuthor() const { return m_children & Author; }
     void clearElementAuthor();
 
     inline QString elementComment() const { return m_comment; }
-    void setElementComment(const QString& a);
+    void setElementComment(const QString &a);
     inline bool hasElementComment() const { return m_children & Comment; }
     void clearElementComment();
 
     inline QString elementExportMacro() const { return m_exportMacro; }
-    void setElementExportMacro(const QString& a);
+    void setElementExportMacro(const QString &a);
     inline bool hasElementExportMacro() const { return m_children & ExportMacro; }
     void clearElementExportMacro();
 
     inline QString elementClass() const { return m_class; }
-    void setElementClass(const QString& a);
+    void setElementClass(const QString &a);
     inline bool hasElementClass() const { return m_children & Class; }
     void clearElementClass();
 
-    inline DomWidget* elementWidget() const { return m_widget; }
-    DomWidget* takeElementWidget();
-    void setElementWidget(DomWidget* a);
+    inline DomWidget *elementWidget() const { return m_widget; }
+    DomWidget *takeElementWidget();
+    void setElementWidget(DomWidget *a);
     inline bool hasElementWidget() const { return m_children & Widget; }
     void clearElementWidget();
 
-    inline DomLayoutDefault* elementLayoutDefault() const { return m_layoutDefault; }
-    DomLayoutDefault* takeElementLayoutDefault();
-    void setElementLayoutDefault(DomLayoutDefault* a);
+    inline DomLayoutDefault *elementLayoutDefault() const { return m_layoutDefault; }
+    DomLayoutDefault *takeElementLayoutDefault();
+    void setElementLayoutDefault(DomLayoutDefault *a);
     inline bool hasElementLayoutDefault() const { return m_children & LayoutDefault; }
     void clearElementLayoutDefault();
 
-    inline DomLayoutFunction* elementLayoutFunction() const { return m_layoutFunction; }
-    DomLayoutFunction* takeElementLayoutFunction();
-    void setElementLayoutFunction(DomLayoutFunction* a);
+    inline DomLayoutFunction *elementLayoutFunction() const { return m_layoutFunction; }
+    DomLayoutFunction *takeElementLayoutFunction();
+    void setElementLayoutFunction(DomLayoutFunction *a);
     inline bool hasElementLayoutFunction() const { return m_children & LayoutFunction; }
     void clearElementLayoutFunction();
 
     inline QString elementPixmapFunction() const { return m_pixmapFunction; }
-    void setElementPixmapFunction(const QString& a);
+    void setElementPixmapFunction(const QString &a);
     inline bool hasElementPixmapFunction() const { return m_children & PixmapFunction; }
     void clearElementPixmapFunction();
 
-    inline DomCustomWidgets* elementCustomWidgets() const { return m_customWidgets; }
-    DomCustomWidgets* takeElementCustomWidgets();
-    void setElementCustomWidgets(DomCustomWidgets* a);
+    inline DomCustomWidgets *elementCustomWidgets() const { return m_customWidgets; }
+    DomCustomWidgets *takeElementCustomWidgets();
+    void setElementCustomWidgets(DomCustomWidgets *a);
     inline bool hasElementCustomWidgets() const { return m_children & CustomWidgets; }
     void clearElementCustomWidgets();
 
-    inline DomTabStops* elementTabStops() const { return m_tabStops; }
-    DomTabStops* takeElementTabStops();
-    void setElementTabStops(DomTabStops* a);
+    inline DomTabStops *elementTabStops() const { return m_tabStops; }
+    DomTabStops *takeElementTabStops();
+    void setElementTabStops(DomTabStops *a);
     inline bool hasElementTabStops() const { return m_children & TabStops; }
     void clearElementTabStops();
 
-    inline DomImages* elementImages() const { return m_images; }
-    DomImages* takeElementImages();
-    void setElementImages(DomImages* a);
+    inline DomImages *elementImages() const { return m_images; }
+    DomImages *takeElementImages();
+    void setElementImages(DomImages *a);
     inline bool hasElementImages() const { return m_children & Images; }
     void clearElementImages();
 
-    inline DomIncludes* elementIncludes() const { return m_includes; }
-    DomIncludes* takeElementIncludes();
-    void setElementIncludes(DomIncludes* a);
+    inline DomIncludes *elementIncludes() const { return m_includes; }
+    DomIncludes *takeElementIncludes();
+    void setElementIncludes(DomIncludes *a);
     inline bool hasElementIncludes() const { return m_children & Includes; }
     void clearElementIncludes();
 
-    inline DomResources* elementResources() const { return m_resources; }
-    DomResources* takeElementResources();
-    void setElementResources(DomResources* a);
+    inline DomResources *elementResources() const { return m_resources; }
+    DomResources *takeElementResources();
+    void setElementResources(DomResources *a);
     inline bool hasElementResources() const { return m_children & Resources; }
     void clearElementResources();
 
-    inline DomConnections* elementConnections() const { return m_connections; }
-    DomConnections* takeElementConnections();
-    void setElementConnections(DomConnections* a);
+    inline DomConnections *elementConnections() const { return m_connections; }
+    DomConnections *takeElementConnections();
+    void setElementConnections(DomConnections *a);
     inline bool hasElementConnections() const { return m_children & Connections; }
     void clearElementConnections();
 
-    inline DomDesignerData* elementDesignerdata() const { return m_designerdata; }
-    DomDesignerData* takeElementDesignerdata();
-    void setElementDesignerdata(DomDesignerData* a);
+    inline DomDesignerData *elementDesignerdata() const { return m_designerdata; }
+    DomDesignerData *takeElementDesignerdata();
+    void setElementDesignerdata(DomDesignerData *a);
     inline bool hasElementDesignerdata() const { return m_children & Designerdata; }
     void clearElementDesignerdata();
 
-    inline DomSlots* elementSlots() const { return m_slots; }
-    DomSlots* takeElementSlots();
-    void setElementSlots(DomSlots* a);
+    inline DomSlots *elementSlots() const { return m_slots; }
+    DomSlots *takeElementSlots();
+    void setElementSlots(DomSlots *a);
     inline bool hasElementSlots() const { return m_children & Slots; }
     void clearElementSlots();
 
-    inline DomButtonGroups* elementButtonGroups() const { return m_buttonGroups; }
-    DomButtonGroups* takeElementButtonGroups();
-    void setElementButtonGroups(DomButtonGroups* a);
+    inline DomButtonGroups *elementButtonGroups() const { return m_buttonGroups; }
+    DomButtonGroups *takeElementButtonGroups();
+    void setElementButtonGroups(DomButtonGroups *a);
     inline bool hasElementButtonGroups() const { return m_children & ButtonGroups; }
     void clearElementButtonGroups();
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_version;
@@ -308,19 +307,19 @@ private:
     QString m_comment;
     QString m_exportMacro;
     QString m_class;
-    DomWidget* m_widget;
-    DomLayoutDefault* m_layoutDefault;
-    DomLayoutFunction* m_layoutFunction;
+    DomWidget *m_widget;
+    DomLayoutDefault *m_layoutDefault;
+    DomLayoutFunction *m_layoutFunction;
     QString m_pixmapFunction;
-    DomCustomWidgets* m_customWidgets;
-    DomTabStops* m_tabStops;
-    DomImages* m_images;
-    DomIncludes* m_includes;
-    DomResources* m_resources;
-    DomConnections* m_connections;
-    DomDesignerData* m_designerdata;
-    DomSlots* m_slots;
-    DomButtonGroups* m_buttonGroups;
+    DomCustomWidgets *m_customWidgets;
+    DomTabStops *m_tabStops;
+    DomImages *m_images;
+    DomIncludes *m_includes;
+    DomResources *m_resources;
+    DomConnections *m_connections;
+    DomDesignerData *m_designerdata;
+    DomSlots *m_slots;
+    DomButtonGroups *m_buttonGroups;
     enum Child {
         Author = 1,
         Comment = 2,
@@ -353,19 +352,16 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
-    inline QVector<DomInclude*> elementInclude() const { return m_include; }
-    void setElementInclude(const QVector<DomInclude*>& a);
+    inline QVector<DomInclude *> elementInclude() const { return m_include; }
+    void setElementInclude(const QVector<DomInclude *> &a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
-    QVector<DomInclude*> m_include;
+    QVector<DomInclude *> m_include;
     enum Child {
         Include = 1
     };
@@ -385,18 +381,16 @@ public:
     // attribute accessors
     inline bool hasAttributeLocation() const { return m_has_attr_location; }
     inline QString attributeLocation() const { return m_attr_location; }
-    inline void setAttributeLocation(const QString& a) { m_attr_location = a; m_has_attr_location = true; }
+    inline void setAttributeLocation(const QString &a) { m_attr_location = a; m_has_attr_location = true; }
     inline void clearAttributeLocation() { m_has_attr_location = false; }
 
     inline bool hasAttributeImpldecl() const { return m_has_attr_impldecl; }
     inline QString attributeImpldecl() const { return m_attr_impldecl; }
-    inline void setAttributeImpldecl(const QString& a) { m_attr_impldecl = a; m_has_attr_impldecl = true; }
+    inline void setAttributeImpldecl(const QString &a) { m_attr_impldecl = a; m_has_attr_impldecl = true; }
     inline void clearAttributeImpldecl() { m_has_attr_impldecl = false; }
 
-    // child element accessors
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_location;
@@ -405,8 +399,6 @@ private:
     QString m_attr_impldecl;
     bool m_has_attr_impldecl;
 
-    // child element data
-    uint m_children;
 };
 
 class QDESIGNER_UILIB_EXPORT DomResources {
@@ -423,16 +415,15 @@ public:
     // attribute accessors
     inline bool hasAttributeName() const { return m_has_attr_name; }
     inline QString attributeName() const { return m_attr_name; }
-    inline void setAttributeName(const QString& a) { m_attr_name = a; m_has_attr_name = true; }
+    inline void setAttributeName(const QString &a) { m_attr_name = a; m_has_attr_name = true; }
     inline void clearAttributeName() { m_has_attr_name = false; }
 
     // child element accessors
-    inline QVector<DomResource*> elementInclude() const { return m_include; }
-    void setElementInclude(const QVector<DomResource*>& a);
+    inline QVector<DomResource *> elementInclude() const { return m_include; }
+    void setElementInclude(const QVector<DomResource *> &a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_name;
@@ -440,7 +431,7 @@ private:
 
     // child element data
     uint m_children;
-    QVector<DomResource*> m_include;
+    QVector<DomResource *> m_include;
     enum Child {
         Include = 1
     };
@@ -460,20 +451,16 @@ public:
     // attribute accessors
     inline bool hasAttributeLocation() const { return m_has_attr_location; }
     inline QString attributeLocation() const { return m_attr_location; }
-    inline void setAttributeLocation(const QString& a) { m_attr_location = a; m_has_attr_location = true; }
+    inline void setAttributeLocation(const QString &a) { m_attr_location = a; m_has_attr_location = true; }
     inline void clearAttributeLocation() { m_has_attr_location = false; }
 
-    // child element accessors
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_location;
     bool m_has_attr_location;
 
-    // child element data
-    uint m_children;
 };
 
 class QDESIGNER_UILIB_EXPORT DomActionGroup {
@@ -490,25 +477,24 @@ public:
     // attribute accessors
     inline bool hasAttributeName() const { return m_has_attr_name; }
     inline QString attributeName() const { return m_attr_name; }
-    inline void setAttributeName(const QString& a) { m_attr_name = a; m_has_attr_name = true; }
+    inline void setAttributeName(const QString &a) { m_attr_name = a; m_has_attr_name = true; }
     inline void clearAttributeName() { m_has_attr_name = false; }
 
     // child element accessors
-    inline QVector<DomAction*> elementAction() const { return m_action; }
-    void setElementAction(const QVector<DomAction*>& a);
+    inline QVector<DomAction *> elementAction() const { return m_action; }
+    void setElementAction(const QVector<DomAction *> &a);
 
-    inline QVector<DomActionGroup*> elementActionGroup() const { return m_actionGroup; }
-    void setElementActionGroup(const QVector<DomActionGroup*>& a);
+    inline QVector<DomActionGroup *> elementActionGroup() const { return m_actionGroup; }
+    void setElementActionGroup(const QVector<DomActionGroup *> &a);
 
     inline QList<DomProperty*> elementProperty() const { return m_property; }
-    void setElementProperty(const QList<DomProperty*>& a);
+    void setElementProperty(const QList<DomProperty *> &a);
 
     inline QList<DomProperty*> elementAttribute() const { return m_attribute; }
-    void setElementAttribute(const QList<DomProperty*>& a);
+    void setElementAttribute(const QList<DomProperty *> &a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_name;
@@ -516,8 +502,8 @@ private:
 
     // child element data
     uint m_children;
-    QVector<DomAction*> m_action;
-    QVector<DomActionGroup*> m_actionGroup;
+    QVector<DomAction *> m_action;
+    QVector<DomActionGroup *> m_actionGroup;
     QList<DomProperty*> m_property;
     QList<DomProperty*> m_attribute;
     enum Child {
@@ -542,24 +528,23 @@ public:
     // attribute accessors
     inline bool hasAttributeName() const { return m_has_attr_name; }
     inline QString attributeName() const { return m_attr_name; }
-    inline void setAttributeName(const QString& a) { m_attr_name = a; m_has_attr_name = true; }
+    inline void setAttributeName(const QString &a) { m_attr_name = a; m_has_attr_name = true; }
     inline void clearAttributeName() { m_has_attr_name = false; }
 
     inline bool hasAttributeMenu() const { return m_has_attr_menu; }
     inline QString attributeMenu() const { return m_attr_menu; }
-    inline void setAttributeMenu(const QString& a) { m_attr_menu = a; m_has_attr_menu = true; }
+    inline void setAttributeMenu(const QString &a) { m_attr_menu = a; m_has_attr_menu = true; }
     inline void clearAttributeMenu() { m_has_attr_menu = false; }
 
     // child element accessors
     inline QList<DomProperty*> elementProperty() const { return m_property; }
-    void setElementProperty(const QList<DomProperty*>& a);
+    void setElementProperty(const QList<DomProperty *> &a);
 
     inline QList<DomProperty*> elementAttribute() const { return m_attribute; }
-    void setElementAttribute(const QList<DomProperty*>& a);
+    void setElementAttribute(const QList<DomProperty *> &a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_name;
@@ -592,20 +577,16 @@ public:
     // attribute accessors
     inline bool hasAttributeName() const { return m_has_attr_name; }
     inline QString attributeName() const { return m_attr_name; }
-    inline void setAttributeName(const QString& a) { m_attr_name = a; m_has_attr_name = true; }
+    inline void setAttributeName(const QString &a) { m_attr_name = a; m_has_attr_name = true; }
     inline void clearAttributeName() { m_has_attr_name = false; }
 
-    // child element accessors
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_name;
     bool m_has_attr_name;
 
-    // child element data
-    uint m_children;
 };
 
 class QDESIGNER_UILIB_EXPORT DomButtonGroup {
@@ -622,19 +603,18 @@ public:
     // attribute accessors
     inline bool hasAttributeName() const { return m_has_attr_name; }
     inline QString attributeName() const { return m_attr_name; }
-    inline void setAttributeName(const QString& a) { m_attr_name = a; m_has_attr_name = true; }
+    inline void setAttributeName(const QString &a) { m_attr_name = a; m_has_attr_name = true; }
     inline void clearAttributeName() { m_has_attr_name = false; }
 
     // child element accessors
     inline QList<DomProperty*> elementProperty() const { return m_property; }
-    void setElementProperty(const QList<DomProperty*>& a);
+    void setElementProperty(const QList<DomProperty *> &a);
 
     inline QList<DomProperty*> elementAttribute() const { return m_attribute; }
-    void setElementAttribute(const QList<DomProperty*>& a);
+    void setElementAttribute(const QList<DomProperty *> &a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_name;
@@ -661,19 +641,16 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
-    inline QVector<DomButtonGroup*> elementButtonGroup() const { return m_buttonGroup; }
-    void setElementButtonGroup(const QVector<DomButtonGroup*>& a);
+    inline QVector<DomButtonGroup *> elementButtonGroup() const { return m_buttonGroup; }
+    void setElementButtonGroup(const QVector<DomButtonGroup *> &a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
-    QVector<DomButtonGroup*> m_buttonGroup;
+    QVector<DomButtonGroup *> m_buttonGroup;
     enum Child {
         ButtonGroup = 1
     };
@@ -690,19 +667,16 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
-    inline QVector<DomImage*> elementImage() const { return m_image; }
-    void setElementImage(const QVector<DomImage*>& a);
+    inline QVector<DomImage *> elementImage() const { return m_image; }
+    void setElementImage(const QVector<DomImage *> &a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
-    QVector<DomImage*> m_image;
+    QVector<DomImage *> m_image;
     enum Child {
         Image = 1
     };
@@ -722,19 +696,18 @@ public:
     // attribute accessors
     inline bool hasAttributeName() const { return m_has_attr_name; }
     inline QString attributeName() const { return m_attr_name; }
-    inline void setAttributeName(const QString& a) { m_attr_name = a; m_has_attr_name = true; }
+    inline void setAttributeName(const QString &a) { m_attr_name = a; m_has_attr_name = true; }
     inline void clearAttributeName() { m_has_attr_name = false; }
 
     // child element accessors
-    inline DomImageData* elementData() const { return m_data; }
-    DomImageData* takeElementData();
-    void setElementData(DomImageData* a);
+    inline DomImageData *elementData() const { return m_data; }
+    DomImageData *takeElementData();
+    void setElementData(DomImageData *a);
     inline bool hasElementData() const { return m_children & Data; }
     void clearElementData();
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_name;
@@ -742,7 +715,7 @@ private:
 
     // child element data
     uint m_children;
-    DomImageData* m_data;
+    DomImageData *m_data;
     enum Child {
         Data = 1
     };
@@ -762,7 +735,7 @@ public:
     // attribute accessors
     inline bool hasAttributeFormat() const { return m_has_attr_format; }
     inline QString attributeFormat() const { return m_attr_format; }
-    inline void setAttributeFormat(const QString& a) { m_attr_format = a; m_has_attr_format = true; }
+    inline void setAttributeFormat(const QString &a) { m_attr_format = a; m_has_attr_format = true; }
     inline void clearAttributeFormat() { m_has_attr_format = false; }
 
     inline bool hasAttributeLength() const { return m_has_attr_length; }
@@ -770,10 +743,8 @@ public:
     inline void setAttributeLength(int a) { m_attr_length = a; m_has_attr_length = true; }
     inline void clearAttributeLength() { m_has_attr_length = false; }
 
-    // child element accessors
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_format;
@@ -782,8 +753,6 @@ private:
     int m_attr_length;
     bool m_has_attr_length;
 
-    // child element data
-    uint m_children;
 };
 
 class QDESIGNER_UILIB_EXPORT DomCustomWidgets {
@@ -797,19 +766,16 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
-    inline QVector<DomCustomWidget*> elementCustomWidget() const { return m_customWidget; }
-    void setElementCustomWidget(const QVector<DomCustomWidget*>& a);
+    inline QVector<DomCustomWidget *> elementCustomWidget() const { return m_customWidget; }
+    void setElementCustomWidget(const QVector<DomCustomWidget *> &a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
-    QVector<DomCustomWidget*> m_customWidget;
+    QVector<DomCustomWidget *> m_customWidget;
     enum Child {
         CustomWidget = 1
     };
@@ -829,20 +795,16 @@ public:
     // attribute accessors
     inline bool hasAttributeLocation() const { return m_has_attr_location; }
     inline QString attributeLocation() const { return m_attr_location; }
-    inline void setAttributeLocation(const QString& a) { m_attr_location = a; m_has_attr_location = true; }
+    inline void setAttributeLocation(const QString &a) { m_attr_location = a; m_has_attr_location = true; }
     inline void clearAttributeLocation() { m_has_attr_location = false; }
 
-    // child element accessors
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_location;
     bool m_has_attr_location;
 
-    // child element data
-    uint m_children;
 };
 
 class QDESIGNER_UILIB_EXPORT DomCustomWidget {
@@ -856,32 +818,31 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
     inline QString elementClass() const { return m_class; }
-    void setElementClass(const QString& a);
+    void setElementClass(const QString &a);
     inline bool hasElementClass() const { return m_children & Class; }
     void clearElementClass();
 
     inline QString elementExtends() const { return m_extends; }
-    void setElementExtends(const QString& a);
+    void setElementExtends(const QString &a);
     inline bool hasElementExtends() const { return m_children & Extends; }
     void clearElementExtends();
 
-    inline DomHeader* elementHeader() const { return m_header; }
-    DomHeader* takeElementHeader();
-    void setElementHeader(DomHeader* a);
+    inline DomHeader *elementHeader() const { return m_header; }
+    DomHeader *takeElementHeader();
+    void setElementHeader(DomHeader *a);
     inline bool hasElementHeader() const { return m_children & Header; }
     void clearElementHeader();
 
-    inline DomSize* elementSizeHint() const { return m_sizeHint; }
-    DomSize* takeElementSizeHint();
-    void setElementSizeHint(DomSize* a);
+    inline DomSize *elementSizeHint() const { return m_sizeHint; }
+    DomSize *takeElementSizeHint();
+    void setElementSizeHint(DomSize *a);
     inline bool hasElementSizeHint() const { return m_children & SizeHint; }
     void clearElementSizeHint();
 
     inline QString elementAddPageMethod() const { return m_addPageMethod; }
-    void setElementAddPageMethod(const QString& a);
+    void setElementAddPageMethod(const QString &a);
     inline bool hasElementAddPageMethod() const { return m_children & AddPageMethod; }
     void clearElementAddPageMethod();
 
@@ -890,60 +851,58 @@ public:
     inline bool hasElementContainer() const { return m_children & Container; }
     void clearElementContainer();
 
-    inline DomSizePolicyData* elementSizePolicy() const { return m_sizePolicy; }
-    DomSizePolicyData* takeElementSizePolicy();
-    void setElementSizePolicy(DomSizePolicyData* a);
+    inline DomSizePolicyData *elementSizePolicy() const { return m_sizePolicy; }
+    DomSizePolicyData *takeElementSizePolicy();
+    void setElementSizePolicy(DomSizePolicyData *a);
     inline bool hasElementSizePolicy() const { return m_children & SizePolicy; }
     void clearElementSizePolicy();
 
     inline QString elementPixmap() const { return m_pixmap; }
-    void setElementPixmap(const QString& a);
+    void setElementPixmap(const QString &a);
     inline bool hasElementPixmap() const { return m_children & Pixmap; }
     void clearElementPixmap();
 
-    inline DomScript* elementScript() const { return m_script; }
-    DomScript* takeElementScript();
-    void setElementScript(DomScript* a);
+    inline DomScript *elementScript() const { return m_script; }
+    DomScript *takeElementScript();
+    void setElementScript(DomScript *a);
     inline bool hasElementScript() const { return m_children & Script; }
     void clearElementScript();
 
-    inline DomProperties* elementProperties() const { return m_properties; }
-    DomProperties* takeElementProperties();
-    void setElementProperties(DomProperties* a);
+    inline DomProperties *elementProperties() const { return m_properties; }
+    DomProperties *takeElementProperties();
+    void setElementProperties(DomProperties *a);
     inline bool hasElementProperties() const { return m_children & Properties; }
     void clearElementProperties();
 
-    inline DomSlots* elementSlots() const { return m_slots; }
-    DomSlots* takeElementSlots();
-    void setElementSlots(DomSlots* a);
+    inline DomSlots *elementSlots() const { return m_slots; }
+    DomSlots *takeElementSlots();
+    void setElementSlots(DomSlots *a);
     inline bool hasElementSlots() const { return m_children & Slots; }
     void clearElementSlots();
 
-    inline DomPropertySpecifications* elementPropertyspecifications() const { return m_propertyspecifications; }
-    DomPropertySpecifications* takeElementPropertyspecifications();
-    void setElementPropertyspecifications(DomPropertySpecifications* a);
+    inline DomPropertySpecifications *elementPropertyspecifications() const { return m_propertyspecifications; }
+    DomPropertySpecifications *takeElementPropertyspecifications();
+    void setElementPropertyspecifications(DomPropertySpecifications *a);
     inline bool hasElementPropertyspecifications() const { return m_children & Propertyspecifications; }
     void clearElementPropertyspecifications();
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
     QString m_class;
     QString m_extends;
-    DomHeader* m_header;
-    DomSize* m_sizeHint;
+    DomHeader *m_header;
+    DomSize *m_sizeHint;
     QString m_addPageMethod;
     int m_container;
-    DomSizePolicyData* m_sizePolicy;
+    DomSizePolicyData *m_sizePolicy;
     QString m_pixmap;
-    DomScript* m_script;
-    DomProperties* m_properties;
-    DomSlots* m_slots;
-    DomPropertySpecifications* m_propertyspecifications;
+    DomScript *m_script;
+    DomProperties *m_properties;
+    DomSlots *m_slots;
+    DomPropertySpecifications *m_propertyspecifications;
     enum Child {
         Class = 1,
         Extends = 2,
@@ -971,19 +930,16 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
-    inline QVector<DomPropertyData*> elementProperty() const { return m_property; }
-    void setElementProperty(const QVector<DomPropertyData*>& a);
+    inline QVector<DomPropertyData *> elementProperty() const { return m_property; }
+    void setElementProperty(const QVector<DomPropertyData *> &a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
-    QVector<DomPropertyData*> m_property;
+    QVector<DomPropertyData *> m_property;
     enum Child {
         Property = 1
     };
@@ -1003,20 +959,16 @@ public:
     // attribute accessors
     inline bool hasAttributeType() const { return m_has_attr_type; }
     inline QString attributeType() const { return m_attr_type; }
-    inline void setAttributeType(const QString& a) { m_attr_type = a; m_has_attr_type = true; }
+    inline void setAttributeType(const QString &a) { m_attr_type = a; m_has_attr_type = true; }
     inline void clearAttributeType() { m_has_attr_type = false; }
 
-    // child element accessors
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_type;
     bool m_has_attr_type;
 
-    // child element data
-    uint m_children;
 };
 
 class QDESIGNER_UILIB_EXPORT DomSizePolicyData {
@@ -1030,7 +982,6 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
     inline int elementHorData() const { return m_horData; }
     void setElementHorData(int a);
@@ -1044,9 +995,7 @@ public:
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
     int m_horData;
@@ -1079,10 +1028,8 @@ public:
     inline void setAttributeMargin(int a) { m_attr_margin = a; m_has_attr_margin = true; }
     inline void clearAttributeMargin() { m_has_attr_margin = false; }
 
-    // child element accessors
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     int m_attr_spacing;
@@ -1091,8 +1038,6 @@ private:
     int m_attr_margin;
     bool m_has_attr_margin;
 
-    // child element data
-    uint m_children;
 };
 
 class QDESIGNER_UILIB_EXPORT DomLayoutFunction {
@@ -1109,18 +1054,16 @@ public:
     // attribute accessors
     inline bool hasAttributeSpacing() const { return m_has_attr_spacing; }
     inline QString attributeSpacing() const { return m_attr_spacing; }
-    inline void setAttributeSpacing(const QString& a) { m_attr_spacing = a; m_has_attr_spacing = true; }
+    inline void setAttributeSpacing(const QString &a) { m_attr_spacing = a; m_has_attr_spacing = true; }
     inline void clearAttributeSpacing() { m_has_attr_spacing = false; }
 
     inline bool hasAttributeMargin() const { return m_has_attr_margin; }
     inline QString attributeMargin() const { return m_attr_margin; }
-    inline void setAttributeMargin(const QString& a) { m_attr_margin = a; m_has_attr_margin = true; }
+    inline void setAttributeMargin(const QString &a) { m_attr_margin = a; m_has_attr_margin = true; }
     inline void clearAttributeMargin() { m_has_attr_margin = false; }
 
-    // child element accessors
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_spacing;
@@ -1129,8 +1072,6 @@ private:
     QString m_attr_margin;
     bool m_has_attr_margin;
 
-    // child element data
-    uint m_children;
 };
 
 class QDESIGNER_UILIB_EXPORT DomTabStops {
@@ -1144,16 +1085,13 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
     inline QStringList elementTabStop() const { return m_tabStop; }
-    void setElementTabStop(const QStringList& a);
+    void setElementTabStop(const QStringList &a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
     QStringList m_tabStop;
@@ -1176,52 +1114,51 @@ public:
     // attribute accessors
     inline bool hasAttributeClass() const { return m_has_attr_class; }
     inline QString attributeClass() const { return m_attr_class; }
-    inline void setAttributeClass(const QString& a) { m_attr_class = a; m_has_attr_class = true; }
+    inline void setAttributeClass(const QString &a) { m_attr_class = a; m_has_attr_class = true; }
     inline void clearAttributeClass() { m_has_attr_class = false; }
 
     inline bool hasAttributeName() const { return m_has_attr_name; }
     inline QString attributeName() const { return m_attr_name; }
-    inline void setAttributeName(const QString& a) { m_attr_name = a; m_has_attr_name = true; }
+    inline void setAttributeName(const QString &a) { m_attr_name = a; m_has_attr_name = true; }
     inline void clearAttributeName() { m_has_attr_name = false; }
 
     inline bool hasAttributeStretch() const { return m_has_attr_stretch; }
     inline QString attributeStretch() const { return m_attr_stretch; }
-    inline void setAttributeStretch(const QString& a) { m_attr_stretch = a; m_has_attr_stretch = true; }
+    inline void setAttributeStretch(const QString &a) { m_attr_stretch = a; m_has_attr_stretch = true; }
     inline void clearAttributeStretch() { m_has_attr_stretch = false; }
 
     inline bool hasAttributeRowStretch() const { return m_has_attr_rowStretch; }
     inline QString attributeRowStretch() const { return m_attr_rowStretch; }
-    inline void setAttributeRowStretch(const QString& a) { m_attr_rowStretch = a; m_has_attr_rowStretch = true; }
+    inline void setAttributeRowStretch(const QString &a) { m_attr_rowStretch = a; m_has_attr_rowStretch = true; }
     inline void clearAttributeRowStretch() { m_has_attr_rowStretch = false; }
 
     inline bool hasAttributeColumnStretch() const { return m_has_attr_columnStretch; }
     inline QString attributeColumnStretch() const { return m_attr_columnStretch; }
-    inline void setAttributeColumnStretch(const QString& a) { m_attr_columnStretch = a; m_has_attr_columnStretch = true; }
+    inline void setAttributeColumnStretch(const QString &a) { m_attr_columnStretch = a; m_has_attr_columnStretch = true; }
     inline void clearAttributeColumnStretch() { m_has_attr_columnStretch = false; }
 
     inline bool hasAttributeRowMinimumHeight() const { return m_has_attr_rowMinimumHeight; }
     inline QString attributeRowMinimumHeight() const { return m_attr_rowMinimumHeight; }
-    inline void setAttributeRowMinimumHeight(const QString& a) { m_attr_rowMinimumHeight = a; m_has_attr_rowMinimumHeight = true; }
+    inline void setAttributeRowMinimumHeight(const QString &a) { m_attr_rowMinimumHeight = a; m_has_attr_rowMinimumHeight = true; }
     inline void clearAttributeRowMinimumHeight() { m_has_attr_rowMinimumHeight = false; }
 
     inline bool hasAttributeColumnMinimumWidth() const { return m_has_attr_columnMinimumWidth; }
     inline QString attributeColumnMinimumWidth() const { return m_attr_columnMinimumWidth; }
-    inline void setAttributeColumnMinimumWidth(const QString& a) { m_attr_columnMinimumWidth = a; m_has_attr_columnMinimumWidth = true; }
+    inline void setAttributeColumnMinimumWidth(const QString &a) { m_attr_columnMinimumWidth = a; m_has_attr_columnMinimumWidth = true; }
     inline void clearAttributeColumnMinimumWidth() { m_has_attr_columnMinimumWidth = false; }
 
     // child element accessors
     inline QList<DomProperty*> elementProperty() const { return m_property; }
-    void setElementProperty(const QList<DomProperty*>& a);
+    void setElementProperty(const QList<DomProperty *> &a);
 
     inline QList<DomProperty*> elementAttribute() const { return m_attribute; }
-    void setElementAttribute(const QList<DomProperty*>& a);
+    void setElementAttribute(const QList<DomProperty *> &a);
 
-    inline QVector<DomLayoutItem*> elementItem() const { return m_item; }
-    void setElementItem(const QVector<DomLayoutItem*>& a);
+    inline QVector<DomLayoutItem *> elementItem() const { return m_item; }
+    void setElementItem(const QVector<DomLayoutItem *> &a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_class;
@@ -1249,7 +1186,7 @@ private:
     uint m_children;
     QList<DomProperty*> m_property;
     QList<DomProperty*> m_attribute;
-    QVector<DomLayoutItem*> m_item;
+    QVector<DomLayoutItem *> m_item;
     enum Child {
         Property = 1,
         Attribute = 2,
@@ -1291,28 +1228,29 @@ public:
 
     inline bool hasAttributeAlignment() const { return m_has_attr_alignment; }
     inline QString attributeAlignment() const { return m_attr_alignment; }
-    inline void setAttributeAlignment(const QString& a) { m_attr_alignment = a; m_has_attr_alignment = true; }
+    inline void setAttributeAlignment(const QString &a) { m_attr_alignment = a; m_has_attr_alignment = true; }
     inline void clearAttributeAlignment() { m_has_attr_alignment = false; }
 
     // child element accessors
     enum Kind { Unknown = 0, Widget, Layout, Spacer };
     inline Kind kind() const { return m_kind; }
 
-    inline DomWidget* elementWidget() const { return m_widget; }
-    DomWidget* takeElementWidget();
-    void setElementWidget(DomWidget* a);
+    inline DomWidget *elementWidget() const { return m_widget; }
+    DomWidget *takeElementWidget();
+    void setElementWidget(DomWidget *a);
 
-    inline DomLayout* elementLayout() const { return m_layout; }
-    DomLayout* takeElementLayout();
-    void setElementLayout(DomLayout* a);
+    inline DomLayout *elementLayout() const { return m_layout; }
+    DomLayout *takeElementLayout();
+    void setElementLayout(DomLayout *a);
 
-    inline DomSpacer* elementSpacer() const { return m_spacer; }
-    DomSpacer* takeElementSpacer();
-    void setElementSpacer(DomSpacer* a);
+    inline DomSpacer *elementSpacer() const { return m_spacer; }
+    DomSpacer *takeElementSpacer();
+    void setElementSpacer(DomSpacer *a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
+
+    void clear();
 
     // attribute data
     int m_attr_row;
@@ -1332,9 +1270,9 @@ private:
 
     // child element data
     Kind m_kind;
-    DomWidget* m_widget;
-    DomLayout* m_layout;
-    DomSpacer* m_spacer;
+    DomWidget *m_widget;
+    DomLayout *m_layout;
+    DomSpacer *m_spacer;
 };
 
 class QDESIGNER_UILIB_EXPORT DomRow {
@@ -1348,16 +1286,13 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
     inline QList<DomProperty*> elementProperty() const { return m_property; }
-    void setElementProperty(const QList<DomProperty*>& a);
+    void setElementProperty(const QList<DomProperty *> &a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
     QList<DomProperty*> m_property;
@@ -1377,16 +1312,13 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
     inline QList<DomProperty*> elementProperty() const { return m_property; }
-    void setElementProperty(const QList<DomProperty*>& a);
+    void setElementProperty(const QList<DomProperty *> &a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
     QList<DomProperty*> m_property;
@@ -1419,14 +1351,13 @@ public:
 
     // child element accessors
     inline QList<DomProperty*> elementProperty() const { return m_property; }
-    void setElementProperty(const QList<DomProperty*>& a);
+    void setElementProperty(const QList<DomProperty *> &a);
 
-    inline QVector<DomItem*> elementItem() const { return m_item; }
-    void setElementItem(const QVector<DomItem*>& a);
+    inline QVector<DomItem *> elementItem() const { return m_item; }
+    void setElementItem(const QVector<DomItem *> &a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     int m_attr_row;
@@ -1438,7 +1369,7 @@ private:
     // child element data
     uint m_children;
     QList<DomProperty*> m_property;
-    QVector<DomItem*> m_item;
+    QVector<DomItem *> m_item;
     enum Child {
         Property = 1,
         Item = 2
@@ -1459,12 +1390,12 @@ public:
     // attribute accessors
     inline bool hasAttributeClass() const { return m_has_attr_class; }
     inline QString attributeClass() const { return m_attr_class; }
-    inline void setAttributeClass(const QString& a) { m_attr_class = a; m_has_attr_class = true; }
+    inline void setAttributeClass(const QString &a) { m_attr_class = a; m_has_attr_class = true; }
     inline void clearAttributeClass() { m_has_attr_class = false; }
 
     inline bool hasAttributeName() const { return m_has_attr_name; }
     inline QString attributeName() const { return m_attr_name; }
-    inline void setAttributeName(const QString& a) { m_attr_name = a; m_has_attr_name = true; }
+    inline void setAttributeName(const QString &a) { m_attr_name = a; m_has_attr_name = true; }
     inline void clearAttributeName() { m_has_attr_name = false; }
 
     inline bool hasAttributeNative() const { return m_has_attr_native; }
@@ -1474,50 +1405,49 @@ public:
 
     // child element accessors
     inline QStringList elementClass() const { return m_class; }
-    void setElementClass(const QStringList& a);
+    void setElementClass(const QStringList &a);
 
     inline QList<DomProperty*> elementProperty() const { return m_property; }
-    void setElementProperty(const QList<DomProperty*>& a);
+    void setElementProperty(const QList<DomProperty *> &a);
 
-    inline QVector<DomScript*> elementScript() const { return m_script; }
-    void setElementScript(const QVector<DomScript*>& a);
+    inline QVector<DomScript *> elementScript() const { return m_script; }
+    void setElementScript(const QVector<DomScript *> &a);
 
-    inline QVector<DomWidgetData*> elementWidgetData() const { return m_widgetData; }
-    void setElementWidgetData(const QVector<DomWidgetData*>& a);
+    inline QVector<DomWidgetData *> elementWidgetData() const { return m_widgetData; }
+    void setElementWidgetData(const QVector<DomWidgetData *> &a);
 
     inline QList<DomProperty*> elementAttribute() const { return m_attribute; }
-    void setElementAttribute(const QList<DomProperty*>& a);
+    void setElementAttribute(const QList<DomProperty *> &a);
 
-    inline QVector<DomRow*> elementRow() const { return m_row; }
-    void setElementRow(const QVector<DomRow*>& a);
+    inline QVector<DomRow *> elementRow() const { return m_row; }
+    void setElementRow(const QVector<DomRow *> &a);
 
-    inline QVector<DomColumn*> elementColumn() const { return m_column; }
-    void setElementColumn(const QVector<DomColumn*>& a);
+    inline QVector<DomColumn *> elementColumn() const { return m_column; }
+    void setElementColumn(const QVector<DomColumn *> &a);
 
-    inline QVector<DomItem*> elementItem() const { return m_item; }
-    void setElementItem(const QVector<DomItem*>& a);
+    inline QVector<DomItem *> elementItem() const { return m_item; }
+    void setElementItem(const QVector<DomItem *> &a);
 
-    inline QVector<DomLayout*> elementLayout() const { return m_layout; }
-    void setElementLayout(const QVector<DomLayout*>& a);
+    inline QVector<DomLayout *> elementLayout() const { return m_layout; }
+    void setElementLayout(const QVector<DomLayout *> &a);
 
-    inline QVector<DomWidget*> elementWidget() const { return m_widget; }
-    void setElementWidget(const QVector<DomWidget*>& a);
+    inline QVector<DomWidget *> elementWidget() const { return m_widget; }
+    void setElementWidget(const QVector<DomWidget *> &a);
 
-    inline QVector<DomAction*> elementAction() const { return m_action; }
-    void setElementAction(const QVector<DomAction*>& a);
+    inline QVector<DomAction *> elementAction() const { return m_action; }
+    void setElementAction(const QVector<DomAction *> &a);
 
-    inline QVector<DomActionGroup*> elementActionGroup() const { return m_actionGroup; }
-    void setElementActionGroup(const QVector<DomActionGroup*>& a);
+    inline QVector<DomActionGroup *> elementActionGroup() const { return m_actionGroup; }
+    void setElementActionGroup(const QVector<DomActionGroup *> &a);
 
-    inline QVector<DomActionRef*> elementAddAction() const { return m_addAction; }
-    void setElementAddAction(const QVector<DomActionRef*>& a);
+    inline QVector<DomActionRef *> elementAddAction() const { return m_addAction; }
+    void setElementAddAction(const QVector<DomActionRef *> &a);
 
     inline QStringList elementZOrder() const { return m_zOrder; }
-    void setElementZOrder(const QStringList& a);
+    void setElementZOrder(const QStringList &a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_class;
@@ -1533,17 +1463,17 @@ private:
     uint m_children;
     QStringList m_class;
     QList<DomProperty*> m_property;
-    QVector<DomScript*> m_script;
-    QVector<DomWidgetData*> m_widgetData;
+    QVector<DomScript *> m_script;
+    QVector<DomWidgetData *> m_widgetData;
     QList<DomProperty*> m_attribute;
-    QVector<DomRow*> m_row;
-    QVector<DomColumn*> m_column;
-    QVector<DomItem*> m_item;
-    QVector<DomLayout*> m_layout;
-    QVector<DomWidget*> m_widget;
-    QVector<DomAction*> m_action;
-    QVector<DomActionGroup*> m_actionGroup;
-    QVector<DomActionRef*> m_addAction;
+    QVector<DomRow *> m_row;
+    QVector<DomColumn *> m_column;
+    QVector<DomItem *> m_item;
+    QVector<DomLayout *> m_layout;
+    QVector<DomWidget *> m_widget;
+    QVector<DomAction *> m_action;
+    QVector<DomActionGroup *> m_actionGroup;
+    QVector<DomActionRef *> m_addAction;
     QStringList m_zOrder;
     enum Child {
         Class = 1,
@@ -1577,16 +1507,15 @@ public:
     // attribute accessors
     inline bool hasAttributeName() const { return m_has_attr_name; }
     inline QString attributeName() const { return m_attr_name; }
-    inline void setAttributeName(const QString& a) { m_attr_name = a; m_has_attr_name = true; }
+    inline void setAttributeName(const QString &a) { m_attr_name = a; m_has_attr_name = true; }
     inline void clearAttributeName() { m_has_attr_name = false; }
 
     // child element accessors
     inline QList<DomProperty*> elementProperty() const { return m_property; }
-    void setElementProperty(const QList<DomProperty*>& a);
+    void setElementProperty(const QList<DomProperty *> &a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_name;
@@ -1635,7 +1564,6 @@ public:
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     int m_attr_alpha;
@@ -1671,15 +1599,14 @@ public:
     inline void clearAttributePosition() { m_has_attr_position = false; }
 
     // child element accessors
-    inline DomColor* elementColor() const { return m_color; }
-    DomColor* takeElementColor();
-    void setElementColor(DomColor* a);
+    inline DomColor *elementColor() const { return m_color; }
+    DomColor *takeElementColor();
+    void setElementColor(DomColor *a);
     inline bool hasElementColor() const { return m_children & Color; }
     void clearElementColor();
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     double m_attr_position;
@@ -1687,7 +1614,7 @@ private:
 
     // child element data
     uint m_children;
-    DomColor* m_color;
+    DomColor *m_color;
     enum Child {
         Color = 1
     };
@@ -1757,26 +1684,25 @@ public:
 
     inline bool hasAttributeType() const { return m_has_attr_type; }
     inline QString attributeType() const { return m_attr_type; }
-    inline void setAttributeType(const QString& a) { m_attr_type = a; m_has_attr_type = true; }
+    inline void setAttributeType(const QString &a) { m_attr_type = a; m_has_attr_type = true; }
     inline void clearAttributeType() { m_has_attr_type = false; }
 
     inline bool hasAttributeSpread() const { return m_has_attr_spread; }
     inline QString attributeSpread() const { return m_attr_spread; }
-    inline void setAttributeSpread(const QString& a) { m_attr_spread = a; m_has_attr_spread = true; }
+    inline void setAttributeSpread(const QString &a) { m_attr_spread = a; m_has_attr_spread = true; }
     inline void clearAttributeSpread() { m_has_attr_spread = false; }
 
     inline bool hasAttributeCoordinateMode() const { return m_has_attr_coordinateMode; }
     inline QString attributeCoordinateMode() const { return m_attr_coordinateMode; }
-    inline void setAttributeCoordinateMode(const QString& a) { m_attr_coordinateMode = a; m_has_attr_coordinateMode = true; }
+    inline void setAttributeCoordinateMode(const QString &a) { m_attr_coordinateMode = a; m_has_attr_coordinateMode = true; }
     inline void clearAttributeCoordinateMode() { m_has_attr_coordinateMode = false; }
 
     // child element accessors
-    inline QVector<DomGradientStop*> elementGradientStop() const { return m_gradientStop; }
-    void setElementGradientStop(const QVector<DomGradientStop*>& a);
+    inline QVector<DomGradientStop *> elementGradientStop() const { return m_gradientStop; }
+    void setElementGradientStop(const QVector<DomGradientStop *> &a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     double m_attr_startX;
@@ -1820,7 +1746,7 @@ private:
 
     // child element data
     uint m_children;
-    QVector<DomGradientStop*> m_gradientStop;
+    QVector<DomGradientStop *> m_gradientStop;
     enum Child {
         GradientStop = 1
     };
@@ -1840,28 +1766,29 @@ public:
     // attribute accessors
     inline bool hasAttributeBrushStyle() const { return m_has_attr_brushStyle; }
     inline QString attributeBrushStyle() const { return m_attr_brushStyle; }
-    inline void setAttributeBrushStyle(const QString& a) { m_attr_brushStyle = a; m_has_attr_brushStyle = true; }
+    inline void setAttributeBrushStyle(const QString &a) { m_attr_brushStyle = a; m_has_attr_brushStyle = true; }
     inline void clearAttributeBrushStyle() { m_has_attr_brushStyle = false; }
 
     // child element accessors
     enum Kind { Unknown = 0, Color, Texture, Gradient };
     inline Kind kind() const { return m_kind; }
 
-    inline DomColor* elementColor() const { return m_color; }
-    DomColor* takeElementColor();
-    void setElementColor(DomColor* a);
+    inline DomColor *elementColor() const { return m_color; }
+    DomColor *takeElementColor();
+    void setElementColor(DomColor *a);
 
-    inline DomProperty* elementTexture() const { return m_texture; }
-    DomProperty* takeElementTexture();
-    void setElementTexture(DomProperty* a);
+    inline DomProperty *elementTexture() const { return m_texture; }
+    DomProperty *takeElementTexture();
+    void setElementTexture(DomProperty *a);
 
-    inline DomGradient* elementGradient() const { return m_gradient; }
-    DomGradient* takeElementGradient();
-    void setElementGradient(DomGradient* a);
+    inline DomGradient *elementGradient() const { return m_gradient; }
+    DomGradient *takeElementGradient();
+    void setElementGradient(DomGradient *a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
+
+    void clear();
 
     // attribute data
     QString m_attr_brushStyle;
@@ -1869,9 +1796,9 @@ private:
 
     // child element data
     Kind m_kind;
-    DomColor* m_color;
-    DomProperty* m_texture;
-    DomGradient* m_gradient;
+    DomColor *m_color;
+    DomProperty *m_texture;
+    DomGradient *m_gradient;
 };
 
 class QDESIGNER_UILIB_EXPORT DomColorRole {
@@ -1888,19 +1815,18 @@ public:
     // attribute accessors
     inline bool hasAttributeRole() const { return m_has_attr_role; }
     inline QString attributeRole() const { return m_attr_role; }
-    inline void setAttributeRole(const QString& a) { m_attr_role = a; m_has_attr_role = true; }
+    inline void setAttributeRole(const QString &a) { m_attr_role = a; m_has_attr_role = true; }
     inline void clearAttributeRole() { m_has_attr_role = false; }
 
     // child element accessors
-    inline DomBrush* elementBrush() const { return m_brush; }
-    DomBrush* takeElementBrush();
-    void setElementBrush(DomBrush* a);
+    inline DomBrush *elementBrush() const { return m_brush; }
+    DomBrush *takeElementBrush();
+    void setElementBrush(DomBrush *a);
     inline bool hasElementBrush() const { return m_children & Brush; }
     void clearElementBrush();
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_role;
@@ -1908,7 +1834,7 @@ private:
 
     // child element data
     uint m_children;
-    DomBrush* m_brush;
+    DomBrush *m_brush;
     enum Child {
         Brush = 1
     };
@@ -1925,23 +1851,20 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
-    inline QVector<DomColorRole*> elementColorRole() const { return m_colorRole; }
-    void setElementColorRole(const QVector<DomColorRole*>& a);
+    inline QVector<DomColorRole *> elementColorRole() const { return m_colorRole; }
+    void setElementColorRole(const QVector<DomColorRole *> &a);
 
-    inline QVector<DomColor*> elementColor() const { return m_color; }
-    void setElementColor(const QVector<DomColor*>& a);
+    inline QVector<DomColor *> elementColor() const { return m_color; }
+    void setElementColor(const QVector<DomColor *> &a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
-    QVector<DomColorRole*> m_colorRole;
-    QVector<DomColor*> m_color;
+    QVector<DomColorRole *> m_colorRole;
+    QVector<DomColor *> m_color;
     enum Child {
         ColorRole = 1,
         Color = 2
@@ -1959,36 +1882,33 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
-    inline DomColorGroup* elementActive() const { return m_active; }
-    DomColorGroup* takeElementActive();
-    void setElementActive(DomColorGroup* a);
+    inline DomColorGroup *elementActive() const { return m_active; }
+    DomColorGroup *takeElementActive();
+    void setElementActive(DomColorGroup *a);
     inline bool hasElementActive() const { return m_children & Active; }
     void clearElementActive();
 
-    inline DomColorGroup* elementInactive() const { return m_inactive; }
-    DomColorGroup* takeElementInactive();
-    void setElementInactive(DomColorGroup* a);
+    inline DomColorGroup *elementInactive() const { return m_inactive; }
+    DomColorGroup *takeElementInactive();
+    void setElementInactive(DomColorGroup *a);
     inline bool hasElementInactive() const { return m_children & Inactive; }
     void clearElementInactive();
 
-    inline DomColorGroup* elementDisabled() const { return m_disabled; }
-    DomColorGroup* takeElementDisabled();
-    void setElementDisabled(DomColorGroup* a);
+    inline DomColorGroup *elementDisabled() const { return m_disabled; }
+    DomColorGroup *takeElementDisabled();
+    void setElementDisabled(DomColorGroup *a);
     inline bool hasElementDisabled() const { return m_children & Disabled; }
     void clearElementDisabled();
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
-    DomColorGroup* m_active;
-    DomColorGroup* m_inactive;
-    DomColorGroup* m_disabled;
+    DomColorGroup *m_active;
+    DomColorGroup *m_inactive;
+    DomColorGroup *m_disabled;
     enum Child {
         Active = 1,
         Inactive = 2,
@@ -2007,10 +1927,9 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
     inline QString elementFamily() const { return m_family; }
-    void setElementFamily(const QString& a);
+    void setElementFamily(const QString &a);
     inline bool hasElementFamily() const { return m_children & Family; }
     void clearElementFamily();
 
@@ -2050,7 +1969,7 @@ public:
     void clearElementAntialiasing();
 
     inline QString elementStyleStrategy() const { return m_styleStrategy; }
-    void setElementStyleStrategy(const QString& a);
+    void setElementStyleStrategy(const QString &a);
     inline bool hasElementStyleStrategy() const { return m_children & StyleStrategy; }
     void clearElementStyleStrategy();
 
@@ -2061,9 +1980,7 @@ public:
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
     QString m_family;
@@ -2101,7 +2018,6 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
     inline int elementX() const { return m_x; }
     void setElementX(int a);
@@ -2115,9 +2031,7 @@ public:
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
     int m_x;
@@ -2139,7 +2053,6 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
     inline int elementX() const { return m_x; }
     void setElementX(int a);
@@ -2163,9 +2076,7 @@ public:
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
     int m_x;
@@ -2194,18 +2105,16 @@ public:
     // attribute accessors
     inline bool hasAttributeLanguage() const { return m_has_attr_language; }
     inline QString attributeLanguage() const { return m_attr_language; }
-    inline void setAttributeLanguage(const QString& a) { m_attr_language = a; m_has_attr_language = true; }
+    inline void setAttributeLanguage(const QString &a) { m_attr_language = a; m_has_attr_language = true; }
     inline void clearAttributeLanguage() { m_has_attr_language = false; }
 
     inline bool hasAttributeCountry() const { return m_has_attr_country; }
     inline QString attributeCountry() const { return m_attr_country; }
-    inline void setAttributeCountry(const QString& a) { m_attr_country = a; m_has_attr_country = true; }
+    inline void setAttributeCountry(const QString &a) { m_attr_country = a; m_has_attr_country = true; }
     inline void clearAttributeCountry() { m_has_attr_country = false; }
 
-    // child element accessors
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_language;
@@ -2214,8 +2123,6 @@ private:
     QString m_attr_country;
     bool m_has_attr_country;
 
-    // child element data
-    uint m_children;
 };
 
 class QDESIGNER_UILIB_EXPORT DomSizePolicy {
@@ -2232,12 +2139,12 @@ public:
     // attribute accessors
     inline bool hasAttributeHSizeType() const { return m_has_attr_hSizeType; }
     inline QString attributeHSizeType() const { return m_attr_hSizeType; }
-    inline void setAttributeHSizeType(const QString& a) { m_attr_hSizeType = a; m_has_attr_hSizeType = true; }
+    inline void setAttributeHSizeType(const QString &a) { m_attr_hSizeType = a; m_has_attr_hSizeType = true; }
     inline void clearAttributeHSizeType() { m_has_attr_hSizeType = false; }
 
     inline bool hasAttributeVSizeType() const { return m_has_attr_vSizeType; }
     inline QString attributeVSizeType() const { return m_attr_vSizeType; }
-    inline void setAttributeVSizeType(const QString& a) { m_attr_vSizeType = a; m_has_attr_vSizeType = true; }
+    inline void setAttributeVSizeType(const QString &a) { m_attr_vSizeType = a; m_has_attr_vSizeType = true; }
     inline void clearAttributeVSizeType() { m_has_attr_vSizeType = false; }
 
     // child element accessors
@@ -2263,7 +2170,6 @@ public:
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_hSizeType;
@@ -2297,7 +2203,6 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
     inline int elementWidth() const { return m_width; }
     void setElementWidth(int a);
@@ -2311,9 +2216,7 @@ public:
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
     int m_width;
@@ -2335,7 +2238,6 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
     inline int elementYear() const { return m_year; }
     void setElementYear(int a);
@@ -2354,9 +2256,7 @@ public:
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
     int m_year;
@@ -2380,7 +2280,6 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
     inline int elementHour() const { return m_hour; }
     void setElementHour(int a);
@@ -2399,9 +2298,7 @@ public:
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
     int m_hour;
@@ -2425,7 +2322,6 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
     inline int elementHour() const { return m_hour; }
     void setElementHour(int a);
@@ -2459,9 +2355,7 @@ public:
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
     int m_hour;
@@ -2494,26 +2388,25 @@ public:
     // attribute accessors
     inline bool hasAttributeNotr() const { return m_has_attr_notr; }
     inline QString attributeNotr() const { return m_attr_notr; }
-    inline void setAttributeNotr(const QString& a) { m_attr_notr = a; m_has_attr_notr = true; }
+    inline void setAttributeNotr(const QString &a) { m_attr_notr = a; m_has_attr_notr = true; }
     inline void clearAttributeNotr() { m_has_attr_notr = false; }
 
     inline bool hasAttributeComment() const { return m_has_attr_comment; }
     inline QString attributeComment() const { return m_attr_comment; }
-    inline void setAttributeComment(const QString& a) { m_attr_comment = a; m_has_attr_comment = true; }
+    inline void setAttributeComment(const QString &a) { m_attr_comment = a; m_has_attr_comment = true; }
     inline void clearAttributeComment() { m_has_attr_comment = false; }
 
     inline bool hasAttributeExtraComment() const { return m_has_attr_extraComment; }
     inline QString attributeExtraComment() const { return m_attr_extraComment; }
-    inline void setAttributeExtraComment(const QString& a) { m_attr_extraComment = a; m_has_attr_extraComment = true; }
+    inline void setAttributeExtraComment(const QString &a) { m_attr_extraComment = a; m_has_attr_extraComment = true; }
     inline void clearAttributeExtraComment() { m_has_attr_extraComment = false; }
 
     // child element accessors
     inline QStringList elementString() const { return m_string; }
-    void setElementString(const QStringList& a);
+    void setElementString(const QStringList &a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_notr;
@@ -2547,18 +2440,16 @@ public:
     // attribute accessors
     inline bool hasAttributeResource() const { return m_has_attr_resource; }
     inline QString attributeResource() const { return m_attr_resource; }
-    inline void setAttributeResource(const QString& a) { m_attr_resource = a; m_has_attr_resource = true; }
+    inline void setAttributeResource(const QString &a) { m_attr_resource = a; m_has_attr_resource = true; }
     inline void clearAttributeResource() { m_has_attr_resource = false; }
 
     inline bool hasAttributeAlias() const { return m_has_attr_alias; }
     inline QString attributeAlias() const { return m_attr_alias; }
-    inline void setAttributeAlias(const QString& a) { m_attr_alias = a; m_has_attr_alias = true; }
+    inline void setAttributeAlias(const QString &a) { m_attr_alias = a; m_has_attr_alias = true; }
     inline void clearAttributeAlias() { m_has_attr_alias = false; }
 
-    // child element accessors
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_resource;
@@ -2567,8 +2458,6 @@ private:
     QString m_attr_alias;
     bool m_has_attr_alias;
 
-    // child element data
-    uint m_children;
 };
 
 class QDESIGNER_UILIB_EXPORT DomResourceIcon {
@@ -2585,66 +2474,65 @@ public:
     // attribute accessors
     inline bool hasAttributeTheme() const { return m_has_attr_theme; }
     inline QString attributeTheme() const { return m_attr_theme; }
-    inline void setAttributeTheme(const QString& a) { m_attr_theme = a; m_has_attr_theme = true; }
+    inline void setAttributeTheme(const QString &a) { m_attr_theme = a; m_has_attr_theme = true; }
     inline void clearAttributeTheme() { m_has_attr_theme = false; }
 
     inline bool hasAttributeResource() const { return m_has_attr_resource; }
     inline QString attributeResource() const { return m_attr_resource; }
-    inline void setAttributeResource(const QString& a) { m_attr_resource = a; m_has_attr_resource = true; }
+    inline void setAttributeResource(const QString &a) { m_attr_resource = a; m_has_attr_resource = true; }
     inline void clearAttributeResource() { m_has_attr_resource = false; }
 
     // child element accessors
-    inline DomResourcePixmap* elementNormalOff() const { return m_normalOff; }
-    DomResourcePixmap* takeElementNormalOff();
-    void setElementNormalOff(DomResourcePixmap* a);
+    inline DomResourcePixmap *elementNormalOff() const { return m_normalOff; }
+    DomResourcePixmap *takeElementNormalOff();
+    void setElementNormalOff(DomResourcePixmap *a);
     inline bool hasElementNormalOff() const { return m_children & NormalOff; }
     void clearElementNormalOff();
 
-    inline DomResourcePixmap* elementNormalOn() const { return m_normalOn; }
-    DomResourcePixmap* takeElementNormalOn();
-    void setElementNormalOn(DomResourcePixmap* a);
+    inline DomResourcePixmap *elementNormalOn() const { return m_normalOn; }
+    DomResourcePixmap *takeElementNormalOn();
+    void setElementNormalOn(DomResourcePixmap *a);
     inline bool hasElementNormalOn() const { return m_children & NormalOn; }
     void clearElementNormalOn();
 
-    inline DomResourcePixmap* elementDisabledOff() const { return m_disabledOff; }
-    DomResourcePixmap* takeElementDisabledOff();
-    void setElementDisabledOff(DomResourcePixmap* a);
+    inline DomResourcePixmap *elementDisabledOff() const { return m_disabledOff; }
+    DomResourcePixmap *takeElementDisabledOff();
+    void setElementDisabledOff(DomResourcePixmap *a);
     inline bool hasElementDisabledOff() const { return m_children & DisabledOff; }
     void clearElementDisabledOff();
 
-    inline DomResourcePixmap* elementDisabledOn() const { return m_disabledOn; }
-    DomResourcePixmap* takeElementDisabledOn();
-    void setElementDisabledOn(DomResourcePixmap* a);
+    inline DomResourcePixmap *elementDisabledOn() const { return m_disabledOn; }
+    DomResourcePixmap *takeElementDisabledOn();
+    void setElementDisabledOn(DomResourcePixmap *a);
     inline bool hasElementDisabledOn() const { return m_children & DisabledOn; }
     void clearElementDisabledOn();
 
-    inline DomResourcePixmap* elementActiveOff() const { return m_activeOff; }
-    DomResourcePixmap* takeElementActiveOff();
-    void setElementActiveOff(DomResourcePixmap* a);
+    inline DomResourcePixmap *elementActiveOff() const { return m_activeOff; }
+    DomResourcePixmap *takeElementActiveOff();
+    void setElementActiveOff(DomResourcePixmap *a);
     inline bool hasElementActiveOff() const { return m_children & ActiveOff; }
     void clearElementActiveOff();
 
-    inline DomResourcePixmap* elementActiveOn() const { return m_activeOn; }
-    DomResourcePixmap* takeElementActiveOn();
-    void setElementActiveOn(DomResourcePixmap* a);
+    inline DomResourcePixmap *elementActiveOn() const { return m_activeOn; }
+    DomResourcePixmap *takeElementActiveOn();
+    void setElementActiveOn(DomResourcePixmap *a);
     inline bool hasElementActiveOn() const { return m_children & ActiveOn; }
     void clearElementActiveOn();
 
-    inline DomResourcePixmap* elementSelectedOff() const { return m_selectedOff; }
-    DomResourcePixmap* takeElementSelectedOff();
-    void setElementSelectedOff(DomResourcePixmap* a);
+    inline DomResourcePixmap *elementSelectedOff() const { return m_selectedOff; }
+    DomResourcePixmap *takeElementSelectedOff();
+    void setElementSelectedOff(DomResourcePixmap *a);
     inline bool hasElementSelectedOff() const { return m_children & SelectedOff; }
     void clearElementSelectedOff();
 
-    inline DomResourcePixmap* elementSelectedOn() const { return m_selectedOn; }
-    DomResourcePixmap* takeElementSelectedOn();
-    void setElementSelectedOn(DomResourcePixmap* a);
+    inline DomResourcePixmap *elementSelectedOn() const { return m_selectedOn; }
+    DomResourcePixmap *takeElementSelectedOn();
+    void setElementSelectedOn(DomResourcePixmap *a);
     inline bool hasElementSelectedOn() const { return m_children & SelectedOn; }
     void clearElementSelectedOn();
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_theme;
@@ -2655,14 +2543,14 @@ private:
 
     // child element data
     uint m_children;
-    DomResourcePixmap* m_normalOff;
-    DomResourcePixmap* m_normalOn;
-    DomResourcePixmap* m_disabledOff;
-    DomResourcePixmap* m_disabledOn;
-    DomResourcePixmap* m_activeOff;
-    DomResourcePixmap* m_activeOn;
-    DomResourcePixmap* m_selectedOff;
-    DomResourcePixmap* m_selectedOn;
+    DomResourcePixmap *m_normalOff;
+    DomResourcePixmap *m_normalOn;
+    DomResourcePixmap *m_disabledOff;
+    DomResourcePixmap *m_disabledOn;
+    DomResourcePixmap *m_activeOff;
+    DomResourcePixmap *m_activeOn;
+    DomResourcePixmap *m_selectedOff;
+    DomResourcePixmap *m_selectedOn;
     enum Child {
         NormalOff = 1,
         NormalOn = 2,
@@ -2689,23 +2577,21 @@ public:
     // attribute accessors
     inline bool hasAttributeNotr() const { return m_has_attr_notr; }
     inline QString attributeNotr() const { return m_attr_notr; }
-    inline void setAttributeNotr(const QString& a) { m_attr_notr = a; m_has_attr_notr = true; }
+    inline void setAttributeNotr(const QString &a) { m_attr_notr = a; m_has_attr_notr = true; }
     inline void clearAttributeNotr() { m_has_attr_notr = false; }
 
     inline bool hasAttributeComment() const { return m_has_attr_comment; }
     inline QString attributeComment() const { return m_attr_comment; }
-    inline void setAttributeComment(const QString& a) { m_attr_comment = a; m_has_attr_comment = true; }
+    inline void setAttributeComment(const QString &a) { m_attr_comment = a; m_has_attr_comment = true; }
     inline void clearAttributeComment() { m_has_attr_comment = false; }
 
     inline bool hasAttributeExtraComment() const { return m_has_attr_extraComment; }
     inline QString attributeExtraComment() const { return m_attr_extraComment; }
-    inline void setAttributeExtraComment(const QString& a) { m_attr_extraComment = a; m_has_attr_extraComment = true; }
+    inline void setAttributeExtraComment(const QString &a) { m_attr_extraComment = a; m_has_attr_extraComment = true; }
     inline void clearAttributeExtraComment() { m_has_attr_extraComment = false; }
 
-    // child element accessors
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_notr;
@@ -2717,8 +2603,6 @@ private:
     QString m_attr_extraComment;
     bool m_has_attr_extraComment;
 
-    // child element data
-    uint m_children;
 };
 
 class QDESIGNER_UILIB_EXPORT DomPointF {
@@ -2732,7 +2616,6 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
     inline double elementX() const { return m_x; }
     void setElementX(double a);
@@ -2746,9 +2629,7 @@ public:
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
     double m_x;
@@ -2770,7 +2651,6 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
     inline double elementX() const { return m_x; }
     void setElementX(double a);
@@ -2794,9 +2674,7 @@ public:
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
     double m_x;
@@ -2822,7 +2700,6 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
     inline double elementWidth() const { return m_width; }
     void setElementWidth(double a);
@@ -2836,9 +2713,7 @@ public:
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
     double m_width;
@@ -2860,7 +2735,6 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
     inline int elementUnicode() const { return m_unicode; }
     void setElementUnicode(int a);
@@ -2869,9 +2743,7 @@ public:
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
     int m_unicode;
@@ -2891,22 +2763,19 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
-    inline DomString* elementString() const { return m_string; }
-    DomString* takeElementString();
-    void setElementString(DomString* a);
+    inline DomString *elementString() const { return m_string; }
+    DomString *takeElementString();
+    void setElementString(DomString *a);
     inline bool hasElementString() const { return m_children & String; }
     void clearElementString();
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
-    DomString* m_string;
+    DomString *m_string;
     enum Child {
         String = 1
     };
@@ -2926,7 +2795,7 @@ public:
     // attribute accessors
     inline bool hasAttributeName() const { return m_has_attr_name; }
     inline QString attributeName() const { return m_attr_name; }
-    inline void setAttributeName(const QString& a) { m_attr_name = a; m_has_attr_name = true; }
+    inline void setAttributeName(const QString &a) { m_attr_name = a; m_has_attr_name = true; }
     inline void clearAttributeName() { m_has_attr_name = false; }
 
     inline bool hasAttributeStdset() const { return m_has_attr_stdset; }
@@ -2939,70 +2808,70 @@ public:
     inline Kind kind() const { return m_kind; }
 
     inline QString elementBool() const { return m_bool; }
-    void setElementBool(const QString& a);
+    void setElementBool(const QString &a);
 
-    inline DomColor* elementColor() const { return m_color; }
-    DomColor* takeElementColor();
-    void setElementColor(DomColor* a);
+    inline DomColor *elementColor() const { return m_color; }
+    DomColor *takeElementColor();
+    void setElementColor(DomColor *a);
 
     inline QString elementCstring() const { return m_cstring; }
-    void setElementCstring(const QString& a);
+    void setElementCstring(const QString &a);
 
     inline int elementCursor() const { return m_cursor; }
     void setElementCursor(int a);
 
     inline QString elementCursorShape() const { return m_cursorShape; }
-    void setElementCursorShape(const QString& a);
+    void setElementCursorShape(const QString &a);
 
     inline QString elementEnum() const { return m_enum; }
-    void setElementEnum(const QString& a);
+    void setElementEnum(const QString &a);
 
-    inline DomFont* elementFont() const { return m_font; }
-    DomFont* takeElementFont();
-    void setElementFont(DomFont* a);
+    inline DomFont *elementFont() const { return m_font; }
+    DomFont *takeElementFont();
+    void setElementFont(DomFont *a);
 
-    inline DomResourceIcon* elementIconSet() const { return m_iconSet; }
-    DomResourceIcon* takeElementIconSet();
-    void setElementIconSet(DomResourceIcon* a);
+    inline DomResourceIcon *elementIconSet() const { return m_iconSet; }
+    DomResourceIcon *takeElementIconSet();
+    void setElementIconSet(DomResourceIcon *a);
 
-    inline DomResourcePixmap* elementPixmap() const { return m_pixmap; }
-    DomResourcePixmap* takeElementPixmap();
-    void setElementPixmap(DomResourcePixmap* a);
+    inline DomResourcePixmap *elementPixmap() const { return m_pixmap; }
+    DomResourcePixmap *takeElementPixmap();
+    void setElementPixmap(DomResourcePixmap *a);
 
-    inline DomPalette* elementPalette() const { return m_palette; }
-    DomPalette* takeElementPalette();
-    void setElementPalette(DomPalette* a);
+    inline DomPalette *elementPalette() const { return m_palette; }
+    DomPalette *takeElementPalette();
+    void setElementPalette(DomPalette *a);
 
-    inline DomPoint* elementPoint() const { return m_point; }
-    DomPoint* takeElementPoint();
-    void setElementPoint(DomPoint* a);
+    inline DomPoint *elementPoint() const { return m_point; }
+    DomPoint *takeElementPoint();
+    void setElementPoint(DomPoint *a);
 
-    inline DomRect* elementRect() const { return m_rect; }
-    DomRect* takeElementRect();
-    void setElementRect(DomRect* a);
+    inline DomRect *elementRect() const { return m_rect; }
+    DomRect *takeElementRect();
+    void setElementRect(DomRect *a);
 
     inline QString elementSet() const { return m_set; }
-    void setElementSet(const QString& a);
+    void setElementSet(const QString &a);
 
-    inline DomLocale* elementLocale() const { return m_locale; }
-    DomLocale* takeElementLocale();
-    void setElementLocale(DomLocale* a);
+    inline DomLocale *elementLocale() const { return m_locale; }
+    DomLocale *takeElementLocale();
+    void setElementLocale(DomLocale *a);
 
-    inline DomSizePolicy* elementSizePolicy() const { return m_sizePolicy; }
-    DomSizePolicy* takeElementSizePolicy();
-    void setElementSizePolicy(DomSizePolicy* a);
+    inline DomSizePolicy *elementSizePolicy() const { return m_sizePolicy; }
+    DomSizePolicy *takeElementSizePolicy();
+    void setElementSizePolicy(DomSizePolicy *a);
 
-    inline DomSize* elementSize() const { return m_size; }
-    DomSize* takeElementSize();
-    void setElementSize(DomSize* a);
+    inline DomSize *elementSize() const { return m_size; }
+    DomSize *takeElementSize();
+    void setElementSize(DomSize *a);
 
-    inline DomString* elementString() const { return m_string; }
-    DomString* takeElementString();
-    void setElementString(DomString* a);
+    inline DomString *elementString() const { return m_string; }
+    DomString *takeElementString();
+    void setElementString(DomString *a);
 
-    inline DomStringList* elementStringList() const { return m_stringList; }
-    DomStringList* takeElementStringList();
-    void setElementStringList(DomStringList* a);
+    inline DomStringList *elementStringList() const { return m_stringList; }
+    DomStringList *takeElementStringList();
+    void setElementStringList(DomStringList *a);
 
     inline int elementNumber() const { return m_number; }
     void setElementNumber(int a);
@@ -3013,40 +2882,40 @@ public:
     inline double elementDouble() const { return m_double; }
     void setElementDouble(double a);
 
-    inline DomDate* elementDate() const { return m_date; }
-    DomDate* takeElementDate();
-    void setElementDate(DomDate* a);
+    inline DomDate *elementDate() const { return m_date; }
+    DomDate *takeElementDate();
+    void setElementDate(DomDate *a);
 
-    inline DomTime* elementTime() const { return m_time; }
-    DomTime* takeElementTime();
-    void setElementTime(DomTime* a);
+    inline DomTime *elementTime() const { return m_time; }
+    DomTime *takeElementTime();
+    void setElementTime(DomTime *a);
 
-    inline DomDateTime* elementDateTime() const { return m_dateTime; }
-    DomDateTime* takeElementDateTime();
-    void setElementDateTime(DomDateTime* a);
+    inline DomDateTime *elementDateTime() const { return m_dateTime; }
+    DomDateTime *takeElementDateTime();
+    void setElementDateTime(DomDateTime *a);
 
-    inline DomPointF* elementPointF() const { return m_pointF; }
-    DomPointF* takeElementPointF();
-    void setElementPointF(DomPointF* a);
+    inline DomPointF *elementPointF() const { return m_pointF; }
+    DomPointF *takeElementPointF();
+    void setElementPointF(DomPointF *a);
 
-    inline DomRectF* elementRectF() const { return m_rectF; }
-    DomRectF* takeElementRectF();
-    void setElementRectF(DomRectF* a);
+    inline DomRectF *elementRectF() const { return m_rectF; }
+    DomRectF *takeElementRectF();
+    void setElementRectF(DomRectF *a);
 
-    inline DomSizeF* elementSizeF() const { return m_sizeF; }
-    DomSizeF* takeElementSizeF();
-    void setElementSizeF(DomSizeF* a);
+    inline DomSizeF *elementSizeF() const { return m_sizeF; }
+    DomSizeF *takeElementSizeF();
+    void setElementSizeF(DomSizeF *a);
 
     inline qlonglong elementLongLong() const { return m_longLong; }
     void setElementLongLong(qlonglong a);
 
-    inline DomChar* elementChar() const { return m_char; }
-    DomChar* takeElementChar();
-    void setElementChar(DomChar* a);
+    inline DomChar *elementChar() const { return m_char; }
+    DomChar *takeElementChar();
+    void setElementChar(DomChar *a);
 
-    inline DomUrl* elementUrl() const { return m_url; }
-    DomUrl* takeElementUrl();
-    void setElementUrl(DomUrl* a);
+    inline DomUrl *elementUrl() const { return m_url; }
+    DomUrl *takeElementUrl();
+    void setElementUrl(DomUrl *a);
 
     inline uint elementUInt() const { return m_UInt; }
     void setElementUInt(uint a);
@@ -3054,13 +2923,14 @@ public:
     inline qulonglong elementULongLong() const { return m_uLongLong; }
     void setElementULongLong(qulonglong a);
 
-    inline DomBrush* elementBrush() const { return m_brush; }
-    DomBrush* takeElementBrush();
-    void setElementBrush(DomBrush* a);
+    inline DomBrush *elementBrush() const { return m_brush; }
+    DomBrush *takeElementBrush();
+    void setElementBrush(DomBrush *a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
+
+    void clear();
 
     // attribute data
     QString m_attr_name;
@@ -3072,38 +2942,38 @@ private:
     // child element data
     Kind m_kind;
     QString m_bool;
-    DomColor* m_color;
+    DomColor *m_color;
     QString m_cstring;
     int m_cursor;
     QString m_cursorShape;
     QString m_enum;
-    DomFont* m_font;
-    DomResourceIcon* m_iconSet;
-    DomResourcePixmap* m_pixmap;
-    DomPalette* m_palette;
-    DomPoint* m_point;
-    DomRect* m_rect;
+    DomFont *m_font;
+    DomResourceIcon *m_iconSet;
+    DomResourcePixmap *m_pixmap;
+    DomPalette *m_palette;
+    DomPoint *m_point;
+    DomRect *m_rect;
     QString m_set;
-    DomLocale* m_locale;
-    DomSizePolicy* m_sizePolicy;
-    DomSize* m_size;
-    DomString* m_string;
-    DomStringList* m_stringList;
+    DomLocale *m_locale;
+    DomSizePolicy *m_sizePolicy;
+    DomSize *m_size;
+    DomString *m_string;
+    DomStringList *m_stringList;
     int m_number;
     float m_float;
     double m_double;
-    DomDate* m_date;
-    DomTime* m_time;
-    DomDateTime* m_dateTime;
-    DomPointF* m_pointF;
-    DomRectF* m_rectF;
-    DomSizeF* m_sizeF;
+    DomDate *m_date;
+    DomTime *m_time;
+    DomDateTime *m_dateTime;
+    DomPointF *m_pointF;
+    DomRectF *m_rectF;
+    DomSizeF *m_sizeF;
     qlonglong m_longLong;
-    DomChar* m_char;
-    DomUrl* m_url;
+    DomChar *m_char;
+    DomUrl *m_url;
     uint m_UInt;
     qulonglong m_uLongLong;
-    DomBrush* m_brush;
+    DomBrush *m_brush;
 };
 
 class QDESIGNER_UILIB_EXPORT DomConnections {
@@ -3117,19 +2987,16 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
-    inline QVector<DomConnection*> elementConnection() const { return m_connection; }
-    void setElementConnection(const QVector<DomConnection*>& a);
+    inline QVector<DomConnection *> elementConnection() const { return m_connection; }
+    void setElementConnection(const QVector<DomConnection *> &a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
-    QVector<DomConnection*> m_connection;
+    QVector<DomConnection *> m_connection;
     enum Child {
         Connection = 1
     };
@@ -3146,46 +3013,43 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
     inline QString elementSender() const { return m_sender; }
-    void setElementSender(const QString& a);
+    void setElementSender(const QString &a);
     inline bool hasElementSender() const { return m_children & Sender; }
     void clearElementSender();
 
     inline QString elementSignal() const { return m_signal; }
-    void setElementSignal(const QString& a);
+    void setElementSignal(const QString &a);
     inline bool hasElementSignal() const { return m_children & Signal; }
     void clearElementSignal();
 
     inline QString elementReceiver() const { return m_receiver; }
-    void setElementReceiver(const QString& a);
+    void setElementReceiver(const QString &a);
     inline bool hasElementReceiver() const { return m_children & Receiver; }
     void clearElementReceiver();
 
     inline QString elementSlot() const { return m_slot; }
-    void setElementSlot(const QString& a);
+    void setElementSlot(const QString &a);
     inline bool hasElementSlot() const { return m_children & Slot; }
     void clearElementSlot();
 
-    inline DomConnectionHints* elementHints() const { return m_hints; }
-    DomConnectionHints* takeElementHints();
-    void setElementHints(DomConnectionHints* a);
+    inline DomConnectionHints *elementHints() const { return m_hints; }
+    DomConnectionHints *takeElementHints();
+    void setElementHints(DomConnectionHints *a);
     inline bool hasElementHints() const { return m_children & Hints; }
     void clearElementHints();
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
     QString m_sender;
     QString m_signal;
     QString m_receiver;
     QString m_slot;
-    DomConnectionHints* m_hints;
+    DomConnectionHints *m_hints;
     enum Child {
         Sender = 1,
         Signal = 2,
@@ -3206,19 +3070,16 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
-    inline QVector<DomConnectionHint*> elementHint() const { return m_hint; }
-    void setElementHint(const QVector<DomConnectionHint*>& a);
+    inline QVector<DomConnectionHint *> elementHint() const { return m_hint; }
+    void setElementHint(const QVector<DomConnectionHint *> &a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
-    QVector<DomConnectionHint*> m_hint;
+    QVector<DomConnectionHint *> m_hint;
     enum Child {
         Hint = 1
     };
@@ -3238,7 +3099,7 @@ public:
     // attribute accessors
     inline bool hasAttributeType() const { return m_has_attr_type; }
     inline QString attributeType() const { return m_attr_type; }
-    inline void setAttributeType(const QString& a) { m_attr_type = a; m_has_attr_type = true; }
+    inline void setAttributeType(const QString &a) { m_attr_type = a; m_has_attr_type = true; }
     inline void clearAttributeType() { m_has_attr_type = false; }
 
     // child element accessors
@@ -3254,7 +3115,6 @@ public:
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_type;
@@ -3284,18 +3144,16 @@ public:
     // attribute accessors
     inline bool hasAttributeSource() const { return m_has_attr_source; }
     inline QString attributeSource() const { return m_attr_source; }
-    inline void setAttributeSource(const QString& a) { m_attr_source = a; m_has_attr_source = true; }
+    inline void setAttributeSource(const QString &a) { m_attr_source = a; m_has_attr_source = true; }
     inline void clearAttributeSource() { m_has_attr_source = false; }
 
     inline bool hasAttributeLanguage() const { return m_has_attr_language; }
     inline QString attributeLanguage() const { return m_attr_language; }
-    inline void setAttributeLanguage(const QString& a) { m_attr_language = a; m_has_attr_language = true; }
+    inline void setAttributeLanguage(const QString &a) { m_attr_language = a; m_has_attr_language = true; }
     inline void clearAttributeLanguage() { m_has_attr_language = false; }
 
-    // child element accessors
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_source;
@@ -3304,8 +3162,6 @@ private:
     QString m_attr_language;
     bool m_has_attr_language;
 
-    // child element data
-    uint m_children;
 };
 
 class QDESIGNER_UILIB_EXPORT DomWidgetData {
@@ -3319,16 +3175,13 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
     inline QList<DomProperty*> elementProperty() const { return m_property; }
-    void setElementProperty(const QList<DomProperty*>& a);
+    void setElementProperty(const QList<DomProperty *> &a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
     QList<DomProperty*> m_property;
@@ -3348,16 +3201,13 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
     inline QList<DomProperty*> elementProperty() const { return m_property; }
-    void setElementProperty(const QList<DomProperty*>& a);
+    void setElementProperty(const QList<DomProperty *> &a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
     QList<DomProperty*> m_property;
@@ -3377,19 +3227,16 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
     inline QStringList elementSignal() const { return m_signal; }
-    void setElementSignal(const QStringList& a);
+    void setElementSignal(const QStringList &a);
 
     inline QStringList elementSlot() const { return m_slot; }
-    void setElementSlot(const QStringList& a);
+    void setElementSlot(const QStringList &a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
     QStringList m_signal;
@@ -3411,23 +3258,20 @@ public:
     inline QString text() const { return m_text; }
     inline void setText(const QString &s) { m_text = s; }
 
-    // attribute accessors
     // child element accessors
-    inline QVector<DomPropertyToolTip*> elementTooltip() const { return m_tooltip; }
-    void setElementTooltip(const QVector<DomPropertyToolTip*>& a);
+    inline QVector<DomPropertyToolTip *> elementTooltip() const { return m_tooltip; }
+    void setElementTooltip(const QVector<DomPropertyToolTip *> &a);
 
-    inline QVector<DomStringPropertySpecification*> elementStringpropertyspecification() const { return m_stringpropertyspecification; }
-    void setElementStringpropertyspecification(const QVector<DomStringPropertySpecification*>& a);
+    inline QVector<DomStringPropertySpecification *> elementStringpropertyspecification() const { return m_stringpropertyspecification; }
+    void setElementStringpropertyspecification(const QVector<DomStringPropertySpecification *> &a);
 
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
-    // attribute data
     // child element data
     uint m_children;
-    QVector<DomPropertyToolTip*> m_tooltip;
-    QVector<DomStringPropertySpecification*> m_stringpropertyspecification;
+    QVector<DomPropertyToolTip *> m_tooltip;
+    QVector<DomStringPropertySpecification *> m_stringpropertyspecification;
     enum Child {
         Tooltip = 1,
         Stringpropertyspecification = 2
@@ -3448,20 +3292,16 @@ public:
     // attribute accessors
     inline bool hasAttributeName() const { return m_has_attr_name; }
     inline QString attributeName() const { return m_attr_name; }
-    inline void setAttributeName(const QString& a) { m_attr_name = a; m_has_attr_name = true; }
+    inline void setAttributeName(const QString &a) { m_attr_name = a; m_has_attr_name = true; }
     inline void clearAttributeName() { m_has_attr_name = false; }
 
-    // child element accessors
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_name;
     bool m_has_attr_name;
 
-    // child element data
-    uint m_children;
 };
 
 class QDESIGNER_UILIB_EXPORT DomStringPropertySpecification {
@@ -3478,23 +3318,21 @@ public:
     // attribute accessors
     inline bool hasAttributeName() const { return m_has_attr_name; }
     inline QString attributeName() const { return m_attr_name; }
-    inline void setAttributeName(const QString& a) { m_attr_name = a; m_has_attr_name = true; }
+    inline void setAttributeName(const QString &a) { m_attr_name = a; m_has_attr_name = true; }
     inline void clearAttributeName() { m_has_attr_name = false; }
 
     inline bool hasAttributeType() const { return m_has_attr_type; }
     inline QString attributeType() const { return m_attr_type; }
-    inline void setAttributeType(const QString& a) { m_attr_type = a; m_has_attr_type = true; }
+    inline void setAttributeType(const QString &a) { m_attr_type = a; m_has_attr_type = true; }
     inline void clearAttributeType() { m_has_attr_type = false; }
 
     inline bool hasAttributeNotr() const { return m_has_attr_notr; }
     inline QString attributeNotr() const { return m_attr_notr; }
-    inline void setAttributeNotr(const QString& a) { m_attr_notr = a; m_has_attr_notr = true; }
+    inline void setAttributeNotr(const QString &a) { m_attr_notr = a; m_has_attr_notr = true; }
     inline void clearAttributeNotr() { m_has_attr_notr = false; }
 
-    // child element accessors
 private:
     QString m_text;
-    void clear(bool clear_all = true);
 
     // attribute data
     QString m_attr_name;
@@ -3506,8 +3344,6 @@ private:
     QString m_attr_notr;
     bool m_has_attr_notr;
 
-    // child element data
-    uint m_children;
 };