Index: sources/view/hd/alarm/VAlarmActiveList.h =================================================================== diff -u -r376859852f4d1a07263c44524aec347db29e0133 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/view/hd/alarm/VAlarmActiveList.h (.../VAlarmActiveList.h) (revision 376859852f4d1a07263c44524aec347db29e0133) +++ sources/view/hd/alarm/VAlarmActiveList.h (.../VAlarmActiveList.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-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 VAlarmActiveList.h - * \author (last) denali - * \date (last) 5/26/2021 - * \author (original) denali - * \date (original) 5/26/2021 + * \author (last) Behrouz NematiPour + * \date (last) 10-Feb-2023 + * \author (original) Behrouz NematiPour + * \date (original) 27-May-2021 * */ #pragma once @@ -18,9 +18,10 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MAlarmActiveList.h" +#include "MSettings.h" namespace View { @@ -38,12 +39,14 @@ // friends friend class ::tst_views; - // coco begin validated: + QMap _alarmTitles; + + // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // coco end + // disabled coco end PROPERTY( quint32, a0ID , 0 ) PROPERTY( quint32, a1ID , 0 ) @@ -72,7 +75,9 @@ PROPERTY(QString , status , "") - VIEW_DEC_CLASS_ADJUSTMENT(VAlarmActiveList, AlarmActiveListResponseData) + VIEW_DEC_CLASS ( VAlarmActiveList ) + VIEW_DEC_SLOT ( AlarmActiveListResponseData ) + VIEW_DEC_SLOT ( SettingsData ) QString alarmIDText(quint32 vID);