Changeset 769 for trunk/src/xmlpatterns

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• src/xmlpatterns/api/qxmlresultitems.cpp (modified) (1 diff)
• src/xmlpatterns/data/qatomicvalue.cpp (modified) (1 diff)
• src/xmlpatterns/data/qdecimal_p.h (modified) (1 diff)
• src/xmlpatterns/schema/qxsdschemaparser.cpp (modified) (8 diffs)
• src/xmlpatterns/schema/qxsdschemaparser_p.h (modified) (2 diffs)
• src/xmlpatterns/schema/qxsdschemaresolver.cpp (modified) (1 diff)
• src/xmlpatterns/xmlpatterns.pro (modified) (1 diff)

trunk/src/xmlpatterns/api/qxmlresultitems.cpp

@@ -70 +70 @@
   sequence and returns it, and current() always returns the QXmlItem
   that next() returned the last time it was called.
+
+
+
+
 
   \sa QXmlItem::isNode(), QXmlItem::isAtomicValue(), QXmlNodeModelIndex

trunk/src/xmlpatterns/data/qatomicvalue.cpp

@@ -227 +227 @@
         case QVariant::Time:
             return BuiltinTypes::xsDateTime;
+
+
         case QVariant::Double:
             return BuiltinTypes::xsDouble;

trunk/src/xmlpatterns/data/qdecimal_p.h

@@ -62 +62 @@
  * Defined in QtCore's qlocale.cpp.
  */
-extern char *qdtoa(double d, int mode, int ndigits, int *decpt, int *sign, char **rve, char **resultp);
+extern char *qdtoa(double d, int mode, int ndigits, int *decpt, int *sign, char **rve, char **resultp);
 
 namespace QPatternist

trunk/src/xmlpatterns/schema/qxsdschemaparser.cpp

@@ -265 +265 @@
 }
 
+
+
+
+
+
 void XsdSchemaParser::setIncludedSchemas(const NamespaceSet &schemas)
 {
@@ -270 +275 @@
 }
 
+
+
+
+
+
 void XsdSchemaParser::setImportedSchemas(const NamespaceSet &schemas)
 {
     m_importedSchemas = schemas;
+
+
+
+
+
 }
 
@@ -298 +313 @@
     m_includedSchemas.insert(uri);
     m_importedSchemas.insert(uri);
+
 }
 
@@ -595 +611 @@
             parser.setImportedSchemas(m_importedSchemas);
             parser.setRedefinedSchemas(m_redefinedSchemas);
-            if (!parser.parse(XsdSchemaParser::IncludeParser))
+            if (!parser.parse(XsdSchemaParser::IncludeParser))
                 return;
+
+
+
+
+
+
         }
     }
@@ -685 +707 @@
                 parser.setImportedSchemas(m_importedSchemas);
                 parser.setRedefinedSchemas(m_redefinedSchemas);
-                if (!parser.parse(XsdSchemaParser::ImportParser))
+                if (!parser.parse(XsdSchemaParser::ImportParser))
                     return;
+
+
+
+
+
+
             }
         }
@@ -703 +731 @@
                     parser.setImportedSchemas(m_importedSchemas);
                     parser.setRedefinedSchemas(m_redefinedSchemas);
-                    if (!parser.parse(XsdSchemaParser::ImportParser))
+                    if (!parser.parse(XsdSchemaParser::ImportParser))
                         return;
+
+
+
+
+
+
                 }
             }
@@ -840 +874 @@
             parser.setImportedSchemas(m_importedSchemas);
             parser.setRedefinedSchemas(m_redefinedSchemas);
-            if (!parser.parse(XsdSchemaParser::RedefineParser))
+            if (!parser.parse(XsdSchemaParser::RedefineParser))
                 return;
+
+
+
+
+
+
 
             delete reply;
@@ -4833 +4873 @@
             if (isSchemaTag(XsdSchemaToken::Annotation, token, namespaceToken)) {
                 const XsdAnnotation::Ptr annotation = parseAnnotation();
-                element->addAnnotation(annotation);
+                ->addAnnotation(annotation);
             } else if (isSchemaTag(XsdSchemaToken::SimpleType, token, namespaceToken)) {
                 if (hasRefAttribute) {

trunk/src/xmlpatterns/schema/qxsdschemaparser_p.h

@@ -121 +121 @@
 
             /**
+
+
+
+
+
+
              * Sets which @p schemas have been included already, so the parser
-             * can detect circular includes.
+             * can detect .
              */
             void setIncludedSchemas(const NamespaceSet &schemas);
+
+
+
+
+
+
 
             /**
@@ -133 +145 @@
 
             /**
+
+
+
+
+
+
              * Sets which @p schemas have been redefined already, so the parser
-             * can detect circular redefines.
+             * can detect .
              */
             void setRedefinedSchemas(const NamespaceSet &schemas);

trunk/src/xmlpatterns/schema/qxsdschemaresolver.cpp

@@ -633 +633 @@
                     // 1.2
                     const XsdSimpleType::Ptr anonType(new XsdSimpleType());
-                    anonType->setCategory(complexBaseType->contentType()->simpleType()->category());
+                    XsdSimpleType::TypeCategory baseCategory = complexBaseType->contentType()->simpleType()->category();
+                    anonType->setCategory(baseCategory);
+
+                    if (baseCategory == XsdSimpleType::SimpleTypeList) {
+                        const XsdSimpleType::Ptr baseSimpleType = complexBaseType->contentType()->simpleType();
+                        anonType->setItemType(baseSimpleType->itemType());
+                    }
+
                     anonType->setDerivationMethod(XsdSimpleType::DerivationRestriction);
                     anonType->setWxsSuperType(complexBaseType->contentType()->simpleType());

trunk/src/xmlpatterns/xmlpatterns.pro

@@ -26 +26 @@
 include($$PWD/utils/utils.pri)
 include($$PWD/qobjectmodel/qobjectmodel.pri, "", true)
-wince*:# The Microsoft MIPS compiler crashes if /Og is specified
-:
 
-# -O2/1 expands to /Og plus additional arguments.
-contains(DEFINES, MIPS): { 
-    QMAKE_CXXFLAGS_RELEASE ~= s/-O2/-Oi -Ot -Oy -Ob2/
-    QMAKE_CXXFLAGS_RELEASE ~= s/-O1/-Os -Oy -Ob2/
+wince* {
+    # The Microsoft MIPS compiler crashes if /Og is specified.
+    # -O2/1 expands to /Og plus additional arguments.
+    contains(DEFINES, MIPS) {
+        QMAKE_CXXFLAGS_RELEASE ~= s/-O2/-Oi -Ot -Oy -Ob2/
+        QMAKE_CXXFLAGS_RELEASE ~= s/-O1/-Os -Oy -Ob2/
+    }
 }
+
 symbian:TARGET.UID3 = 0x2001E62B
-HEADERS +=