Changeset 846 for trunk/src/xmlpatterns/schema

Timestamp:

May 5, 2011, 5:36:53 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/xmlpatterns/schema/qxsdparticlechecker.cpp (modified) (2 diffs)
• src/xmlpatterns/schema/qxsdparticlechecker_p.h (modified) (1 diff)
• src/xmlpatterns/schema/qxsdschemachecker_setup.cpp (modified) (1 diff)
• src/xmlpatterns/schema/qxsdschemaparser.cpp (modified) (5 diffs)
• src/xmlpatterns/schema/qxsdschemaparser_setup.cpp (modified) (2 diffs)
• src/xmlpatterns/schema/qxsdstatemachine_p.h (modified) (2 diffs)
• src/xmlpatterns/schema/qxsdtypechecker.cpp (modified) (1 diff)

trunk/src/xmlpatterns/schema/qxsdparticlechecker.cpp

@@ -345 +345 @@
 bool XsdParticleChecker::isUPAConform(const XsdParticle::Ptr &particle, const NamePool::Ptr &namePool)
 {
+
+
+
+
+
+
+
+
+
+
+
+
+
     /**
      * The algorithm is implemented like described in http://www.ltg.ed.ac.uk/~ht/XML_Europe_2003.html#S2.2
@@ -412 +425 @@
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     return true;
 }

trunk/src/xmlpatterns/schema/qxsdparticlechecker_p.h

@@ -86 +86 @@
 
             /**
+
+
+
+
+
+
+
              * Checks whether the given @p particle subsumes the given @p derivedParticle.
              * (http://www.w3.org/TR/xmlschema-1/#cos-particle-restrict)

trunk/src/xmlpatterns/schema/qxsdschemachecker_setup.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/xmlpatterns/schema/qxsdschemaparser.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -915 +915 @@
 
                 // 3) remove the base type resolving job from the resolver as
-                //    we have set the base type here explicitely
+                //    we have set the base type here explicitly
                 m_parserContext->resolver()->removeSimpleRestrictionBase(redefinedType);
 
@@ -964 +964 @@
 
                 // 3) remove the base type resolving job from the resolver as
-                //    we have set the base type here explicitely
+                //    we have set the base type here explicitly
                 m_parserContext->resolver()->removeComplexBaseType(redefinedType);
 
@@ -5782 +5782 @@
 SchemaType::DerivationConstraints XsdSchemaParser::readDerivationConstraintAttribute(const SchemaType::DerivationConstraints &allowedConstraints, const char *elementName)
 {
-    // first convert the flags into strings for easier comparision
+    // first convert the flags into strings for easier comparison
     QSet<QString> allowedContent;
     if (allowedConstraints & SchemaType::RestrictionConstraint)
@@ -5845 +5845 @@
 NamedSchemaComponent::BlockingConstraints XsdSchemaParser::readBlockingConstraintAttribute(const NamedSchemaComponent::BlockingConstraints &allowedConstraints, const char *elementName)
 {
-    // first convert the flags into strings for easier comparision
+    // first convert the flags into strings for easier comparison
     QSet<QString> allowedContent;
     if (allowedConstraints & NamedSchemaComponent::RestrictionConstraint)

trunk/src/xmlpatterns/schema/qxsdschemaparser_setup.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -54 +54 @@
  * XML parent tag occur in the right order.
  *
- * To validate the occurence of XML tags one need a regular expression that describes
+ * To validate the occurence of XML tags one need a regular expression that describes
  * which tags can appear how often in what context. For example the regular expression
  * of the global <em>attribute</em> tag in XML Schema is (annotation?, simpleType?).

trunk/src/xmlpatterns/schema/qxsdstatemachine_p.h

@@ -139 +139 @@
              * Continues execution of the machine with the given input @p transition.
              *
-             * @return @c true if the transition was successfull, @c false otherwise.
+             * @return @c true if the transition was successful, @c false otherwise.
              */
             bool proceed(TransitionType transition);
@@ -155 +155 @@
              *       to find the right transition to use.
              *
-             * @return @c true if the transition was successfull, @c false otherwise.
+             * @return @c true if the transition was successful, @c false otherwise.
              */
             template <typename InputType>

trunk/src/xmlpatterns/schema/qxsdtypechecker.cpp

@@ -172 +172 @@
 XsdTypeChecker::~XsdTypeChecker()
 {
+
 }