From 98c5057c28b067dd38fce7975953572a6db80fb5 Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 12 Mar 2020 11:22:08 +0100 Subject: [PATCH] Made APMFactMetaDataRaw a qobject-derived class to manage its lifetime by parent --- src/FirmwarePlugin/APM/APMParameterMetaData.cc | 2 +- src/FirmwarePlugin/APM/APMParameterMetaData.h | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/FirmwarePlugin/APM/APMParameterMetaData.cc b/src/FirmwarePlugin/APM/APMParameterMetaData.cc index e463808ef..7859fea5b 100644 --- a/src/FirmwarePlugin/APM/APMParameterMetaData.cc +++ b/src/FirmwarePlugin/APM/APMParameterMetaData.cc @@ -260,7 +260,7 @@ void APMParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData qCDebug(APMParameterMetaDataLog) << "Duplicate parameter found:" << name; rawMetaData = _vehicleTypeToParametersMap[currentCategory][name]; } else { - rawMetaData = new APMFactMetaDataRaw(); + rawMetaData = new APMFactMetaDataRaw(this); _vehicleTypeToParametersMap[currentCategory][name] = rawMetaData; groupMembers[group] << name; } diff --git a/src/FirmwarePlugin/APM/APMParameterMetaData.h b/src/FirmwarePlugin/APM/APMParameterMetaData.h index fc028f304..51ca87b45 100644 --- a/src/FirmwarePlugin/APM/APMParameterMetaData.h +++ b/src/FirmwarePlugin/APM/APMParameterMetaData.h @@ -24,11 +24,12 @@ Q_DECLARE_LOGGING_CATEGORY(APMParameterMetaDataLog) Q_DECLARE_LOGGING_CATEGORY(APMParameterMetaDataVerboseLog) -class APMFactMetaDataRaw +class APMFactMetaDataRaw : public QObject { + Q_OBJECT public: - APMFactMetaDataRaw(void) - : rebootRequired(false) + APMFactMetaDataRaw(QObject *parent = nullptr) + : QObject(parent), rebootRequired(false) { } QString name; -- 2.22.0