From 3a1086516a5edf30b3bad6a2e138b03bc0479005 Mon Sep 17 00:00:00 2001 From: Christian Linke Date: Thu, 17 Jan 2013 12:47:00 +0100 Subject: * changes that follow the review comments from Thomas G. Signed-off-by: Christian Linke --- AudioManagerDaemon/test/CAmCommonFunctions.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'AudioManagerDaemon/test/CAmCommonFunctions.cpp') diff --git a/AudioManagerDaemon/test/CAmCommonFunctions.cpp b/AudioManagerDaemon/test/CAmCommonFunctions.cpp index c1f1af4..8c5821d 100644 --- a/AudioManagerDaemon/test/CAmCommonFunctions.cpp +++ b/AudioManagerDaemon/test/CAmCommonFunctions.cpp @@ -111,7 +111,7 @@ bool equalMainSoundProperty(const am_MainSoundProperty_s a, const am_MainSoundPr bool equalNotificationConfiguration(const am_NotificationConfiguration_s a, const am_NotificationConfiguration_s b) { - return (a.notificationParameter == b.notificationParameter && a.notificationStatus == b.notificationStatus && a.notificationType == b.notificationType); + return (a.parameter == b.parameter && a.status == b.status && a.type == b.type); } bool equalRoutingElement(const am_RoutingElement_s a, const am_RoutingElement_s b) @@ -320,14 +320,14 @@ std::vector am::CAmCommonFunctions::getStandardN { std::vector listNotificationConfigurations; am_NotificationConfiguration_s tempNotificationConfiguration; - tempNotificationConfiguration.notificationParameter=12; - tempNotificationConfiguration.notificationStatus=NS_PERIODIC; - tempNotificationConfiguration.notificationType=NT_MAX; + tempNotificationConfiguration.parameter=12; + tempNotificationConfiguration.status=NS_PERIODIC; + tempNotificationConfiguration.type=NT_MAX; listNotificationConfigurations.push_back(tempNotificationConfiguration); - tempNotificationConfiguration.notificationParameter=16; - tempNotificationConfiguration.notificationStatus=NS_CHANGE; - tempNotificationConfiguration.notificationType=NT_UNKNOWN; + tempNotificationConfiguration.parameter=16; + tempNotificationConfiguration.status=NS_CHANGE; + tempNotificationConfiguration.type=NT_UNKNOWN; listNotificationConfigurations.push_back(tempNotificationConfiguration); return (listNotificationConfigurations); -- cgit v1.2.1