diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-12 09:38:34 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-12 09:38:34 +0200 |
| commit | 3a44e86cdceba7acc6b830274968b0dfa482f5a8 (patch) | |
| tree | a79d85a9f3af64c874b87329a9045a41999f6f29 /src/xmlpatterns/data/qatomicvalue.cpp | |
| parent | befda75eb0adc1a4b39e7f8e0c78d667160a6c41 (diff) | |
| parent | f799a226b1025bf7158bc00dff35ee060f57a137 (diff) | |
| download | qtxmlpatterns-3a44e86cdceba7acc6b830274968b0dfa482f5a8.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta2
Change-Id: Iad56858cfdc688957e7a8426f908ab0a641a3312
Diffstat (limited to 'src/xmlpatterns/data/qatomicvalue.cpp')
| -rw-r--r-- | src/xmlpatterns/data/qatomicvalue.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/xmlpatterns/data/qatomicvalue.cpp b/src/xmlpatterns/data/qatomicvalue.cpp index 8e41827..0c813a8 100644 --- a/src/xmlpatterns/data/qatomicvalue.cpp +++ b/src/xmlpatterns/data/qatomicvalue.cpp @@ -135,7 +135,8 @@ Item AtomicValue::toXDM(const QVariant &value) switch(value.userType()) { case QVariant::Char: - /* Fallthrough. A single codepoint is a string in XQuery. */ + /* A single codepoint is a string in XQuery. */ + Q_FALLTHROUGH(); case QVariant::String: return AtomicString::fromValue(value.toString()); case QVariant::Url: @@ -149,9 +150,7 @@ Item AtomicValue::toXDM(const QVariant &value) case QVariant::ByteArray: return HexBinary::fromValue(value.toByteArray()); case QVariant::Int: - /* Fallthrough. */ case QVariant::LongLong: - /* Fallthrough. */ case QVariant::UInt: return Integer::fromValue(value.toLongLong()); case QVariant::ULongLong: @@ -203,9 +202,7 @@ ItemType::Ptr AtomicValue::qtToXDMType(const QXmlItem &item) switch(int(v.type())) { case QVariant::Char: - /* Fallthrough. */ case QVariant::String: - /* Fallthrough. */ case QVariant::Url: return BuiltinTypes::xsString; case QVariant::Bool: @@ -213,7 +210,6 @@ ItemType::Ptr AtomicValue::qtToXDMType(const QXmlItem &item) case QVariant::ByteArray: return BuiltinTypes::xsBase64Binary; case QVariant::Int: - /* Fallthrough. */ case QVariant::LongLong: return BuiltinTypes::xsInteger; case QVariant::ULongLong: @@ -221,7 +217,6 @@ ItemType::Ptr AtomicValue::qtToXDMType(const QXmlItem &item) case QVariant::Date: return BuiltinTypes::xsDate; case QVariant::DateTime: - /* Fallthrough. */ case QVariant::Time: return BuiltinTypes::xsDateTime; case QMetaType::Float: |