Qt Designer: Modernize the ui4.cpp/.h files

Silence clang-tidy warnings in the generated files

- use nullptr [modernize-use-nullptr]:

  Use nullptr where applicable and simplify the switch()
  statement in write() on this occasion to use member variables
  instead of accessors.

-  use '= default' to define a trivial destructor [modernize-use-equals-default]

  Check if any delete statements are required. If not, use "= default".

- use auto when initializing with new to avoid duplicating the type name [modernize-use-auto]

  Use auto.

Change-Id: I48abfd8719b1ee66d68014cc02038a7decb70d4c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

2 files changed, 371 insertions, 440 deletions

diff --git a/src/designer/data/generate_impl.xsl b/src/designer/data/generate_impl.xsl
index 049ac00df..da7a043b2 100644
--- a/src/designer/data/generate_impl.xsl
+++ b/src/designer/data/generate_impl.xsl
@@ -94,16 +94,27 @@
         <xsl:value-of select="$name"/>
         <xsl:text>::~</xsl:text>
         <xsl:value-of select="$name"/>
-        <xsl:text>()&endl;</xsl:text>
-        <xsl:text>{&endl;</xsl:text>
-
-        <xsl:for-each select="$node//xs:sequence | $node//xs:choice | $node//xs:all">
-            <xsl:call-template name="dtor-delete-members">
-                <xsl:with-param name="node" select="."/>
-            </xsl:call-template>
-        </xsl:for-each>
+        <xsl:text>()</xsl:text>
 
-        <xsl:text>}&endl;&endl;</xsl:text>
+        <!-- Collect the delete statements for the pointer members in a variable.
+             If there are any, write a destructor body, else use "= default;" -->
+        <xsl:variable name="dtor-body">
+            <xsl:for-each select="$node//xs:sequence | $node//xs:choice | $node//xs:all">
+                <xsl:call-template name="dtor-delete-members">
+                    <xsl:with-param name="node" select="."/>
+                </xsl:call-template>
+            </xsl:for-each>
+        </xsl:variable>
+        <xsl:choose>
+            <xsl:when test="$dtor-body != ''">
+                <xsl:text>&endl;{&endl;</xsl:text>
+                <xsl:value-of select="$dtor-body"/>
+                <xsl:text>}&endl;&endl;</xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:text> = default;&endl;&endl;</xsl:text>
+            </xsl:otherwise>
+        </xsl:choose>
     </xsl:template>
 
 <!-- Implementation: clear() -->
@@ -294,8 +305,7 @@
                     <xsl:text>);&endl;</xsl:text>
                 </xsl:when>
                 <xsl:when test="not(@maxOccurs='unbounded') and $xs-type-cat = 'pointer'">
-                    <xsl:text>                Dom</xsl:text>
-                    <xsl:value-of select="@type"/>
+                    <xsl:text>                auto</xsl:text>
                     <xsl:text> *v = new Dom</xsl:text>
                     <xsl:value-of select="@type"/>
                     <xsl:text>();&endl;</xsl:text>
@@ -305,8 +315,7 @@
                     <xsl:text>(v);&endl;</xsl:text>
                 </xsl:when>
                 <xsl:when test="@maxOccurs='unbounded' and $xs-type-cat = 'pointer'">
-                    <xsl:text>                Dom</xsl:text>
-                    <xsl:value-of select="@type"/>
+                    <xsl:text>                auto</xsl:text>
                     <xsl:text> *v = new Dom</xsl:text>
                     <xsl:value-of select="@type"/>
                     <xsl:text>();&endl;</xsl:text>
@@ -438,7 +447,7 @@
 
             <xsl:text>    case </xsl:text>
             <xsl:value-of select="$cap-name"/>
-            <xsl:text>: {&endl;</xsl:text>
+            <xsl:text>:&endl;</xsl:text>
                 <xsl:choose>
                     <xsl:when test="$xs-type-cat = 'value'">
                         <xsl:variable name="qstring-func">
@@ -463,13 +472,12 @@
                             </xsl:call-template>
                         </xsl:variable>
 
-                        <xsl:text>        </xsl:text>
-                        <xsl:value-of select="$cpp-return-type"/>
-                        <xsl:text>v = element</xsl:text>
-                        <xsl:value-of select="$cap-name"/>
-                        <xsl:text>();&endl;</xsl:text>
-                        <xsl:text>        if (v != 0)&endl;</xsl:text>
-                        <xsl:text>            v->write(writer, </xsl:text>
+                        <xsl:text>        if (m_</xsl:text>
+                        <xsl:value-of select="$camel-case-name"/>
+                        <xsl:text> != nullptr)&endl;</xsl:text>
+                        <xsl:text>            m_</xsl:text>
+                        <xsl:value-of select="$camel-case-name"/>
+                        <xsl:text>->write(writer, </xsl:text>
                         <xsl:call-template name="string-constant-for-storage">
                             <xsl:with-param name="literal" select="$lower-name"/>
                         </xsl:call-template>
@@ -477,7 +485,7 @@
                     </xsl:when>
                 </xsl:choose>
             <xsl:text>        break;&endl;</xsl:text>
-            <xsl:text>    }&endl;</xsl:text>
+            <xsl:text>&endl;</xsl:text>
         </xsl:for-each>
 
         <xsl:text>    default:&endl;</xsl:text>
@@ -680,7 +688,7 @@
                 <xsl:text>;&endl;</xsl:text>
                 <xsl:text>    m_</xsl:text>
                 <xsl:value-of select="$camel-case-name"/>
-                <xsl:text> = 0;&endl;</xsl:text>
+                <xsl:text> = nullptr;&endl;</xsl:text>
                 <xsl:if test="not($isChoice)">
                     <xsl:text>    m_children ^= </xsl:text>
                     <xsl:value-of select="$cap-name"/>
@@ -775,7 +783,7 @@
                         <xsl:text>;&endl;</xsl:text>
                         <xsl:text>    m_</xsl:text>
                         <xsl:value-of select="$camel-case-name"/>
-                        <xsl:text> = 0;&endl;</xsl:text>
+                        <xsl:text> = nullptr;&endl;</xsl:text>
                     </xsl:if>
                     <xsl:text>    m_children &amp;= ~</xsl:text>
                     <xsl:value-of select="$cap-name"/>
diff --git a/src/designer/src/lib/uilib/ui4.cpp b/src/designer/src/lib/uilib/ui4.cpp
index f93a5b2d4..4afa1dce5 100644
--- a/src/designer/src/lib/uilib/ui4.cpp
+++ b/src/designer/src/lib/uilib/ui4.cpp
@@ -130,19 +130,19 @@ void DomUI::read(QXmlStreamReader &reader)
                 continue;
             }
             if (!tag.compare(QLatin1String("widget"), Qt::CaseInsensitive)) {
-                DomWidget *v = new DomWidget();
+                auto *v = new DomWidget();
                 v->read(reader);
                 setElementWidget(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("layoutdefault"), Qt::CaseInsensitive)) {
-                DomLayoutDefault *v = new DomLayoutDefault();
+                auto *v = new DomLayoutDefault();
                 v->read(reader);
                 setElementLayoutDefault(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("layoutfunction"), Qt::CaseInsensitive)) {
-                DomLayoutFunction *v = new DomLayoutFunction();
+                auto *v = new DomLayoutFunction();
                 v->read(reader);
                 setElementLayoutFunction(v);
                 continue;
@@ -152,13 +152,13 @@ void DomUI::read(QXmlStreamReader &reader)
                 continue;
             }
             if (!tag.compare(QLatin1String("customwidgets"), Qt::CaseInsensitive)) {
-                DomCustomWidgets *v = new DomCustomWidgets();
+                auto *v = new DomCustomWidgets();
                 v->read(reader);
                 setElementCustomWidgets(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("tabstops"), Qt::CaseInsensitive)) {
-                DomTabStops *v = new DomTabStops();
+                auto *v = new DomTabStops();
                 v->read(reader);
                 setElementTabStops(v);
                 continue;
@@ -169,37 +169,37 @@ void DomUI::read(QXmlStreamReader &reader)
                 continue;
             }
             if (!tag.compare(QLatin1String("includes"), Qt::CaseInsensitive)) {
-                DomIncludes *v = new DomIncludes();
+                auto *v = new DomIncludes();
                 v->read(reader);
                 setElementIncludes(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("resources"), Qt::CaseInsensitive)) {
-                DomResources *v = new DomResources();
+                auto *v = new DomResources();
                 v->read(reader);
                 setElementResources(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("connections"), Qt::CaseInsensitive)) {
-                DomConnections *v = new DomConnections();
+                auto *v = new DomConnections();
                 v->read(reader);
                 setElementConnections(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("designerdata"), Qt::CaseInsensitive)) {
-                DomDesignerData *v = new DomDesignerData();
+                auto *v = new DomDesignerData();
                 v->read(reader);
                 setElementDesignerdata(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("slots"), Qt::CaseInsensitive)) {
-                DomSlots *v = new DomSlots();
+                auto *v = new DomSlots();
                 v->read(reader);
                 setElementSlots(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("buttongroups"), Qt::CaseInsensitive)) {
-                DomButtonGroups *v = new DomButtonGroups();
+                auto *v = new DomButtonGroups();
                 v->read(reader);
                 setElementButtonGroups(v);
                 continue;
@@ -315,7 +315,7 @@ void DomUI::setElementClass(const QString &a)
 DomWidget *DomUI::takeElementWidget()
 {
     DomWidget *a = m_widget;
-    m_widget = 0;
+    m_widget = nullptr;
     m_children ^= Widget;
     return a;
 }
@@ -330,7 +330,7 @@ void DomUI::setElementWidget(DomWidget *a)
 DomLayoutDefault *DomUI::takeElementLayoutDefault()
 {
     DomLayoutDefault *a = m_layoutDefault;
-    m_layoutDefault = 0;
+    m_layoutDefault = nullptr;
     m_children ^= LayoutDefault;
     return a;
 }
@@ -345,7 +345,7 @@ void DomUI::setElementLayoutDefault(DomLayoutDefault *a)
 DomLayoutFunction *DomUI::takeElementLayoutFunction()
 {
     DomLayoutFunction *a = m_layoutFunction;
-    m_layoutFunction = 0;
+    m_layoutFunction = nullptr;
     m_children ^= LayoutFunction;
     return a;
 }
@@ -366,7 +366,7 @@ void DomUI::setElementPixmapFunction(const QString &a)
 DomCustomWidgets *DomUI::takeElementCustomWidgets()
 {
     DomCustomWidgets *a = m_customWidgets;
-    m_customWidgets = 0;
+    m_customWidgets = nullptr;
     m_children ^= CustomWidgets;
     return a;
 }
@@ -381,7 +381,7 @@ void DomUI::setElementCustomWidgets(DomCustomWidgets *a)
 DomTabStops *DomUI::takeElementTabStops()
 {
     DomTabStops *a = m_tabStops;
-    m_tabStops = 0;
+    m_tabStops = nullptr;
     m_children ^= TabStops;
     return a;
 }
@@ -396,7 +396,7 @@ void DomUI::setElementTabStops(DomTabStops *a)
 DomIncludes *DomUI::takeElementIncludes()
 {
     DomIncludes *a = m_includes;
-    m_includes = 0;
+    m_includes = nullptr;
     m_children ^= Includes;
     return a;
 }
@@ -411,7 +411,7 @@ void DomUI::setElementIncludes(DomIncludes *a)
 DomResources *DomUI::takeElementResources()
 {
     DomResources *a = m_resources;
-    m_resources = 0;
+    m_resources = nullptr;
     m_children ^= Resources;
     return a;
 }
@@ -426,7 +426,7 @@ void DomUI::setElementResources(DomResources *a)
 DomConnections *DomUI::takeElementConnections()
 {
     DomConnections *a = m_connections;
-    m_connections = 0;
+    m_connections = nullptr;
     m_children ^= Connections;
     return a;
 }
@@ -441,7 +441,7 @@ void DomUI::setElementConnections(DomConnections *a)
 DomDesignerData *DomUI::takeElementDesignerdata()
 {
     DomDesignerData *a = m_designerdata;
-    m_designerdata = 0;
+    m_designerdata = nullptr;
     m_children ^= Designerdata;
     return a;
 }
@@ -456,7 +456,7 @@ void DomUI::setElementDesignerdata(DomDesignerData *a)
 DomSlots *DomUI::takeElementSlots()
 {
     DomSlots *a = m_slots;
-    m_slots = 0;
+    m_slots = nullptr;
     m_children ^= Slots;
     return a;
 }
@@ -471,7 +471,7 @@ void DomUI::setElementSlots(DomSlots *a)
 DomButtonGroups *DomUI::takeElementButtonGroups()
 {
     DomButtonGroups *a = m_buttonGroups;
-    m_buttonGroups = 0;
+    m_buttonGroups = nullptr;
     m_children ^= ButtonGroups;
     return a;
 }
@@ -506,21 +506,21 @@ void DomUI::clearElementClass()
 void DomUI::clearElementWidget()
 {
     delete m_widget;
-    m_widget = 0;
+    m_widget = nullptr;
     m_children &= ~Widget;
 }
 
 void DomUI::clearElementLayoutDefault()
 {
     delete m_layoutDefault;
-    m_layoutDefault = 0;
+    m_layoutDefault = nullptr;
     m_children &= ~LayoutDefault;
 }
 
 void DomUI::clearElementLayoutFunction()
 {
     delete m_layoutFunction;
-    m_layoutFunction = 0;
+    m_layoutFunction = nullptr;
     m_children &= ~LayoutFunction;
 }
 
@@ -532,56 +532,56 @@ void DomUI::clearElementPixmapFunction()
 void DomUI::clearElementCustomWidgets()
 {
     delete m_customWidgets;
-    m_customWidgets = 0;
+    m_customWidgets = nullptr;
     m_children &= ~CustomWidgets;
 }
 
 void DomUI::clearElementTabStops()
 {
     delete m_tabStops;
-    m_tabStops = 0;
+    m_tabStops = nullptr;
     m_children &= ~TabStops;
 }
 
 void DomUI::clearElementIncludes()
 {
     delete m_includes;
-    m_includes = 0;
+    m_includes = nullptr;
     m_children &= ~Includes;
 }
 
 void DomUI::clearElementResources()
 {
     delete m_resources;
-    m_resources = 0;
+    m_resources = nullptr;
     m_children &= ~Resources;
 }
 
 void DomUI::clearElementConnections()
 {
     delete m_connections;
-    m_connections = 0;
+    m_connections = nullptr;
     m_children &= ~Connections;
 }
 
 void DomUI::clearElementDesignerdata()
 {
     delete m_designerdata;
-    m_designerdata = 0;
+    m_designerdata = nullptr;
     m_children &= ~Designerdata;
 }
 
 void DomUI::clearElementSlots()
 {
     delete m_slots;
-    m_slots = 0;
+    m_slots = nullptr;
     m_children &= ~Slots;
 }
 
 void DomUI::clearElementButtonGroups()
 {
     delete m_buttonGroups;
-    m_buttonGroups = 0;
+    m_buttonGroups = nullptr;
     m_children &= ~ButtonGroups;
 }
 
@@ -598,7 +598,7 @@ void DomIncludes::read(QXmlStreamReader &reader)
         case QXmlStreamReader::StartElement : {
             const QStringRef tag = reader.name();
             if (!tag.compare(QLatin1String("include"), Qt::CaseInsensitive)) {
-                DomInclude *v = new DomInclude();
+                auto *v = new DomInclude();
                 v->read(reader);
                 m_include.append(v);
                 continue;
@@ -630,9 +630,7 @@ void DomIncludes::setElementInclude(const QVector<DomInclude *> &a)
     m_include = a;
 }
 
-DomInclude::~DomInclude()
-{
-}
+DomInclude::~DomInclude() = default;
 
 void DomInclude::read(QXmlStreamReader &reader)
 {
@@ -708,7 +706,7 @@ void DomResources::read(QXmlStreamReader &reader)
         case QXmlStreamReader::StartElement : {
             const QStringRef tag = reader.name();
             if (!tag.compare(QLatin1String("include"), Qt::CaseInsensitive)) {
-                DomResource *v = new DomResource();
+                auto *v = new DomResource();
                 v->read(reader);
                 m_include.append(v);
                 continue;
@@ -743,9 +741,7 @@ void DomResources::setElementInclude(const QVector<DomResource *> &a)
     m_include = a;
 }
 
-DomResource::~DomResource()
-{
-}
+DomResource::~DomResource() = default;
 
 void DomResource::read(QXmlStreamReader &reader)
 {
@@ -813,25 +809,25 @@ void DomActionGroup::read(QXmlStreamReader &reader)
         case QXmlStreamReader::StartElement : {
             const QStringRef tag = reader.name();
             if (!tag.compare(QLatin1String("action"), Qt::CaseInsensitive)) {
-                DomAction *v = new DomAction();
+                auto *v = new DomAction();
                 v->read(reader);
                 m_action.append(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("actiongroup"), Qt::CaseInsensitive)) {
-                DomActionGroup *v = new DomActionGroup();
+                auto *v = new DomActionGroup();
                 v->read(reader);
                 m_actionGroup.append(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("property"), Qt::CaseInsensitive)) {
-                DomProperty *v = new DomProperty();
+                auto *v = new DomProperty();
                 v->read(reader);
                 m_property.append(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("attribute"), Qt::CaseInsensitive)) {
-                DomProperty *v = new DomProperty();
+                auto *v = new DomProperty();
                 v->read(reader);
                 m_attribute.append(v);
                 continue;
@@ -922,13 +918,13 @@ void DomAction::read(QXmlStreamReader &reader)
         case QXmlStreamReader::StartElement : {
             const QStringRef tag = reader.name();
             if (!tag.compare(QLatin1String("property"), Qt::CaseInsensitive)) {
-                DomProperty *v = new DomProperty();
+                auto *v = new DomProperty();
                 v->read(reader);
                 m_property.append(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("attribute"), Qt::CaseInsensitive)) {
-                DomProperty *v = new DomProperty();
+                auto *v = new DomProperty();
                 v->read(reader);
                 m_attribute.append(v);
                 continue;
@@ -975,9 +971,7 @@ void DomAction::setElementAttribute(const QList<DomProperty *> &a)
     m_attribute = a;
 }
 
-DomActionRef::~DomActionRef()
-{
-}
+DomActionRef::~DomActionRef() = default;
 
 void DomActionRef::read(QXmlStreamReader &reader)
 {
@@ -1041,13 +1035,13 @@ void DomButtonGroup::read(QXmlStreamReader &reader)
         case QXmlStreamReader::StartElement : {
             const QStringRef tag = reader.name();
             if (!tag.compare(QLatin1String("property"), Qt::CaseInsensitive)) {
-                DomProperty *v = new DomProperty();
+                auto *v = new DomProperty();
                 v->read(reader);
                 m_property.append(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("attribute"), Qt::CaseInsensitive)) {
-                DomProperty *v = new DomProperty();
+                auto *v = new DomProperty();
                 v->read(reader);
                 m_attribute.append(v);
                 continue;
@@ -1104,7 +1098,7 @@ void DomButtonGroups::read(QXmlStreamReader &reader)
         case QXmlStreamReader::StartElement : {
             const QStringRef tag = reader.name();
             if (!tag.compare(QLatin1String("buttongroup"), Qt::CaseInsensitive)) {
-                DomButtonGroup *v = new DomButtonGroup();
+                auto *v = new DomButtonGroup();
                 v->read(reader);
                 m_buttonGroup.append(v);
                 continue;
@@ -1149,7 +1143,7 @@ void DomCustomWidgets::read(QXmlStreamReader &reader)
         case QXmlStreamReader::StartElement : {
             const QStringRef tag = reader.name();
             if (!tag.compare(QLatin1String("customwidget"), Qt::CaseInsensitive)) {
-                DomCustomWidget *v = new DomCustomWidget();
+                auto *v = new DomCustomWidget();
                 v->read(reader);
                 m_customWidget.append(v);
                 continue;
@@ -1181,9 +1175,7 @@ void DomCustomWidgets::setElementCustomWidget(const QVector<DomCustomWidget *> &
     m_customWidget = a;
 }
 
-DomHeader::~DomHeader()
-{
-}
+DomHeader::~DomHeader() = default;
 
 void DomHeader::read(QXmlStreamReader &reader)
 {
@@ -1252,13 +1244,13 @@ void DomCustomWidget::read(QXmlStreamReader &reader)
                 continue;
             }
             if (!tag.compare(QLatin1String("header"), Qt::CaseInsensitive)) {
-                DomHeader *v = new DomHeader();
+                auto *v = new DomHeader();
                 v->read(reader);
                 setElementHeader(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("sizehint"), Qt::CaseInsensitive)) {
-                DomSize *v = new DomSize();
+                auto *v = new DomSize();
                 v->read(reader);
                 setElementSizeHint(v);
                 continue;
@@ -1291,13 +1283,13 @@ void DomCustomWidget::read(QXmlStreamReader &reader)
                 continue;
             }
             if (!tag.compare(QLatin1String("slots"), Qt::CaseInsensitive)) {
-                DomSlots *v = new DomSlots();
+                auto *v = new DomSlots();
                 v->read(reader);
                 setElementSlots(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("propertyspecifications"), Qt::CaseInsensitive)) {
-                DomPropertySpecifications *v = new DomPropertySpecifications();
+                auto *v = new DomPropertySpecifications();
                 v->read(reader);
                 setElementPropertyspecifications(v);
                 continue;
@@ -1362,7 +1354,7 @@ void DomCustomWidget::setElementExtends(const QString &a)
 DomHeader *DomCustomWidget::takeElementHeader()
 {
     DomHeader *a = m_header;
-    m_header = 0;
+    m_header = nullptr;
     m_children ^= Header;
     return a;
 }
@@ -1377,7 +1369,7 @@ void DomCustomWidget::setElementHeader(DomHeader *a)
 DomSize *DomCustomWidget::takeElementSizeHint()
 {
     DomSize *a = m_sizeHint;
-    m_sizeHint = 0;
+    m_sizeHint = nullptr;
     m_children ^= SizeHint;
     return a;
 }
@@ -1410,7 +1402,7 @@ void DomCustomWidget::setElementPixmap(const QString &a)
 DomSlots *DomCustomWidget::takeElementSlots()
 {
     DomSlots *a = m_slots;
-    m_slots = 0;
+    m_slots = nullptr;
     m_children ^= Slots;
     return a;
 }
@@ -1425,7 +1417,7 @@ void DomCustomWidget::setElementSlots(DomSlots *a)
 DomPropertySpecifications *DomCustomWidget::takeElementPropertyspecifications()
 {
     DomPropertySpecifications *a = m_propertyspecifications;
-    m_propertyspecifications = 0;
+    m_propertyspecifications = nullptr;
     m_children ^= Propertyspecifications;
     return a;
 }
@@ -1450,14 +1442,14 @@ void DomCustomWidget::clearElementExtends()
 void DomCustomWidget::clearElementHeader()
 {
     delete m_header;
-    m_header = 0;
+    m_header = nullptr;
     m_children &= ~Header;
 }
 
 void DomCustomWidget::clearElementSizeHint()
 {
     delete m_sizeHint;
-    m_sizeHint = 0;
+    m_sizeHint = nullptr;
     m_children &= ~SizeHint;
 }
 
@@ -1479,20 +1471,18 @@ void DomCustomWidget::clearElementPixmap()
 void DomCustomWidget::clearElementSlots()
 {
     delete m_slots;
-    m_slots = 0;
+    m_slots = nullptr;
     m_children &= ~Slots;
 }
 
 void DomCustomWidget::clearElementPropertyspecifications()
 {
     delete m_propertyspecifications;
-    m_propertyspecifications = 0;
+    m_propertyspecifications = nullptr;
     m_children &= ~Propertyspecifications;
 }
 
-DomLayoutDefault::~DomLayoutDefault()
-{
-}
+DomLayoutDefault::~DomLayoutDefault() = default;
 
 void DomLayoutDefault::read(QXmlStreamReader &reader)
 {
@@ -1538,9 +1528,7 @@ void DomLayoutDefault::write(QXmlStreamWriter &writer, const QString &tagName) c
     writer.writeEndElement();
 }
 
-DomLayoutFunction::~DomLayoutFunction()
-{
-}
+DomLayoutFunction::~DomLayoutFunction() = default;
 
 void DomLayoutFunction::read(QXmlStreamReader &reader)
 {
@@ -1679,19 +1667,19 @@ void DomLayout::read(QXmlStreamReader &reader)
         case QXmlStreamReader::StartElement : {
             const QStringRef tag = reader.name();
             if (!tag.compare(QLatin1String("property"), Qt::CaseInsensitive)) {
-                DomProperty *v = new DomProperty();
+                auto *v = new DomProperty();
                 v->read(reader);
                 m_property.append(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("attribute"), Qt::CaseInsensitive)) {
-                DomProperty *v = new DomProperty();
+                auto *v = new DomProperty();
                 v->read(reader);
                 m_attribute.append(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("item"), Qt::CaseInsensitive)) {
-                DomLayoutItem *v = new DomLayoutItem();
+                auto *v = new DomLayoutItem();
                 v->read(reader);
                 m_item.append(v);
                 continue;
@@ -1815,19 +1803,19 @@ void DomLayoutItem::read(QXmlStreamReader &reader)
         case QXmlStreamReader::StartElement : {
             const QStringRef tag = reader.name();
             if (!tag.compare(QLatin1String("widget"), Qt::CaseInsensitive)) {
-                DomWidget *v = new DomWidget();
+                auto *v = new DomWidget();
                 v->read(reader);
                 setElementWidget(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("layout"), Qt::CaseInsensitive)) {
-                DomLayout *v = new DomLayout();
+                auto *v = new DomLayout();
                 v->read(reader);
                 setElementLayout(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("spacer"), Qt::CaseInsensitive)) {
-                DomSpacer *v = new DomSpacer();
+                auto *v = new DomSpacer();
                 v->read(reader);
                 setElementSpacer(v);
                 continue;
@@ -1863,24 +1851,21 @@ 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"));
+    case Widget:
+        if (m_widget != nullptr)
+            m_widget->write(writer, QStringLiteral("widget"));
         break;
-    }
-    case Layout: {
-        DomLayout *v = elementLayout();
-        if (v != 0)
-            v->write(writer, QStringLiteral("layout"));
+
+    case Layout:
+        if (m_layout != nullptr)
+            m_layout->write(writer, QStringLiteral("layout"));
         break;
-    }
-    case Spacer: {
-        DomSpacer *v = elementSpacer();
-        if (v != 0)
-            v->write(writer, QStringLiteral("spacer"));
+
+    case Spacer:
+        if (m_spacer != nullptr)
+            m_spacer->write(writer, QStringLiteral("spacer"));
         break;
-    }
+
     default:
         break;
     }
@@ -1890,7 +1875,7 @@ void DomLayoutItem::write(QXmlStreamWriter &writer, const QString &tagName) cons
 DomWidget *DomLayoutItem::takeElementWidget()
 {
     DomWidget *a = m_widget;
-    m_widget = 0;
+    m_widget = nullptr;
     return a;
 }
 
@@ -1904,7 +1889,7 @@ void DomLayoutItem::setElementWidget(DomWidget *a)
 DomLayout *DomLayoutItem::takeElementLayout()
 {
     DomLayout *a = m_layout;
-    m_layout = 0;
+    m_layout = nullptr;
     return a;
 }
 
@@ -1918,7 +1903,7 @@ void DomLayoutItem::setElementLayout(DomLayout *a)
 DomSpacer *DomLayoutItem::takeElementSpacer()
 {
     DomSpacer *a = m_spacer;
-    m_spacer = 0;
+    m_spacer = nullptr;
     return a;
 }
 
@@ -1942,7 +1927,7 @@ void DomRow::read(QXmlStreamReader &reader)
         case QXmlStreamReader::StartElement : {
             const QStringRef tag = reader.name();
             if (!tag.compare(QLatin1String("property"), Qt::CaseInsensitive)) {
-                DomProperty *v = new DomProperty();
+                auto *v = new DomProperty();
                 v->read(reader);
                 m_property.append(v);
                 continue;
@@ -1987,7 +1972,7 @@ void DomColumn::read(QXmlStreamReader &reader)
         case QXmlStreamReader::StartElement : {
             const QStringRef tag = reader.name();
             if (!tag.compare(QLatin1String("property"), Qt::CaseInsensitive)) {
-                DomProperty *v = new DomProperty();
+                auto *v = new DomProperty();
                 v->read(reader);
                 m_property.append(v);
                 continue;
@@ -2048,13 +2033,13 @@ void DomItem::read(QXmlStreamReader &reader)
         case QXmlStreamReader::StartElement : {
             const QStringRef tag = reader.name();
             if (!tag.compare(QLatin1String("property"), Qt::CaseInsensitive)) {
-                DomProperty *v = new DomProperty();
+                auto *v = new DomProperty();
                 v->read(reader);
                 m_property.append(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("item"), Qt::CaseInsensitive)) {
-                DomItem *v = new DomItem();
+                auto *v = new DomItem();
                 v->read(reader);
                 m_item.append(v);
                 continue;
@@ -2156,7 +2141,7 @@ void DomWidget::read(QXmlStreamReader &reader)
                 continue;
             }
             if (!tag.compare(QLatin1String("property"), Qt::CaseInsensitive)) {
-                DomProperty *v = new DomProperty();
+                auto *v = new DomProperty();
                 v->read(reader);
                 m_property.append(v);
                 continue;
@@ -2172,55 +2157,55 @@ void DomWidget::read(QXmlStreamReader &reader)
                 continue;
             }
             if (!tag.compare(QLatin1String("attribute"), Qt::CaseInsensitive)) {
-                DomProperty *v = new DomProperty();
+                auto *v = new DomProperty();
                 v->read(reader);
                 m_attribute.append(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("row"), Qt::CaseInsensitive)) {
-                DomRow *v = new DomRow();
+                auto *v = new DomRow();
                 v->read(reader);
                 m_row.append(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("column"), Qt::CaseInsensitive)) {
-                DomColumn *v = new DomColumn();
+                auto *v = new DomColumn();
                 v->read(reader);
                 m_column.append(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("item"), Qt::CaseInsensitive)) {
-                DomItem *v = new DomItem();
+                auto *v = new DomItem();
                 v->read(reader);
                 m_item.append(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("layout"), Qt::CaseInsensitive)) {
-                DomLayout *v = new DomLayout();
+                auto *v = new DomLayout();
                 v->read(reader);
                 m_layout.append(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("widget"), Qt::CaseInsensitive)) {
-                DomWidget *v = new DomWidget();
+                auto *v = new DomWidget();
                 v->read(reader);
                 m_widget.append(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("action"), Qt::CaseInsensitive)) {
-                DomAction *v = new DomAction();
+                auto *v = new DomAction();
                 v->read(reader);
                 m_action.append(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("actiongroup"), Qt::CaseInsensitive)) {
-                DomActionGroup *v = new DomActionGroup();
+                auto *v = new DomActionGroup();
                 v->read(reader);
                 m_actionGroup.append(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("addaction"), Qt::CaseInsensitive)) {
-                DomActionRef *v = new DomActionRef();
+                auto *v = new DomActionRef();
                 v->read(reader);
                 m_addAction.append(v);
                 continue;
@@ -2387,7 +2372,7 @@ void DomSpacer::read(QXmlStreamReader &reader)
         case QXmlStreamReader::StartElement : {
             const QStringRef tag = reader.name();
             if (!tag.compare(QLatin1String("property"), Qt::CaseInsensitive)) {
-                DomProperty *v = new DomProperty();
+                auto *v = new DomProperty();
                 v->read(reader);
                 m_property.append(v);
                 continue;
@@ -2422,9 +2407,7 @@ void DomSpacer::setElementProperty(const QList<DomProperty *> &a)
     m_property = a;
 }
 
-DomColor::~DomColor()
-{
-}
+DomColor::~DomColor() = default;
 
 void DomColor::read(QXmlStreamReader &reader)
 {
@@ -2539,7 +2522,7 @@ void DomGradientStop::read(QXmlStreamReader &reader)
         case QXmlStreamReader::StartElement : {
             const QStringRef tag = reader.name();
             if (!tag.compare(QLatin1String("color"), Qt::CaseInsensitive)) {
-                DomColor *v = new DomColor();
+                auto *v = new DomColor();
                 v->read(reader);
                 setElementColor(v);
                 continue;
@@ -2571,7 +2554,7 @@ void DomGradientStop::write(QXmlStreamWriter &writer, const QString &tagName) co
 DomColor *DomGradientStop::takeElementColor()
 {
     DomColor *a = m_color;
-    m_color = 0;
+    m_color = nullptr;
     m_children ^= Color;
     return a;
 }
@@ -2586,7 +2569,7 @@ void DomGradientStop::setElementColor(DomColor *a)
 void DomGradientStop::clearElementColor()
 {
     delete m_color;
-    m_color = 0;
+    m_color = nullptr;
     m_children &= ~Color;
 }
 
@@ -2661,7 +2644,7 @@ void DomGradient::read(QXmlStreamReader &reader)
         case QXmlStreamReader::StartElement : {
             const QStringRef tag = reader.name();
             if (!tag.compare(QLatin1String("gradientstop"), Qt::CaseInsensitive)) {
-                DomGradientStop *v = new DomGradientStop();
+                auto *v = new DomGradientStop();
                 v->read(reader);
                 m_gradientStop.append(v);
                 continue;
@@ -2769,19 +2752,19 @@ void DomBrush::read(QXmlStreamReader &reader)
         case QXmlStreamReader::StartElement : {
             const QStringRef tag = reader.name();
             if (!tag.compare(QLatin1String("color"), Qt::CaseInsensitive)) {
-                DomColor *v = new DomColor();
+                auto *v = new DomColor();
                 v->read(reader);
                 setElementColor(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("texture"), Qt::CaseInsensitive)) {
-                DomProperty *v = new DomProperty();
+                auto *v = new DomProperty();
                 v->read(reader);
                 setElementTexture(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("gradient"), Qt::CaseInsensitive)) {
-                DomGradient *v = new DomGradient();
+                auto *v = new DomGradient();
                 v->read(reader);
                 setElementGradient(v);
                 continue;
@@ -2805,24 +2788,21 @@ void DomBrush::write(QXmlStreamWriter &writer, const QString &tagName) const
         writer.writeAttribute(QStringLiteral("brushstyle"), attributeBrushStyle());
 
     switch (kind()) {
-    case Color: {
-        DomColor *v = elementColor();
-        if (v != 0)
-            v->write(writer, QStringLiteral("color"));
+    case Color:
+        if (m_color != nullptr)
+            m_color->write(writer, QStringLiteral("color"));
         break;
-    }
-    case Texture: {
-        DomProperty *v = elementTexture();
-        if (v != 0)
-            v->write(writer, QStringLiteral("texture"));
+
+    case Texture:
+        if (m_texture != nullptr)
+            m_texture->write(writer, QStringLiteral("texture"));
         break;
-    }
-    case Gradient: {
-        DomGradient *v = elementGradient();
-        if (v != 0)
-            v->write(writer, QStringLiteral("gradient"));
+
+    case Gradient:
+        if (m_gradient != nullptr)
+            m_gradient->write(writer, QStringLiteral("gradient"));
         break;
-    }
+
     default:
         break;
     }
@@ -2832,7 +2812,7 @@ void DomBrush::write(QXmlStreamWriter &writer, const QString &tagName) const
 DomColor *DomBrush::takeElementColor()
 {
     DomColor *a = m_color;
-    m_color = 0;
+    m_color = nullptr;
     return a;
 }
 
@@ -2846,7 +2826,7 @@ void DomBrush::setElementColor(DomColor *a)
 DomProperty *DomBrush::takeElementTexture()
 {
     DomProperty *a = m_texture;
-    m_texture = 0;
+    m_texture = nullptr;
     return a;
 }
 
@@ -2860,7 +2840,7 @@ void DomBrush::setElementTexture(DomProperty *a)
 DomGradient *DomBrush::takeElementGradient()
 {
     DomGradient *a = m_gradient;
-    m_gradient = 0;
+    m_gradient = nullptr;
     return a;
 }
 
@@ -2893,7 +2873,7 @@ void DomColorRole::read(QXmlStreamReader &reader)
         case QXmlStreamReader::StartElement : {
             const QStringRef tag = reader.name();
             if (!tag.compare(QLatin1String("brush"), Qt::CaseInsensitive)) {
-                DomBrush *v = new DomBrush();
+                auto *v = new DomBrush();
                 v->read(reader);
                 setElementBrush(v);
                 continue;
@@ -2925,7 +2905,7 @@ void DomColorRole::write(QXmlStreamWriter &writer, const QString &tagName) const
 DomBrush *DomColorRole::takeElementBrush()
 {
     DomBrush *a = m_brush;
-    m_brush = 0;
+    m_brush = nullptr;
     m_children ^= Brush;
     return a;
 }
@@ -2940,7 +2920,7 @@ void DomColorRole::setElementBrush(DomBrush *a)
 void DomColorRole::clearElementBrush()
 {
     delete m_brush;
-    m_brush = 0;
+    m_brush = nullptr;
     m_children &= ~Brush;
 }
 
@@ -2959,13 +2939,13 @@ void DomColorGroup::read(QXmlStreamReader &reader)
         case QXmlStreamReader::StartElement : {
             const QStringRef tag = reader.name();
             if (!tag.compare(QLatin1String("colorrole"), Qt::CaseInsensitive)) {
-                DomColorRole *v = new DomColorRole();
+                auto *v = new DomColorRole();
                 v->read(reader);
                 m_colorRole.append(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("color"), Qt::CaseInsensitive)) {
-                DomColor *v = new DomColor();
+                auto *v = new DomColor();
                 v->read(reader);
                 m_color.append(v);
                 continue;
@@ -3020,19 +3000,19 @@ void DomPalette::read(QXmlStreamReader &reader)
         case QXmlStreamReader::StartElement : {
             const QStringRef tag = reader.name();
             if (!tag.compare(QLatin1String("active"), Qt::CaseInsensitive)) {
-                DomColorGroup *v = new DomColorGroup();
+                auto *v = new DomColorGroup();
                 v->read(reader);
                 setElementActive(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("inactive"), Qt::CaseInsensitive)) {
-                DomColorGroup *v = new DomColorGroup();
+                auto *v = new DomColorGroup();
                 v->read(reader);
                 setElementInactive(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("disabled"), Qt::CaseInsensitive)) {
-                DomColorGroup *v = new DomColorGroup();
+                auto *v = new DomColorGroup();
                 v->read(reader);
                 setElementDisabled(v);
                 continue;
@@ -3067,7 +3047,7 @@ void DomPalette::write(QXmlStreamWriter &writer, const QString &tagName) const
 DomColorGroup *DomPalette::takeElementActive()
 {
     DomColorGroup *a = m_active;
-    m_active = 0;
+    m_active = nullptr;
     m_children ^= Active;
     return a;
 }
@@ -3082,7 +3062,7 @@ void DomPalette::setElementActive(DomColorGroup *a)
 DomColorGroup *DomPalette::takeElementInactive()
 {
     DomColorGroup *a = m_inactive;
-    m_inactive = 0;
+    m_inactive = nullptr;
     m_children ^= Inactive;
     return a;
 }
@@ -3097,7 +3077,7 @@ void DomPalette::setElementInactive(DomColorGroup *a)
 DomColorGroup *DomPalette::takeElementDisabled()
 {
     DomColorGroup *a = m_disabled;
-    m_disabled = 0;
+    m_disabled = nullptr;
     m_children ^= Disabled;
     return a;
 }
@@ -3112,27 +3092,25 @@ void DomPalette::setElementDisabled(DomColorGroup *a)
 void DomPalette::clearElementActive()
 {
     delete m_active;
-    m_active = 0;
+    m_active = nullptr;
     m_children &= ~Active;
 }
 
 void DomPalette::clearElementInactive()
 {
     delete m_inactive;
-    m_inactive = 0;
+    m_inactive = nullptr;
     m_children &= ~Inactive;
 }
 
 void DomPalette::clearElementDisabled()
 {
     delete m_disabled;
-    m_disabled = 0;
+    m_disabled = nullptr;
     m_children &= ~Disabled;
 }
 
-DomFont::~DomFont()
-{
-}
+DomFont::~DomFont() = default;
 
 void DomFont::read(QXmlStreamReader &reader)
 {
@@ -3338,9 +3316,7 @@ void DomFont::clearElementKerning()
     m_children &= ~Kerning;
 }
 
-DomPoint::~DomPoint()
-{
-}
+DomPoint::~DomPoint() = default;
 
 void DomPoint::read(QXmlStreamReader &reader)
 {
@@ -3402,9 +3378,7 @@ void DomPoint::clearElementY()
     m_children &= ~Y;
 }
 
-DomRect::~DomRect()
-{
-}
+DomRect::~DomRect() = default;
 
 void DomRect::read(QXmlStreamReader &reader)
 {
@@ -3502,9 +3476,7 @@ void DomRect::clearElementHeight()
     m_children &= ~Height;
 }
 
-DomLocale::~DomLocale()
-{
-}
+DomLocale::~DomLocale() = default;
 
 void DomLocale::read(QXmlStreamReader &reader)
 {
@@ -3550,9 +3522,7 @@ void DomLocale::write(QXmlStreamWriter &writer, const QString &tagName) const
     writer.writeEndElement();
 }
 
-DomSizePolicy::~DomSizePolicy()
-{
-}
+DomSizePolicy::~DomSizePolicy() = default;
 
 void DomSizePolicy::read(QXmlStreamReader &reader)
 {
@@ -3670,9 +3640,7 @@ void DomSizePolicy::clearElementVerStretch()
     m_children &= ~VerStretch;
 }
 
-DomSize::~DomSize()
-{
-}
+DomSize::~DomSize() = default;
 
 void DomSize::read(QXmlStreamReader &reader)
 {
@@ -3734,9 +3702,7 @@ void DomSize::clearElementHeight()
     m_children &= ~Height;
 }
 
-DomDate::~DomDate()
-{
-}
+DomDate::~DomDate() = default;
 
 void DomDate::read(QXmlStreamReader &reader)
 {
@@ -3816,9 +3782,7 @@ void DomDate::clearElementDay()
     m_children &= ~Day;
 }
 
-DomTime::~DomTime()
-{
-}
+DomTime::~DomTime() = default;
 
 void DomTime::read(QXmlStreamReader &reader)
 {
@@ -3898,9 +3862,7 @@ void DomTime::clearElementSecond()
     m_children &= ~Second;
 }
 
-DomDateTime::~DomDateTime()
-{
-}
+DomDateTime::~DomDateTime() = default;
 
 void DomDateTime::read(QXmlStreamReader &reader)
 {
@@ -4110,9 +4072,7 @@ void DomStringList::setElementString(const QStringList &a)
     m_string = a;
 }
 
-DomResourcePixmap::~DomResourcePixmap()
-{
-}
+DomResourcePixmap::~DomResourcePixmap() = default;
 
 void DomResourcePixmap::read(QXmlStreamReader &reader)
 {
@@ -4198,49 +4158,49 @@ void DomResourceIcon::read(QXmlStreamReader &reader)
         case QXmlStreamReader::StartElement : {
             const QStringRef tag = reader.name();
             if (!tag.compare(QLatin1String("normaloff"), Qt::CaseInsensitive)) {
-                DomResourcePixmap *v = new DomResourcePixmap();
+                auto *v = new DomResourcePixmap();
                 v->read(reader);
                 setElementNormalOff(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("normalon"), Qt::CaseInsensitive)) {
-                DomResourcePixmap *v = new DomResourcePixmap();
+                auto *v = new DomResourcePixmap();
                 v->read(reader);
                 setElementNormalOn(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("disabledoff"), Qt::CaseInsensitive)) {
-                DomResourcePixmap *v = new DomResourcePixmap();
+                auto *v = new DomResourcePixmap();
                 v->read(reader);
                 setElementDisabledOff(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("disabledon"), Qt::CaseInsensitive)) {
-                DomResourcePixmap *v = new DomResourcePixmap();
+                auto *v = new DomResourcePixmap();
                 v->read(reader);
                 setElementDisabledOn(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("activeoff"), Qt::CaseInsensitive)) {
-                DomResourcePixmap *v = new DomResourcePixmap();
+                auto *v = new DomResourcePixmap();
                 v->read(reader);
                 setElementActiveOff(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("activeon"), Qt::CaseInsensitive)) {
-                DomResourcePixmap *v = new DomResourcePixmap();
+                auto *v = new DomResourcePixmap();
                 v->read(reader);
                 setElementActiveOn(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("selectedoff"), Qt::CaseInsensitive)) {
-                DomResourcePixmap *v = new DomResourcePixmap();
+                auto *v = new DomResourcePixmap();
                 v->read(reader);
                 setElementSelectedOff(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("selectedon"), Qt::CaseInsensitive)) {
-                DomResourcePixmap *v = new DomResourcePixmap();
+                auto *v = new DomResourcePixmap();
                 v->read(reader);
                 setElementSelectedOn(v);
                 continue;
@@ -4303,7 +4263,7 @@ void DomResourceIcon::write(QXmlStreamWriter &writer, const QString &tagName) co
 DomResourcePixmap *DomResourceIcon::takeElementNormalOff()
 {
     DomResourcePixmap *a = m_normalOff;
-    m_normalOff = 0;
+    m_normalOff = nullptr;
     m_children ^= NormalOff;
     return a;
 }
@@ -4318,7 +4278,7 @@ void DomResourceIcon::setElementNormalOff(DomResourcePixmap *a)
 DomResourcePixmap *DomResourceIcon::takeElementNormalOn()
 {
     DomResourcePixmap *a = m_normalOn;
-    m_normalOn = 0;
+    m_normalOn = nullptr;
     m_children ^= NormalOn;
     return a;
 }
@@ -4333,7 +4293,7 @@ void DomResourceIcon::setElementNormalOn(DomResourcePixmap *a)
 DomResourcePixmap *DomResourceIcon::takeElementDisabledOff()
 {
     DomResourcePixmap *a = m_disabledOff;
-    m_disabledOff = 0;
+    m_disabledOff = nullptr;
     m_children ^= DisabledOff;
     return a;
 }
@@ -4348,7 +4308,7 @@ void DomResourceIcon::setElementDisabledOff(DomResourcePixmap *a)
 DomResourcePixmap *DomResourceIcon::takeElementDisabledOn()
 {
     DomResourcePixmap *a = m_disabledOn;
-    m_disabledOn = 0;
+    m_disabledOn = nullptr;
     m_children ^= DisabledOn;
     return a;
 }
@@ -4363,7 +4323,7 @@ void DomResourceIcon::setElementDisabledOn(DomResourcePixmap *a)
 DomResourcePixmap *DomResourceIcon::takeElementActiveOff()
 {
     DomResourcePixmap *a = m_activeOff;
-    m_activeOff = 0;
+    m_activeOff = nullptr;
     m_children ^= ActiveOff;
     return a;
 }
@@ -4378,7 +4338,7 @@ void DomResourceIcon::setElementActiveOff(DomResourcePixmap *a)
 DomResourcePixmap *DomResourceIcon::takeElementActiveOn()
 {
     DomResourcePixmap *a = m_activeOn;
-    m_activeOn = 0;
+    m_activeOn = nullptr;
     m_children ^= ActiveOn;
     return a;
 }
@@ -4393,7 +4353,7 @@ void DomResourceIcon::setElementActiveOn(DomResourcePixmap *a)
 DomResourcePixmap *DomResourceIcon::takeElementSelectedOff()
 {
     DomResourcePixmap *a = m_selectedOff;
-    m_selectedOff = 0;
+    m_selectedOff = nullptr;
     m_children ^= SelectedOff;
     return a;
 }
@@ -4408,7 +4368,7 @@ void DomResourceIcon::setElementSelectedOff(DomResourcePixmap *a)
 DomResourcePixmap *DomResourceIcon::takeElementSelectedOn()
 {
     DomResourcePixmap *a = m_selectedOn;
-    m_selectedOn = 0;
+    m_selectedOn = nullptr;
     m_children ^= SelectedOn;
     return a;
 }
@@ -4423,62 +4383,60 @@ void DomResourceIcon::setElementSelectedOn(DomResourcePixmap *a)
 void DomResourceIcon::clearElementNormalOff()
 {
     delete m_normalOff;
-    m_normalOff = 0;
+    m_normalOff = nullptr;
     m_children &= ~NormalOff;
 }
 
 void DomResourceIcon::clearElementNormalOn()
 {
     delete m_normalOn;
-    m_normalOn = 0;
+    m_normalOn = nullptr;
     m_children &= ~NormalOn;
 }
 
 void DomResourceIcon::clearElementDisabledOff()
 {
     delete m_disabledOff;
-    m_disabledOff = 0;
+    m_disabledOff = nullptr;
     m_children &= ~DisabledOff;
 }
 
 void DomResourceIcon::clearElementDisabledOn()
 {
     delete m_disabledOn;
-    m_disabledOn = 0;
+    m_disabledOn = nullptr;
     m_children &= ~DisabledOn;
 }
 
 void DomResourceIcon::clearElementActiveOff()
 {
     delete m_activeOff;
-    m_activeOff = 0;
+    m_activeOff = nullptr;
     m_children &= ~ActiveOff;
 }
 
 void DomResourceIcon::clearElementActiveOn()
 {
     delete m_activeOn;
-    m_activeOn = 0;
+    m_activeOn = nullptr;
     m_children &= ~ActiveOn;
 }
 
 void DomResourceIcon::clearElementSelectedOff()
 {
     delete m_selectedOff;
-    m_selectedOff = 0;
+    m_selectedOff = nullptr;
     m_children &= ~SelectedOff;
 }
 
 void DomResourceIcon::clearElementSelectedOn()
 {
     delete m_selectedOn;
-    m_selectedOn = 0;
+    m_selectedOn = nullptr;
     m_children &= ~SelectedOn;
 }
 
-DomString::~DomString()
-{
-}
+DomString::~DomString() = default;
 
 void DomString::read(QXmlStreamReader &reader)
 {
@@ -4545,9 +4503,7 @@ void DomString::write(QXmlStreamWriter &writer, const QString &tagName) const
     writer.writeEndElement();
 }
 
-DomPointF::~DomPointF()
-{
-}
+DomPointF::~DomPointF() = default;
 
 void DomPointF::read(QXmlStreamReader &reader)
 {
@@ -4609,9 +4565,7 @@ void DomPointF::clearElementY()
     m_children &= ~Y;
 }
 
-DomRectF::~DomRectF()
-{
-}
+DomRectF::~DomRectF() = default;
 
 void DomRectF::read(QXmlStreamReader &reader)
 {
@@ -4709,9 +4663,7 @@ void DomRectF::clearElementHeight()
     m_children &= ~Height;
 }
 
-DomSizeF::~DomSizeF()
-{
-}
+DomSizeF::~DomSizeF() = default;
 
 void DomSizeF::read(QXmlStreamReader &reader)
 {
@@ -4773,9 +4725,7 @@ void DomSizeF::clearElementHeight()
     m_children &= ~Height;
 }
 
-DomChar::~DomChar()
-{
-}
+DomChar::~DomChar() = default;
 
 void DomChar::read(QXmlStreamReader &reader)
 {
@@ -4831,7 +4781,7 @@ void DomUrl::read(QXmlStreamReader &reader)
         case QXmlStreamReader::StartElement : {
             const QStringRef tag = reader.name();
             if (!tag.compare(QLatin1String("string"), Qt::CaseInsensitive)) {
-                DomString *v = new DomString();
+                auto *v = new DomString();
                 v->read(reader);
                 setElementString(v);
                 continue;
@@ -4860,7 +4810,7 @@ void DomUrl::write(QXmlStreamWriter &writer, const QString &tagName) const
 DomString *DomUrl::takeElementString()
 {
     DomString *a = m_string;
-    m_string = 0;
+    m_string = nullptr;
     m_children ^= String;
     return a;
 }
@@ -4875,7 +4825,7 @@ void DomUrl::setElementString(DomString *a)
 void DomUrl::clearElementString()
 {
     delete m_string;
-    m_string = 0;
+    m_string = nullptr;
     m_children &= ~String;
 }
 
@@ -4985,7 +4935,7 @@ void DomProperty::read(QXmlStreamReader &reader)
                 continue;
             }
             if (!tag.compare(QLatin1String("color"), Qt::CaseInsensitive)) {
-                DomColor *v = new DomColor();
+                auto *v = new DomColor();
                 v->read(reader);
                 setElementColor(v);
                 continue;
@@ -5007,37 +4957,37 @@ void DomProperty::read(QXmlStreamReader &reader)
                 continue;
             }
             if (!tag.compare(QLatin1String("font"), Qt::CaseInsensitive)) {
-                DomFont *v = new DomFont();
+                auto *v = new DomFont();
                 v->read(reader);
                 setElementFont(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("iconset"), Qt::CaseInsensitive)) {
-                DomResourceIcon *v = new DomResourceIcon();
+                auto *v = new DomResourceIcon();
                 v->read(reader);
                 setElementIconSet(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("pixmap"), Qt::CaseInsensitive)) {
-                DomResourcePixmap *v = new DomResourcePixmap();
+                auto *v = new DomResourcePixmap();
                 v->read(reader);
                 setElementPixmap(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("palette"), Qt::CaseInsensitive)) {
-                DomPalette *v = new DomPalette();
+                auto *v = new DomPalette();
                 v->read(reader);
                 setElementPalette(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("point"), Qt::CaseInsensitive)) {
-                DomPoint *v = new DomPoint();
+                auto *v = new DomPoint();
                 v->read(reader);
                 setElementPoint(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("rect"), Qt::CaseInsensitive)) {
-                DomRect *v = new DomRect();
+                auto *v = new DomRect();
                 v->read(reader);
                 setElementRect(v);
                 continue;
@@ -5047,31 +4997,31 @@ void DomProperty::read(QXmlStreamReader &reader)
                 continue;
             }
             if (!tag.compare(QLatin1String("locale"), Qt::CaseInsensitive)) {
-                DomLocale *v = new DomLocale();
+                auto *v = new DomLocale();
                 v->read(reader);
                 setElementLocale(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("sizepolicy"), Qt::CaseInsensitive)) {
-                DomSizePolicy *v = new DomSizePolicy();
+                auto *v = new DomSizePolicy();
                 v->read(reader);
                 setElementSizePolicy(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("size"), Qt::CaseInsensitive)) {
-                DomSize *v = new DomSize();
+                auto *v = new DomSize();
                 v->read(reader);
                 setElementSize(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("string"), Qt::CaseInsensitive)) {
-                DomString *v = new DomString();
+                auto *v = new DomString();
                 v->read(reader);
                 setElementString(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("stringlist"), Qt::CaseInsensitive)) {
-                DomStringList *v = new DomStringList();
+                auto *v = new DomStringList();
                 v->read(reader);
                 setElementStringList(v);
                 continue;
@@ -5089,37 +5039,37 @@ void DomProperty::read(QXmlStreamReader &reader)
                 continue;
             }
             if (!tag.compare(QLatin1String("date"), Qt::CaseInsensitive)) {
-                DomDate *v = new DomDate();
+                auto *v = new DomDate();
                 v->read(reader);
                 setElementDate(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("time"), Qt::CaseInsensitive)) {
-                DomTime *v = new DomTime();
+                auto *v = new DomTime();
                 v->read(reader);
                 setElementTime(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("datetime"), Qt::CaseInsensitive)) {
-                DomDateTime *v = new DomDateTime();
+                auto *v = new DomDateTime();
                 v->read(reader);
                 setElementDateTime(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("pointf"), Qt::CaseInsensitive)) {
-                DomPointF *v = new DomPointF();
+                auto *v = new DomPointF();
                 v->read(reader);
                 setElementPointF(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("rectf"), Qt::CaseInsensitive)) {
-                DomRectF *v = new DomRectF();
+                auto *v = new DomRectF();
                 v->read(reader);
                 setElementRectF(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("sizef"), Qt::CaseInsensitive)) {
-                DomSizeF *v = new DomSizeF();
+                auto *v = new DomSizeF();
                 v->read(reader);
                 setElementSizeF(v);
                 continue;
@@ -5129,13 +5079,13 @@ void DomProperty::read(QXmlStreamReader &reader)
                 continue;
             }
             if (!tag.compare(QLatin1String("char"), Qt::CaseInsensitive)) {
-                DomChar *v = new DomChar();
+                auto *v = new DomChar();
                 v->read(reader);
                 setElementChar(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("url"), Qt::CaseInsensitive)) {
-                DomUrl *v = new DomUrl();
+                auto *v = new DomUrl();
                 v->read(reader);
                 setElementUrl(v);
                 continue;
@@ -5149,7 +5099,7 @@ void DomProperty::read(QXmlStreamReader &reader)
                 continue;
             }
             if (!tag.compare(QLatin1String("brush"), Qt::CaseInsensitive)) {
-                DomBrush *v = new DomBrush();
+                auto *v = new DomBrush();
                 v->read(reader);
                 setElementBrush(v);
                 continue;
@@ -5176,180 +5126,159 @@ void DomProperty::write(QXmlStreamWriter &writer, const QString &tagName) const
         writer.writeAttribute(QStringLiteral("stdset"), QString::number(attributeStdset()));
 
     switch (kind()) {
-    case Bool: {
+    case Bool:
         writer.writeTextElement(QStringLiteral("bool"), elementBool());
         break;
-    }
-    case Color: {
-        DomColor *v = elementColor();
-        if (v != 0)
-            v->write(writer, QStringLiteral("color"));
+
+    case Color:
+        if (m_color != nullptr)
+            m_color->write(writer, QStringLiteral("color"));
         break;
-    }
-    case Cstring: {
+
+    case Cstring:
         writer.writeTextElement(QStringLiteral("cstring"), elementCstring());
         break;
-    }
-    case Cursor: {
+
+    case Cursor:
         writer.writeTextElement(QStringLiteral("cursor"), QString::number(elementCursor()));
         break;
-    }
-    case CursorShape: {
+
+    case CursorShape:
         writer.writeTextElement(QStringLiteral("cursorShape"), elementCursorShape());
         break;
-    }
-    case Enum: {
+
+    case Enum:
         writer.writeTextElement(QStringLiteral("enum"), elementEnum());
         break;
-    }
-    case Font: {
-        DomFont *v = elementFont();
-        if (v != 0)
-            v->write(writer, QStringLiteral("font"));
+
+    case Font:
+        if (m_font != nullptr)
+            m_font->write(writer, QStringLiteral("font"));
         break;
-    }
-    case IconSet: {
-        DomResourceIcon *v = elementIconSet();
-        if (v != 0)
-            v->write(writer, QStringLiteral("iconset"));
+
+    case IconSet:
+        if (m_iconSet != nullptr)
+            m_iconSet->write(writer, QStringLiteral("iconset"));
         break;
-    }
-    case Pixmap: {
-        DomResourcePixmap *v = elementPixmap();
-        if (v != 0)
-            v->write(writer, QStringLiteral("pixmap"));
+
+    case Pixmap:
+        if (m_pixmap != nullptr)
+            m_pixmap->write(writer, QStringLiteral("pixmap"));
         break;
-    }
-    case Palette: {
-        DomPalette *v = elementPalette();
-        if (v != 0)
-            v->write(writer, QStringLiteral("palette"));
+
+    case Palette:
+        if (m_palette != nullptr)
+            m_palette->write(writer, QStringLiteral("palette"));
         break;
-    }
-    case Point: {
-        DomPoint *v = elementPoint();
-        if (v != 0)
-            v->write(writer, QStringLiteral("point"));
+
+    case Point:
+        if (m_point != nullptr)
+            m_point->write(writer, QStringLiteral("point"));
         break;
-    }
-    case Rect: {
-        DomRect *v = elementRect();
-        if (v != 0)
-            v->write(writer, QStringLiteral("rect"));
+
+    case Rect:
+        if (m_rect != nullptr)
+            m_rect->write(writer, QStringLiteral("rect"));
         break;
-    }
-    case Set: {
+
+    case Set:
         writer.writeTextElement(QStringLiteral("set"), elementSet());
         break;
-    }
-    case Locale: {
-        DomLocale *v = elementLocale();
-        if (v != 0)
-            v->write(writer, QStringLiteral("locale"));
+
+    case Locale:
+        if (m_locale != nullptr)
+            m_locale->write(writer, QStringLiteral("locale"));
         break;
-    }
-    case SizePolicy: {
-        DomSizePolicy *v = elementSizePolicy();
-        if (v != 0)
-            v->write(writer, QStringLiteral("sizepolicy"));
+
+    case SizePolicy:
+        if (m_sizePolicy != nullptr)
+            m_sizePolicy->write(writer, QStringLiteral("sizepolicy"));
         break;
-    }
-    case Size: {
-        DomSize *v = elementSize();
-        if (v != 0)
-            v->write(writer, QStringLiteral("size"));
+
+    case Size:
+        if (m_size != nullptr)
+            m_size->write(writer, QStringLiteral("size"));
         break;
-    }
-    case String: {
-        DomString *v = elementString();
-        if (v != 0)
-            v->write(writer, QStringLiteral("string"));
+
+    case String:
+        if (m_string != nullptr)
+            m_string->write(writer, QStringLiteral("string"));
         break;
-    }
-    case StringList: {
-        DomStringList *v = elementStringList();
-        if (v != 0)
-            v->write(writer, QStringLiteral("stringlist"));
+
+    case StringList:
+        if (m_stringList != nullptr)
+            m_stringList->write(writer, QStringLiteral("stringlist"));
         break;
-    }
-    case Number: {
+
+    case Number:
         writer.writeTextElement(QStringLiteral("number"), QString::number(elementNumber()));
         break;
-    }
-    case Float: {
+
+    case Float:
         writer.writeTextElement(QStringLiteral("float"), QString::number(elementFloat(), 'f', 8));
         break;
-    }
-    case Double: {
+
+    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"));
+
+    case Date:
+        if (m_date != nullptr)
+            m_date->write(writer, QStringLiteral("date"));
         break;
-    }
-    case Time: {
-        DomTime *v = elementTime();
-        if (v != 0)
-            v->write(writer, QStringLiteral("time"));
+
+    case Time:
+        if (m_time != nullptr)
+            m_time->write(writer, QStringLiteral("time"));
         break;
-    }
-    case DateTime: {
-        DomDateTime *v = elementDateTime();
-        if (v != 0)
-            v->write(writer, QStringLiteral("datetime"));
+
+    case DateTime:
+        if (m_dateTime != nullptr)
+            m_dateTime->write(writer, QStringLiteral("datetime"));
         break;
-    }
-    case PointF: {
-        DomPointF *v = elementPointF();
-        if (v != 0)
-            v->write(writer, QStringLiteral("pointf"));
+
+    case PointF:
+        if (m_pointF != nullptr)
+            m_pointF->write(writer, QStringLiteral("pointf"));
         break;
-    }
-    case RectF: {
-        DomRectF *v = elementRectF();
-        if (v != 0)
-            v->write(writer, QStringLiteral("rectf"));
+
+    case RectF:
+        if (m_rectF != nullptr)
+            m_rectF->write(writer, QStringLiteral("rectf"));
         break;
-    }
-    case SizeF: {
-        DomSizeF *v = elementSizeF();
-        if (v != 0)
-            v->write(writer, QStringLiteral("sizef"));
+
+    case SizeF:
+        if (m_sizeF != nullptr)
+            m_sizeF->write(writer, QStringLiteral("sizef"));
         break;
-    }
-    case LongLong: {
+
+    case LongLong:
         writer.writeTextElement(QStringLiteral("longLong"), QString::number(elementLongLong()));
         break;
-    }
-    case Char: {
-        DomChar *v = elementChar();
-        if (v != 0)
-            v->write(writer, QStringLiteral("char"));
+
+    case Char:
+        if (m_char != nullptr)
+            m_char->write(writer, QStringLiteral("char"));
         break;
-    }
-    case Url: {
-        DomUrl *v = elementUrl();
-        if (v != 0)
-            v->write(writer, QStringLiteral("url"));
+
+    case Url:
+        if (m_url != nullptr)
+            m_url->write(writer, QStringLiteral("url"));
         break;
-    }
-    case UInt: {
+
+    case UInt:
         writer.writeTextElement(QStringLiteral("UInt"), QString::number(elementUInt()));
         break;
-    }
-    case ULongLong: {
+
+    case ULongLong:
         writer.writeTextElement(QStringLiteral("uLongLong"), QString::number(elementULongLong()));
         break;
-    }
-    case Brush: {
-        DomBrush *v = elementBrush();
-        if (v != 0)
-            v->write(writer, QStringLiteral("brush"));
+
+    case Brush:
+        if (m_brush != nullptr)
+            m_brush->write(writer, QStringLiteral("brush"));
         break;
-    }
+
     default:
         break;
     }
@@ -5366,7 +5295,7 @@ void DomProperty::setElementBool(const QString &a)
 DomColor *DomProperty::takeElementColor()
 {
     DomColor *a = m_color;
-    m_color = 0;
+    m_color = nullptr;
     return a;
 }
 
@@ -5408,7 +5337,7 @@ void DomProperty::setElementEnum(const QString &a)
 DomFont *DomProperty::takeElementFont()
 {
     DomFont *a = m_font;
-    m_font = 0;
+    m_font = nullptr;
     return a;
 }
 
@@ -5422,7 +5351,7 @@ void DomProperty::setElementFont(DomFont *a)
 DomResourceIcon *DomProperty::takeElementIconSet()
 {
     DomResourceIcon *a = m_iconSet;
-    m_iconSet = 0;
+    m_iconSet = nullptr;
     return a;
 }
 
@@ -5436,7 +5365,7 @@ void DomProperty::setElementIconSet(DomResourceIcon *a)
 DomResourcePixmap *DomProperty::takeElementPixmap()
 {
     DomResourcePixmap *a = m_pixmap;
-    m_pixmap = 0;
+    m_pixmap = nullptr;
     return a;
 }
 
@@ -5450,7 +5379,7 @@ void DomProperty::setElementPixmap(DomResourcePixmap *a)
 DomPalette *DomProperty::takeElementPalette()
 {
     DomPalette *a = m_palette;
-    m_palette = 0;
+    m_palette = nullptr;
     return a;
 }
 
@@ -5464,7 +5393,7 @@ void DomProperty::setElementPalette(DomPalette *a)
 DomPoint *DomProperty::takeElementPoint()
 {
     DomPoint *a = m_point;
-    m_point = 0;
+    m_point = nullptr;
     return a;
 }
 
@@ -5478,7 +5407,7 @@ void DomProperty::setElementPoint(DomPoint *a)
 DomRect *DomProperty::takeElementRect()
 {
     DomRect *a = m_rect;
-    m_rect = 0;
+    m_rect = nullptr;
     return a;
 }
 
@@ -5499,7 +5428,7 @@ void DomProperty::setElementSet(const QString &a)
 DomLocale *DomProperty::takeElementLocale()
 {
     DomLocale *a = m_locale;
-    m_locale = 0;
+    m_locale = nullptr;
     return a;
 }
 
@@ -5513,7 +5442,7 @@ void DomProperty::setElementLocale(DomLocale *a)
 DomSizePolicy *DomProperty::takeElementSizePolicy()
 {
     DomSizePolicy *a = m_sizePolicy;
-    m_sizePolicy = 0;
+    m_sizePolicy = nullptr;
     return a;
 }
 
@@ -5527,7 +5456,7 @@ void DomProperty::setElementSizePolicy(DomSizePolicy *a)
 DomSize *DomProperty::takeElementSize()
 {
     DomSize *a = m_size;
-    m_size = 0;
+    m_size = nullptr;
     return a;
 }
 
@@ -5541,7 +5470,7 @@ void DomProperty::setElementSize(DomSize *a)
 DomString *DomProperty::takeElementString()
 {
     DomString *a = m_string;
-    m_string = 0;
+    m_string = nullptr;
     return a;
 }
 
@@ -5555,7 +5484,7 @@ void DomProperty::setElementString(DomString *a)
 DomStringList *DomProperty::takeElementStringList()
 {
     DomStringList *a = m_stringList;
-    m_stringList = 0;
+    m_stringList = nullptr;
     return a;
 }
 
@@ -5590,7 +5519,7 @@ void DomProperty::setElementDouble(double a)
 DomDate *DomProperty::takeElementDate()
 {
     DomDate *a = m_date;
-    m_date = 0;
+    m_date = nullptr;
     return a;
 }
 
@@ -5604,7 +5533,7 @@ void DomProperty::setElementDate(DomDate *a)
 DomTime *DomProperty::takeElementTime()
 {
     DomTime *a = m_time;
-    m_time = 0;
+    m_time = nullptr;
     return a;
 }
 
@@ -5618,7 +5547,7 @@ void DomProperty::setElementTime(DomTime *a)
 DomDateTime *DomProperty::takeElementDateTime()
 {
     DomDateTime *a = m_dateTime;
-    m_dateTime = 0;
+    m_dateTime = nullptr;
     return a;
 }
 
@@ -5632,7 +5561,7 @@ void DomProperty::setElementDateTime(DomDateTime *a)
 DomPointF *DomProperty::takeElementPointF()
 {
     DomPointF *a = m_pointF;
-    m_pointF = 0;
+    m_pointF = nullptr;
     return a;
 }
 
@@ -5646,7 +5575,7 @@ void DomProperty::setElementPointF(DomPointF *a)
 DomRectF *DomProperty::takeElementRectF()
 {
     DomRectF *a = m_rectF;
-    m_rectF = 0;
+    m_rectF = nullptr;
     return a;
 }
 
@@ -5660,7 +5589,7 @@ void DomProperty::setElementRectF(DomRectF *a)
 DomSizeF *DomProperty::takeElementSizeF()
 {
     DomSizeF *a = m_sizeF;
-    m_sizeF = 0;
+    m_sizeF = nullptr;
     return a;
 }
 
@@ -5681,7 +5610,7 @@ void DomProperty::setElementLongLong(qlonglong a)
 DomChar *DomProperty::takeElementChar()
 {
     DomChar *a = m_char;
-    m_char = 0;
+    m_char = nullptr;
     return a;
 }
 
@@ -5695,7 +5624,7 @@ void DomProperty::setElementChar(DomChar *a)
 DomUrl *DomProperty::takeElementUrl()
 {
     DomUrl *a = m_url;
-    m_url = 0;
+    m_url = nullptr;
     return a;
 }
 
@@ -5723,7 +5652,7 @@ void DomProperty::setElementULongLong(qulonglong a)
 DomBrush *DomProperty::takeElementBrush()
 {
     DomBrush *a = m_brush;
-    m_brush = 0;
+    m_brush = nullptr;
     return a;
 }
 
@@ -5747,7 +5676,7 @@ void DomConnections::read(QXmlStreamReader &reader)
         case QXmlStreamReader::StartElement : {
             const QStringRef tag = reader.name();
             if (!tag.compare(QLatin1String("connection"), Qt::CaseInsensitive)) {
-                DomConnection *v = new DomConnection();
+                auto *v = new DomConnection();
                 v->read(reader);
                 m_connection.append(v);
                 continue;
@@ -5807,7 +5736,7 @@ void DomConnection::read(QXmlStreamReader &reader)
                 continue;
             }
             if (!tag.compare(QLatin1String("hints"), Qt::CaseInsensitive)) {
-                DomConnectionHints *v = new DomConnectionHints();
+                auto *v = new DomConnectionHints();
                 v->read(reader);
                 setElementHints(v);
                 continue;
@@ -5872,7 +5801,7 @@ void DomConnection::setElementSlot(const QString &a)
 DomConnectionHints *DomConnection::takeElementHints()
 {
     DomConnectionHints *a = m_hints;
-    m_hints = 0;
+    m_hints = nullptr;
     m_children ^= Hints;
     return a;
 }
@@ -5907,7 +5836,7 @@ void DomConnection::clearElementSlot()
 void DomConnection::clearElementHints()
 {
     delete m_hints;
-    m_hints = 0;
+    m_hints = nullptr;
     m_children &= ~Hints;
 }
 
@@ -5924,7 +5853,7 @@ void DomConnectionHints::read(QXmlStreamReader &reader)
         case QXmlStreamReader::StartElement : {
             const QStringRef tag = reader.name();
             if (!tag.compare(QLatin1String("hint"), Qt::CaseInsensitive)) {
-                DomConnectionHint *v = new DomConnectionHint();
+                auto *v = new DomConnectionHint();
                 v->read(reader);
                 m_hint.append(v);
                 continue;
@@ -5956,9 +5885,7 @@ void DomConnectionHints::setElementHint(const QVector<DomConnectionHint *> &a)
     m_hint = a;
 }
 
-DomConnectionHint::~DomConnectionHint()
-{
-}
+DomConnectionHint::~DomConnectionHint() = default;
 
 void DomConnectionHint::read(QXmlStreamReader &reader)
 {
@@ -6046,7 +5973,7 @@ void DomDesignerData::read(QXmlStreamReader &reader)
         case QXmlStreamReader::StartElement : {
             const QStringRef tag = reader.name();
             if (!tag.compare(QLatin1String("property"), Qt::CaseInsensitive)) {
-                DomProperty *v = new DomProperty();
+                auto *v = new DomProperty();
                 v->read(reader);
                 m_property.append(v);
                 continue;
@@ -6149,13 +6076,13 @@ void DomPropertySpecifications::read(QXmlStreamReader &reader)
         case QXmlStreamReader::StartElement : {
             const QStringRef tag = reader.name();
             if (!tag.compare(QLatin1String("tooltip"), Qt::CaseInsensitive)) {
-                DomPropertyToolTip *v = new DomPropertyToolTip();
+                auto *v = new DomPropertyToolTip();
                 v->read(reader);
                 m_tooltip.append(v);
                 continue;
             }
             if (!tag.compare(QLatin1String("stringpropertyspecification"), Qt::CaseInsensitive)) {
-                DomStringPropertySpecification *v = new DomStringPropertySpecification();
+                auto *v = new DomStringPropertySpecification();
                 v->read(reader);
                 m_stringpropertyspecification.append(v);
                 continue;
@@ -6196,9 +6123,7 @@ void DomPropertySpecifications::setElementStringpropertyspecification(const QVec
     m_stringpropertyspecification = a;
 }
 
-DomPropertyToolTip::~DomPropertyToolTip()
-{
-}
+DomPropertyToolTip::~DomPropertyToolTip() = default;
 
 void DomPropertyToolTip::read(QXmlStreamReader &reader)
 {
@@ -6237,9 +6162,7 @@ void DomPropertyToolTip::write(QXmlStreamWriter &writer, const QString &tagName)
     writer.writeEndElement();
 }
 
-DomStringPropertySpecification::~DomStringPropertySpecification()
-{
-}
+DomStringPropertySpecification::~DomStringPropertySpecification() = default;
 
 void DomStringPropertySpecification::read(QXmlStreamReader &reader)
 {