From 57e750e6209ee899a936f463b9a74a6a811e731b Mon Sep 17 00:00:00 2001 From: Harald Fernengel Date: Wed, 22 Aug 2012 13:34:21 +0200 Subject: [PATCH] De-inline QVariant(float) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- src/corelib/kernel/qvariant.cpp | 3 +++ src/corelib/kernel/qvariant.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index fb1292c..b899cd0 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 6d7d56e..bde67ed 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 -- 2.7.4