Change function name - OnCanvasRequestedFN() to OnCanvasRequestedN()

Change-Id: I9eee44106f2eaee672386106877bf2d40ccf5a52
Signed-off-by: Jaewon Cho <jaewon7.cho@samsung.com>

diff --git a/src/ui/FUi_Control.cpp b/src/ui/FUi_Control.cpp
index faea898..6e28034 100644 (file)
--- a/src/ui/FUi_Control.cpp
+++ b/src/ui/FUi_Control.cpp
@@ -786,7 +786,7 @@ _Control::OnDraw(void)
 }
 
 Canvas*
-_Control::OnCanvasRequestedFN(const FloatRectangle& bounds)
+_Control::OnCanvasRequestedN(const FloatRectangle& bounds)
 {
 
        return null;
@@ -2356,7 +2356,7 @@ Canvas*
 _Control::GetCanvasN(const Rectangle& bounds) const
 {
        ClearLastResult();
-       Canvas *pCanvas = GetControlDelegate().OnCanvasRequestedFN(FloatRectangle(bounds.x, bounds.y, bounds.width, bounds.height));
+       Canvas *pCanvas = GetControlDelegate().OnCanvasRequestedN(FloatRectangle(bounds.x, bounds.y, bounds.width, bounds.height));
        if (pCanvas == null)
        {
                GetVisualElement()->SetFlushNeeded();
@@ -2380,7 +2380,7 @@ Canvas*
 _Control::GetCanvasN(const FloatRectangle& bounds) const
 {
        ClearLastResult();
-       Canvas *pCanvas = GetControlDelegate().OnCanvasRequestedFN(FloatRectangle(bounds));
+       Canvas *pCanvas = GetControlDelegate().OnCanvasRequestedN(FloatRectangle(bounds));
        if (pCanvas == null)
        {
                GetVisualElement()->SetFlushNeeded();

diff --git a/src/ui/FUi_ControlImpl.cpp b/src/ui/FUi_ControlImpl.cpp
index 064d591..16e9349 100644 (file)
--- a/src/ui/FUi_ControlImpl.cpp
+++ b/src/ui/FUi_ControlImpl.cpp
@@ -2589,9 +2589,9 @@ _ControlImpl::OnDraw(void)
 }
 
 Tizen::Graphics::Canvas*
-_ControlImpl::OnCanvasRequestedFN(const Tizen::Graphics::FloatRectangle& bounds)
+_ControlImpl::OnCanvasRequestedN(const Tizen::Graphics::FloatRectangle& bounds)
 {
-       return GetCore().OnCanvasRequestedFN(bounds);
+       return GetCore().OnCanvasRequestedN(bounds);
 }
 
 Tizen::Graphics::Bitmap*

diff --git a/src/ui/controls/FUiCtrl_Button.cpp b/src/ui/controls/FUiCtrl_Button.cpp
index 83ab77a..235ce54 100644 (file)
--- a/src/ui/controls/FUiCtrl_Button.cpp
+++ b/src/ui/controls/FUiCtrl_Button.cpp
@@ -427,9 +427,9 @@ _Button::OnFocusLost(const _Control& source)
 }
 
 Canvas*
-_Button::OnCanvasRequestedFN(const FloatRectangle& bounds)
+_Button::OnCanvasRequestedN(const FloatRectangle& bounds)
 {
-       return __pButtonPresenter->OnCanvasRequestedFN(bounds);
+       return __pButtonPresenter->OnCanvasRequestedN(bounds);
 }
 
 result

diff --git a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
index 614de60..722fe65 100644 (file)
--- a/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_ButtonPresenter.cpp
@@ -1160,7 +1160,7 @@ _ButtonPresenter::IsEnabledStateChanged(void)
 }
 
 Canvas*
-_ButtonPresenter::OnCanvasRequestedFN(const FloatRectangle& bounds)
+_ButtonPresenter::OnCanvasRequestedN(const FloatRectangle& bounds)
 {
        Canvas* pCanvas = null;
 

diff --git a/src/ui/inc/FUiCtrl_Button.h b/src/ui/inc/FUiCtrl_Button.h
index f891af1..18ca9f2 100644 (file)
--- a/src/ui/inc/FUiCtrl_Button.h
+++ b/src/ui/inc/FUiCtrl_Button.h
@@ -145,7 +145,7 @@ public:
        virtual void OnFocusModeStateChanged(void);
        virtual bool OnFocusGained(const _Control& source);
        virtual bool OnFocusLost(const _Control& source);
-       virtual Tizen::Graphics::Canvas* OnCanvasRequestedFN(const Tizen::Graphics::FloatRectangle& bounds);
+       virtual Tizen::Graphics::Canvas* OnCanvasRequestedN(const Tizen::Graphics::FloatRectangle& bounds);
 
 public:
        result SetText(const Tizen::Base::String& text);

diff --git a/src/ui/inc/FUiCtrl_ButtonPresenter.h b/src/ui/inc/FUiCtrl_ButtonPresenter.h
index 65d1444..1708689 100644 (file)
--- a/src/ui/inc/FUiCtrl_ButtonPresenter.h
+++ b/src/ui/inc/FUiCtrl_ButtonPresenter.h
@@ -73,7 +73,7 @@ public:
        virtual void OnFocusModeStateChanged(void);
        virtual bool OnFocusGained(const _Control& source);
        virtual bool OnFocusLost(const _Control& source);
-       virtual Tizen::Graphics::Canvas* OnCanvasRequestedFN(const Tizen::Graphics::FloatRectangle& bounds);
+       virtual Tizen::Graphics::Canvas* OnCanvasRequestedN(const Tizen::Graphics::FloatRectangle& bounds);
 
        void Draw(void);
 

diff --git a/src/ui/inc/FUi_Control.h b/src/ui/inc/FUi_Control.h
index 3bb7e43..0ac77bc 100644 (file)
--- a/src/ui/inc/FUi_Control.h
+++ b/src/ui/inc/FUi_Control.h
@@ -80,7 +80,7 @@ public:
 
        // Invoked by operations
        virtual void OnDraw(void) = 0;
-       virtual Tizen::Graphics::Canvas* OnCanvasRequestedFN(const Tizen::Graphics::FloatRectangle& bounds) = 0;
+       virtual Tizen::Graphics::Canvas* OnCanvasRequestedN(const Tizen::Graphics::FloatRectangle& bounds) = 0;
        virtual Tizen::Graphics::Bitmap* OnCapturedBitmapRequestedN(void) = 0;
        virtual result OnAttaching(const _Control* pParent) = 0;
        virtual result OnAttached(void) = 0;
@@ -236,7 +236,7 @@ public:
 
 // Callbacks // [ToDo] Make these callbacks protected.
        virtual void OnDraw(void);
-       virtual Tizen::Graphics::Canvas* OnCanvasRequestedFN(const Tizen::Graphics::FloatRectangle& bounds);
+       virtual Tizen::Graphics::Canvas* OnCanvasRequestedN(const Tizen::Graphics::FloatRectangle& bounds);
        virtual Tizen::Graphics::Bitmap* OnCapturedBitmapRequestedN(void);
        virtual result OnAttaching(const _Control* pParent);
        virtual result OnAttached(void);

diff --git a/src/ui/inc/FUi_ControlImpl.h b/src/ui/inc/FUi_ControlImpl.h
index 8f6da30..b79d7a2 100644 (file)
--- a/src/ui/inc/FUi_ControlImpl.h
+++ b/src/ui/inc/FUi_ControlImpl.h
@@ -132,7 +132,7 @@ public:
 
 // Callbacks
        virtual void OnDraw(void);
-       virtual Tizen::Graphics::Canvas* OnCanvasRequestedFN(const Tizen::Graphics::FloatRectangle& size);
+       virtual Tizen::Graphics::Canvas* OnCanvasRequestedN(const Tizen::Graphics::FloatRectangle& size);
        virtual Tizen::Graphics::Bitmap* OnCapturedBitmapRequestedN(void);
        virtual result OnAttaching(const _Control* pParent);
        virtual void OnAttachingFailed(const _Control& parent);