diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | examples/xmlpatterns/shared/xmlsyntaxhighlighter.h | 1 | ||||
| -rwxr-xr-x | src/xmlpatterns/qtokenautomaton/regenerate.sh | 6 | ||||
| -rw-r--r-- | src/xmlpatterns/type/qatomiccasterlocators_p.h | 684 | ||||
| -rw-r--r-- | src/xmlpatterns/type/qatomiccomparatorlocators.cpp | 10 | ||||
| -rw-r--r-- | src/xmlpatterns/type/qatomicmathematicianlocators.cpp | 15 | ||||
| -rw-r--r-- | tools/xmlpatterns/qapplicationargumentparser.cpp | 1 |
7 files changed, 363 insertions, 356 deletions
diff --git a/.qmake.conf b/.qmake.conf index 63235ed..74c762b 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.8.1 +MODULE_VERSION = 5.9.0 diff --git a/examples/xmlpatterns/shared/xmlsyntaxhighlighter.h b/examples/xmlpatterns/shared/xmlsyntaxhighlighter.h index 7da81be..7a104d5 100644 --- a/examples/xmlpatterns/shared/xmlsyntaxhighlighter.h +++ b/examples/xmlpatterns/shared/xmlsyntaxhighlighter.h @@ -41,6 +41,7 @@ #ifndef XMLSYNTAXHIGHLIGHTER_H #define XMLSYNTAXHIGHLIGHTER_H +#include <QtCore/QRegExp> #include <QtGui/QSyntaxHighlighter> class XmlSyntaxHighlighter : public QSyntaxHighlighter diff --git a/src/xmlpatterns/qtokenautomaton/regenerate.sh b/src/xmlpatterns/qtokenautomaton/regenerate.sh index 23b49b1..e095549 100755 --- a/src/xmlpatterns/qtokenautomaton/regenerate.sh +++ b/src/xmlpatterns/qtokenautomaton/regenerate.sh @@ -1,8 +1,8 @@ -#/bin/sh -x +#!/bin/sh -x ############################################################################# ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2017 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the build tools of the Qt Toolkit. @@ -33,6 +33,6 @@ ## ############################################################################# -cd $(dirname "$0")/.. +cd `dirname "$0"`/.. saxonb-xslt -ext:on -xsl:qtokenautomaton/qautomaton2cpp.xsl -s:schema/tokens.xml -o:schema/qxsdschematoken.cpp saxonb-xslt -ext:on -xsl:qtokenautomaton/qautomaton2cpp.xsl -s:parser/qxslttokenlookup.xml -o:parser/qxslttokenlookup.cpp diff --git a/src/xmlpatterns/type/qatomiccasterlocators_p.h b/src/xmlpatterns/type/qatomiccasterlocators_p.h index 3f29390..115641d 100644 --- a/src/xmlpatterns/type/qatomiccasterlocators_p.h +++ b/src/xmlpatterns/type/qatomiccasterlocators_p.h @@ -71,52 +71,52 @@ namespace QPatternist { public: using AtomicCasterLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const AnyURIType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const Base64BinaryType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const BooleanType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DateType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DecimalType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DoubleType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DurationType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const FloatType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GDayType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GMonthDayType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GMonthType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GYearMonthType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GYearType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const HexBinaryType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const IntegerType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const NOTATIONType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const QNameType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const SchemaTimeType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const AnyURIType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const Base64BinaryType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const BooleanType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DateType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DecimalType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DoubleType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DurationType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const FloatType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const GDayType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const GMonthDayType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const GMonthType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const GYearMonthType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const GYearType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const HexBinaryType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const IntegerType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const NOTATIONType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const QNameType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const SchemaTimeType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, + const SourceLocationReflection *const r) const override; }; /** @@ -126,52 +126,52 @@ namespace QPatternist { public: using AtomicCasterLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const AnyURIType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const Base64BinaryType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const BooleanType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DateType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DecimalType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DoubleType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DurationType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const FloatType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GDayType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GMonthDayType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GMonthType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GYearMonthType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GYearType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const HexBinaryType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const IntegerType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const NOTATIONType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const QNameType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const SchemaTimeType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const AnyURIType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const Base64BinaryType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const BooleanType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DateType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DecimalType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DoubleType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DurationType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const FloatType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const GDayType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const GMonthDayType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const GMonthType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const GYearMonthType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const GYearType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const HexBinaryType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const IntegerType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const NOTATIONType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const QNameType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const SchemaTimeType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, + const SourceLocationReflection *const r) const override; }; /** @@ -181,12 +181,12 @@ namespace QPatternist { public: using AtomicCasterLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const AnyURIType *, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const AnyURIType *, + const SourceLocationReflection *const r) const override; }; /** @@ -196,20 +196,20 @@ namespace QPatternist { public: using AtomicCasterLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const BooleanType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DecimalType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DoubleType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const FloatType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const IntegerType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const BooleanType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DecimalType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DoubleType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const FloatType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const IntegerType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const SourceLocationReflection *const r) const override; }; /** @@ -219,20 +219,20 @@ namespace QPatternist { public: using AtomicCasterLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const BooleanType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DoubleType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DecimalType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const FloatType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const IntegerType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const BooleanType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DoubleType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DecimalType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const FloatType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const IntegerType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const SourceLocationReflection *const r) const override; }; /** @@ -242,20 +242,20 @@ namespace QPatternist { public: using AtomicCasterLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const BooleanType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DecimalType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DoubleType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const FloatType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const IntegerType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const BooleanType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DecimalType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DoubleType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const FloatType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const IntegerType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const SourceLocationReflection *const r) const override; }; /** @@ -265,20 +265,20 @@ namespace QPatternist { public: using AtomicCasterLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const BooleanType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DecimalType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DoubleType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const FloatType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const IntegerType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const BooleanType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DecimalType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DoubleType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const FloatType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const IntegerType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const SourceLocationReflection *const r) const override; }; /** @@ -288,20 +288,20 @@ namespace QPatternist { public: using AtomicCasterLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const BooleanType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DecimalType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DoubleType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const FloatType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const IntegerType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const BooleanType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DecimalType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DoubleType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const FloatType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const IntegerType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const SourceLocationReflection *const r) const override; }; /** @@ -311,14 +311,14 @@ namespace QPatternist { public: using AtomicCasterLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const Base64BinaryType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const HexBinaryType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const Base64BinaryType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const HexBinaryType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const SourceLocationReflection *const r) const override; }; /** @@ -328,14 +328,14 @@ namespace QPatternist { public: using AtomicCasterLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const Base64BinaryType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const HexBinaryType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const Base64BinaryType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const HexBinaryType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const SourceLocationReflection *const r) const override; }; /** @@ -345,10 +345,10 @@ namespace QPatternist { public: using AtomicCasterLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const QNameType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const QNameType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const SourceLocationReflection *const r) const override; }; /** @@ -358,16 +358,16 @@ namespace QPatternist { public: using AtomicCasterLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DateType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GYearType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DateType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const GYearType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const SourceLocationReflection *const r) const override; }; /** @@ -377,16 +377,16 @@ namespace QPatternist { public: using AtomicCasterLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DateType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GDayType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DateType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const GDayType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const SourceLocationReflection *const r) const override; }; /** @@ -396,16 +396,16 @@ namespace QPatternist { public: using AtomicCasterLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DateType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GMonthType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DateType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const GMonthType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const SourceLocationReflection *const r) const override; }; /** @@ -415,16 +415,16 @@ namespace QPatternist { public: using AtomicCasterLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DateType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GYearMonthType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DateType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const GYearMonthType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const SourceLocationReflection *const r) const override; }; /** @@ -434,16 +434,16 @@ namespace QPatternist { public: using AtomicCasterLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DateType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const GMonthDayType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DateType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const GMonthDayType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const SourceLocationReflection *const r) const override; }; /** @@ -453,14 +453,14 @@ namespace QPatternist { public: using AtomicCasterLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DateType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DateType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const SourceLocationReflection *const r) const override; }; /** @@ -470,14 +470,14 @@ namespace QPatternist { public: using AtomicCasterLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DateType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DateType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const SourceLocationReflection *const r) const override; }; /** @@ -487,14 +487,14 @@ namespace QPatternist { public: using AtomicCasterLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const SchemaTimeType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const SchemaTimeType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const SourceLocationReflection *const r) const override; }; /** @@ -504,16 +504,16 @@ namespace QPatternist { public: using AtomicCasterLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DurationType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DurationType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, + const SourceLocationReflection *const r) const override; }; /** @@ -523,16 +523,16 @@ namespace QPatternist { public: using AtomicCasterLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DurationType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DurationType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, + const SourceLocationReflection *const r) const override; }; /** @@ -542,16 +542,16 @@ namespace QPatternist { public: using AtomicCasterLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const DurationType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const SourceLocationReflection *const r) const; - virtual AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, - const SourceLocationReflection *const r) const; + AtomicTypeVisitorResult::Ptr visit(const DayTimeDurationType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const DurationType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const SourceLocationReflection *const r) const override; + AtomicTypeVisitorResult::Ptr visit(const YearMonthDurationType *, + const SourceLocationReflection *const r) const override; }; /** @@ -563,36 +563,36 @@ namespace QPatternist public: using ToIntegerCasterLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const BooleanType *, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr visit(const BooleanType *, + const SourceLocationReflection *const r) const override { Q_UNUSED(r); return AtomicTypeVisitorResult::Ptr(new BooleanToDerivedIntegerCaster<type>()); } - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const SourceLocationReflection *const r) const override { Q_UNUSED(r); return AtomicTypeVisitorResult::Ptr(new StringToDerivedIntegerCaster<type>()); } - virtual AtomicTypeVisitorResult::Ptr visit(const AnyURIType *, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr visit(const AnyURIType *, + const SourceLocationReflection *const r) const override { Q_UNUSED(r); return AtomicTypeVisitorResult::Ptr(new StringToDerivedIntegerCaster<type>()); } - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const SourceLocationReflection *const r) const override { Q_UNUSED(r); return AtomicTypeVisitorResult::Ptr(new StringToDerivedIntegerCaster<type>()); } - virtual AtomicTypeVisitorResult::Ptr visit(const IntegerType *, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr visit(const IntegerType *, + const SourceLocationReflection *const r) const override { Q_UNUSED(r); return AtomicTypeVisitorResult::Ptr(new NumericToDerivedIntegerCaster<type>()); @@ -682,15 +682,15 @@ namespace QPatternist return AtomicTypeVisitorResult::Ptr(new NumericToDerivedIntegerCaster<type>()); } - virtual AtomicTypeVisitorResult::Ptr visit(const DoubleType *, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr visit(const DoubleType *, + const SourceLocationReflection *const r) const override { Q_UNUSED(r); return AtomicTypeVisitorResult::Ptr(new NumericToDerivedIntegerCaster<type>()); } - virtual AtomicTypeVisitorResult::Ptr visit(const FloatType *, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr visit(const FloatType *, + const SourceLocationReflection *const r) const override { Q_UNUSED(r); return AtomicTypeVisitorResult::Ptr(new NumericToDerivedIntegerCaster<type>()); @@ -706,29 +706,29 @@ namespace QPatternist public: using ToStringCasterLocator::visit; - virtual AtomicTypeVisitorResult::Ptr visit(const BooleanType *, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr visit(const BooleanType *, + const SourceLocationReflection *const r) const override { Q_UNUSED(r); return AtomicTypeVisitorResult::Ptr(new AnyToDerivedStringCaster<type>()); } - virtual AtomicTypeVisitorResult::Ptr visit(const StringType *, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr visit(const StringType *, + const SourceLocationReflection *const r) const override { Q_UNUSED(r); return AtomicTypeVisitorResult::Ptr(new AnyToDerivedStringCaster<type>()); } - virtual AtomicTypeVisitorResult::Ptr visit(const AnyURIType *, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr visit(const AnyURIType *, + const SourceLocationReflection *const r) const override { Q_UNUSED(r); return AtomicTypeVisitorResult::Ptr(new AnyToDerivedStringCaster<type>()); } - virtual AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr visit(const UntypedAtomicType *, + const SourceLocationReflection *const r) const override { Q_UNUSED(r); return AtomicTypeVisitorResult::Ptr(new AnyToDerivedStringCaster<type>()); @@ -798,99 +798,99 @@ namespace QPatternist return AtomicTypeVisitorResult::Ptr(new AnyToDerivedStringCaster<type>()); } - virtual AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr visit(const DateTimeType *, + const SourceLocationReflection *const r) const override { Q_UNUSED(r); return AtomicTypeVisitorResult::Ptr(new AnyToDerivedStringCaster<type>()); } - virtual AtomicTypeVisitorResult::Ptr visit(const DateType *, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr visit(const DateType *, + const SourceLocationReflection *const r) const override { Q_UNUSED(r); return AtomicTypeVisitorResult::Ptr(new AnyToDerivedStringCaster<type>()); } - virtual AtomicTypeVisitorResult::Ptr visit(const SchemaTimeType *, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr visit(const SchemaTimeType *, + const SourceLocationReflection *const r) const override { Q_UNUSED(r); return AtomicTypeVisitorResult::Ptr(new AnyToDerivedStringCaster<type>()); } - virtual AtomicTypeVisitorResult::Ptr visit(const FloatType *, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr visit(const FloatType *, + const SourceLocationReflection *const r) const override { Q_UNUSED(r); return AtomicTypeVisitorResult::Ptr(new AnyToDerivedStringCaster<type>()); } - virtual AtomicTypeVisitorResult::Ptr visit(const DoubleType *, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr visit(const DoubleType *, + const SourceLocationReflection *const r) const override { Q_UNUSED(r); return AtomicTypeVisitorResult::Ptr(new AnyToDerivedStringCaster<type>()); } - virtual AtomicTypeVisitorResult::Ptr visit(const DecimalType *, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr visit(const DecimalType *, + const SourceLocationReflection *const r) const override { Q_UNUSED(r); return AtomicTypeVisitorResult::Ptr(new AnyToDerivedStringCaster<type>()); } - virtual AtomicTypeVisitorResult::Ptr visit(const IntegerType *, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr visit(const IntegerType *, + const SourceLocationReflection *const r) const override { Q_UNUSED(r); return AtomicTypeVisitorResult::Ptr(new AnyToDerivedStringCaster<type>()); } - virtual AtomicTypeVisitorResult::Ptr visit(const DurationType *, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr visit(const DurationType *, + const SourceLocationReflection *const r) const override { Q_UNUSED(r); return AtomicTypeVisitorResult::Ptr(new AnyToDerivedStringCaster<type>()); } - virtual AtomicTypeVisitorResult::Ptr visit(const GYearMonthType *, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr visit(const GYearMonthType *, + const SourceLocationReflection *const r) const override { Q_UNUSED(r); return AtomicTypeVisitorResult::Ptr(new AnyToDerivedStringCaster<type>()); } - virtual AtomicTypeVisitorResult::Ptr visit(const GYearType *, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr visit(const GYearType *, + const SourceLocationReflection *const r) const override { Q_UNUSED(r); return AtomicTypeVisitorResult::Ptr(new AnyToDerivedStringCaster<type>()); } - virtual AtomicTypeVisitorResult::Ptr visit(const GMonthDayType *, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr visit(const GMonthDayType *, + const SourceLocationReflection *const r) const override { Q_UNUSED(r); return AtomicTypeVisitorResult::Ptr(new AnyToDerivedStringCaster<type>()); } - virtual AtomicTypeVisitorResult::Ptr visit(const GDayType *, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr visit(const GDayType *, + const SourceLocationReflection *const r) const override { Q_UNUSED(r); return AtomicTypeVisitorResult::Ptr(new AnyToDerivedStringCaster<type>()); } - virtual AtomicTypeVisitorResult::Ptr visit(const GMonthType *, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr visit(const GMonthType *, + const SourceLocationReflection *const r) const override { Q_UNUSED(r); return AtomicTypeVisitorResult::Ptr(new AnyToDerivedStringCaster<type>()); } - virtual AtomicTypeVisitorResult::Ptr visit(const QNameType *, - const SourceLocationReflection *const r) const + AtomicTypeVisitorResult::Ptr visit(const QNameType *, + const SourceLocationReflection *const r) const override { Q_UNUSED(r); return AtomicTypeVisitorResult::Ptr(new AnyToDerivedStringCaster<type>()); diff --git a/src/xmlpatterns/type/qatomiccomparatorlocators.cpp b/src/xmlpatterns/type/qatomiccomparatorlocators.cpp index 870fc8a..c09652a 100644 --- a/src/xmlpatterns/type/qatomiccomparatorlocators.cpp +++ b/src/xmlpatterns/type/qatomiccomparatorlocators.cpp @@ -54,11 +54,12 @@ static const AtomicComparator::Operators AllCompOperators(AtomicComparator::Oper #define addVisitor(owner, type, comp, validOps) \ AtomicTypeVisitorResult::Ptr \ owner##ComparatorLocator::visit(const type *, \ - const qint16 op, \ + const qint16 opIn, \ const SourceLocationReflection *const) const \ { \ /* Note the extra paranteses around validOps. */ \ - if(((validOps) & AtomicComparator::Operator(op)) == op) \ + const AtomicComparator::Operator op = AtomicComparator::Operator(opIn); \ + if (((validOps) & op) == op) \ return AtomicTypeVisitorResult::Ptr(new comp()); \ else \ return AtomicTypeVisitorResult::Ptr(); \ @@ -67,12 +68,13 @@ owner##ComparatorLocator::visit(const type *, #define visitorForDouble(owner, type) \ AtomicTypeVisitorResult::Ptr \ owner##ComparatorLocator::visit(const type *, \ - const qint16 op, \ + const qint16 opIn, \ const SourceLocationReflection *const) const \ { \ + const AtomicComparator::Operator op = AtomicComparator::Operator(opIn); \ if(((AtomicComparator::OperatorNotEqual | \ AtomicComparator::OperatorGreaterOrEqual | \ - AtomicComparator::OperatorLessOrEqual) & AtomicComparator::Operator(op)) == op) \ + AtomicComparator::OperatorLessOrEqual) & op) == op) \ return AtomicTypeVisitorResult::Ptr(new AbstractFloatComparator()); \ else if(op == AtomicComparator::OperatorLessThanNaNLeast) \ return AtomicTypeVisitorResult::Ptr(new AbstractFloatSortComparator<AtomicComparator::OperatorLessThanNaNLeast>()); \ diff --git a/src/xmlpatterns/type/qatomicmathematicianlocators.cpp b/src/xmlpatterns/type/qatomicmathematicianlocators.cpp index 59446f9..9177b33 100644 --- a/src/xmlpatterns/type/qatomicmathematicianlocators.cpp +++ b/src/xmlpatterns/type/qatomicmathematicianlocators.cpp @@ -47,12 +47,13 @@ using namespace QPatternist; #define implMathVisit(ownerClass, visitor, mather, validOps) \ AtomicTypeVisitorResult::Ptr \ -ownerClass##MathematicianLocator::visit(const visitor *, const qint16 op, \ +ownerClass##MathematicianLocator::visit(const visitor *, const qint16 opIn, \ const SourceLocationReflection *const r) const \ { \ Q_UNUSED(r) \ /* Note the extra paranteses around validOps. */ \ - if(((validOps) & AtomicMathematician::Operator(op)) == op) \ + const AtomicComparator::Operator op = AtomicComparator::Operator(opIn); \ + if (((validOps) & op) == op) \ return AtomicTypeVisitorResult::Ptr(new mather()); \ else \ return AtomicTypeVisitorResult::Ptr(); \ @@ -60,11 +61,12 @@ ownerClass##MathematicianLocator::visit(const visitor *, const qint16 op, #define implReportingMathVisit(ownerClass, visitor, mather, validOps) \ AtomicTypeVisitorResult::Ptr \ -ownerClass##MathematicianLocator::visit(const visitor *, const qint16 op, \ +ownerClass##MathematicianLocator::visit(const visitor *, const qint16 opIn, \ const SourceLocationReflection *const r) const \ { \ + const AtomicComparator::Operator op = AtomicComparator::Operator(opIn); \ /* Note the extra paranteses around validOps. */ \ - if(((validOps) & AtomicMathematician::Operator(op)) == op) \ + if (((validOps) & op) == op) \ return AtomicTypeVisitorResult::Ptr(new mather(r)); \ else \ return AtomicTypeVisitorResult::Ptr(); \ @@ -72,11 +74,12 @@ ownerClass##MathematicianLocator::visit(const visitor *, const qint16 op, #define implRevReportingMathVisit(ownerClass, visitor, mather, validOps) \ AtomicTypeVisitorResult::Ptr \ -ownerClass##MathematicianLocator::visit(const visitor *, const qint16 op, \ +ownerClass##MathematicianLocator::visit(const visitor *, const qint16 opIn, \ const SourceLocationReflection *const r) const \ { \ + const AtomicComparator::Operator op = AtomicComparator::Operator(opIn); \ /* Note the extra paranteses around validOps. */ \ - if(((validOps) & AtomicMathematician::Operator(op)) == op) \ + if (((validOps) & op) == op) \ return AtomicTypeVisitorResult::Ptr(new OperandSwitcherMathematician( \ AtomicMathematician::Ptr(new mather(r)))); \ else \ diff --git a/tools/xmlpatterns/qapplicationargumentparser.cpp b/tools/xmlpatterns/qapplicationargumentparser.cpp index 6d4594b..f441b93 100644 --- a/tools/xmlpatterns/qapplicationargumentparser.cpp +++ b/tools/xmlpatterns/qapplicationargumentparser.cpp @@ -34,6 +34,7 @@ #include <QStringList> #include <QTextStream> #include <QUrl> +#include <QRegExp> #include "qapplicationargument_p.h" |