Showing the changes to libraries/script-engine/src/qtscript/ScriptEngineQtScript_cast.cpp (1 of 16 files). Show all
Unified · Split
| @@ -199,6 +199,7 @@ int ScriptEngineQtScript::computeCastPenalty(QScriptValue& val, int destTypeId) · 198 unmodified lines | ||
| 199 | 199 | if (val.isNumber()) { |
| 200 | 200 | switch (destTypeId){ |
| 201 | 201 | case QMetaType::Bool: |
| 202 | + // Conversion to bool is acceptable, but numbers are preferred | |
| 202 | 203 | return 5; |
| 203 | 204 | break; |
| 204 | 205 | case QMetaType::UInt: |
| @@ -211,20 +212,24 @@ int ScriptEngineQtScript::computeCastPenalty(QScriptValue& val, int destTypeId) · 6 unmodified lines | ||
| 211 | 212 | case QMetaType::ULongLong: |
| 212 | 213 | case QMetaType::LongLong: |
| 213 | 214 | case QMetaType::UShort: |
| 215 | + // Perfect case. JS doesn't have separate integer and floating point type | |
| 214 | 216 | return 0; |
| 215 | 217 | break; |
| 216 | 218 | case QMetaType::QString: |
| 217 | 219 | case QMetaType::QByteArray: |
| 218 | 220 | case QMetaType::QDateTime: |
| 219 | 221 | case QMetaType::QDate: |
| 222 | + // Conversion to string should be avoided, it's probably not what we want | |
| 220 | 223 | return 100; |
| 221 | 224 | break; |
| 222 | 225 | default: |
| 226 | + // Other, not predicted cases | |
| 223 | 227 | return 5; |
| 224 | 228 | } |
| 225 | 229 | } else if (val.isString() || val.isDate() || val.isRegExp()) { |
| 226 | 230 | switch (destTypeId){ |
| 227 | 231 | case QMetaType::Bool: |
| 232 | + // Conversion from to bool should be avoided if possible, it's probably not what we want | |
| 228 | 233 | return 100; |
| 229 | 234 | case QMetaType::UInt: |
| 230 | 235 | case QMetaType::ULong: |
| @@ -236,12 +241,15 @@ int ScriptEngineQtScript::computeCastPenalty(QScriptValue& val, int destTypeId) · 5 unmodified lines | ||
| 236 | 241 | case QMetaType::ULongLong: |
| 237 | 242 | case QMetaType::LongLong: |
| 238 | 243 | case QMetaType::UShort: |
| 244 | + // Conversion from to number should be avoided if possible, it's probably not what we want | |
| 239 | 245 | return 100; |
| 240 | 246 | case QMetaType::QString: |
| 247 | + // Perfect case | |
| 241 | 248 | return 0; |
| 242 | 249 | case QMetaType::QByteArray: |
| 243 | 250 | case QMetaType::QDateTime: |
| 244 | 251 | case QMetaType::QDate: |
| 252 | + // String to string should be slightly preferred | |
| 245 | 253 | return 5; |
| 246 | 254 | default: |
| 247 | 255 | return 5; |
| @@ -249,6 +257,7 @@ int ScriptEngineQtScript::computeCastPenalty(QScriptValue& val, int destTypeId) · 1 unmodified line | ||
| 249 | 257 | } else if (val.isBool() || val.isBoolean()) { |
| 250 | 258 | switch (destTypeId){ |
| 251 | 259 | case QMetaType::Bool: |
| 260 | + // Perfect case | |
| 252 | 261 | return 0; |
| 253 | 262 | break; |
| 254 | 263 | case QMetaType::UInt: |
| @@ -261,12 +270,14 @@ int ScriptEngineQtScript::computeCastPenalty(QScriptValue& val, int destTypeId) · 6 unmodified lines | ||
| 261 | 270 | case QMetaType::ULongLong: |
| 262 | 271 | case QMetaType::LongLong: |
| 263 | 272 | case QMetaType::UShort: |
| 273 | + // Using function with bool parameter should be preferred over converted bool to nimber | |
| 264 | 274 | return 5; |
| 265 | 275 | break; |
| 266 | 276 | case QMetaType::QString: |
| 267 | 277 | case QMetaType::QByteArray: |
| 268 | 278 | case QMetaType::QDateTime: |
| 269 | 279 | case QMetaType::QDate: |
| 280 | + // Bool probably shouldn't be converted to string if there are better alternatives | |
| 270 | 281 | return 50; |
| 271 | 282 | break; |
| 272 | 283 | default: |
| @@ -292,13 +303,6 @@ bool ScriptEngineQtScript::castValueToVariant(const QScriptValue& val, QVariant& · 19 unmodified lines | ||
| 292 | 303 | } |
| 293 | 304 | } |
| 294 | 305 | } |
| 295 | −/* if (QMetaType(destTypeId).name() == "MenuItemProperties") { | |
| 296 | − qDebug() << "castValueToVariant MenuItemProperties " << destTypeId << "map size: " << _customTypes.size(); | |
| 297 | − for (auto iter = _customTypes.keyBegin(); iter != _customTypes.keyEnd(); iter++){ | |
| 298 | − qDebug() << (*iter); | |
| 299 | − } | |
| 300 | − printf("castValueToVariant MenuItemProperties"); | |
| 301 | − }*/ | |
| 302 | 306 | |
| 303 | 307 | if (destTypeId == qMetaTypeId<ScriptValue>()) { |
| 304 | 308 | dest = QVariant::fromValue(ScriptValue(new ScriptValueQtWrapper(this, val))); |