Fix deprecation warningsv5.13.0-alpha1

Replace trUtf8() by tr() and implement QAbstractItemModel::roleNames(),
fixing:

multimedia.cpp:76:5: note: in expansion of macro ‘Q_OBJECT’
multimedia.cpp:143:77: warning: ‘static QString QMultimediaDeclarativeModule::trUtf8(const char*, const char*, int)’ is deprecated [-Wdeprecated-declarations]
                 from multimedia.cpp:40:
....
qdeclarativecamerafocus.cpp:403:23: warning: ‘void QAbstractItemModel::setRoleNames(const QHash<int, QByteArray>&)’ is deprecated [-Wdeprecated-declarations]
     setRoleNames(roles);

Change-Id: I2648551a1b2774c45101ab1cad9e0ea3ab79ccbc
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>

1 files changed, 6 insertions, 4 deletions

diff --git a/src/imports/multimedia/qdeclarativecamerafocus.cpp b/src/imports/multimedia/qdeclarativecamerafocus.cpp
index 1dd216467..61c22c066 100644
--- a/src/imports/multimedia/qdeclarativecamerafocus.cpp
+++ b/src/imports/multimedia/qdeclarativecamerafocus.cpp
@@ -397,10 +397,6 @@ void QDeclarativeCameraFocus::updateFocusZones()
 FocusZonesModel::FocusZonesModel(QObject *parent)
     :QAbstractListModel(parent)
 {
-    QHash<int, QByteArray> roles;
-    roles[StatusRole] = "status";
-    roles[AreaRole] = "area";
-    setRoleNames(roles);
 }
 
 int FocusZonesModel::rowCount(const QModelIndex &parent) const
@@ -427,6 +423,12 @@ QVariant FocusZonesModel::data(const QModelIndex &index, int role) const
     return QVariant();
 }
 
+QHash<int,QByteArray> FocusZonesModel::roleNames() const
+{
+    return {{StatusRole, QByteArrayLiteral("status")},
+            {AreaRole, QByteArrayLiteral("area")}};
+}
+
 void FocusZonesModel::setFocusZones(const QCameraFocusZoneList &zones)
 {
     beginResetModel();