Changeset 561 for trunk/src/xmlpatterns/data/qatomicvalue.cpp
- Timestamp:
- Feb 11, 2010, 11:19:06 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible /branches/vendor/nokia/qt/current merged eligible /branches/vendor/trolltech/qt/current 3-149
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/src/xmlpatterns/data/qatomicvalue.cpp
r2 r561 2 2 ** 3 3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ** Contact: Qt Software Information ([email protected]) 4 ** All rights reserved. 5 ** Contact: Nokia Corporation ([email protected]) 5 6 ** 6 7 ** 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. 22 23 ** 23 ** In addition, as a special exception, Nokia gives you certain 24 ** additional rights. These rights are described in the Nokia Qt LGPL 25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this 26 ** package. 24 ** In addition, as a special exception, Nokia gives you certain additional 25 ** rights. These rights are described in the Nokia Qt LGPL Exception 26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 27 ** 28 28 ** GNU General Public License Usage … … 34 34 ** met: http://www.gnu.org/copyleft/gpl.html. 35 35 ** 36 ** If you are unsure which license is appropriate for your use, please37 ** contact the sales department at qt-sales@nokia.com.36 ** If you 37 ** @nokia.com. 38 38 ** $QT_END_LICENSE$ 39 39 ** … … 135 135 "QVariants sent to Patternist must be valid."); 136 136 137 switch(value. type())137 switch(value.ype()) 138 138 { 139 139 case QVariant::Char: … … 167 167 case QVariant::DateTime: 168 168 return DateTime::fromDateTime(value.toDateTime()); 169 170 169 171 case QVariant::Double: 170 172 return Item(Double::fromValue(value.toDouble())); 171 173 default: 172 174 { 173 Q_ASSERT_X(false, 174 Q_FUNC_INFO, 175 qPrintable(QString::fromLatin1( 176 "QVariants of type %1 are not supported in " 177 "Patternist, see the documentation") 175 if (value.userType() == qMetaTypeId<float>()) 176 { 177 return Item(Float::fromValue(value.value<float>())); 178 } 179 else { 180 Q_ASSERT_X(false, 181 Q_FUNC_INFO, 182 qPrintable(QString::fromLatin1( 183 "QVariants of type %1 are not supported in " 184 "Patternist, see the documentation") 178 185 .arg(QLatin1String(value.typeName())))); 179 return AtomicValue::Ptr(); 186 return AtomicValue::Ptr(); 187 } 180 188 } 181 189 }
Note:
See TracChangeset
for help on using the changeset viewer.