Fix QNearFieldManager related override warnings

Change-Id: If7adc165e063445ee0c34291a3e3840ddae0f570
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>

5 files changed, 29 insertions, 27 deletions

diff --git a/src/bluetooth/qlowenergycontroller_bluez.cpp b/src/bluetooth/qlowenergycontroller_bluez.cpp
index ea43bbc0..2b979244 100644
--- a/src/bluetooth/qlowenergycontroller_bluez.cpp
+++ b/src/bluetooth/qlowenergycontroller_bluez.cpp
@@ -333,6 +333,7 @@ void QLowEnergyControllerPrivateBluez::init()
             requestTimer->setInterval(gattRequestTimeout);
             connect(requestTimer, &QTimer::timeout,
                     this, &QLowEnergyControllerPrivateBluez::handleGattRequestTimeout);
+            qRegisterMetaTypeStreamOperators<QBluetoothUuid>();
         }
     }
 }
diff --git a/src/nfc/qnearfieldmanager_android_p.h b/src/nfc/qnearfieldmanager_android_p.h
index 563d26bc..7bf444d9 100644
--- a/src/nfc/qnearfieldmanager_android_p.h
+++ b/src/nfc/qnearfieldmanager_android_p.h
@@ -73,18 +73,18 @@ class QNearFieldManagerPrivateImpl : public QNearFieldManagerPrivate, public And
 
 public:
     QNearFieldManagerPrivateImpl();
-    ~QNearFieldManagerPrivateImpl();
+    ~QNearFieldManagerPrivateImpl() override;
 
-    virtual bool isAvailable() const;
+    bool isAvailable() const override;
     bool isSupported() const override;
-    virtual bool startTargetDetection();
-    virtual void stopTargetDetection();
-    virtual int registerNdefMessageHandler(QObject *object, const QMetaMethod &method);
-    virtual int registerNdefMessageHandler(const QNdefFilter &filter, QObject *object, const QMetaMethod &method);
-    virtual bool unregisterNdefMessageHandler(int handlerId);
-    virtual void requestAccess(QNearFieldManager::TargetAccessModes accessModes);
-    virtual void releaseAccess(QNearFieldManager::TargetAccessModes accessModes);
-    virtual void newIntent(QAndroidJniObject intent);
+    bool startTargetDetection() override;
+    void stopTargetDetection() override;
+    int registerNdefMessageHandler(QObject *object, const QMetaMethod &method) override;
+    int registerNdefMessageHandler(const QNdefFilter &filter, QObject *object, const QMetaMethod &method) override;
+    bool unregisterNdefMessageHandler(int handlerId) override;
+    void requestAccess(QNearFieldManager::TargetAccessModes accessModes) override;
+    void releaseAccess(QNearFieldManager::TargetAccessModes accessModes) override;
+    void newIntent(QAndroidJniObject intent);
     QByteArray getUid(const QAndroidJniObject &intent);
 
 public slots:
diff --git a/src/nfc/qnearfieldmanager_emulator_p.h b/src/nfc/qnearfieldmanager_emulator_p.h
index 1b660a23..0416388a 100644
--- a/src/nfc/qnearfieldmanager_emulator_p.h
+++ b/src/nfc/qnearfieldmanager_emulator_p.h
@@ -67,9 +67,9 @@ class QNearFieldManagerPrivateImpl : public QNearFieldManagerPrivateVirtualBase
 
 public:
     QNearFieldManagerPrivateImpl();
-    ~QNearFieldManagerPrivateImpl();
+    ~QNearFieldManagerPrivateImpl() override;
 
-    bool isAvailable() const;
+    bool isAvailable() const override;
 
     void reset();
 
diff --git a/src/nfc/qnearfieldmanager_neard_p.h b/src/nfc/qnearfieldmanager_neard_p.h
index cf026982..88c45c1c 100644
--- a/src/nfc/qnearfieldmanager_neard_p.h
+++ b/src/nfc/qnearfieldmanager_neard_p.h
@@ -71,26 +71,27 @@ class QNearFieldManagerPrivateImpl : public QNearFieldManagerPrivate
 
 public:
     QNearFieldManagerPrivateImpl();
-    ~QNearFieldManagerPrivateImpl();
+    ~QNearFieldManagerPrivateImpl() override;
 
-    bool isAvailable() const;
+    bool isAvailable() const override;
 
     bool isSupported() const override;
 
-    bool startTargetDetection();
+    bool startTargetDetection() override;
 
-    void stopTargetDetection();
+    void stopTargetDetection() override;
 
     // not implemented
-    int registerNdefMessageHandler(QObject *object, const QMetaMethod &method);
+    int registerNdefMessageHandler(QObject *object, const QMetaMethod &method) override;
 
-    int registerNdefMessageHandler(const QNdefFilter &filter, QObject *object, const QMetaMethod &method);
+    int registerNdefMessageHandler(const QNdefFilter &filter, QObject *object,
+                                   const QMetaMethod &method) override;
 
-    bool unregisterNdefMessageHandler(int handlerId);
+    bool unregisterNdefMessageHandler(int handlerId) override;
 
-    void requestAccess(QNearFieldManager::TargetAccessModes accessModes);
+    void requestAccess(QNearFieldManager::TargetAccessModes accessModes) override;
 
-    void releaseAccess(QNearFieldManager::TargetAccessModes accessModes);
+    void releaseAccess(QNearFieldManager::TargetAccessModes accessModes) override;
 
 private Q_SLOTS:
     void handleTagFound(const QDBusObjectPath&);
diff --git a/src/nfc/qnearfieldmanagervirtualbase_p.h b/src/nfc/qnearfieldmanagervirtualbase_p.h
index 3d8cf2ef..164edaf5 100644
--- a/src/nfc/qnearfieldmanagervirtualbase_p.h
+++ b/src/nfc/qnearfieldmanagervirtualbase_p.h
@@ -63,16 +63,16 @@ class QNearFieldManagerPrivateVirtualBase : public QNearFieldManagerPrivate
 
 public:
     QNearFieldManagerPrivateVirtualBase();
-    ~QNearFieldManagerPrivateVirtualBase();
+    ~QNearFieldManagerPrivateVirtualBase() override;
 
-    bool startTargetDetection();
-    void stopTargetDetection();
+    bool startTargetDetection() override;
+    void stopTargetDetection() override;
 
-    int registerNdefMessageHandler(QObject *object, const QMetaMethod &method);
+    int registerNdefMessageHandler(QObject *object, const QMetaMethod &method) override;
     int registerNdefMessageHandler(const QNdefFilter &filter,
-                                   QObject *object, const QMetaMethod &method);
+                                   QObject *object, const QMetaMethod &method) override;
 
-    bool unregisterNdefMessageHandler(int id);
+    bool unregisterNdefMessageHandler(int id) override;
 
 protected:
     struct Callback {