Changeset 561 for trunk/src/xmlpatterns/expr/qcastingplatform.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/xmlpatterns/expr/qcastingplatform.cpp (modified) (9 diffs)

trunk/src/xmlpatterns/expr/qcastingplatform.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtXmlPatterns module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -84 +84 @@
     {
         bool castImpossible = false;
-        const AtomicCaster::Ptr caster(locateCaster(sourceValue.type(), context, castImpossible));
+        const AtomicCaster::Ptr caster(locateCaster(sourceValue.type(), context, castImpossible));
 
         if(!issueError && castImpossible)
@@ -113 +113 @@
 
     bool castImpossible = false;
-    m_caster = locateCaster(sourceType, context, castImpossible);
+    m_caster = locateCaster(sourceType, context, castImpossible);
 
     return !castImpossible;
@@ -121 +121 @@
 AtomicCaster::Ptr CastingPlatform<TSubClass, issueError>::locateCaster(const ItemType::Ptr &sourceType,
                                                                        const ReportContext::Ptr &context,
-                                                                       bool &castImpossible) const
+                                                                       bool &castImpossible,
+                                                                       const SourceLocationReflection *const location,
+                                                                       const ItemType::Ptr &targetType)
 {
     Q_ASSERT(sourceType);
-    Q_ASSERT(targetType());
+    Q_ASSERT(targetType);
 
     const AtomicCasterLocator::Ptr locator(static_cast<AtomicType *>(
-            targetType().data())->casterLocator());
+            targetType.data())->casterLocator());
     if(!locator)
     {
@@ -133 +135 @@
         {
             context->error(QtXmlPatterns::tr("No casting is possible with %1 as the target type.")
-                                        .arg(formatType(context->namePool(), targetType())),
-                                       ReportContext::XPTY0004, static_cast<const TSubClass *>(this));
+                                        .arg(formatType(context->namePool(), targetType)),
+                                       ReportContext::XPTY0004, );
         }
         else
@@ -142 +144 @@
     }
 
-    const AtomicCaster::Ptr caster(static_cast<const AtomicType *>(sourceType.data())->accept(locator, static_cast<const TSubClass *>(this)));
+    const AtomicCaster::Ptr caster(static_cast<const AtomicType *>(sourceType.data())->accept(locator, ));
     if(!caster)
     {
@@ -149 +151 @@
             context->error(QtXmlPatterns::tr("It is not possible to cast from %1 to %2.")
                                             .arg(formatType(context->namePool(), sourceType))
-                                            .arg(formatType(context->namePool(), targetType())),
-                                       ReportContext::XPTY0004, static_cast<const TSubClass *>(this));
+                                            .arg(formatType(context->namePool(), targetType)),
+                                       ReportContext::XPTY0004, );
         }
         else