Port existing qmlInfo callers to qmlWarning

Now that qmlInfo actually reports info messages, we want to change
existing callers to use warning-level messages to preserve the original
message level.

This was done through:
    perl -p -i -e "s/qmlInfo\(/qmlWarning\(/" **/*.{cpp,h,qdoc}
.. with a little care taken to only add the hunks that should be changed.

Change-Id: I511cee11ce0a26ec1048cd2b84c7536b812a0d89
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

5 files changed, 56 insertions, 56 deletions

diff --git a/src/qml/types/qqmlbind.cpp b/src/qml/types/qqmlbind.cpp
index a545fe57ca..2ded9c13c8 100644
--- a/src/qml/types/qqmlbind.cpp
+++ b/src/qml/types/qqmlbind.cpp
@@ -82,12 +82,12 @@ void QQmlBindPrivate::validate(QObject *binding) const
         return;
 
     if (!prop.isValid()) {
-        qmlInfo(binding) << "Property '" << propName << "' does not exist on " << QQmlMetaType::prettyTypeName(obj) << ".";
+        qmlWarning(binding) << "Property '" << propName << "' does not exist on " << QQmlMetaType::prettyTypeName(obj) << ".";
         return;
     }
 
     if (!prop.isWritable()) {
-        qmlInfo(binding) << "Property '" << propName << "' on " << QQmlMetaType::prettyTypeName(obj) << " is read-only.";
+        qmlWarning(binding) << "Property '" << propName << "' on " << QQmlMetaType::prettyTypeName(obj) << " is read-only.";
         return;
     }
 }
diff --git a/src/qml/types/qqmlconnections.cpp b/src/qml/types/qqmlconnections.cpp
index 2aed4d9972..864ecf54dd 100644
--- a/src/qml/types/qqmlconnections.cpp
+++ b/src/qml/types/qqmlconnections.cpp
@@ -295,7 +295,7 @@ void QQmlConnections::connectSignals()
             d->boundsignals += signal;
         } else {
             if (!d->ignoreUnknownSignals)
-                qmlInfo(this) << tr("Cannot assign to non-existent property \"%1\"").arg(propName);
+                qmlWarning(this) << tr("Cannot assign to non-existent property \"%1\"").arg(propName);
         }
     }
 }
diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp
index be10b270ae..c635ccf79c 100644
--- a/src/qml/types/qqmldelegatemodel.cpp
+++ b/src/qml/types/qqmldelegatemodel.cpp
@@ -310,7 +310,7 @@ void QQmlDelegateModel::componentComplete()
             --d->m_groupCount;
             --i;
         } else if (name.at(0).isUpper()) {
-            qmlInfo(d->m_groups[i]) << QQmlDelegateModelGroup::tr("Group names must start with a lower case letter");
+            qmlWarning(d->m_groups[i]) << QQmlDelegateModelGroup::tr("Group names must start with a lower case letter");
             d->m_groups[i] = d->m_groups[d->m_groupCount - 1];
             --d->m_groupCount;
             --i;
@@ -404,7 +404,7 @@ void QQmlDelegateModel::setDelegate(QQmlComponent *delegate)
 {
     Q_D(QQmlDelegateModel);
     if (d->m_transaction) {
-        qmlInfo(this) << tr("The delegate of a DelegateModel cannot be changed within onUpdated.");
+        qmlWarning(this) << tr("The delegate of a DelegateModel cannot be changed within onUpdated.");
         return;
     }
     bool wasValid = d->m_delegate != 0;
@@ -610,7 +610,7 @@ void QQmlDelegateModelPrivate::group_append(
     if (d->m_complete)
         return;
     if (d->m_groupCount == Compositor::MaximumGroupCount) {
-        qmlInfo(d->q_func()) << QQmlDelegateModel::tr("The maximum number of supported DelegateModelGroups is 8");
+        qmlWarning(d->q_func()) << QQmlDelegateModel::tr("The maximum number of supported DelegateModelGroups is 8");
         return;
     }
     d->m_groups[d->m_groupCount] = group;
@@ -719,7 +719,7 @@ void QQmlDelegateModel::setFilterGroup(const QString &group)
     Q_D(QQmlDelegateModel);
 
     if (d->m_transaction) {
-        qmlInfo(this) << tr("The group of a DelegateModel cannot be changed within onChanged");
+        qmlWarning(this) << tr("The group of a DelegateModel cannot be changed within onChanged");
         return;
     }
 
@@ -889,7 +889,7 @@ void QQmlDelegateModelPrivate::incubatorStatusChanged(QQDMIncubationTask *incuba
             emitCreatedItem(incubationTask, cacheItem->object);
         cacheItem->releaseObject();
     } else if (status == QQmlIncubator::Error) {
-        qmlInfo(q, m_delegate->errors()) << "Error creating delegate";
+        qmlWarning(q, m_delegate->errors()) << "Error creating delegate";
     }
 
     if (!cacheItem->isObjectReferenced()) {
@@ -2459,7 +2459,7 @@ QQmlV4Handle QQmlDelegateModelGroup::get(int index)
     if (!model->m_context || !model->m_context->isValid()) {
         return QQmlV4Handle(QV4::Encode::undefined());
     } else if (index < 0 || index >= model->m_compositor.count(d->group)) {
-        qmlInfo(this) << tr("get: index out of range");
+        qmlWarning(this) << tr("get: index out of range");
         return QQmlV4Handle(QV4::Encode::undefined());
     }
 
@@ -2552,7 +2552,7 @@ void QQmlDelegateModelGroup::insert(QQmlV4Function *args)
     QV4::ScopedValue v(scope, (*args)[i]);
     if (d->parseIndex(v, &index, &group)) {
         if (index < 0 || index > model->m_compositor.count(group)) {
-            qmlInfo(this) << tr("insert: index out of range");
+            qmlWarning(this) << tr("insert: index out of range");
             return;
         }
         if (++i == args->length())
@@ -2637,7 +2637,7 @@ void QQmlDelegateModelGroup::create(QQmlV4Function *args)
         }
     }
     if (index < 0 || index >= model->m_compositor.count(group)) {
-        qmlInfo(this) << tr("create: index out of range");
+        qmlWarning(this) << tr("create: index out of range");
         return;
     }
 
@@ -2690,22 +2690,22 @@ void QQmlDelegateModelGroup::resolve(QQmlV4Function *args)
     QV4::ScopedValue v(scope, (*args)[0]);
     if (d->parseIndex(v, &from, &fromGroup)) {
         if (from < 0 || from >= model->m_compositor.count(fromGroup)) {
-            qmlInfo(this) << tr("resolve: from index out of range");
+            qmlWarning(this) << tr("resolve: from index out of range");
             return;
         }
     } else {
-        qmlInfo(this) << tr("resolve: from index invalid");
+        qmlWarning(this) << tr("resolve: from index invalid");
         return;
     }
 
     v = (*args)[1];
     if (d->parseIndex(v, &to, &toGroup)) {
         if (to < 0 || to >= model->m_compositor.count(toGroup)) {
-            qmlInfo(this) << tr("resolve: to index out of range");
+            qmlWarning(this) << tr("resolve: to index out of range");
             return;
         }
     } else {
-        qmlInfo(this) << tr("resolve: to index invalid");
+        qmlWarning(this) << tr("resolve: to index invalid");
         return;
     }
 
@@ -2713,11 +2713,11 @@ void QQmlDelegateModelGroup::resolve(QQmlV4Function *args)
     Compositor::iterator toIt = model->m_compositor.find(toGroup, to);
 
     if (!fromIt->isUnresolved()) {
-        qmlInfo(this) << tr("resolve: from is not an unresolved item");
+        qmlWarning(this) << tr("resolve: from is not an unresolved item");
         return;
     }
     if (!toIt->list) {
-        qmlInfo(this) << tr("resolve: to is not a model item");
+        qmlWarning(this) << tr("resolve: to is not a model item");
         return;
     }
 
@@ -2787,7 +2787,7 @@ void QQmlDelegateModelGroup::remove(QQmlV4Function *args)
     QV4::Scope scope(args->v4engine());
     QV4::ScopedValue v(scope, (*args)[0]);
     if (!d->parseIndex(v, &index, &group)) {
-        qmlInfo(this) << tr("remove: invalid index");
+        qmlWarning(this) << tr("remove: invalid index");
         return;
     }
 
@@ -2799,11 +2799,11 @@ void QQmlDelegateModelGroup::remove(QQmlV4Function *args)
 
     QQmlDelegateModelPrivate *model = QQmlDelegateModelPrivate::get(d->model);
     if (index < 0 || index >= model->m_compositor.count(group)) {
-        qmlInfo(this) << tr("remove: index out of range");
+        qmlWarning(this) << tr("remove: index out of range");
     } else if (count != 0) {
         Compositor::iterator it = model->m_compositor.find(group, index);
         if (count < 0 || count > model->m_compositor.count(d->group) - it.index[d->group]) {
-            qmlInfo(this) << tr("remove: invalid count");
+            qmlWarning(this) << tr("remove: invalid count");
         } else {
             model->removeGroups(it, count, d->group, 1 << d->group);
         }
@@ -2858,11 +2858,11 @@ void QQmlDelegateModelGroup::addGroups(QQmlV4Function *args)
 
     QQmlDelegateModelPrivate *model = QQmlDelegateModelPrivate::get(d->model);
     if (index < 0 || index >= model->m_compositor.count(group)) {
-        qmlInfo(this) << tr("addGroups: index out of range");
+        qmlWarning(this) << tr("addGroups: index out of range");
     } else if (count != 0) {
         Compositor::iterator it = model->m_compositor.find(group, index);
         if (count < 0 || count > model->m_compositor.count(d->group) - it.index[d->group]) {
-            qmlInfo(this) << tr("addGroups: invalid count");
+            qmlWarning(this) << tr("addGroups: invalid count");
         } else {
             model->addGroups(it, count, d->group, groups);
         }
@@ -2888,11 +2888,11 @@ void QQmlDelegateModelGroup::removeGroups(QQmlV4Function *args)
 
     QQmlDelegateModelPrivate *model = QQmlDelegateModelPrivate::get(d->model);
     if (index < 0 || index >= model->m_compositor.count(group)) {
-        qmlInfo(this) << tr("removeGroups: index out of range");
+        qmlWarning(this) << tr("removeGroups: index out of range");
     } else if (count != 0) {
         Compositor::iterator it = model->m_compositor.find(group, index);
         if (count < 0 || count > model->m_compositor.count(d->group) - it.index[d->group]) {
-            qmlInfo(this) << tr("removeGroups: invalid count");
+            qmlWarning(this) << tr("removeGroups: invalid count");
         } else {
             model->removeGroups(it, count, d->group, groups);
         }
@@ -2918,11 +2918,11 @@ void QQmlDelegateModelGroup::setGroups(QQmlV4Function *args)
 
     QQmlDelegateModelPrivate *model = QQmlDelegateModelPrivate::get(d->model);
     if (index < 0 || index >= model->m_compositor.count(group)) {
-        qmlInfo(this) << tr("setGroups: index out of range");
+        qmlWarning(this) << tr("setGroups: index out of range");
     } else if (count != 0) {
         Compositor::iterator it = model->m_compositor.find(group, index);
         if (count < 0 || count > model->m_compositor.count(d->group) - it.index[d->group]) {
-            qmlInfo(this) << tr("setGroups: invalid count");
+            qmlWarning(this) << tr("setGroups: invalid count");
         } else {
             model->setGroups(it, count, d->group, groups);
         }
@@ -2957,13 +2957,13 @@ void QQmlDelegateModelGroup::move(QQmlV4Function *args)
     QV4::Scope scope(args->v4engine());
     QV4::ScopedValue v(scope, (*args)[0]);
     if (!d->parseIndex(v, &from, &fromGroup)) {
-        qmlInfo(this) << tr("move: invalid from index");
+        qmlWarning(this) << tr("move: invalid from index");
         return;
     }
 
     v = (*args)[1];
     if (!d->parseIndex(v, &to, &toGroup)) {
-        qmlInfo(this) << tr("move: invalid to index");
+        qmlWarning(this) << tr("move: invalid to index");
         return;
     }
 
@@ -2976,11 +2976,11 @@ void QQmlDelegateModelGroup::move(QQmlV4Function *args)
     QQmlDelegateModelPrivate *model = QQmlDelegateModelPrivate::get(d->model);
 
     if (count < 0) {
-        qmlInfo(this) << tr("move: invalid count");
+        qmlWarning(this) << tr("move: invalid count");
     } else if (from < 0 || from + count > model->m_compositor.count(fromGroup)) {
-        qmlInfo(this) << tr("move: from index out of range");
+        qmlWarning(this) << tr("move: from index out of range");
     } else if (!model->m_compositor.verifyMoveTo(fromGroup, from, toGroup, to, count, d->group)) {
-        qmlInfo(this) << tr("move: to index out of range");
+        qmlWarning(this) << tr("move: to index out of range");
     } else if (count > 0) {
         QVector<Compositor::Remove> removes;
         QVector<Compositor::Insert> inserts;
@@ -3038,7 +3038,7 @@ QString QQmlPartsModel::filterGroup() const
 void QQmlPartsModel::setFilterGroup(const QString &group)
 {
     if (QQmlDelegateModelPrivate::get(m_model)->m_transaction) {
-        qmlInfo(this) << tr("The group of a DelegateModel cannot be changed within onChanged");
+        qmlWarning(this) << tr("The group of a DelegateModel cannot be changed within onChanged");
         return;
     }
 
@@ -3151,7 +3151,7 @@ QObject *QQmlPartsModel::object(int index, bool asynchronous)
     model->release(object);
     if (!model->m_delegateValidated) {
         if (object)
-            qmlInfo(model->m_delegate) << tr("Delegate component must be Package type.");
+            qmlWarning(model->m_delegate) << tr("Delegate component must be Package type.");
         model->m_delegateValidated = true;
     }
 
diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp
index 1a2e4c7f6f..5e06455b26 100644
--- a/src/qml/types/qqmllistmodel.cpp
+++ b/src/qml/types/qqmllistmodel.cpp
@@ -99,7 +99,7 @@ const ListLayout::Role &ListLayout::getRoleOrCreate(const QString &key, Role::Da
     if (node) {
         const Role &r = *node->value;
         if (type != r.type)
-            qmlInfo(0) << QStringLiteral("Can't assign to existing role '%1' of different type [%2 -> %3]").arg(r.name).arg(roleTypeName(type)).arg(roleTypeName(r.type));
+            qmlWarning(0) << QStringLiteral("Can't assign to existing role '%1' of different type [%2 -> %3]").arg(r.name).arg(roleTypeName(type)).arg(roleTypeName(r.type));
         return r;
     }
 
@@ -112,7 +112,7 @@ const ListLayout::Role &ListLayout::getRoleOrCreate(QV4::String *key, Role::Data
     if (node) {
         const Role &r = *node->value;
         if (type != r.type)
-            qmlInfo(0) << QStringLiteral("Can't assign to existing role '%1' of different type [%2 -> %3]").arg(r.name).arg(roleTypeName(type)).arg(roleTypeName(r.type));
+            qmlWarning(0) << QStringLiteral("Can't assign to existing role '%1' of different type [%2 -> %3]").arg(r.name).arg(roleTypeName(type)).arg(roleTypeName(r.type));
         return r;
     }
 
@@ -226,7 +226,7 @@ const ListLayout::Role *ListLayout::getRoleOrCreate(const QString &key, const QV
     }
 
     if (type == Role::Invalid) {
-        qmlInfo(0) << "Can't create role for unsupported data type";
+        qmlWarning(0) << "Can't create role for unsupported data type";
         return 0;
     }
 
@@ -1201,7 +1201,7 @@ int ListElement::setJsProperty(const ListLayout::Role &role, const QV4::Value &d
             }
             roleIndex = setListProperty(role, subModel);
         } else {
-            qmlInfo(0) << QStringLiteral("Can't assign to existing role '%1' of different type [%2 -> %3]").arg(role.name).arg(roleTypeName(role.type)).arg(roleTypeName(ListLayout::Role::List));
+            qmlWarning(0) << QStringLiteral("Can't assign to existing role '%1' of different type [%2 -> %3]").arg(role.name).arg(roleTypeName(role.type)).arg(roleTypeName(ListLayout::Role::List));
         }
     } else if (d.isBoolean()) {
         roleIndex = setBoolProperty(role, d.booleanValue());
@@ -1984,18 +1984,18 @@ void QQmlListModel::setDynamicRoles(bool enableDynamicRoles)
     if (m_mainThread && m_agent == 0) {
         if (enableDynamicRoles) {
             if (m_layout->roleCount())
-                qmlInfo(this) << tr("unable to enable dynamic roles as this model is not empty!");
+                qmlWarning(this) << tr("unable to enable dynamic roles as this model is not empty!");
             else
                 m_dynamicRoles = true;
         } else {
             if (m_roles.count()) {
-                qmlInfo(this) << tr("unable to enable static roles as this model is not empty!");
+                qmlWarning(this) << tr("unable to enable static roles as this model is not empty!");
             } else {
                 m_dynamicRoles = false;
             }
         }
     } else {
-        qmlInfo(this) << tr("dynamic role setting must be made from the main thread, before any worker scripts are created");
+        qmlWarning(this) << tr("dynamic role setting must be made from the main thread, before any worker scripts are created");
     }
 }
 
@@ -2048,7 +2048,7 @@ void QQmlListModel::remove(QQmlV4Function *args)
         int removeCount = (argLength == 2 ? QV4::ScopedValue(scope, (*args)[1])->toInt32() : 1);
 
         if (index < 0 || index+removeCount > count() || removeCount <= 0) {
-            qmlInfo(this) << tr("remove: indices [%1 - %2] out of range [0 - %3]").arg(index).arg(index+removeCount).arg(count());
+            qmlWarning(this) << tr("remove: indices [%1 - %2] out of range [0 - %3]").arg(index).arg(index+removeCount).arg(count());
             return;
         }
 
@@ -2064,7 +2064,7 @@ void QQmlListModel::remove(QQmlV4Function *args)
 
         emitItemsRemoved(index, removeCount);
     } else {
-        qmlInfo(this) << tr("remove: incorrect number of arguments");
+        qmlWarning(this) << tr("remove: incorrect number of arguments");
     }
 }
 
@@ -2092,7 +2092,7 @@ void QQmlListModel::insert(QQmlV4Function *args)
         int index = arg0->toInt32();
 
         if (index < 0 || index > count()) {
-            qmlInfo(this) << tr("insert: index %1 out of range").arg(index);
+            qmlWarning(this) << tr("insert: index %1 out of range").arg(index);
             return;
         }
 
@@ -2124,10 +2124,10 @@ void QQmlListModel::insert(QQmlV4Function *args)
 
             emitItemsInserted(index, 1);
         } else {
-            qmlInfo(this) << tr("insert: value is not an object");
+            qmlWarning(this) << tr("insert: value is not an object");
         }
     } else {
-        qmlInfo(this) << tr("insert: value is not an object");
+        qmlWarning(this) << tr("insert: value is not an object");
     }
 }
 
@@ -2150,7 +2150,7 @@ void QQmlListModel::move(int from, int to, int n)
     if (n==0 || from==to)
         return;
     if (!canMove(from, to, n)) {
-        qmlInfo(this) << tr("move: out of range");
+        qmlWarning(this) << tr("move: out of range");
         return;
     }
 
@@ -2239,10 +2239,10 @@ void QQmlListModel::append(QQmlV4Function *args)
 
             emitItemsInserted(index, 1);
         } else {
-            qmlInfo(this) << tr("append: value is not an object");
+            qmlWarning(this) << tr("append: value is not an object");
         }
     } else {
-        qmlInfo(this) << tr("append: value is not an object");
+        qmlWarning(this) << tr("append: value is not an object");
     }
 }
 
@@ -2321,11 +2321,11 @@ void QQmlListModel::set(int index, const QQmlV4Handle &handle)
     QV4::ScopedObject object(scope, handle);
 
     if (!object) {
-        qmlInfo(this) << tr("set: value is not an object");
+        qmlWarning(this) << tr("set: value is not an object");
         return;
     }
     if (index > count() || index < 0) {
-        qmlInfo(this) << tr("set: index %1 out of range").arg(index);
+        qmlWarning(this) << tr("set: index %1 out of range").arg(index);
         return;
     }
 
@@ -2371,7 +2371,7 @@ void QQmlListModel::set(int index, const QQmlV4Handle &handle)
 void QQmlListModel::setProperty(int index, const QString& property, const QVariant& value)
 {
     if (count() == 0 || index >= count() || index < 0) {
-        qmlInfo(this) << tr("set: index %1 out of range").arg(index);
+        qmlWarning(this) << tr("set: index %1 out of range").arg(index);
         return;
     }
 
@@ -2401,7 +2401,7 @@ void QQmlListModel::sync()
     // This is just a dummy method to make it look like sync() exists in
     // ListModel (and not just QQmlListModelWorkerAgent) and to let
     // us document sync().
-    qmlInfo(this) << "List sync() can only be called from a WorkerScript";
+    qmlWarning(this) << "List sync() can only be called from a WorkerScript";
 }
 
 bool QQmlListModelParser::verifyProperty(const QV4::CompiledData::Unit *qmlUnit, const QV4::CompiledData::Binding *binding)
@@ -2543,7 +2543,7 @@ void QQmlListModelParser::applyBindings(QObject *obj, QV4::CompiledData::Compila
     }
 
     if (setRoles == false)
-        qmlInfo(obj) << "All ListElement declarations are empty, no roles can be created unless dynamicRoles is set.";
+        qmlWarning(obj) << "All ListElement declarations are empty, no roles can be created unless dynamicRoles is set.";
 }
 
 bool QQmlListModelParser::definesEmptyList(const QString &s)
diff --git a/src/qml/types/qqmlobjectmodel.cpp b/src/qml/types/qqmlobjectmodel.cpp
index 695043b592..21205f4490 100644
--- a/src/qml/types/qqmlobjectmodel.cpp
+++ b/src/qml/types/qqmlobjectmodel.cpp
@@ -373,7 +373,7 @@ void QQmlObjectModel::insert(int index, QObject *object)
 {
     Q_D(QQmlObjectModel);
     if (index < 0 || index > count()) {
-        qmlInfo(this) << tr("insert: index %1 out of range").arg(index);
+        qmlWarning(this) << tr("insert: index %1 out of range").arg(index);
         return;
     }
     d->insert(index, object);
@@ -400,7 +400,7 @@ void QQmlObjectModel::move(int from, int to, int n)
     if (n <= 0 || from == to)
         return;
     if (from < 0 || to < 0 || from + n > count() || to + n > count()) {
-        qmlInfo(this) << tr("move: out of range");
+        qmlWarning(this) << tr("move: out of range");
         return;
     }
     d->move(from, to, n);
@@ -418,7 +418,7 @@ void QQmlObjectModel::remove(int index, int n)
 {
     Q_D(QQmlObjectModel);
     if (index < 0 || n <= 0 || index + n > count()) {
-        qmlInfo(this) << tr("remove: indices [%1 - %2] out of range [0 - %3]").arg(index).arg(index+n).arg(count());
+        qmlWarning(this) << tr("remove: indices [%1 - %2] out of range [0 - %3]").arg(index).arg(index+n).arg(count());
         return;
     }
     d->remove(index, n);