aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4value.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-09-25 13:52:15 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-28 13:33:32 +0200
commit4d40fa24c3ee8def2f27bd237fc8dec25cf3f473 (patch)
treecb4ad758f03cf204cbae1e7d086bfeaf73a64bc3 /src/qml/jsruntime/qv4value.cpp
parentabd82c68d564c97a4452a3afa2d63320e7292b30 (diff)
Move Value::toInteger(double) and related to Primitive
Also clean up a few other direct uses of Value Change-Id: Ie27d42c1b31b9e6d16d0a60071cb5e4e1c5b9e8b Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4value.cpp')
-rw-r--r--src/qml/jsruntime/qv4value.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4value.cpp b/src/qml/jsruntime/qv4value.cpp
index 51f7fba6d3..b256b04da0 100644
--- a/src/qml/jsruntime/qv4value.cpp
+++ b/src/qml/jsruntime/qv4value.cpp
@@ -79,7 +79,7 @@ double Value::toInteger() const
if (integerCompatible())
return int_32;
- return Value::toInteger(toNumber());
+ return Primitive::toInteger(toNumber());
}
double Value::toNumberImpl() const
@@ -213,7 +213,7 @@ Value Value::fromString(ExecutionEngine *engine, const QString &s)
}
-int Value::toInt32(double number)
+int Primitive::toInt32(double number)
{
const double D32 = 4294967296.0;
const double D31 = D32 / 2.0;
@@ -239,7 +239,7 @@ int Value::toInt32(double number)
return int(number);
}
-unsigned int Value::toUInt32(double number)
+unsigned int Primitive::toUInt32(double number)
{
const double D32 = 4294967296.0;
if ((number >= 0 && number < D32))
@@ -260,7 +260,7 @@ unsigned int Value::toUInt32(double number)
return unsigned(number);
}
-double Value::toInteger(double number)
+double Primitive::toInteger(double number)
{
if (std::isnan(number))
return +0;