Index: sources/model/hd/alarm/MAlarmCleared.h =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/model/hd/alarm/MAlarmCleared.h (.../MAlarmCleared.h) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/model/hd/alarm/MAlarmCleared.h (.../MAlarmCleared.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file MAlarmCleared.h - * \author (last) Behrouz NematiPour - * \date (last) 16-Oct-2020 - * \author (original) Behrouz NemaiPour - * \date (original) 02-Jul-2020 + * \file MAlarmCleared.h + * \author (last) Behrouz NematiPour + * \date (last) 03-Dec-2020 + * \author (original) Behrouz NemaiPour + * \date (original) 02-Jul-2020 * */ #pragma once @@ -18,6 +18,7 @@ #include // Project +#include "MAbstract.h" #include "types.h" // forward declarations @@ -47,30 +48,31 @@ * | infoText | Alarm Cleared | * */ -class MAlarmCleared { +class MAlarmCleared : public MAbstract { // friends friend class ::tst_models; -public: - QString stringPrefix = "Alarm Cleared"; - struct Data { - quint32 mAlarmID = 0; ///< Alarm ID - }; + QVariantList parameters() const override; -private: struct { Types::U32 mAlarmID ; } _data; public: - MAlarmCleared () { } + Type_Enum typeText() const override { return Type_Enum::eEvent ; } + Unit_Enum unitText() const override { return Unit_Enum::eHD ; } + QString infoText() const override { return QString("AlarmCleared") ; } - QString toString ( ) const ; - void toVariantList ( QVariantList &vData ) const ; - bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr); + struct Data { + quint32 mAlarmID = 0; ///< Alarm ID + }; - Data data() const; +public: + MAlarmCleared () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; }; }