From: Ivailo Monev <xakepa10@laimg.moc>
Date: Wed, 25 Dec 2019 18:39:35 +0000 (+0000)
Subject: remove uic3 leftovers
X-Git-Tag: 4.12.0~4552
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5ab0bd19cf62506fdcc805b0614a33cfc9569b6a;p=kde%2FKatie.git

remove uic3 leftovers

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---

diff --git a/src/designer/data/generate_header.xsl b/src/designer/data/generate_header.xsl
index ad0a36c01..33da0dc28 100644
--- a/src/designer/data/generate_header.xsl
+++ b/src/designer/data/generate_header.xsl
@@ -248,9 +248,6 @@
         <xsl:text>();&endl;&endl;</xsl:text>
 
         <xsl:text>    void read(QXmlStreamReader &amp;reader);&endl;</xsl:text>
-        <xsl:text>#ifdef QUILOADER_QDOM_READ&endl;</xsl:text>
-        <xsl:text>    void read(const QDomElement &amp;node);&endl;</xsl:text>
-        <xsl:text>#endif&endl;</xsl:text>
         <xsl:text>    void write(QXmlStreamWriter &amp;writer, const QString &amp;tagName = QString()) const;&endl;</xsl:text>
 
         <xsl:if test="$hasText">
@@ -398,21 +395,12 @@
 #include &lt;QtCore/QXmlStreamWriter&gt;
 #include &lt;QtCore/qglobal.h&gt;
 
-#if defined(QT_UIC3)
- #define QUILOADER_QDOM_READ
-#endif
-
 QT_BEGIN_NAMESPACE
 
-#ifdef QUILOADER_QDOM_READ
- class QDomElement;
-#endif
-
-
 #define QDESIGNER_UILIB_EXTERN Q_DECL_EXPORT
 #define QDESIGNER_UILIB_IMPORT Q_DECL_IMPORT
 
-#if defined(QT_DESIGNER_STATIC) || defined(QT_UIC) || defined(QT_UIC3)
+#if defined(QT_DESIGNER_STATIC) || defined(QT_UIC)
 #  define QDESIGNER_UILIB_EXPORT
 #elif defined(QDESIGNER_UILIB_LIBRARY)
 #  define QDESIGNER_UILIB_EXPORT QDESIGNER_UILIB_EXTERN
diff --git a/src/designer/data/generate_impl.xsl b/src/designer/data/generate_impl.xsl
index 8ef6eaecb..655c410c2 100644
--- a/src/designer/data/generate_impl.xsl
+++ b/src/designer/data/generate_impl.xsl
@@ -574,56 +574,6 @@
         </xsl:for-each>
     </xsl:template>
 
-    <xsl:template name="read-impl-qdom">
-        <xsl:param name="node"/>
-        <xsl:variable name="name" select="concat('Dom', $node/@name)"/>
-
-        <xsl:text>#ifdef QUILOADER_QDOM_READ&endl;</xsl:text>
-
-        <xsl:text>void </xsl:text>
-        <xsl:value-of select="$name"/>
-        <xsl:text>::read(const QDomElement &amp;node)&endl;</xsl:text>
-
-        <xsl:text>{</xsl:text>
-
-        <xsl:call-template name="read-impl-qdom-load-attributes">
-            <xsl:with-param name="node" select="$node"/>
-        </xsl:call-template>
-
-        <xsl:text>&endl;</xsl:text>
-
-        <xsl:text>    for (QDomNode n = node.firstChild(); !n.isNull(); n = n.nextSibling()) {&endl;</xsl:text>
-        <xsl:text>        if (!n.isElement())&endl;</xsl:text>
-        <xsl:text>            continue;&endl;</xsl:text>
-        <xsl:text>        QDomElement e = n.toElement();&endl;</xsl:text>
-        <xsl:text>        QString tag = e.tagName().toLower();&endl;</xsl:text>
-
-        <xsl:for-each select="$node//xs:sequence | $node//xs:choice | $node//xs:all">
-            <xsl:call-template name="read-impl-qdom-load-child-element">
-                <xsl:with-param name="node" select="."/>
-            </xsl:call-template>
-        </xsl:for-each>
-
-        <xsl:text>    }&endl;</xsl:text>
-
-        <xsl:choose>
-            <xsl:when test="$node[@mixed='true']">
-                <xsl:text>    m_text = QLatin1String("");&endl;</xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:text>    m_text.clear();&endl;</xsl:text>
-            </xsl:otherwise>
-        </xsl:choose>
-
-        <xsl:text>    for (QDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling()) {&endl;</xsl:text>
-        <xsl:text>        if (child.isText())&endl;</xsl:text>
-        <xsl:text>            m_text.append(child.nodeValue());&endl;</xsl:text>
-        <xsl:text>     }&endl;</xsl:text>
-
-        <xsl:text>}&endl;</xsl:text>
-        <xsl:text>#endif&endl;</xsl:text>
-        <xsl:text>&endl;</xsl:text>
-    </xsl:template>
 <!-- Implementation: write() -->
 
     <xsl:template name="write-impl-save-attributes">
@@ -1133,10 +1083,6 @@
 </xsl:text>
         <xsl:text>#include "ui4_p.h"&endl;</xsl:text>
         <xsl:text>&endl;</xsl:text>
-        <xsl:text>#ifdef QUILOADER_QDOM_READ&endl;</xsl:text>
-        <xsl:text>#include &lt;QtXml/QDomElement&gt;&endl;</xsl:text>
-        <xsl:text>#endif&endl;</xsl:text>
-        <xsl:text>&endl;</xsl:text>
         <xsl:text>QT_BEGIN_NAMESPACE&endl;</xsl:text>
 
         <xsl:text>#ifdef QFORMINTERNAL_NAMESPACE&endl;</xsl:text>