diff options
author | Zhang Sheng <zhangsheng@uniontech.com> | 2020-11-16 11:19:17 +0800 |
---|---|---|
committer | Zhang Sheng <zhangsheng@uniontech.com> | 2020-11-16 12:53:37 +0000 |
commit | e13173c112b729da8f53dd2e81e8116a1ed857cf (patch) | |
tree | 49c2bce0c3349eebd0f2b62c80a1b7168ae45dc2 /src/corelib/serialization | |
parent | 802e5a45baf3ac7da2cb3be06d10bdd69696fcae (diff) |
Adjust code format, add space after 'if'
Change-Id: Ice081c891ff7f4b766f49dd4bd5cf18c30237acf
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/corelib/serialization')
-rw-r--r-- | src/corelib/serialization/qxmlstream.cpp | 4 | ||||
-rw-r--r-- | src/corelib/serialization/qxmlstream_p.h | 2 | ||||
-rw-r--r-- | src/corelib/serialization/qxmlutils.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp index e15db62aeb..7a4a6ed3e5 100644 --- a/src/corelib/serialization/qxmlstream.cpp +++ b/src/corelib/serialization/qxmlstream.cpp @@ -1572,7 +1572,7 @@ void QXmlStreamReaderPrivate::resolveTag() namespaceDeclaration.prefix.clear(); const XmlStringRef ns(dtdAttribute.defaultValue); - if(ns == QLatin1String("http://www.w3.org/2000/xmlns/") || + if (ns == QLatin1String("http://www.w3.org/2000/xmlns/") || ns == QLatin1String("http://www.w3.org/XML/1998/namespace")) raiseWellFormedError(QXmlStream::tr("Illegal namespace declaration.")); else @@ -1783,7 +1783,7 @@ void QXmlStreamReaderPrivate::startDocument() if (prefix.isEmpty() && key == QLatin1String("encoding")) { documentEncoding = value; - if(hasStandalone) + if (hasStandalone) err = QXmlStream::tr("The standalone pseudo attribute must appear after the encoding."); if (!QXmlUtils::isEncName(value)) err = QXmlStream::tr("%1 is an invalid encoding name.").arg(value); diff --git a/src/corelib/serialization/qxmlstream_p.h b/src/corelib/serialization/qxmlstream_p.h index a601c24bd6..afbd6f22de 100644 --- a/src/corelib/serialization/qxmlstream_p.h +++ b/src/corelib/serialization/qxmlstream_p.h @@ -529,7 +529,7 @@ private: */ inline void setType(const QXmlStreamReader::TokenType t) { - if(type != QXmlStreamReader::Invalid) + if (type != QXmlStreamReader::Invalid) type = t; } }; diff --git a/src/corelib/serialization/qxmlutils.cpp b/src/corelib/serialization/qxmlutils.cpp index 01c84251fd..dccdf85182 100644 --- a/src/corelib/serialization/qxmlutils.cpp +++ b/src/corelib/serialization/qxmlutils.cpp @@ -371,16 +371,16 @@ bool QXmlUtils::isPublicID(QStringView candidate) */ bool QXmlUtils::isNCName(QStringView ncName) { - if(ncName.isEmpty()) + if (ncName.isEmpty()) return false; const QChar first(ncName.at(0)); - if(!QXmlUtils::isLetter(first) && first.unicode() != '_' && first.unicode() != ':') + if (!QXmlUtils::isLetter(first) && first.unicode() != '_' && first.unicode() != ':') return false; for (QChar at : ncName) { - if(!QXmlUtils::isNameChar(at) || at == QLatin1Char(':')) + if (!QXmlUtils::isNameChar(at) || at == QLatin1Char(':')) return false; } |