diff options
| author | Christian Tismer <tismer@stackless.com> | 2019-06-16 12:05:39 +0200 |
|---|---|---|
| committer | Christian Tismer <tismer@stackless.com> | 2019-06-25 12:21:20 +0200 |
| commit | 2eced73f6b8dd9f568e84e78f786a0ec8d6dd429 (patch) | |
| tree | 1a69e560b5210d1386d0c3c28155acf110bfca5a /sources/shiboken2 | |
| parent | 9ad35a85e893eadb6602846194bb87e6f9a65211 (diff) | |
Cleanup pointer and trailing whitespace (omissions)
The "Cleanup pointer whitespace" patch was augmented by some
C++11 changes.
Unfortunately, this was done in the same commit, and so some old
whitespace that was removed could re-appear invisibly, since it
was in the original version.
This fix tries to remove all trailing whitespace and also adds a few
" *" corrections that were lost. The "type *" entries in XML files were
changed back to "type*".
Change-Id: Ic5c945ad64a47455fb15eebdf184b126af5ecd1d
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/shiboken2')
| -rw-r--r-- | sources/shiboken2/ApiExtractor/merge.xsl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sources/shiboken2/ApiExtractor/merge.xsl b/sources/shiboken2/ApiExtractor/merge.xsl index d0b7eafa5..c6cab5a42 100644 --- a/sources/shiboken2/ApiExtractor/merge.xsl +++ b/sources/shiboken2/ApiExtractor/merge.xsl @@ -2,11 +2,11 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:output method="xml" indent="yes"/> - <xsl:param name="lang" /> - <xsl:param name="source" /> + <xsl:param name="lang" /> + <xsl:param name="source" /> <xsl:template match="processing-instruction()" /> - + <xsl:template match="/typesystem"> <xsl:copy> <xsl:for-each select="@*"> @@ -20,8 +20,8 @@ <xsl:value-of select="." /> </xsl:copy> </xsl:for-each> - - <xsl:variable name="other" select="document($source)/typesystem/*[not(self::object-type | self::value-type | self::interface-type | self::namespace-type)]" /> + + <xsl:variable name="other" select="document($source)/typesystem/*[not(self::object-type | self::value-type | self::interface-type | self::namespace-type)]" /> <xsl:if test="$other"> <xsl:choose> <xsl:when test="$lang != ''"> @@ -37,7 +37,7 @@ </xsl:if> <xsl:apply-templates select="node()" /> - + </xsl:copy> </xsl:template> @@ -53,14 +53,14 @@ </xsl:for-each> <xsl:apply-templates select="node()" /> - + <xsl:variable name="other" select="document($source)/typesystem/*[name() = $name][@name = current()/@name]" /> <xsl:if test="$other"> <xsl:choose> <xsl:when test="$lang != ''"> <xsl:element name="language"> <xsl:attribute name="name" ><xsl:value-of select="$lang" /></xsl:attribute> - <xsl:copy-of select="$other/node()" /> + <xsl:copy-of select="$other/node()" /> </xsl:element> </xsl:when> <xsl:otherwise> |