diff options
Diffstat (limited to 'src/xmlpatterns/expr')
-rw-r--r-- | src/xmlpatterns/expr/qgeneralcomparison.cpp | 5 | ||||
-rw-r--r-- | src/xmlpatterns/expr/qgeneralcomparison_p.h | 5 | ||||
-rw-r--r-- | src/xmlpatterns/expr/qnamespaceconstructor.cpp | 5 | ||||
-rw-r--r-- | src/xmlpatterns/expr/qnamespaceconstructor_p.h | 3 | ||||
-rw-r--r-- | src/xmlpatterns/expr/qorderby_p.h | 2 | ||||
-rw-r--r-- | src/xmlpatterns/expr/qpath.cpp | 5 | ||||
-rw-r--r-- | src/xmlpatterns/expr/qpath_p.h | 3 | ||||
-rw-r--r-- | src/xmlpatterns/expr/qsinglecontainer.cpp | 5 | ||||
-rw-r--r-- | src/xmlpatterns/expr/qsinglecontainer_p.h | 4 | ||||
-rw-r--r-- | src/xmlpatterns/expr/qtemplate.cpp | 5 | ||||
-rw-r--r-- | src/xmlpatterns/expr/qtemplate_p.h | 4 | ||||
-rw-r--r-- | src/xmlpatterns/expr/qvaluecomparison.cpp | 5 | ||||
-rw-r--r-- | src/xmlpatterns/expr/qvaluecomparison_p.h | 5 | ||||
-rw-r--r-- | src/xmlpatterns/expr/qvariablereference.cpp | 5 | ||||
-rw-r--r-- | src/xmlpatterns/expr/qvariablereference_p.h | 3 |
15 files changed, 54 insertions, 10 deletions
diff --git a/src/xmlpatterns/expr/qgeneralcomparison.cpp b/src/xmlpatterns/expr/qgeneralcomparison.cpp index e8ef401..78aaabb 100644 --- a/src/xmlpatterns/expr/qgeneralcomparison.cpp +++ b/src/xmlpatterns/expr/qgeneralcomparison.cpp @@ -62,6 +62,11 @@ GeneralComparison::GeneralComparison(const Expression::Ptr &op1, { } +/*! \internal */ +GeneralComparison::~GeneralComparison() +{ +} + bool GeneralComparison::generalCompare(const Item &op1, const Item &op2, const DynamicContext::Ptr &context) const diff --git a/src/xmlpatterns/expr/qgeneralcomparison_p.h b/src/xmlpatterns/expr/qgeneralcomparison_p.h index 1923135..b3fffca 100644 --- a/src/xmlpatterns/expr/qgeneralcomparison_p.h +++ b/src/xmlpatterns/expr/qgeneralcomparison_p.h @@ -70,8 +70,8 @@ namespace QPatternist * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ - class GeneralComparison : public PairContainer, - public ComparisonPlatform<GeneralComparison, + class Q_AUTOTEST_EXPORT GeneralComparison + : public PairContainer, public ComparisonPlatform<GeneralComparison, true /* We want to report errors. */, AtomicComparator::AsGeneralComparison> { @@ -80,6 +80,7 @@ namespace QPatternist const AtomicComparator::Operator op, const Expression::Ptr &op2, const bool isBackwardsCompat = false); + ~GeneralComparison(); virtual bool evaluateEBV(const DynamicContext::Ptr &) const; virtual Expression::Ptr typeCheck(const StaticContext::Ptr &context, diff --git a/src/xmlpatterns/expr/qnamespaceconstructor.cpp b/src/xmlpatterns/expr/qnamespaceconstructor.cpp index d5c9c4c..51bc615 100644 --- a/src/xmlpatterns/expr/qnamespaceconstructor.cpp +++ b/src/xmlpatterns/expr/qnamespaceconstructor.cpp @@ -50,6 +50,11 @@ NamespaceConstructor::NamespaceConstructor(const QXmlName nb) : m_binding(nb) Q_ASSERT(!m_binding.isNull()); } +/*! \internal */ +NamespaceConstructor::~NamespaceConstructor() +{ +} + void NamespaceConstructor::evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const { context->outputReceiver()->namespaceBinding(m_binding); diff --git a/src/xmlpatterns/expr/qnamespaceconstructor_p.h b/src/xmlpatterns/expr/qnamespaceconstructor_p.h index df2cb9d..78aceaf 100644 --- a/src/xmlpatterns/expr/qnamespaceconstructor_p.h +++ b/src/xmlpatterns/expr/qnamespaceconstructor_p.h @@ -63,10 +63,11 @@ namespace QPatternist * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ - class NamespaceConstructor : public EmptyContainer + class Q_AUTOTEST_EXPORT NamespaceConstructor : public EmptyContainer { public: NamespaceConstructor(const QXmlName nb); + ~NamespaceConstructor(); virtual void evaluateToSequenceReceiver(const DynamicContext::Ptr &context) const; diff --git a/src/xmlpatterns/expr/qorderby_p.h b/src/xmlpatterns/expr/qorderby_p.h index 5ae39ee..dcc567b 100644 --- a/src/xmlpatterns/expr/qorderby_p.h +++ b/src/xmlpatterns/expr/qorderby_p.h @@ -103,6 +103,8 @@ namespace QPatternist * @short Default constructor, which is needed by QVector. */ inline OrderSpec() + : direction(Ascending), + orderingEmptySequence(StaticContext::Greatest) { } diff --git a/src/xmlpatterns/expr/qpath.cpp b/src/xmlpatterns/expr/qpath.cpp index 5dde3e7..862a790 100644 --- a/src/xmlpatterns/expr/qpath.cpp +++ b/src/xmlpatterns/expr/qpath.cpp @@ -61,6 +61,11 @@ Path::Path(const Expression::Ptr &operand1, { } +/*! \internal */ +Path::~Path() +{ +} + Item::Iterator::Ptr Path::mapToSequence(const Item &item, const DynamicContext::Ptr &context) const { diff --git a/src/xmlpatterns/expr/qpath_p.h b/src/xmlpatterns/expr/qpath_p.h index d11380f..f3e3b59 100644 --- a/src/xmlpatterns/expr/qpath_p.h +++ b/src/xmlpatterns/expr/qpath_p.h @@ -65,7 +65,7 @@ namespace QPatternist * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ - class Path : public PairContainer + class Q_AUTOTEST_EXPORT Path : public PairContainer { public: enum Kind @@ -94,6 +94,7 @@ namespace QPatternist Path(const Expression::Ptr &operand1, const Expression::Ptr &operand2, const Kind kind = RegularPath); + ~Path(); virtual Item::Iterator::Ptr evaluateSequence(const DynamicContext::Ptr &context) const; virtual Item evaluateSingleton(const DynamicContext::Ptr &context) const; diff --git a/src/xmlpatterns/expr/qsinglecontainer.cpp b/src/xmlpatterns/expr/qsinglecontainer.cpp index 369f564..186d920 100644 --- a/src/xmlpatterns/expr/qsinglecontainer.cpp +++ b/src/xmlpatterns/expr/qsinglecontainer.cpp @@ -51,6 +51,11 @@ SingleContainer::SingleContainer(const Expression::Ptr &operand) : m_operand(ope Q_ASSERT(operand); } +/*! \internal */ +SingleContainer::~SingleContainer() +{ +} + Expression::List SingleContainer::operands() const { Expression::List list; diff --git a/src/xmlpatterns/expr/qsinglecontainer_p.h b/src/xmlpatterns/expr/qsinglecontainer_p.h index 2becfd1..6d016be 100644 --- a/src/xmlpatterns/expr/qsinglecontainer_p.h +++ b/src/xmlpatterns/expr/qsinglecontainer_p.h @@ -62,9 +62,11 @@ namespace QPatternist * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ - class SingleContainer : public Expression + class Q_AUTOTEST_EXPORT SingleContainer : public Expression { public: + ~SingleContainer(); + virtual Expression::List operands() const; virtual void setOperands(const Expression::List &operands); diff --git a/src/xmlpatterns/expr/qtemplate.cpp b/src/xmlpatterns/expr/qtemplate.cpp index aa76fbc..41095ff 100644 --- a/src/xmlpatterns/expr/qtemplate.cpp +++ b/src/xmlpatterns/expr/qtemplate.cpp @@ -46,6 +46,11 @@ QT_BEGIN_NAMESPACE using namespace QPatternist; +/*! \internal */ +Template::~Template() +{ +} + const SourceLocationReflection* Template::actualReflection() const { return this; diff --git a/src/xmlpatterns/expr/qtemplate_p.h b/src/xmlpatterns/expr/qtemplate_p.h index 411444d..5ec3ad4 100644 --- a/src/xmlpatterns/expr/qtemplate_p.h +++ b/src/xmlpatterns/expr/qtemplate_p.h @@ -78,8 +78,7 @@ namespace QPatternist * @ingroup Patternist_expressions * @since 4.5 */ - class Template : public QSharedData - , public SourceLocationReflection + class Q_AUTOTEST_EXPORT Template : public QSharedData, public SourceLocationReflection { public: @@ -91,6 +90,7 @@ namespace QPatternist , m_reqType(reqType) { } + ~Template(); Expression::Ptr body; diff --git a/src/xmlpatterns/expr/qvaluecomparison.cpp b/src/xmlpatterns/expr/qvaluecomparison.cpp index eac8160..5ab1a3a 100644 --- a/src/xmlpatterns/expr/qvaluecomparison.cpp +++ b/src/xmlpatterns/expr/qvaluecomparison.cpp @@ -57,6 +57,11 @@ ValueComparison::ValueComparison(const Expression::Ptr &op1, { } +/*! \internal */ +ValueComparison::~ValueComparison() +{ +} + Item ValueComparison::evaluateSingleton(const DynamicContext::Ptr &context) const { const Item it1(m_operand1->evaluateSingleton(context)); diff --git a/src/xmlpatterns/expr/qvaluecomparison_p.h b/src/xmlpatterns/expr/qvaluecomparison_p.h index 33cd658..9566dfb 100644 --- a/src/xmlpatterns/expr/qvaluecomparison_p.h +++ b/src/xmlpatterns/expr/qvaluecomparison_p.h @@ -70,13 +70,14 @@ namespace QPatternist * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ - class ValueComparison : public PairContainer, - public ComparisonPlatform<ValueComparison, true> + class Q_AUTOTEST_EXPORT ValueComparison + : public PairContainer, public ComparisonPlatform<ValueComparison, true> { public: ValueComparison(const Expression::Ptr &op1, const AtomicComparator::Operator op, const Expression::Ptr &op2); + ~ValueComparison(); virtual Item evaluateSingleton(const DynamicContext::Ptr &) const; diff --git a/src/xmlpatterns/expr/qvariablereference.cpp b/src/xmlpatterns/expr/qvariablereference.cpp index 768b1fd..5fb867d 100644 --- a/src/xmlpatterns/expr/qvariablereference.cpp +++ b/src/xmlpatterns/expr/qvariablereference.cpp @@ -48,6 +48,11 @@ VariableReference::VariableReference(const VariableSlotID slotP) : m_varSlot(slo Q_ASSERT(m_varSlot > -1); } +/*! \internal */ +VariableReference::~VariableReference() +{ +} + Expression::Properties VariableReference::properties() const { return DisableElimination; diff --git a/src/xmlpatterns/expr/qvariablereference_p.h b/src/xmlpatterns/expr/qvariablereference_p.h index ed43617..807b55b 100644 --- a/src/xmlpatterns/expr/qvariablereference_p.h +++ b/src/xmlpatterns/expr/qvariablereference_p.h @@ -64,7 +64,7 @@ namespace QPatternist * @author Frans Englich <frans.englich@nokia.com> * @ingroup Patternist_expressions */ - class VariableReference : public EmptyContainer + class Q_AUTOTEST_EXPORT VariableReference : public EmptyContainer { public: typedef QExplicitlySharedDataPointer<VariableReference> Ptr; @@ -76,6 +76,7 @@ namespace QPatternist * @param slot must be a valid slot. That is, zero or larger. */ VariableReference(const VariableSlotID slot); + ~VariableReference(); /** * @returns the slot that this reference communicates through. |