Index: sources/view/hd/alarm/VAlarmStatus.h
===================================================================
diff -u -r6f2622be80fcaee8d71baf78404627381157970c -r124c2e38e72a1a655d9d479c9c7a1cd8c5d5e6c4
--- sources/view/hd/alarm/VAlarmStatus.h	(.../VAlarmStatus.h)	(revision 6f2622be80fcaee8d71baf78404627381157970c)
+++ sources/view/hd/alarm/VAlarmStatus.h	(.../VAlarmStatus.h)	(revision 124c2e38e72a1a655d9d479c9c7a1cd8c5d5e6c4)
@@ -1,13 +1,13 @@
 /*!
  *
- * Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2020-2025 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    VAlarmStatus.h
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      18-Apr-2022
+ * \date    (last)      10-Feb-2023
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  26-Aug-2020
  *
@@ -21,9 +21,10 @@
 #include "main.h" // Doxygen : do not remove
 #include "VView.h"
 #include "MTreatmentAdjustRequests.h"
+#include "MAlarmStatusData.h"
+#include "MSettings.h"
 #include "GuiGlobals.h"
 #include "MessageGlobals.h"
-#include "GuiController.h"
 #include "format.h"
 
 // forward declarations
@@ -58,16 +59,8 @@
         bool    hasInstruction() { return instructions.count(); }
     };
 
-    bool isTitle    (const QString &vKey) {
-        return vKey == "Title";
-    }
+    QMap<quint32, AlarmData> _alarms;
 
-    bool isMessage  (const QString &vKey) {
-        return vKey == "Message";
-    }
-
-    QMap<quint16, AlarmData> _alarms;
-
     // ********** DYNAMIC PROPERTIES: The properties which need to be updated by each alarm message received. ********** //
     READONLY( bool    , hasAlarm                    , false)
     // disabled coco begin validated: Has been validated manually