Fixes for code review

ksuprynowicz committed 4 years ago

Commit 586bd7f1 parent e9bfdd416 files · +142 −117Browse files

Showing the changes to libraries/script-engine/src/qtscript/ScriptEngineQtScript_cast.cpp (1 of 16 files). Show all

Unified · Split

libraries/script-engine/src/qtscript/ScriptEngineQtScript_cast.cpp+11−7

     if (val.isNumber()) {
         switch (destTypeId){
             case QMetaType::Bool:
+                // Conversion to bool is acceptable, but numbers are preferred
                 return 5;
                 break;
             case QMetaType::UInt:
             case QMetaType::ULongLong:
             case QMetaType::LongLong:
             case QMetaType::UShort:
+                // Perfect case. JS doesn't have separate integer and floating point type
                 return 0;
                 break;
             case QMetaType::QString:
             case QMetaType::QByteArray:
             case QMetaType::QDateTime:
             case QMetaType::QDate:
+                // Conversion to string should be avoided, it's probably not what we want
                 return 100;
                 break;
             default:
+                // Other, not predicted cases
                 return 5;
         }
     } else if (val.isString() || val.isDate() || val.isRegExp()) {
         switch (destTypeId){
             case QMetaType::Bool:
+                // Conversion from to bool should be avoided if possible, it's probably not what we want
                 return 100;
             case QMetaType::UInt:
             case QMetaType::ULong:
             case QMetaType::ULongLong:
             case QMetaType::LongLong:
             case QMetaType::UShort:
+                // Conversion from to number should be avoided if possible, it's probably not what we want
                 return 100;
             case QMetaType::QString:
+                // Perfect case
                 return 0;
             case QMetaType::QByteArray:
             case QMetaType::QDateTime:
             case QMetaType::QDate:
+                // String to string should be slightly preferred
                 return 5;
             default:
                 return 5;
     } else if (val.isBool() || val.isBoolean()) {
         switch (destTypeId){
             case QMetaType::Bool:
+                // Perfect case
                 return 0;
                 break;
             case QMetaType::UInt:
             case QMetaType::ULongLong:
             case QMetaType::LongLong:
             case QMetaType::UShort:
+                // Using function with bool parameter should be preferred over converted bool to nimber
                 return 5;
                 break;
             case QMetaType::QString:
             case QMetaType::QByteArray:
             case QMetaType::QDateTime:
             case QMetaType::QDate:
+                // Bool probably shouldn't be converted to string if there are better alternatives
                 return 50;
                 break;
             default:
             }
         }
     }
-/*    if (QMetaType(destTypeId).name() == "MenuItemProperties") {
-        qDebug() << "castValueToVariant MenuItemProperties " << destTypeId << "map size: " << _customTypes.size();
-        for (auto iter = _customTypes.keyBegin(); iter != _customTypes.keyEnd(); iter++){
-            qDebug() << (*iter);
-        }
-        printf("castValueToVariant MenuItemProperties");
-    }*/
     if (destTypeId == qMetaTypeId<ScriptValue>()) {
         dest = QVariant::fromValue(ScriptValue(new ScriptValueQtWrapper(this, val)));