diff options
author | Robin Burchell <robin.burchell@crimson.no> | 2017-01-05 21:03:23 +0100 |
---|---|---|
committer | Robin Burchell <robin.burchell@crimson.no> | 2017-01-13 22:40:49 +0000 |
commit | beb4f4c4c98b8c6ad634b13e07aaf9b7a9c54d4a (patch) | |
tree | 2a055d776cbf6528b83d22c0c3d73aa7812867a6 /src | |
parent | d08213709959cd52f55b8a277e7485ae14e441c2 (diff) | |
download | qtlocation-beb4f4c4c98b8c6ad634b13e07aaf9b7a9c54d4a.tar.gz |
QtLocation: Use the newly-introduced qmlWarning instead of qmlInfo
qmlInfo will shortly be returning info-level messages (as the name
hints), rather than warning level messages.
Change-Id: I941f716c4fbe0566e1e5b0ecf673faa7283cde10
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src')
12 files changed, 24 insertions, 24 deletions
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp index 69ded2d0..834737ff 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp @@ -1182,7 +1182,7 @@ QPlaceManager *QDeclarativePlace::manager() } if (!m_plugin) { - qmlInfo(this) << QStringLiteral("Plugin is not assigned to place."); + qmlWarning(this) << QStringLiteral("Plugin is not assigned to place."); return 0; } diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp b/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp index d10b2b08..1d3fb2c1 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp @@ -203,7 +203,7 @@ void QDeclarativePlaceIcon::pluginReady() QGeoServiceProvider *serviceProvider = m_plugin->sharedGeoServiceProvider(); QPlaceManager *placeManager = serviceProvider->placeManager(); if (!placeManager || serviceProvider->error() != QGeoServiceProvider::NoError) { - qmlInfo(this) << QCoreApplication::translate(CONTEXT_NAME, PLUGIN_ERROR) + qmlWarning(this) << QCoreApplication::translate(CONTEXT_NAME, PLUGIN_ERROR) .arg(m_plugin->name()).arg(serviceProvider->errorString()); return; } @@ -216,7 +216,7 @@ void QDeclarativePlaceIcon::pluginReady() QPlaceManager *QDeclarativePlaceIcon::manager() const { if (!m_plugin) { - qmlInfo(this) << QStringLiteral("Plugin is not assigned to place."); + qmlWarning(this) << QStringLiteral("Plugin is not assigned to place."); return 0; } diff --git a/src/imports/location/qdeclarativegeocodemodel.cpp b/src/imports/location/qdeclarativegeocodemodel.cpp index d8ff4e85..e92949ee 100644 --- a/src/imports/location/qdeclarativegeocodemodel.cpp +++ b/src/imports/location/qdeclarativegeocodemodel.cpp @@ -529,7 +529,7 @@ int QDeclarativeGeocodeModel::count() const QDeclarativeGeoLocation *QDeclarativeGeocodeModel::get(int index) { if (index < 0 || index >= declarativeLocations_.count()) { - qmlInfo(this) << QStringLiteral("Index '%1' out of range").arg(index); + qmlWarning(this) << QStringLiteral("Index '%1' out of range").arg(index); return 0; } return declarativeLocations_.at(index); @@ -679,12 +679,12 @@ void QDeclarativeGeocodeModel::setQuery(const QVariant &query) connect(address_, SIGNAL(streetChanged()), this, SLOT(queryContentChanged())); connect(address_, SIGNAL(postalCodeChanged()), this, SLOT(queryContentChanged())); } else { - qmlInfo(this) << QStringLiteral("Unsupported query type for geocode model ") + qmlWarning(this) << QStringLiteral("Unsupported query type for geocode model ") << QStringLiteral("(coordinate, string and Address supported)."); return; } } else { - qmlInfo(this) << QStringLiteral("Unsupported query type for geocode model ") + qmlWarning(this) << QStringLiteral("Unsupported query type for geocode model ") << QStringLiteral("(coordinate, string and Address supported)."); return; } diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp index 050b5afb..a46d8b81 100644 --- a/src/imports/location/qdeclarativegeomap.cpp +++ b/src/imports/location/qdeclarativegeomap.cpp @@ -516,7 +516,7 @@ QSGNode *QDeclarativeGeoMap::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeDa void QDeclarativeGeoMap::setPlugin(QDeclarativeGeoServiceProvider *plugin) { if (m_plugin) { - qmlInfo(this) << QStringLiteral("Plugin is a write-once property, and cannot be set again."); + qmlWarning(this) << QStringLiteral("Plugin is a write-once property, and cannot be set again."); return; } m_plugin = plugin; diff --git a/src/imports/location/qdeclarativegeomapitembase.cpp b/src/imports/location/qdeclarativegeomapitembase.cpp index 1788f740..b4ba761d 100644 --- a/src/imports/location/qdeclarativegeomapitembase.cpp +++ b/src/imports/location/qdeclarativegeomapitembase.cpp @@ -102,11 +102,11 @@ void QDeclarativeGeoMapItemBase::afterChildrenChanged() if (i->flags() & QQuickItem::ItemHasContents && !qobject_cast<QQuickMouseArea *>(i)) { if (!printedWarning) { - qmlInfo(this) << "Geographic map items do not support child items"; + qmlWarning(this) << "Geographic map items do not support child items"; printedWarning = true; } - qmlInfo(i) << "deleting this child"; + qmlWarning(i) << "deleting this child"; i->deleteLater(); } } diff --git a/src/imports/location/qdeclarativegeomapquickitem.cpp b/src/imports/location/qdeclarativegeomapquickitem.cpp index a66efb1d..41f2a821 100644 --- a/src/imports/location/qdeclarativegeomapquickitem.cpp +++ b/src/imports/location/qdeclarativegeomapquickitem.cpp @@ -224,11 +224,11 @@ void QDeclarativeGeoMapQuickItem::afterChildrenChanged() && sourceItem_.data() != i && opacityContainer_ != i) { if (!printedWarning) { - qmlInfo(this) << "Use the sourceItem property for the contained item, direct children are not supported"; + qmlWarning(this) << "Use the sourceItem property for the contained item, direct children are not supported"; printedWarning = true; } - qmlInfo(i) << "deleting this child"; + qmlWarning(i) << "deleting this child"; i->deleteLater(); } } diff --git a/src/imports/location/qdeclarativegeoroute.cpp b/src/imports/location/qdeclarativegeoroute.cpp index 9fe29090..44c59ce2 100644 --- a/src/imports/location/qdeclarativegeoroute.cpp +++ b/src/imports/location/qdeclarativegeoroute.cpp @@ -189,7 +189,7 @@ void QDeclarativeGeoRoute::setPath(const QJSValue &value) QGeoCoordinate c = parseCoordinate(value.property(i), &ok); if (!ok || !c.isValid()) { - qmlInfo(this) << "Unsupported path type"; + qmlWarning(this) << "Unsupported path type"; return; } diff --git a/src/imports/location/qdeclarativegeoroutemodel.cpp b/src/imports/location/qdeclarativegeoroutemodel.cpp index af01d25d..90796412 100644 --- a/src/imports/location/qdeclarativegeoroutemodel.cpp +++ b/src/imports/location/qdeclarativegeoroutemodel.cpp @@ -197,7 +197,7 @@ void QDeclarativeGeoRouteModel::cancel() QDeclarativeGeoRoute *QDeclarativeGeoRouteModel::get(int index) { if (index < 0 || index >= routes_.count()) { - qmlInfo(this) << QStringLiteral("Index '%1' out of range").arg(index); + qmlWarning(this) << QStringLiteral("Index '%1' out of range").arg(index); return 0; } return routes_.at(index); @@ -229,12 +229,12 @@ int QDeclarativeGeoRouteModel::rowCount(const QModelIndex &parent) const QVariant QDeclarativeGeoRouteModel::data(const QModelIndex &index, int role) const { if (!index.isValid()) { - qmlInfo(this) << QStringLiteral("Error in indexing route model's data (invalid index)."); + qmlWarning(this) << QStringLiteral("Error in indexing route model's data (invalid index)."); return QVariant(); } if (index.row() >= routes_.count()) { - qmlInfo(this) << QStringLiteral("Fatal error in indexing route model's data (index overflow)."); + qmlWarning(this) << QStringLiteral("Fatal error in indexing route model's data (index overflow)."); return QVariant(); } @@ -807,7 +807,7 @@ void QDeclarativeGeoRouteQuery::setWaypoints(const QJSValue &value) QGeoCoordinate c = parseCoordinate(value.property(i), &ok); if (!ok || !c.isValid()) { - qmlInfo(this) << "Unsupported waypoint type"; + qmlWarning(this) << "Unsupported waypoint type"; return; } @@ -863,7 +863,7 @@ void QDeclarativeGeoRouteQuery::setExcludedAreas(const QJSValue &value) QGeoRectangle r = parseRectangle(value.property(i), &ok); if (!ok || !r.isValid()) { - qmlInfo(this) << "Unsupported area type"; + qmlWarning(this) << "Unsupported area type"; return; } @@ -926,7 +926,7 @@ void QDeclarativeGeoRouteQuery::removeExcludedArea(const QGeoRectangle &area) int index = excludedAreas.lastIndexOf(area); if (index == -1) { - qmlInfo(this) << QStringLiteral("Cannot remove nonexistent area."); + qmlWarning(this) << QStringLiteral("Cannot remove nonexistent area."); return; } excludedAreas.removeAt(index); @@ -966,7 +966,7 @@ void QDeclarativeGeoRouteQuery::clearExcludedAreas() void QDeclarativeGeoRouteQuery::addWaypoint(const QGeoCoordinate &waypoint) { if (!waypoint.isValid()) { - qmlInfo(this) << QStringLiteral("Not adding invalid waypoint."); + qmlWarning(this) << QStringLiteral("Not adding invalid waypoint."); return; } @@ -995,7 +995,7 @@ void QDeclarativeGeoRouteQuery::removeWaypoint(const QGeoCoordinate &waypoint) int index = waypoints.lastIndexOf(waypoint); if (index == -1) { - qmlInfo(this) << QStringLiteral("Cannot remove nonexistent waypoint."); + qmlWarning(this) << QStringLiteral("Cannot remove nonexistent waypoint."); return; } diff --git a/src/imports/location/qdeclarativegeoserviceprovider.cpp b/src/imports/location/qdeclarativegeoserviceprovider.cpp index 5b655f73..8ed6a7bf 100644 --- a/src/imports/location/qdeclarativegeoserviceprovider.cpp +++ b/src/imports/location/qdeclarativegeoserviceprovider.cpp @@ -182,7 +182,7 @@ void QDeclarativeGeoServiceProvider::componentComplete() } } - qmlInfo(this) << "Could not find a plugin with the required features to attach to"; + qmlWarning(this) << "Could not find a plugin with the required features to attach to"; } } diff --git a/src/imports/location/qdeclarativepolygonmapitem.cpp b/src/imports/location/qdeclarativepolygonmapitem.cpp index 41196770..ee603f8c 100644 --- a/src/imports/location/qdeclarativepolygonmapitem.cpp +++ b/src/imports/location/qdeclarativepolygonmapitem.cpp @@ -413,7 +413,7 @@ void QDeclarativePolygonMapItem::setPath(const QJSValue &value) QGeoCoordinate c = parseCoordinate(value.property(i), &ok); if (!ok || !c.isValid()) { - qmlInfo(this) << "Unsupported path type"; + qmlWarning(this) << "Unsupported path type"; return; } diff --git a/src/imports/location/qdeclarativepolylinemapitem.cpp b/src/imports/location/qdeclarativepolylinemapitem.cpp index 2153b036..623629dc 100644 --- a/src/imports/location/qdeclarativepolylinemapitem.cpp +++ b/src/imports/location/qdeclarativepolylinemapitem.cpp @@ -534,7 +534,7 @@ void QDeclarativePolylineMapItem::setPath(const QJSValue &value) QGeoCoordinate c = parseCoordinate(value.property(i), &ok); if (!ok || !c.isValid()) { - qmlInfo(this) << "Unsupported path type"; + qmlWarning(this) << "Unsupported path type"; return; } diff --git a/src/imports/positioning/qdeclarativepositionsource.cpp b/src/imports/positioning/qdeclarativepositionsource.cpp index 35ff33b3..8be953f7 100644 --- a/src/imports/positioning/qdeclarativepositionsource.cpp +++ b/src/imports/positioning/qdeclarativepositionsource.cpp @@ -311,7 +311,7 @@ void QDeclarativePositionSource::setNmeaSource(const QUrl &nmeaSource) QTimer::singleShot(0, this, SLOT(start())); } } else { - qmlInfo(this) << QStringLiteral("Nmea file not found") << localFileName; + qmlWarning(this) << QStringLiteral("Nmea file not found") << localFileName; #ifdef QDECLARATIVE_POSITION_DEBUG qDebug() << "QDeclarativePositionSource NMEA File was not found: " << localFileName; #endif |