1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

De-inline QVariant(float)

Browse Source 
All QVariant constructors are not inline, so change QVariant(float) as
well. This allows for refactoring of QVariant during lifetime of Qt 5
without breaking QVariant(float) case.

Change-Id: Icd1fc331a1ef8a2872be811aa7d1160406038f06
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
This commit is contained in:
Harald Fernengel 2012-08-22 13:34:21 +02:00 committed by Qt by Nokia
parent 80462ee678
commit 57e750e620
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/kernel/qvariant.cpp
View File

@ -1448,6 +1448,9 @@ QVariant::QVariant(bool val)
QVariant::QVariant(double val) QVariant::QVariant(double val)
: d(Double) : d(Double)
{ d.data.d = val; } { d.data.d = val; }
QVariant::QVariant(float val)
: d(QMetaType::Float)
{ d.data.f = val; }
QVariant::QVariant(const QByteArray &val) QVariant::QVariant(const QByteArray &val)
: d(ByteArray) : d(ByteArray)

2
src/corelib/kernel/qvariant.h
View File

@ -210,7 +210,7 @@ class Q_CORE_EXPORT QVariant
QVariant(qulonglong ull); QVariant(qulonglong ull);
QVariant(bool b); QVariant(bool b);
QVariant(double d); QVariant(double d);
QVariant(float f) { d.is_null = false; d.type = QMetaType::Float; d.data.f = f; } QVariant(float f);
#ifndef QT_NO_CAST_FROM_ASCII #ifndef QT_NO_CAST_FROM_ASCII
QT_ASCII_CAST_WARN QVariant(const char *str); QT_ASCII_CAST_WARN QVariant(const char *str);
#endif #endif