From 4bb902c530137d1599bca2b8954a807c81878cb4 Mon Sep 17 00:00:00 2001 From: Keuckdo Bang Date: Wed, 11 Sep 2013 18:26:17 +0900 Subject: [PATCH] Apply reviewed code. Change-Id: I0d507cd46c9b30be551fbd907b759e4c05fde492 --- inc/FUiControl.h | 3 ++- inc/FUiWindow.h | 2 +- src/ui/FUiWindow.cpp | 2 +- src/ui/FUi_Control.cpp | 14 +++++++------- src/ui/inc/FUi_Control.h | 14 +++++++------- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/inc/FUiControl.h b/inc/FUiControl.h index fce347e..d817c46 100644 --- a/inc/FUiControl.h +++ b/inc/FUiControl.h @@ -1275,6 +1275,7 @@ public: * * delete pCanvas; * } + * Control::OnDraw(); * // Do not call Show(). It will be called automatically after OnDraw() callback. * return r; * } @@ -1406,7 +1407,7 @@ public: * * @since 2.0 * - * @return @c true if the show states of the specified control and tis ancestor controls are set to @c true, @n + * @return @c true if the show states of the specified control and its ancestor controls are set to @c true, @n * else @c false if this method is called before the control is added to a parent or the show state * of the specified control or its parent control is set to @c false. * @see GetShowState() diff --git a/inc/FUiWindow.h b/inc/FUiWindow.h index ebc8eac..8c3283a 100644 --- a/inc/FUiWindow.h +++ b/inc/FUiWindow.h @@ -137,7 +137,7 @@ public: * @param[in] pControl The control * @remarks The ownership of @c pControl is not transferred to this instance. It is the developer's responsibility to deallocate @c pControl even after calling this method. */ - void SetOwner(Tizen::Ui::Control *pControl); + void SetOwner(Tizen::Ui::Control* pControl); /** * Gets the owner of the window. diff --git a/src/ui/FUiWindow.cpp b/src/ui/FUiWindow.cpp index 9e0c5c2..f28be66 100644 --- a/src/ui/FUiWindow.cpp +++ b/src/ui/FUiWindow.cpp @@ -160,7 +160,7 @@ Window::SetZOrderGroup(WindowZOrderGroup windowZOrderGroup) } void -Window::SetOwner(Tizen::Ui::Control *pControl) +Window::SetOwner(Tizen::Ui::Control* pControl) { _WindowImpl* pImpl = _WindowImpl::GetInstance(*this); SysAssertf(pImpl != null, "Not yet constructed. Construct() should be called before use."); diff --git a/src/ui/FUi_Control.cpp b/src/ui/FUi_Control.cpp index aa9bc45..e4d4959 100644 --- a/src/ui/FUi_Control.cpp +++ b/src/ui/FUi_Control.cpp @@ -1438,7 +1438,7 @@ _Control::GetChildList() } bool -_Control::IsCalledCallAttachingToMainTree(void) +_Control::IsCalledCallAttachingToMainTree(void) const { return __isCalledCallOnAttachingToMainTree; } @@ -1450,13 +1450,13 @@ _Control::SetCalledCallAttachingToMainTree(bool isAttaching) } bool -_Control::IsCalledCallPreAttachedToMainTree(void) +_Control::IsCalledCallPreAttachedToMainTree(void) const { return __isCalledCallOnPreAttachedToMainTree; } bool -_Control::IsCalledCallAttachedToMainTree(void) +_Control::IsCalledCallAttachedToMainTree(void) const { return __isCalledCallOnAttachedToMainTree; } @@ -2590,7 +2590,7 @@ _Control::SetFocusWindowActivationChecked(bool isChecked) } bool -_Control::IsFocusWindowActivationChecked(void) +_Control::IsFocusWindowActivationChecked(void) const { return __isFocusWindowActivationChecked; } @@ -3792,7 +3792,7 @@ _Control::SetClientBounds(const FloatRectangle& bounds) } bool -_Control::IsCalledSetClientBounds(void) +_Control::IsCalledSetClientBounds(void) const { return __isSetClientBounds; } @@ -4121,7 +4121,7 @@ _Control::SetDrawWhenVisible(bool draw) } bool -_Control::IsDrawWhenVisible(void) +_Control::IsDrawWhenVisible(void) const { return __drawWhenVisible; } @@ -4133,7 +4133,7 @@ _Control::SetTerminatingOrder(bool postOrderTraversal) } bool -_Control::IsPostOrderTraversal(void) +_Control::IsPostOrderTraversal(void) const { return __isPostOrderTraversal; } diff --git a/src/ui/inc/FUi_Control.h b/src/ui/inc/FUi_Control.h index 29f8460..552a0c3 100644 --- a/src/ui/inc/FUi_Control.h +++ b/src/ui/inc/FUi_Control.h @@ -389,9 +389,9 @@ public: Tizen::Graphics::Rectangle GetInvalidatedBounds(void) const; Tizen::Graphics::FloatRectangle GetInvalidatedBoundsF(void) const; void SetDrawWhenVisible(bool draw); - bool IsDrawWhenVisible(void); + bool IsDrawWhenVisible(void) const; void SetTerminatingOrder(bool postOrderTraversal); - bool IsPostOrderTraversal(void); + bool IsPostOrderTraversal(void) const; // Font result SetFont(const Tizen::Base::String& fontName); @@ -426,7 +426,7 @@ public: bool IsNativeObjectFocusable(void) const; void SetNativeObjectFocusable(bool focusable); void SetFocusWindowActivationChecked(bool isChecked); - bool IsFocusWindowActivationChecked(void); + bool IsFocusWindowActivationChecked(void) const; // Focus UI void SetPreviousFocus(_Control* pPreviousFocus); @@ -488,7 +488,7 @@ public: Tizen::Graphics::FloatRectangle GetAbsoluteBoundsF(bool recalcAlways = false) const; result SetClientBounds(const Tizen::Graphics::Rectangle& bounds); result SetClientBounds(const Tizen::Graphics::FloatRectangle& bounds); - bool IsCalledSetClientBounds(void); + bool IsCalledSetClientBounds(void) const; virtual void UpdateClientBounds(const Tizen::Graphics::FloatDimension& size, Tizen::Graphics::FloatRectangle& clientBounds); void InvalidateHierarchyAbsoluteBounds(_Control& control); @@ -625,11 +625,11 @@ private: result EndAttaching(_Control& child); void SetParent(_Control* pParent); - bool IsCalledCallAttachingToMainTree(void); + bool IsCalledCallAttachingToMainTree(void) const; void SetCalledCallAttachingToMainTree(bool isAttaching); - bool IsCalledCallPreAttachedToMainTree(void); + bool IsCalledCallPreAttachedToMainTree(void) const; void SetCalledCallPreAttachedToMainTree(bool isAttached); - bool IsCalledCallAttachedToMainTree(void); + bool IsCalledCallAttachedToMainTree(void) const; void SetCalledCallAttachedToMainTree(bool isAttached); result CallOnAttachingToMainTree(_Control& control); -- 2.7.4