diff options
author | Harald Fernengel <harald.fernengel@nokia.com> | 2012-08-22 13:34:21 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-23 02:55:17 +0200 |
commit | 57e750e6209ee899a936f463b9a74a6a811e731b (patch) | |
tree | 91833bbc91074ea70de484c8d2af4c4aa8cdc699 /src/corelib/kernel | |
parent | 80462ee67848c68697d06fdf859dbcad99838f5b (diff) |
De-inline QVariant(float)
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>
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r-- | src/corelib/kernel/qvariant.cpp | 3 | ||||
-rw-r--r-- | src/corelib/kernel/qvariant.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index fb1292c231..b899cd0eb0 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -1448,6 +1448,9 @@ QVariant::QVariant(bool val) QVariant::QVariant(double val) : d(Double) { d.data.d = val; } +QVariant::QVariant(float val) + : d(QMetaType::Float) +{ d.data.f = val; } QVariant::QVariant(const QByteArray &val) : d(ByteArray) diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index 6d7d56efc6..bde67ed5ac 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -210,7 +210,7 @@ class Q_CORE_EXPORT QVariant QVariant(qulonglong ull); QVariant(bool b); 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 QT_ASCII_CAST_WARN QVariant(const char *str); #endif |