From 317e5efbb4073aeb4bd72f920fb1993a52d8749d Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Thu, 5 Jan 2017 20:54:48 +0100 Subject: QtPim: 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: I19e18b4015d4974366fdbc3c28b9da8e90754f86 Reviewed-by: Simon Hausmann --- src/imports/contacts/qdeclarativecontactrelationship.cpp | 2 +- src/imports/contacts/qdeclarativecontactrelationshipmodel.cpp | 2 +- src/imports/organizer/qdeclarativeorganizermodel.cpp | 2 +- src/imports/organizer/qdeclarativeorganizerrecurrencerule.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/imports/contacts/qdeclarativecontactrelationship.cpp b/src/imports/contacts/qdeclarativecontactrelationship.cpp index ebb9edfce..55e3e79d2 100644 --- a/src/imports/contacts/qdeclarativecontactrelationship.cpp +++ b/src/imports/contacts/qdeclarativecontactrelationship.cpp @@ -141,7 +141,7 @@ void QDeclarativeContactRelationship::setRelationshipType(const QVariant& relati break; default: //unknown type - qmlInfo(this) << tr("unknown relationship type:") << relationshipType; + qmlWarning(this) << tr("unknown relationship type:") << relationshipType; break; } } else { diff --git a/src/imports/contacts/qdeclarativecontactrelationshipmodel.cpp b/src/imports/contacts/qdeclarativecontactrelationshipmodel.cpp index 11c65f6a3..92abbdf8b 100644 --- a/src/imports/contacts/qdeclarativecontactrelationshipmodel.cpp +++ b/src/imports/contacts/qdeclarativecontactrelationshipmodel.cpp @@ -410,7 +410,7 @@ void QDeclarativeContactRelationshipModel::relationshipsRemoved() endRemoveRows(); } else { //impossible? - qmlInfo(this) << tr("this relationship '") << row << tr("' was already removed!"); + qmlWarning(this) << tr("this relationship '") << row << tr("' was already removed!"); } } } diff --git a/src/imports/organizer/qdeclarativeorganizermodel.cpp b/src/imports/organizer/qdeclarativeorganizermodel.cpp index e270ecf66..e4cc0d82f 100644 --- a/src/imports/organizer/qdeclarativeorganizermodel.cpp +++ b/src/imports/organizer/qdeclarativeorganizermodel.cpp @@ -1326,7 +1326,7 @@ void QDeclarativeOrganizerModel::removeItems(const QStringList& ids) // FIXME: no special format for occurrence ids foreach (const QString& id, ids) { if (id.startsWith(QString("qtorganizer:occurrence"))) { - qmlInfo(this) << tr("Can't remove an occurrence item, please modify the parent item's recurrence rule instead!"); + qmlWarning(this) << tr("Can't remove an occurrence item, please modify the parent item's recurrence rule instead!"); continue; } QOrganizerItemId itemId = QOrganizerItemId::fromString(id); diff --git a/src/imports/organizer/qdeclarativeorganizerrecurrencerule.cpp b/src/imports/organizer/qdeclarativeorganizerrecurrencerule.cpp index bc0d8b58f..41dcbbaaf 100644 --- a/src/imports/organizer/qdeclarativeorganizerrecurrencerule.cpp +++ b/src/imports/organizer/qdeclarativeorganizerrecurrencerule.cpp @@ -123,7 +123,7 @@ void QDeclarativeOrganizerRecurrenceRule::setLimit(const QVariant &value) } } else { // TODO throw an error event - qmlInfo(this) << tr("Invalid recurrence rule limit; value ,") << value << tr(", did not match one of the types: date, integer or double"); + qmlWarning(this) << tr("Invalid recurrence rule limit; value ,") << value << tr(", did not match one of the types: date, integer or double"); } } -- cgit v1.2.3