Index: sources/model/hd/alarm/MAlarmStatusData.h
===================================================================
diff -u -rc241fc1d31be3e4958582dff94de8189f5bbba67 -r45ce6e781782be5de1480a1e7acecd1d272bcc84
--- sources/model/hd/alarm/MAlarmStatusData.h	(.../MAlarmStatusData.h)	(revision c241fc1d31be3e4958582dff94de8189f5bbba67)
+++ sources/model/hd/alarm/MAlarmStatusData.h	(.../MAlarmStatusData.h)	(revision 45ce6e781782be5de1480a1e7acecd1d272bcc84)
@@ -2,14 +2,14 @@
  *
  * Copyright (c) 2019-2020 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.
+ *          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 MAlarmStatusData.h
- * \author (last) Behrouz NematiPour
- * \date (last) 16-Oct-2020
- * \author (original) Behrouz NemaiPour
- * \date (original) 02-Jul-2020
+ * \file    MAlarmStatusData.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      16-Oct-2020
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  02-Dec-2020
  *
  */
 #pragma once
@@ -18,6 +18,7 @@
 #include <QString>
 
 // Project
+#include "MAbstract.h"
 #include "types.h"
 #include "GuiGlobals.h"
 
@@ -52,28 +53,27 @@
  * | infoText     | Alarm Status  |
  *
  */
-class MAlarmStatus {
+class MAlarmStatus : public MAbstract {
 
     // friends
     friend class ::tst_models;
 
+    QVariantList parameters() const override;
+
+    struct {
+        Types::U32   mState                 ;
+        Types::U32   mTop                   ;
+        Types::U32   mEscalatesIn           ;
+        Types::U32   mMuteTimeout           ;
+        Types::Flags mFlags                 ;
+    } _data;
+
 public:
-    enum Flag {
-        eFlag_systemFault    = 0 ,
-        eFlag_stop               ,
-        eFlag_noClear            ,
-        eFlag_noResume           ,
-        eFlag_noRinseback        ,
-        eFlag_noEndTreatment     ,
-        eFlag_noNewTreatment     ,
-        eFlag_bypassDialyzer     ,
-        eFlag_alarmsToEscalate   ,
-        eFlag_alarmsSilenced     ,
-        eFlag_userAcknowledged   ,
-        eFlag_Bits_Length    = 16,
-    };
 
-    QString  stringPrefix = "Alarm Status";
+    Type_Enum    typeText  () const override { return Type_Enum::eEvent      ; }
+    Unit_Enum    unitText  () const override { return Unit_Enum::eHD         ; }
+    QString      infoText  () const override { return QString("AlarmStatus") ; }
+
     struct Data {
         quint32     mState               = 0; ///< State       - Alarm Priority
         quint32     mTop                 = 0; ///< Top         - Top current alarm ID
@@ -82,26 +82,15 @@
         QBitArray   mFlags                  ; ///< Flags       - Flags
     };
 
-private:
-    struct {
-        Types::U32   mState                 ;
-        Types::U32   mTop                   ;
-        Types::U32   mEscalatesIn           ;
-        Types::U32   mMuteTimeout           ;
-        Types::Flags mFlags                 ;
-    } _data;
-
 public:
-    MAlarmStatus();
+    MAlarmStatus() { }
 
-    QString toString        (                                   ) const ;
-    void    toVariantList   (      QVariantList     &vData      ) const ;
-    bool    fromByteArray   (const QByteArray       &vByteArray , int *vIndex = nullptr);
-    static QString toText   (      Gui::GuiAlarmID   vAlarmID);
+    bool    fromByteArray   (const QByteArray   &vByteArray  , int *vIndex = nullptr)       override;
+    Data    data            (                                                       ) const         ;
 
-    Data    data() const ;
+    static QString toText   (Gui::GuiAlarmID vAlarmID);
+
 };
 }
 
 typedef Model::MAlarmStatus::Data AlarmStatusData;
-typedef Model::MAlarmStatus::Flag AlarmStatusFlag;