summaryrefslogtreecommitdiffstats
path: root/src/qjson_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/qjson_p.h')
-rw-r--r--src/qjson_p.h13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/qjson_p.h b/src/qjson_p.h
index d96eb6a..36b0659 100644
--- a/src/qjson_p.h
+++ b/src/qjson_p.h
@@ -455,8 +455,7 @@ struct Value
int usedStorage(const Base *b) const;
bool toBoolean() const;
- double toNumber(const Base *b) const;
- int toInt() const;
+ double toDouble(const Base *b) const;
QString toString(const Base *b) const;
String asString(const Base *b) const;
Latin1String asLatin1String(const Base *b) const;
@@ -529,9 +528,9 @@ inline bool Value::toBoolean() const
return val != 0;
}
-inline double Value::toNumber(const Base *b) const
+inline double Value::toDouble(const Base *b) const
{
- Q_ASSERT(type == QJsonValue::Number);
+ Q_ASSERT(type == QJsonValue::Double);
if (latinOrIntValue)
return int_val;
@@ -543,12 +542,6 @@ inline double Value::toNumber(const Base *b) const
return d;
}
-inline int Value::toInt() const
-{
- Q_ASSERT(type == QJsonValue::Number && latinOrIntValue);
- return int_val;
-}
-
inline QString Value::toString(const Base *b) const
{
char *d = data(b);