From 29a05560269a60842a2602188ea1b3633cf44b12 Mon Sep 17 00:00:00 2001 From: "huiyu,eun" Date: Mon, 11 Sep 2017 17:21:31 +0900 Subject: [PATCH] [NUI] Fix build warnings fixed warnings - CS0109, CS0114, CS0162, CS0168, CS1572, CS1573, CS1574 Change-Id: Id489dfe4d282d67ed2a38bc6d77a280536bcd213 Signed-off-by: huiyu,eun --- src/Tizen.NUI/src/internal/Builder.cs | 1 + src/Tizen.NUI/src/internal/Camera.cs | 2 +- src/Tizen.NUI/src/internal/ConnectionTracker.cs | 2 +- src/Tizen.NUI/src/internal/CustomActor.cs | 2 +- src/Tizen.NUI/src/internal/GestureDetector.cs | 2 +- src/Tizen.NUI/src/internal/LinearConstrainer.cs | 2 +- src/Tizen.NUI/src/internal/PathConstrainer.cs | 2 +- src/Tizen.NUI/src/internal/Registry.cs | 2 +- src/Tizen.NUI/src/internal/RenderTask.cs | 2 +- src/Tizen.NUI/src/public/BaseComponents/View.cs | 2 +- src/Tizen.NUI/src/public/CustomViewRegistry.cs | 1 - src/Tizen.NUI/src/public/Layer.cs | 4 ++-- src/Tizen.NUI/src/public/NUIConstants.cs | 2 +- src/Tizen.NUI/src/public/Path.cs | 2 +- src/Tizen.NUI/src/public/Window.cs | 4 +++- 15 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/Tizen.NUI/src/internal/Builder.cs b/src/Tizen.NUI/src/internal/Builder.cs index aaa87be..76e6e86 100755 --- a/src/Tizen.NUI/src/internal/Builder.cs +++ b/src/Tizen.NUI/src/internal/Builder.cs @@ -141,6 +141,7 @@ namespace Tizen.NUI } catch (System.Exception e) { + NUILog.Error(e.Message); throw new global::System.InvalidOperationException("Failed to parse " + fileName); } } diff --git a/src/Tizen.NUI/src/internal/Camera.cs b/src/Tizen.NUI/src/internal/Camera.cs index f43ba7f..f91fcfb 100755 --- a/src/Tizen.NUI/src/internal/Camera.cs +++ b/src/Tizen.NUI/src/internal/Camera.cs @@ -179,7 +179,7 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public new static Camera DownCast(BaseHandle handle) + public static Camera DownCast(BaseHandle handle) { Camera ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as Camera; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/internal/ConnectionTracker.cs b/src/Tizen.NUI/src/internal/ConnectionTracker.cs index 165375f..21bab19 100755 --- a/src/Tizen.NUI/src/internal/ConnectionTracker.cs +++ b/src/Tizen.NUI/src/internal/ConnectionTracker.cs @@ -75,7 +75,7 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public virtual void SignalDisconnected(SlotObserver slotObserver, SWIGTYPE_p_Dali__CallbackBase callback) + public new virtual void SignalDisconnected(SlotObserver slotObserver, SWIGTYPE_p_Dali__CallbackBase callback) { NDalicPINVOKE.ConnectionTracker_SignalDisconnected(swigCPtr, SlotObserver.getCPtr(slotObserver), SWIGTYPE_p_Dali__CallbackBase.getCPtr(callback)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/internal/CustomActor.cs b/src/Tizen.NUI/src/internal/CustomActor.cs index 6f7bf4d..15752d2 100755 --- a/src/Tizen.NUI/src/internal/CustomActor.cs +++ b/src/Tizen.NUI/src/internal/CustomActor.cs @@ -68,7 +68,7 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public new static CustomActor DownCast(BaseHandle handle) + public static CustomActor DownCast(BaseHandle handle) { CustomActor ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as CustomActor; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/internal/GestureDetector.cs b/src/Tizen.NUI/src/internal/GestureDetector.cs index a9e8217..cd60b58 100755 --- a/src/Tizen.NUI/src/internal/GestureDetector.cs +++ b/src/Tizen.NUI/src/internal/GestureDetector.cs @@ -68,7 +68,7 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public new static GestureDetector DownCast(BaseHandle handle) + public static GestureDetector DownCast(BaseHandle handle) { GestureDetector ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as GestureDetector; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/internal/LinearConstrainer.cs b/src/Tizen.NUI/src/internal/LinearConstrainer.cs index 5a21f4c..0ffad08 100755 --- a/src/Tizen.NUI/src/internal/LinearConstrainer.cs +++ b/src/Tizen.NUI/src/internal/LinearConstrainer.cs @@ -160,7 +160,7 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal new static LinearConstrainer DownCast(BaseHandle handle) + internal static LinearConstrainer DownCast(BaseHandle handle) { LinearConstrainer ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as LinearConstrainer; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/internal/PathConstrainer.cs b/src/Tizen.NUI/src/internal/PathConstrainer.cs index 98e2d9e..077720e 100755 --- a/src/Tizen.NUI/src/internal/PathConstrainer.cs +++ b/src/Tizen.NUI/src/internal/PathConstrainer.cs @@ -164,7 +164,7 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public new static PathConstrainer DownCast(BaseHandle handle) + public static PathConstrainer DownCast(BaseHandle handle) { PathConstrainer ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as PathConstrainer; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/internal/Registry.cs b/src/Tizen.NUI/src/internal/Registry.cs index cf91e4e..7cfab4d 100755 --- a/src/Tizen.NUI/src/internal/Registry.cs +++ b/src/Tizen.NUI/src/internal/Registry.cs @@ -53,7 +53,7 @@ namespace Tizen.NUI /// /// Remove the this instance of BaseHandle (C# base class) and native part from the mapping table. /// - /// The instance of BaseHandle (C# base class) + /// The instance of BaseHandle (C# base class) internal static void Unregister(BaseHandle baseHandle) { RefObject refObj = baseHandle.GetObjectPtr(); diff --git a/src/Tizen.NUI/src/internal/RenderTask.cs b/src/Tizen.NUI/src/internal/RenderTask.cs index babb0ed..f7e3e83 100755 --- a/src/Tizen.NUI/src/internal/RenderTask.cs +++ b/src/Tizen.NUI/src/internal/RenderTask.cs @@ -254,7 +254,7 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public new static RenderTask DownCast(BaseHandle handle) + public static RenderTask DownCast(BaseHandle handle) { RenderTask ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as RenderTask; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs index cedb4d0..a68aeb2 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/View.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs @@ -828,7 +828,7 @@ namespace Tizen.NUI.BaseComponents /// Handle to an object /// A handle to a View or an uninitialized handle [Obsolete("Please do not use! this will be deprecated, instead please use as keyword.")] - public new static View DownCast(BaseHandle handle) + public static View DownCast(BaseHandle handle) { View ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as View; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/public/CustomViewRegistry.cs b/src/Tizen.NUI/src/public/CustomViewRegistry.cs index 0b5cc21..99aeb91 100755 --- a/src/Tizen.NUI/src/public/CustomViewRegistry.cs +++ b/src/Tizen.NUI/src/public/CustomViewRegistry.cs @@ -223,7 +223,6 @@ namespace Tizen.NUI else { throw new global::System.InvalidOperationException("C# View not registererd with ViewRegistry" + controlName); - return IntPtr.Zero; } } diff --git a/src/Tizen.NUI/src/public/Layer.cs b/src/Tizen.NUI/src/public/Layer.cs index 17179f8..35f5fd2 100755 --- a/src/Tizen.NUI/src/public/Layer.cs +++ b/src/Tizen.NUI/src/public/Layer.cs @@ -101,7 +101,7 @@ namespace Tizen.NUI [Obsolete("Please do not use! this will be deprecated")] - public new static Layer DownCast(BaseHandle handle) + public static Layer DownCast(BaseHandle handle) { Layer ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as Layer; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -113,7 +113,7 @@ namespace Tizen.NUI /// /// 
This layer(the parent) has been initialized.
/// The actor itself is also considered in the search. - /// The id of the child to find + /// The id of the child to find /// A handle to the view if found, or an empty handle if not. public View FindChildById(uint id) { diff --git a/src/Tizen.NUI/src/public/NUIConstants.cs b/src/Tizen.NUI/src/public/NUIConstants.cs index 704ea52..2139050 100755 --- a/src/Tizen.NUI/src/public/NUIConstants.cs +++ b/src/Tizen.NUI/src/public/NUIConstants.cs @@ -100,7 +100,7 @@ namespace Tizen.NUI /// /// Size is to use the actor's natural size /// - /// + /// UseNaturalSize, /// /// Size is to fill up to the actor's parent's bounds. Aspect ratio is not maintained. diff --git a/src/Tizen.NUI/src/public/Path.cs b/src/Tizen.NUI/src/public/Path.cs index a13eb6a..bc5b9cb 100755 --- a/src/Tizen.NUI/src/public/Path.cs +++ b/src/Tizen.NUI/src/public/Path.cs @@ -86,7 +86,7 @@ namespace Tizen.NUI [Obsolete("Please do not use! this will be deprecated")] - public new static Path DownCast(BaseHandle handle) + public static Path DownCast(BaseHandle handle) { Path ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as Path; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/public/Window.cs b/src/Tizen.NUI/src/public/Window.cs index 8c2b91f..965fcba 100755 --- a/src/Tizen.NUI/src/public/Window.cs +++ b/src/Tizen.NUI/src/public/Window.cs @@ -110,8 +110,10 @@ namespace Tizen.NUI /// True if the window accept focus, false otherwise public bool IsFocusAcceptable() { - return NDalicPINVOKE.IsFocusAcceptable(swigCPtr); + bool ret = NDalicPINVOKE.IsFocusAcceptable(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + + return ret; } /// -- 2.7.4