diff options
Diffstat (limited to 'src/designer/data/generate_shared.xsl')
| -rw-r--r-- | src/designer/data/generate_shared.xsl | 80 |
1 files changed, 43 insertions, 37 deletions
diff --git a/src/designer/data/generate_shared.xsl b/src/designer/data/generate_shared.xsl index 740caaa29..3ac05a42b 100644 --- a/src/designer/data/generate_shared.xsl +++ b/src/designer/data/generate_shared.xsl @@ -260,7 +260,11 @@ <xsl:when test="$xs-type='xs:long'">QList<qlonglong></xsl:when> <xsl:when test="$xs-type='xs:unsignedInt'">QList<uint></xsl:when> <xsl:when test="$xs-type='xs:unsignedLong'">QList<qulonglong></xsl:when> - <xsl:otherwise>QList<Dom<xsl:value-of select="$xs-type"/>*></xsl:otherwise> +<!-- ### fixme Qt 6: Change the QList<DomProperty*> to QVector<DomProperty*> by + removing the below line and change the virtual methods QAbstractFormBuilder::applyProperties() + and QAbstractFormBuilder::computeProperties(QObject *obj) accordingly (repeats 2 times below). --> + <xsl:when test="$xs-type='Property'">QList<DomProperty *></xsl:when> + <xsl:otherwise>QVector<Dom<xsl:value-of select="$xs-type"/> *></xsl:otherwise> </xsl:choose> </xsl:when> <xsl:otherwise> @@ -285,28 +289,29 @@ <xsl:choose> <xsl:when test="$array"> <xsl:choose> - <xsl:when test="$xs-type='xs:string'">QStringList</xsl:when> - <xsl:when test="$xs-type='xs:integer'">QList<int></xsl:when> - <xsl:when test="$xs-type='xs:float'">QList<float></xsl:when> - <xsl:when test="$xs-type='xs:double'">QList<double></xsl:when> - <xsl:when test="$xs-type='xs:boolean'">QList<bool></xsl:when> - <xsl:when test="$xs-type='xs:long'">QList<qlonglong></xsl:when> - <xsl:when test="$xs-type='xs:unsignedInt'">QList<uint></xsl:when> - <xsl:when test="$xs-type='xs:unsignedLong'">QList<qulonglong></xsl:when> - <xsl:otherwise>QList<Dom<xsl:value-of select="$xs-type"/>*></xsl:otherwise> + <xsl:when test="$xs-type='xs:string'">QStringList </xsl:when> + <xsl:when test="$xs-type='xs:integer'">QList<int> </xsl:when> + <xsl:when test="$xs-type='xs:float'">QList<float> </xsl:when> + <xsl:when test="$xs-type='xs:double'">QList<double> </xsl:when> + <xsl:when test="$xs-type='xs:boolean'">QList<bool> </xsl:when> + <xsl:when test="$xs-type='xs:long'">QList<qlonglong> </xsl:when> + <xsl:when test="$xs-type='xs:unsignedInt'">QList<uint> </xsl:when> + <xsl:when test="$xs-type='xs:unsignedLong'">QList<qulonglong> </xsl:when> + <xsl:when test="$xs-type='Property'">QList<DomProperty*> </xsl:when> + <xsl:otherwise>QVector<Dom<xsl:value-of select="$xs-type"/> *> </xsl:otherwise> </xsl:choose> </xsl:when> <xsl:otherwise> <xsl:choose> - <xsl:when test="$xs-type='xs:string'">QString</xsl:when> - <xsl:when test="$xs-type='xs:integer'">int</xsl:when> - <xsl:when test="$xs-type='xs:float'">float</xsl:when> - <xsl:when test="$xs-type='xs:double'">double</xsl:when> - <xsl:when test="$xs-type='xs:boolean'">bool</xsl:when> - <xsl:when test="$xs-type='xs:long'">qlonglong</xsl:when> - <xsl:when test="$xs-type='xs:unsignedInt'">uint</xsl:when> - <xsl:when test="$xs-type='xs:unsignedLong'">qulonglong</xsl:when> - <xsl:otherwise>Dom<xsl:value-of select="$xs-type"/>*</xsl:otherwise> + <xsl:when test="$xs-type='xs:string'">QString </xsl:when> + <xsl:when test="$xs-type='xs:integer'">int </xsl:when> + <xsl:when test="$xs-type='xs:float'">float </xsl:when> + <xsl:when test="$xs-type='xs:double'">double </xsl:when> + <xsl:when test="$xs-type='xs:boolean'">bool </xsl:when> + <xsl:when test="$xs-type='xs:long'">qlonglong </xsl:when> + <xsl:when test="$xs-type='xs:unsignedInt'">uint </xsl:when> + <xsl:when test="$xs-type='xs:unsignedLong'">qulonglong </xsl:when> + <xsl:otherwise>Dom<xsl:value-of select="$xs-type"/> *</xsl:otherwise> </xsl:choose> </xsl:otherwise> </xsl:choose> @@ -318,28 +323,29 @@ <xsl:choose> <xsl:when test="$array"> <xsl:choose> - <xsl:when test="$xs-type='xs:string'">const QStringList&</xsl:when> - <xsl:when test="$xs-type='xs:integer'">const QList<int>&</xsl:when> - <xsl:when test="$xs-type='xs:float'">const QList<float>&</xsl:when> - <xsl:when test="$xs-type='xs:double'">const QList<double>&</xsl:when> - <xsl:when test="$xs-type='xs:boolean'">const QList<bool>&</xsl:when> - <xsl:when test="$xs-type='xs:long'">const QList<qlonglong>&</xsl:when> - <xsl:when test="$xs-type='xs:unsignedInt'">const QList<uint>&</xsl:when> - <xsl:when test="$xs-type='xs:unsignedLong'">const QList<qulonglong>&</xsl:when> - <xsl:otherwise>const QList<Dom<xsl:value-of select="$xs-type"/>*>&</xsl:otherwise> + <xsl:when test="$xs-type='xs:string'">const QStringList &</xsl:when> + <xsl:when test="$xs-type='xs:integer'">const QList<int> &</xsl:when> + <xsl:when test="$xs-type='xs:float'">const QList<float> &</xsl:when> + <xsl:when test="$xs-type='xs:double'">const QList<double> &</xsl:when> + <xsl:when test="$xs-type='xs:boolean'">const QList<bool> &</xsl:when> + <xsl:when test="$xs-type='xs:long'">const QList<qlonglong> &</xsl:when> + <xsl:when test="$xs-type='xs:unsignedInt'">const QList<uint> &</xsl:when> + <xsl:when test="$xs-type='xs:unsignedLong'">const QList<qulonglong> &</xsl:when> + <xsl:when test="$xs-type='Property'">const QList<DomProperty *> &</xsl:when> + <xsl:otherwise>const QVector<Dom<xsl:value-of select="$xs-type"/> *> &</xsl:otherwise> </xsl:choose> </xsl:when> <xsl:otherwise> <xsl:choose> - <xsl:when test="$xs-type='xs:string'">const QString&</xsl:when> - <xsl:when test="$xs-type='xs:integer'">int</xsl:when> - <xsl:when test="$xs-type='xs:float'">float</xsl:when> - <xsl:when test="$xs-type='xs:double'">double</xsl:when> - <xsl:when test="$xs-type='xs:boolean'">bool</xsl:when> - <xsl:when test="$xs-type='xs:long'">qlonglong</xsl:when> - <xsl:when test="$xs-type='xs:unsignedInt'">uint</xsl:when> - <xsl:when test="$xs-type='xs:unsignedLong'">qulonglong</xsl:when> - <xsl:otherwise>Dom<xsl:value-of select="$xs-type"/>*</xsl:otherwise> + <xsl:when test="$xs-type='xs:string'">const QString &</xsl:when> + <xsl:when test="$xs-type='xs:integer'">int </xsl:when> + <xsl:when test="$xs-type='xs:float'">float </xsl:when> + <xsl:when test="$xs-type='xs:double'">double </xsl:when> + <xsl:when test="$xs-type='xs:boolean'">bool </xsl:when> + <xsl:when test="$xs-type='xs:long'">qlonglong </xsl:when> + <xsl:when test="$xs-type='xs:unsignedInt'">uint </xsl:when> + <xsl:when test="$xs-type='xs:unsignedLong'">qulonglong </xsl:when> + <xsl:otherwise>Dom<xsl:value-of select="$xs-type"/> *</xsl:otherwise> </xsl:choose> </xsl:otherwise> </xsl:choose> |