From 26830d435d942ce580dfe17209563c47eb3da722 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 5 Feb 2019 11:36:31 +0100 Subject: Fix deprecation warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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&)’ is deprecated [-Wdeprecated-declarations] setRoleNames(roles); Change-Id: I2648551a1b2774c45101ab1cad9e0ea3ab79ccbc Reviewed-by: VaL Doroshchuk Reviewed-by: Samuel Gaist --- src/imports/multimedia/qdeclarativecamerafocus.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/imports/multimedia/qdeclarativecamerafocus.cpp') 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 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 FocusZonesModel::roleNames() const +{ + return {{StatusRole, QByteArrayLiteral("status")}, + {AreaRole, QByteArrayLiteral("area")}}; +} + void FocusZonesModel::setFocusZones(const QCameraFocusZoneList &zones) { beginResetModel(); -- cgit v1.2.3