Fix MSVC2010 warnings.
authorMitch Curtis <mitch.curtis@digia.com>
Wed, 9 Oct 2013 10:44:13 +0000 (12:44 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 15 Oct 2013 08:34:25 +0000 (10:34 +0200)
Change-Id: Id7a2465db4f9b1cd4d3b7ecd61538ee7110893df
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
src/qml/qml/qqmlscript.cpp

index 4c1a1f7..cc01307 100644 (file)
@@ -991,7 +991,7 @@ bool ProcessAST::visit(AST::UiPublicMember *node)
             for(int typeIndex = 0; typeIndex < propTypeNameToTypesCount; ++typeIndex) {
                 const TypeNameToType *t = propTypeNameToTypes + typeIndex;
                 if (t->nameLength == size_t(memberType.length()) &&
-                    QHashedString::compare(memberType.constData(), t->name, t->nameLength)) {
+                    QHashedString::compare(memberType.constData(), t->name, int(t->nameLength))) {
                     type = t;
                     break;
                 }
@@ -1033,7 +1033,7 @@ bool ProcessAST::visit(AST::UiPublicMember *node)
         Object::DynamicProperty::Type type;
 
         if ((unsigned)memberType.length() == strlen("alias") && 
-            QHashedString::compare(memberType.constData(), "alias", strlen("alias"))) {
+            QHashedString::compare(memberType.constData(), "alias", int(strlen("alias")))) {
             type = Object::DynamicProperty::Alias;
             typeFound = true;
         } 
@@ -1041,7 +1041,7 @@ bool ProcessAST::visit(AST::UiPublicMember *node)
         for(int ii = 0; !typeFound && ii < propTypeNameToTypesCount; ++ii) {
             const TypeNameToType *t = propTypeNameToTypes + ii;
             if (t->nameLength == size_t(memberType.length()) &&
-                QHashedString::compare(memberType.constData(), t->name, t->nameLength)) {
+                QHashedString::compare(memberType.constData(), t->name, int(t->nameLength))) {
                 type = t->type;
                 typeFound = true;
             }
@@ -1053,7 +1053,7 @@ bool ProcessAST::visit(AST::UiPublicMember *node)
             if (typeModifier.isEmpty()) {
                 type = Object::DynamicProperty::Custom;
             } else if((unsigned)typeModifier.length() == strlen("list") && 
-                      QHashedString::compare(typeModifier.constData(), "list", strlen("list"))) {
+                      QHashedString::compare(typeModifier.constData(), "list", int(strlen("list")))) {
                 type = Object::DynamicProperty::CustomList;
             } else {
                 QQmlError error;