From da69cf582bdc5017d4bd9384418b3f7cc33bd0d9 Mon Sep 17 00:00:00 2001
From: Keuckdo Bang <keuckdo.bang@samsung.net>
Date: Fri, 14 Jun 2013 16:51:21 +0900
Subject: [PATCH] Fixed return value.

Change-Id: Ie205317d265064a19e909e92947e4a345c040cfa
---
 src/ui/controls/FUiCtrl_Form.cpp      | 8 ++++----
 src/ui/controls/FUiCtrl_FormImpl.cpp  | 4 ++--
 src/ui/controls/FUiCtrl_Indicator.cpp | 6 +++---
 src/ui/inc/FUiCtrl_Form.h             | 2 +-
 src/ui/inc/FUiCtrl_Indicator.h        | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/ui/controls/FUiCtrl_Form.cpp b/src/ui/controls/FUiCtrl_Form.cpp
index dc460cc..799909d 100644
--- a/src/ui/controls/FUiCtrl_Form.cpp
+++ b/src/ui/controls/FUiCtrl_Form.cpp
@@ -2985,7 +2985,7 @@ _Form::SetIndicatorShowState(bool state)
 	return r;
 }
 
-result
+void
 _Form::SetIndicatorAutoHide(bool autohide)
 {
 	result r = E_SUCCESS;
@@ -2998,11 +2998,11 @@ _Form::SetIndicatorAutoHide(bool autohide)
 		FrameShowMode mode = pFrame->GetShowMode();
 		if (mode == FRAME_SHOW_MODE_FULL_SCREEN)
 		{
-			r = __pIndicator->SetIndicatorAutoHide(autohide);
-			SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
+			__pIndicator->SetIndicatorAutoHide(autohide);
+			r = GetLastResult();
+			SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
 		}
 	}
-	return r;
 }
 
 result
diff --git a/src/ui/controls/FUiCtrl_FormImpl.cpp b/src/ui/controls/FUiCtrl_FormImpl.cpp
index 8cbfdac..7ede3b3 100644
--- a/src/ui/controls/FUiCtrl_FormImpl.cpp
+++ b/src/ui/controls/FUiCtrl_FormImpl.cpp
@@ -336,13 +336,13 @@ _FormImpl::SetFormStyle(unsigned long formStyle)
 	else if(FORM_STYLE_INDICATOR_AUTO_HIDE & formStyle)
 	{
 		r = GetCore().SetIndicatorShowState(true);
-		r = GetCore().SetIndicatorAutoHide(true);
+		GetCore().SetIndicatorAutoHide(true);
 		SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
 	}
 	else
 	{
 		r = GetCore().SetIndicatorShowState(false);
-		r = GetCore().SetIndicatorAutoHide(false);
+		GetCore().SetIndicatorAutoHide(false);
 		SysTryReturnVoidResult(NID_UI_CTRL, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
 	}
 
diff --git a/src/ui/controls/FUiCtrl_Indicator.cpp b/src/ui/controls/FUiCtrl_Indicator.cpp
index fe5af99..b8453ea 100644
--- a/src/ui/controls/FUiCtrl_Indicator.cpp
+++ b/src/ui/controls/FUiCtrl_Indicator.cpp
@@ -135,7 +135,7 @@ _Indicator::SetIndicatorShowState(bool state)
 	return r;
 }
 
-result
+void
 _Indicator::SetIndicatorAutoHide(bool autohide)
 {
 	Ecore_X_Window win;
@@ -145,9 +145,9 @@ _Indicator::SetIndicatorAutoHide(bool autohide)
 	}
 
 	Ecore_Evas *pPortraitEe = ecore_evas_object_ecore_evas_get(__pPortraitIndicatorEvasObject);
-	SysTryReturnResult(NID_UI_CTRL, pPortraitEe, E_SYSTEM, "[E_SYSTEM] Unable to get evas.");
+	SysTryReturnVoidResult(NID_UI_CTRL, pPortraitEe, E_SYSTEM, "[E_SYSTEM] Unable to get evas.");
 	Ecore_Evas *pLandscapeEe = ecore_evas_object_ecore_evas_get(__pLandscapeIndicatorEvasObject);
-	SysTryReturnResult(NID_UI_CTRL, pLandscapeEe, E_SYSTEM, "[E_SYSTEM] Unable to get evas.");
+	SysTryReturnVoidResult(NID_UI_CTRL, pLandscapeEe, E_SYSTEM, "[E_SYSTEM] Unable to get evas.");
 
 	if (autohide)
 	{
diff --git a/src/ui/inc/FUiCtrl_Form.h b/src/ui/inc/FUiCtrl_Form.h
index a40ec80..12954c7 100644
--- a/src/ui/inc/FUiCtrl_Form.h
+++ b/src/ui/inc/FUiCtrl_Form.h
@@ -182,7 +182,7 @@ public:
 	void SetTabStyle(int style);
 
 	result SetIndicatorShowState(bool state);
-	result SetIndicatorAutoHide(bool autohide);
+	void SetIndicatorAutoHide(bool autohide);
 	result SetIndicatorOpacity(_IndicatorOpacity opacity);
 
 	virtual bool OnMousePressed(const _Control& source, const _MouseInfo& mouseinfo);
diff --git a/src/ui/inc/FUiCtrl_Indicator.h b/src/ui/inc/FUiCtrl_Indicator.h
index 43b1d4f..51753a5 100644
--- a/src/ui/inc/FUiCtrl_Indicator.h
+++ b/src/ui/inc/FUiCtrl_Indicator.h
@@ -52,7 +52,7 @@ public:
 		static _Indicator* CreateIndicator(void);
 
 		result SetIndicatorShowState(bool state);
-		result SetIndicatorAutoHide(bool autohide);
+		void SetIndicatorAutoHide(bool autohide);
 		result SetIndicatorOpacity(_IndicatorOpacity opacity);
 		bool GetIndicatorShowState(void) const;
 		_IndicatorOpacity GetIndicatorOpacity(void) const;
-- 
2.7.4