Fix compliation warnings

Change-Id: I4f08874c33adce225f5425bc57fe0fb55b5ddd39
Reviewed-by: Robert Griebl <robert.griebl@qt.io>

4 files changed, 10 insertions, 6 deletions

diff --git a/src/ivicore/qivipendingreply.h b/src/ivicore/qivipendingreply.h
index 5536e75..e0b5aeb 100644
--- a/src/ivicore/qivipendingreply.h
+++ b/src/ivicore/qivipendingreply.h
@@ -98,6 +98,8 @@ public:
     QIviPendingReplyBase() = default;
     QIviPendingReplyBase(const QIviPendingReplyBase & other);
     ~QIviPendingReplyBase() = default;
+    QIviPendingReplyBase& operator=(const QIviPendingReplyBase&) = default;
+    QIviPendingReplyBase& operator=(QIviPendingReplyBase&&) = default;
 
     QIviPendingReplyWatcher* watcher() const;
     QVariant value() const;
diff --git a/src/ivicore/qiviservicemanager.cpp b/src/ivicore/qiviservicemanager.cpp
index ea6f150..606c236 100644
--- a/src/ivicore/qiviservicemanager.cpp
+++ b/src/ivicore/qiviservicemanager.cpp
@@ -304,13 +304,15 @@ void QIviServiceManagerPrivate::addBackend(Backend *backend)
 
     const QString newBackendFile = backend->metaData.value(fileNameLiteral).toString();
     const QString newBackendFileBase = qtivi_helper::backendBaseName(newBackendFile);
-    const QSet<QString> newInterfaces = backend->metaData.value(interfacesLiteral).toStringList().toSet();
+    const QStringList ifaceList = backend->metaData.value(interfacesLiteral).toStringList();
+    const QSet<QString> newInterfaces = QSet<QString>(ifaceList.begin(), ifaceList.end());
 
     bool addBackend = true;
     if (!newBackendFile.isEmpty()) {
         for (int i = 0; i < m_backends.count(); i++) {
             Backend *b = m_backends[i];
-            const QSet<QString> interfaces = b->metaData.value(interfacesLiteral).toStringList().toSet();
+            const QStringList curIfaceList = backend->metaData.value(interfacesLiteral).toStringList();
+            const QSet<QString> interfaces = QSet<QString>(curIfaceList.begin(), curIfaceList.end());
             if (interfaces == newInterfaces && b->name == backend->name) {
                 const QString fileName = b->metaData.value(fileNameLiteral).toString();
                 if (fileName == newBackendFile) {
diff --git a/src/plugins/ivimedia/media_simulator/mediaplayerbackend.cpp b/src/plugins/ivimedia/media_simulator/mediaplayerbackend.cpp
index 7ca958c..6863ed3 100644
--- a/src/plugins/ivimedia/media_simulator/mediaplayerbackend.cpp
+++ b/src/plugins/ivimedia/media_simulator/mediaplayerbackend.cpp
@@ -98,7 +98,7 @@ void MediaPlayerBackend::initialize()
 void MediaPlayerBackend::play()
 {
     qCDebug(media) << Q_FUNC_INFO;
-    qCDebug(media) << m_player->media().canonicalUrl();
+    qCDebug(media) << m_player->media().request().url();
     m_requestedState = QIviMediaPlayer::Playing;
     m_player->play();
 }
diff --git a/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp b/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp
index 65882e0..1d1ceea 100644
--- a/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp
+++ b/tests/auto/core/qivisearchandbrowsemodel/tst_qivisearchandbrowsemodel.cpp
@@ -105,12 +105,12 @@ public:
 
     void registerInstance(const QUuid &identifier) override
     {
-        Q_UNUSED(identifier);
+        Q_UNUSED(identifier)
     }
 
     void unregisterInstance(const QUuid &identifier) override
     {
-        Q_UNUSED(identifier);
+        Q_UNUSED(identifier)
     }
 
     void setContentType(const QUuid &identifier, const QString &contentType) override
@@ -197,7 +197,7 @@ public:
 
             QMetaProperty mp = mo.property(mpi);
 
-            qSort(list.begin(), list.end(), [mp, this](const QIviStandardItem &s1, const QIviStandardItem &s2) {
+            std::sort(list.begin(), list.end(), [mp, this](const QIviStandardItem &s1, const QIviStandardItem &s2) {
                 QVariant var1 = mp.readOnGadget(&s1);
                 QVariant var2 = mp.readOnGadget(&s2);
                 if (var1.canConvert(QMetaType::Int) && var1.canConvert(QMetaType::Int)) {