Index: src/libchengine/FeedbackOperationEventRule.cpp =================================================================== diff -u -N -rf8b6de9c28b2957db0b4e71efa11df8632e41261 -redf1ada01d4339a99fa80c4da7edbb5823adde0e --- src/libchengine/FeedbackOperationEventRule.cpp (.../FeedbackOperationEventRule.cpp) (revision f8b6de9c28b2957db0b4e71efa11df8632e41261) +++ src/libchengine/FeedbackOperationEventRule.cpp (.../FeedbackOperationEventRule.cpp) (revision edf1ada01d4339a99fa80c4da7edbb5823adde0e) @@ -3,6 +3,8 @@ #include "../libstring/TString.h" #include "../libstring/TStringArray.h" #include "../libchcore/TPath.h" +#include "EOperationEventMapper.h" +#include "EFeedbackResultMapper.h" using namespace serializer; using namespace string; @@ -124,20 +126,16 @@ void FeedbackOperationEventRule::StoreInConfig(TConfig& rConfig) const { SetConfigValue(rConfig, _T("OperationEvent.Use"), m_bUseOperationEvent.Get()); - SetConfigValue(rConfig, _T("OperationEvent.Value"), m_eOperationEvent.Get()); + SetConfigValue(rConfig, _T("OperationEvent.Value"), MapEnum(m_eOperationEvent.Get())); SetConfigValue(rConfig, _T("Result"), m_eResult.Get()); } void FeedbackOperationEventRule::ReadFromConfig(const TConfig& rConfig) { - if(!GetConfigValue(rConfig, _T("OperationEvent.Use"), m_bUseOperationEvent.Modify())) - m_bUseOperationEvent = false; - if(!GetConfigValue(rConfig, _T("OperationEvent.Value"), *(int*)m_eOperationEvent.Modify())) - m_eOperationEvent = eOperationEvent_Finished; - - if(!GetConfigValue(rConfig, _T("Result"), *(int*)m_eResult.Modify())) - m_eResult = eResult_Unknown; + m_bUseOperationEvent = GetConfigValueDef(rConfig, _T("OperationEvent.Use"), false); + m_eOperationEvent = UnmapEnum(GetConfigValueDef(rConfig, _T("OperationEvent.Value"), TString(L"finished"))); + m_eResult = UnmapEnum(GetConfigValueDef(rConfig, _T("Result"), TString(L"unknown"))); } bool FeedbackOperationEventRule::HaveSameCondition(const FeedbackOperationEventRule& rSrc) const