mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 03:58:07 +02:00
have variantMapToScriptValue handle lists.
This commit is contained in:
parent
0568dc983e
commit
8735fa1eac
2 changed files with 51 additions and 23 deletions
|
@ -13,35 +13,61 @@
|
||||||
#include "SharedLogging.h"
|
#include "SharedLogging.h"
|
||||||
#include "VariantMapToScriptValue.h"
|
#include "VariantMapToScriptValue.h"
|
||||||
|
|
||||||
|
|
||||||
|
QScriptValue variantToScriptValue(QVariant& qValue, QScriptEngine& scriptEngine) {
|
||||||
|
switch(qValue.type()) {
|
||||||
|
case QVariant::Bool:
|
||||||
|
return qValue.toBool();
|
||||||
|
break;
|
||||||
|
case QVariant::Int:
|
||||||
|
return qValue.toInt();
|
||||||
|
break;
|
||||||
|
case QVariant::Double:
|
||||||
|
return qValue.toDouble();
|
||||||
|
break;
|
||||||
|
case QVariant::String: {
|
||||||
|
return scriptEngine.newVariant(qValue);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case QVariant::Map: {
|
||||||
|
QVariantMap childMap = qValue.toMap();
|
||||||
|
return variantMapToScriptValue(childMap, scriptEngine);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case QVariant::List: {
|
||||||
|
QVariantList childList = qValue.toList();
|
||||||
|
return variantListToScriptValue(childList, scriptEngine);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
qCDebug(shared) << "unhandled QScript type" << qValue.type();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return QScriptValue();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
QScriptValue variantMapToScriptValue(QVariantMap& variantMap, QScriptEngine& scriptEngine) {
|
QScriptValue variantMapToScriptValue(QVariantMap& variantMap, QScriptEngine& scriptEngine) {
|
||||||
QScriptValue scriptValue = scriptEngine.newObject();
|
QScriptValue scriptValue = scriptEngine.newObject();
|
||||||
|
|
||||||
for (QVariantMap::const_iterator iter = variantMap.begin(); iter != variantMap.end(); ++iter) {
|
for (QVariantMap::const_iterator iter = variantMap.begin(); iter != variantMap.end(); ++iter) {
|
||||||
QString key = iter.key();
|
QString key = iter.key();
|
||||||
QVariant qValue = iter.value();
|
QVariant qValue = iter.value();
|
||||||
|
scriptValue.setProperty(key, variantToScriptValue(qValue, scriptEngine));
|
||||||
switch(qValue.type()) {
|
}
|
||||||
case QVariant::Bool:
|
|
||||||
scriptValue.setProperty(key, qValue.toBool());
|
return scriptValue;
|
||||||
break;
|
}
|
||||||
case QVariant::Int:
|
|
||||||
scriptValue.setProperty(key, qValue.toInt());
|
|
||||||
break;
|
QScriptValue variantListToScriptValue(QVariantList& variantList, QScriptEngine& scriptEngine) {
|
||||||
case QVariant::Double:
|
QScriptValue scriptValue = scriptEngine.newObject();
|
||||||
scriptValue.setProperty(key, qValue.toDouble());
|
|
||||||
break;
|
scriptValue.setProperty("length", variantList.size());
|
||||||
case QVariant::String: {
|
int i = 0;
|
||||||
scriptValue.setProperty(key, scriptEngine.newVariant(qValue));
|
foreach (QVariant v, variantList) {
|
||||||
break;
|
scriptValue.setProperty(i++, variantToScriptValue(v, scriptEngine));
|
||||||
}
|
|
||||||
case QVariant::Map: {
|
|
||||||
QVariantMap childMap = qValue.toMap();
|
|
||||||
scriptValue.setProperty(key, variantMapToScriptValue(childMap, scriptEngine));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
default:
|
|
||||||
qCDebug(shared) << "unhandled QScript type" << qValue.type();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return scriptValue;
|
return scriptValue;
|
||||||
|
|
|
@ -13,4 +13,6 @@
|
||||||
#include <QScriptValue>
|
#include <QScriptValue>
|
||||||
#include <QScriptEngine>
|
#include <QScriptEngine>
|
||||||
|
|
||||||
|
QScriptValue variantToScriptValue(QVariant& qValue, QScriptEngine& scriptEngine);
|
||||||
QScriptValue variantMapToScriptValue(QVariantMap& variantMap, QScriptEngine& scriptEngine);
|
QScriptValue variantMapToScriptValue(QVariantMap& variantMap, QScriptEngine& scriptEngine);
|
||||||
|
QScriptValue variantListToScriptValue(QVariantList& variantList, QScriptEngine& scriptEngine);
|
||||||
|
|
Loading…
Reference in a new issue