Index: sources/view/valarmstatus.cpp
===================================================================
diff -u -r5abbbc0d8019925283cc4b38c782afde9802aa35 -rfa1f16359855b827d0e63e48df4f448ab11f54b9
--- sources/view/valarmstatus.cpp	(.../valarmstatus.cpp)	(revision 5abbbc0d8019925283cc4b38c782afde9802aa35)
+++ sources/view/valarmstatus.cpp	(.../valarmstatus.cpp)	(revision fa1f16359855b827d0e63e48df4f448ab11f54b9)
@@ -66,33 +66,22 @@
 
 /*!
  * \brief   VAlarmStatus::alarmIDText
- * \details this code is the place holder for the alarms description mapping
- *          since it is another feature
- *          it returns the enum name for now
+ * \details Looks up the alarm text from the alarm ID
  * \param   vEnum - The Alarm ID
- * \return  String representation of the Alarm Id Enum name
+ * \return  The alarm text (QString)
  */
 QString VAlarmStatus::alarmIDText(GuiAlarmID vEnum)
 {
-    // TEST : this code is the place holder for the alarms description mapping
-    // since it is another feature
-    // it returns the enum name for now
     const QMetaObject *mo = qt_getEnumMetaObject(vEnum);
     int enumIdx = mo->indexOfEnumerator(qt_getEnumName(vEnum));
     const char *key = mo->enumerator(enumIdx).valueToKey(vEnum);
     if (key)
-    {
-        Model::MAlarmStatus mData;
-        return mData.toText(vEnum);
-    } else
-    {
+        return Model::MAlarmStatus::toText(vEnum);
+    else
         return QString("ALARM_ID_UNDEFINED [%1]").arg(vEnum);
-    }
 }
 
 QString View::VAlarmStatus::text()
 {
-    if (alarm_AlarmID() != GuiAlarmID::ALARM_ID_NO_ALARM)
-        return alarmIDText(static_cast<GuiAlarmID>(alarm_AlarmID()));
-    return "No Alarm";
+    return alarmIDText(static_cast<GuiAlarmID>(alarm_AlarmID()));
 }