From 98aa6ba02628eb29cc82361fad6d2d8b18ae0488 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Tue, 24 Jul 2018 13:28:55 +0200 Subject: Mark classes derived from QLowEnergyControllerPrivate as final Fixes missing overrides for the dtor in the process. Change-Id: Iea3d010c1cebddaf8ea6ea392a7f13e4d87f67da Reviewed-by: Timur Pocheptsov --- src/bluetooth/qlowenergycontroller_android_p.h | 4 ++-- src/bluetooth/qlowenergycontroller_bluez_p.h | 4 ++-- src/bluetooth/qlowenergycontroller_bluezdbus_p.h | 4 ++-- src/bluetooth/qlowenergycontroller_p.h | 4 ++-- src/bluetooth/qlowenergycontroller_winrt_p.h | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/bluetooth/qlowenergycontroller_android_p.h b/src/bluetooth/qlowenergycontroller_android_p.h index e575d96e..3f97e363 100644 --- a/src/bluetooth/qlowenergycontroller_android_p.h +++ b/src/bluetooth/qlowenergycontroller_android_p.h @@ -92,12 +92,12 @@ extern void registerQLowEnergyControllerMetaType(); class QLeAdvertiser; -class QLowEnergyControllerPrivateAndroid : public QLowEnergyControllerPrivate +class QLowEnergyControllerPrivateAndroid final : public QLowEnergyControllerPrivate { Q_OBJECT public: QLowEnergyControllerPrivateAndroid(); - ~QLowEnergyControllerPrivateAndroid(); + ~QLowEnergyControllerPrivateAndroid() override; void init() override; diff --git a/src/bluetooth/qlowenergycontroller_bluez_p.h b/src/bluetooth/qlowenergycontroller_bluez_p.h index 55a8a482..66c048be 100644 --- a/src/bluetooth/qlowenergycontroller_bluez_p.h +++ b/src/bluetooth/qlowenergycontroller_bluez_p.h @@ -76,12 +76,12 @@ extern void registerQLowEnergyControllerMetaType(); class QLeAdvertiser; -class QLowEnergyControllerPrivateBluez : public QLowEnergyControllerPrivate +class QLowEnergyControllerPrivateBluez final: public QLowEnergyControllerPrivate { Q_OBJECT public: QLowEnergyControllerPrivateBluez(); - ~QLowEnergyControllerPrivateBluez(); + ~QLowEnergyControllerPrivateBluez() override; void init() override; diff --git a/src/bluetooth/qlowenergycontroller_bluezdbus_p.h b/src/bluetooth/qlowenergycontroller_bluezdbus_p.h index 7ac1808f..0e0bfcb5 100644 --- a/src/bluetooth/qlowenergycontroller_bluezdbus_p.h +++ b/src/bluetooth/qlowenergycontroller_bluezdbus_p.h @@ -69,12 +69,12 @@ QT_BEGIN_NAMESPACE class QDBusPendingCallWatcher; -class QLowEnergyControllerPrivateBluezDBus : public QLowEnergyControllerPrivate +class QLowEnergyControllerPrivateBluezDBus final : public QLowEnergyControllerPrivate { Q_OBJECT public: QLowEnergyControllerPrivateBluezDBus(); - ~QLowEnergyControllerPrivateBluezDBus(); + ~QLowEnergyControllerPrivateBluezDBus() override; void init() override; void connectToDevice() override; diff --git a/src/bluetooth/qlowenergycontroller_p.h b/src/bluetooth/qlowenergycontroller_p.h index 623c71a2..54a49b53 100644 --- a/src/bluetooth/qlowenergycontroller_p.h +++ b/src/bluetooth/qlowenergycontroller_p.h @@ -65,12 +65,12 @@ class QLowEnergyServiceData; extern void registerQLowEnergyControllerMetaType(); -class QLowEnergyControllerPrivateCommon : public QLowEnergyControllerPrivate +class QLowEnergyControllerPrivateCommon final : public QLowEnergyControllerPrivate { Q_OBJECT public: QLowEnergyControllerPrivateCommon(); - ~QLowEnergyControllerPrivateCommon(); + ~QLowEnergyControllerPrivateCommon() override; void init() override; diff --git a/src/bluetooth/qlowenergycontroller_winrt_p.h b/src/bluetooth/qlowenergycontroller_winrt_p.h index 7edc4702..783a71fa 100644 --- a/src/bluetooth/qlowenergycontroller_winrt_p.h +++ b/src/bluetooth/qlowenergycontroller_winrt_p.h @@ -73,12 +73,12 @@ class QWinRTLowEnergyServiceHandler; extern void registerQLowEnergyControllerMetaType(); -class QLowEnergyControllerPrivateWinRT : public QLowEnergyControllerPrivate +class QLowEnergyControllerPrivateWinRT final : public QLowEnergyControllerPrivate { Q_OBJECT public: QLowEnergyControllerPrivateWinRT(); - ~QLowEnergyControllerPrivateWinRT(); + ~QLowEnergyControllerPrivateWinRT() override; void init() override; -- cgit v1.2.3