diff options
Diffstat (limited to 'src/xmlpatterns/data')
| -rw-r--r-- | src/xmlpatterns/data/qcommonvalues.cpp | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/data/qcommonvalues_p.h | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/data/qitem_p.h | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/xmlpatterns/data/qcommonvalues.cpp b/src/xmlpatterns/data/qcommonvalues.cpp index 4239895..2aa27f1 100644 --- a/src/xmlpatterns/data/qcommonvalues.cpp +++ b/src/xmlpatterns/data/qcommonvalues.cpp @@ -114,7 +114,7 @@ const AtomicValue::Ptr CommonValues::InfFloat const DayTimeDuration::Ptr CommonValues::DayTimeDurationZero (DayTimeDuration::fromSeconds(0)); -const DayTimeDuration::Ptr CommonValues::YearMonthDurationZero +const YearMonthDuration::Ptr CommonValues::YearMonthDurationZero (YearMonthDuration::fromComponents(true, 0, 0)); diff --git a/src/xmlpatterns/data/qcommonvalues_p.h b/src/xmlpatterns/data/qcommonvalues_p.h index a91b644..78acded 100644 --- a/src/xmlpatterns/data/qcommonvalues_p.h +++ b/src/xmlpatterns/data/qcommonvalues_p.h @@ -204,7 +204,7 @@ namespace QPatternist /** * The @c xs:yearMonthDuration value P0M */ - static const DayTimeDuration::Ptr YearMonthDurationZero; + static const YearMonthDuration::Ptr YearMonthDurationZero; private: /** diff --git a/src/xmlpatterns/data/qitem_p.h b/src/xmlpatterns/data/qitem_p.h index 1654bd9..a395b5e 100644 --- a/src/xmlpatterns/data/qitem_p.h +++ b/src/xmlpatterns/data/qitem_p.h @@ -111,8 +111,7 @@ namespace QPatternist * @ingroup Patternist_xdm * @author Frans Englich <frans.englich@nokia.com> */ - class AtomicValue : public QSharedData - , public CppCastingHelper<AtomicValue> + class Q_AUTOTEST_EXPORT AtomicValue : public QSharedData, public CppCastingHelper<AtomicValue> { public: virtual ~AtomicValue(); @@ -212,7 +211,7 @@ namespace QPatternist inline Item(const Item &other) : node(other.node) { - Q_ASSERT_X(sizeof(QXmlNodeModelIndex) >= sizeof(AtomicValue), Q_FUNC_INFO, + Q_STATIC_ASSERT_X(sizeof(QXmlNodeModelIndex) >= sizeof(AtomicValue), "Since we're only copying the node member, it must be the largest."); if(isAtomicValue()) atomicValue->ref.ref(); |