Showing the changes to libraries/script-engine/src/VariantMapToScriptValue.cpp (1 of 170 files). Show all
Unified · Split
| @@ -15,7 +15,7 @@ · 14 unmodified lines | ||
| 15 | 15 | |
| 16 | 16 | #include "SharedLogging.h" |
| 17 | 17 | |
| 18 | −ScriptValuePointer variantToScriptValue(QVariant& qValue, ScriptEngine& scriptEngine) { | |
| 18 | +ScriptValue variantToScriptValue(QVariant& qValue, ScriptEngine& scriptEngine) { | |
| 19 | 19 | switch(qValue.type()) { |
| 20 | 20 | case QVariant::Bool: |
| 21 | 21 | return scriptEngine.newValue(qValue.toBool()); |
| @@ -48,29 +48,29 @@ ScriptValuePointer variantToScriptValue(QVariant& qValue, ScriptEngine& scriptEn · 26 unmodified lines | ||
| 48 | 48 | break; |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | − return ScriptValuePointer(); | |
| 51 | + return ScriptValue(); | |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | |
| 55 | −ScriptValuePointer variantMapToScriptValue(QVariantMap& variantMap, ScriptEngine& scriptEngine) { | |
| 56 | − ScriptValuePointer scriptValue = scriptEngine.newObject(); | |
| 55 | +ScriptValue variantMapToScriptValue(QVariantMap& variantMap, ScriptEngine& scriptEngine) { | |
| 56 | + ScriptValue scriptValue = scriptEngine.newObject(); | |
| 57 | 57 | |
| 58 | 58 | for (QVariantMap::const_iterator iter = variantMap.begin(); iter != variantMap.end(); ++iter) { |
| 59 | 59 | QString key = iter.key(); |
| 60 | 60 | QVariant qValue = iter.value(); |
| 61 | − scriptValue->setProperty(key, variantToScriptValue(qValue, scriptEngine)); | |
| 61 | + scriptValue.setProperty(key, variantToScriptValue(qValue, scriptEngine)); | |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | return scriptValue; |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | |
| 68 | −ScriptValuePointer variantListToScriptValue(QVariantList& variantList, ScriptEngine& scriptEngine) { | |
| 68 | +ScriptValue variantListToScriptValue(QVariantList& variantList, ScriptEngine& scriptEngine) { | |
| 69 | 69 | |
| 70 | − ScriptValuePointer scriptValue = scriptEngine.newArray(); | |
| 70 | + ScriptValue scriptValue = scriptEngine.newArray(); | |
| 71 | 71 | |
| 72 | 72 | for (int i = 0; i < variantList.size(); i++) { |
| 73 | − scriptValue->setProperty(i, variantToScriptValue(variantList[i], scriptEngine)); | |
| 73 | + scriptValue.setProperty(i, variantToScriptValue(variantList[i], scriptEngine)); | |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | return scriptValue; |