[NUI] Fix some CA2000 warnings in NUI
authorhuayong.xu <huayong.xu@samsung.com>
Thu, 3 Apr 2025 07:58:13 +0000 (15:58 +0800)
committerSangHyeon Jade Lee <dltkdgus1764@gmail.com>
Thu, 17 Apr 2025 07:55:55 +0000 (16:55 +0900)
Some directives '#pragma warning disable CA2000' are removed too.

58 files changed:
src/Tizen.NUI/src/deprecated/Rendering/Renderer_Deprecated.cs
src/Tizen.NUI/src/internal/Application/WatchApplication.cs
src/Tizen.NUI/src/internal/Common/ControlStateUtility.cs
src/Tizen.NUI/src/internal/Common/FrameBuffer.cs
src/Tizen.NUI/src/internal/Common/KeyInputFocusManager.cs
src/Tizen.NUI/src/internal/Common/LinearConstrainer.cs
src/Tizen.NUI/src/internal/Common/NUIWindowProxy.cs
src/Tizen.NUI/src/internal/Common/PathConstrainer.cs
src/Tizen.NUI/src/internal/Common/RenderTask.cs
src/Tizen.NUI/src/internal/Common/RenderTaskList.cs
src/Tizen.NUI/src/internal/Transition/TransitionSet.cs
src/Tizen.NUI/src/internal/Utility/Builder.cs
src/Tizen.NUI/src/internal/Utility/GaussianBlurView.cs
src/Tizen.NUI/src/internal/Utility/PageTurnView.cs
src/Tizen.NUI/src/internal/images/ImageLoading.cs
src/Tizen.NUI/src/public/Animation/AlphaFunction.cs
src/Tizen.NUI/src/public/BaseComponents/AnimatedImageView.cs
src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
src/Tizen.NUI/src/public/BaseComponents/Scrollable.cs
src/Tizen.NUI/src/public/BaseComponents/Style/ViewStyle.cs
src/Tizen.NUI/src/public/BaseComponents/TableView.cs
src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs
src/Tizen.NUI/src/public/BaseComponents/TextEditorEvent.cs
src/Tizen.NUI/src/public/BaseComponents/TextField.cs
src/Tizen.NUI/src/public/BaseComponents/TextFieldEvent.cs
src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
src/Tizen.NUI/src/public/BaseComponents/TextLabelBindableProperty.cs
src/Tizen.NUI/src/public/BaseComponents/TextLabelEvent.cs
src/Tizen.NUI/src/public/BaseComponents/TextUtils.cs
src/Tizen.NUI/src/public/BaseComponents/VectorGraphics/Shape.cs
src/Tizen.NUI/src/public/BaseComponents/VideoView.cs
src/Tizen.NUI/src/public/BaseComponents/View.cs
src/Tizen.NUI/src/public/Clipboard/Clipboard.cs
src/Tizen.NUI/src/public/Clipboard/ClipboardEvent.cs
src/Tizen.NUI/src/public/Common/Color.cs
src/Tizen.NUI/src/public/Common/PropertyMap.cs
src/Tizen.NUI/src/public/Common/PropertyNotification.cs
src/Tizen.NUI/src/public/Common/PropertyValue.cs
src/Tizen.NUI/src/public/Common/StyleManager.cs
src/Tizen.NUI/src/public/Events/LongPressGestureDetector.cs
src/Tizen.NUI/src/public/Events/PinchGestureDetector.cs
src/Tizen.NUI/src/public/Events/RotationGestureDetector.cs
src/Tizen.NUI/src/public/Events/TapGestureDetector.cs
src/Tizen.NUI/src/public/Input/FocusManager.cs
src/Tizen.NUI/src/public/Input/InputMethodContext.cs
src/Tizen.NUI/src/public/Rendering/Renderable.cs
src/Tizen.NUI/src/public/Rendering/TextureSet.cs
src/Tizen.NUI/src/public/Utility/FontClient.cs
src/Tizen.NUI/src/public/Utility/TTSPlayer.cs
src/Tizen.NUI/src/public/Utility/Timer.cs
src/Tizen.NUI/src/public/ViewProperty/ShadowBase.cs
src/Tizen.NUI/src/public/Visuals/VisualObject/ColorVisual.cs
src/Tizen.NUI/src/public/Visuals/VisualObject/ImageVisual.cs
src/Tizen.NUI/src/public/Visuals/VisualObject/NPatchVisual.cs
src/Tizen.NUI/src/public/Visuals/VisualObject/TextVisual.cs
src/Tizen.NUI/src/public/Visuals/VisualObject/VisualBase.cs
src/Tizen.NUI/src/public/WebView/WebView.cs
src/Tizen.NUI/src/public/Window/GLWindowEvent.cs

index d234a4e0b0d13fb8b7cd1d3ca1f96f8aa6e86eb9..debe226b143fbb62bee0f5bc8660ffff9246ce48 100755 (executable)
@@ -813,13 +813,14 @@ namespace Tizen.NUI
             if (ret != null)
             {
                 Interop.BaseHandle.DeleteBaseHandle(new global::System.Runtime.InteropServices.HandleRef(this, cPtr));
+                NDalicPINVOKE.ThrowExceptionIfExists();
+                return ret;
             }
             else
             {
                 ret = new TextureSet(cPtr, true);
+                return ret;
             }
-            NDalicPINVOKE.ThrowExceptionIfExists();
-            return ret;
         }
 
         /// <summary>
index 8be5ed66f56bcd75c7a1abd154c1a9853f9e2884..7afd7fe326de3dcad9cbdd5d7858658994f4bef0 100755 (executable)
@@ -31,22 +31,6 @@ namespace Tizen.NUI
             Interop.Watch.DeleteWatchApplication(swigCPtr);
         }
 
-        private void DisConnectFromSignals()
-        {
-            if (timeTickCallback != null)
-            {
-                this.TimeTickSignal().Disconnect(timeTickCallback);
-            }
-            if (ambientTickCallback != null)
-            {
-                this.AmbientTickSignal().Disconnect(ambientTickCallback);
-            }
-            if (ambientChangedCallback != null)
-            {
-                this.AmbientChangedSignal().Disconnect(ambientChangedCallback);
-            }
-        }
-
         public static WatchApplication NewWatchApplication()
         {
             WatchApplication ret = New();
@@ -143,7 +127,8 @@ namespace Tizen.NUI
                 if (timeTickEventHandler == null)
                 {
                     timeTickCallback = new TimeTickCallbackType(OnTimeTick);
-                    TimeTickSignal().Connect(timeTickCallback);
+                    using var signal = TimeTickSignal();
+                    signal.Connect(timeTickCallback);
                 }
 
                 timeTickEventHandler += value;
@@ -155,7 +140,8 @@ namespace Tizen.NUI
 
                 if (timeTickEventHandler == null && timeTickCallback != null)
                 {
-                    TimeTickSignal().Disconnect(timeTickCallback);
+                    using var signal = TimeTickSignal();
+                    signal.Disconnect(timeTickCallback);
                     timeTickCallback = null;
                 }
             }
@@ -216,7 +202,8 @@ namespace Tizen.NUI
                 if (ambientTickEventHandler == null)
                 {
                     ambientTickCallback = new AmbientTickCallbackType(OnAmbientTick);
-                    AmbientTickSignal().Connect(ambientTickCallback);
+                    using var signal = AmbientTickSignal();
+                    signal.Connect(ambientTickCallback);
                 }
 
                 ambientTickEventHandler += value;
@@ -228,7 +215,8 @@ namespace Tizen.NUI
 
                 if (ambientTickEventHandler == null && ambientTickCallback != null)
                 {
-                    AmbientTickSignal().Disconnect(ambientTickCallback);
+                    using var signal = AmbientTickSignal();
+                    signal.Disconnect(ambientTickCallback);
                     ambientTickCallback = null;
                 }
             }
@@ -289,7 +277,8 @@ namespace Tizen.NUI
                 if (ambientChangedEventHandler == null)
                 {
                     ambientChangedCallback = new AmbientChangedCallbackType(OnAmbientChanged);
-                    AmbientChangedSignal().Connect(ambientChangedCallback);
+                    using var signal = AmbientChangedSignal();
+                    signal.Connect(ambientChangedCallback);
                 }
 
                 ambientChangedEventHandler += value;
@@ -301,7 +290,8 @@ namespace Tizen.NUI
 
                 if (ambientChangedEventHandler == null && ambientChangedCallback != null)
                 {
-                    AmbientChangedSignal().Disconnect(ambientChangedCallback);
+                    using var signal = AmbientChangedSignal();
+                    signal.Disconnect(ambientChangedCallback);
                     ambientChangedCallback = null;
                 }
             }
index 7eb2d4fe51831624d403b3716349b706089c7cf8..1cf4c267e2a95c06bfd38fe927139b27c237ac41 100644 (file)
@@ -47,7 +47,7 @@ namespace Tizen.NUI
         public static ulong Register(string stateName)
         {
             if (stateName == null)
-                throw new ArgumentNullException($"{nameof(stateName)} cannot be null.", nameof(stateName));
+                throw new ArgumentNullException(nameof(stateName), $"{nameof(stateName)} cannot be null.");
 
             if (string.IsNullOrWhiteSpace(stateName))
                 throw new ArgumentException($"{nameof(stateName)} cannot be whitespace.", nameof(stateName));
index f1772c47640935b0dd912185638b43a8e1294725..c2fbfe5ea1dd48cc62d7c00ae26beda0632a3139 100755 (executable)
@@ -71,13 +71,14 @@ namespace Tizen.NUI
             if (ret != null)
             {
                 Interop.BaseHandle.DeleteBaseHandle(new global::System.Runtime.InteropServices.HandleRef(this, cPtr));
+                NDalicPINVOKE.ThrowExceptionIfExists();
+                return ret;
             }
             else
             {
                 ret = new Texture(cPtr, true);
+                return ret;
             }
-            NDalicPINVOKE.ThrowExceptionIfExists();
-            return ret;
         }
 
         /// <summary>
index 1953461d8da41ab9d68137daca875b2dbe6dc13e..0891bc1064d14cc7a2c0c2eb4dcb284c7418b609 100755 (executable)
@@ -71,14 +71,14 @@ namespace Tizen.NUI
                 global::System.Runtime.InteropServices.HandleRef CPtr = new global::System.Runtime.InteropServices.HandleRef(dummyObect, cPtr);
                 Interop.BaseHandle.DeleteBaseHandle(CPtr);
                 CPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
             }
             else
             {
                 ret = new KeyInputFocusManager(cPtr, true);
+                return ret;
             }
-
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
         }
 
         protected override void Dispose(bool disposing)
index 6f07d87f3011ff5bf4bb05bb387533217c78813d..f2125a9eee8a06c3c50c1dd303b06d93fcceda19 100755 (executable)
@@ -76,12 +76,16 @@ namespace Tizen.NUI
             get
             {
                 Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray();
-                Tizen.NUI.Object.GetProperty(SwigCPtr, LinearConstrainer.Property.VALUE).Get(temp);
+                using (var prop = Tizen.NUI.Object.GetProperty(SwigCPtr, LinearConstrainer.Property.VALUE))
+                {
+                    prop.Get(temp);
+                }
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, LinearConstrainer.Property.VALUE, new Tizen.NUI.PropertyValue(value));
+                using var pv = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, LinearConstrainer.Property.VALUE, pv);
             }
         }
 
@@ -90,12 +94,16 @@ namespace Tizen.NUI
             get
             {
                 Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray();
-                Tizen.NUI.Object.GetProperty(SwigCPtr, LinearConstrainer.Property.PROGRESS).Get(temp);
+                using (var prop = Tizen.NUI.Object.GetProperty(SwigCPtr, LinearConstrainer.Property.PROGRESS))
+                {
+                    prop.Get(temp);
+                }
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, LinearConstrainer.Property.PROGRESS, new Tizen.NUI.PropertyValue(value));
+                using var pv = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, LinearConstrainer.Property.PROGRESS, pv);
             }
         }
     }
index 6fa0dddcd0d1848c430f59fb9e4e60d41da3cad3..3cf7d912e2b8824e94a958ea5017fd407d7002fd 100755 (executable)
@@ -60,7 +60,8 @@ namespace Tizen.NUI
 
         public void InitializeWindow(int width, int height)
         {
-            window.WindowSize = new Size(width, height);
+            using var size = new Size(width, height);
+            window.WindowSize = size;
         }
 
         /// <summary>
index 38f896e9ae690784e4f3ba7b68e7b02163e062f9..0d47bb48423c9bd160d663ed589c817d69ba8485 100755 (executable)
@@ -77,12 +77,16 @@ namespace Tizen.NUI
             get
             {
                 Vector3 temp = new Vector3(0.0f, 0.0f, 0.0f);
-                Tizen.NUI.Object.GetProperty(SwigCPtr, PathConstrainer.Property.FORWARD).Get(temp);
+                using (var prop = Tizen.NUI.Object.GetProperty(SwigCPtr, PathConstrainer.Property.FORWARD))
+                {
+                    prop.Get(temp);
+                }
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, PathConstrainer.Property.FORWARD, new Tizen.NUI.PropertyValue(value));
+                using var pv = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, PathConstrainer.Property.FORWARD, pv);
             }
         }
 
@@ -91,12 +95,16 @@ namespace Tizen.NUI
             get
             {
                 Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray();
-                Tizen.NUI.Object.GetProperty(SwigCPtr, PathConstrainer.Property.POINTS).Get(temp);
+                using (var prop = Tizen.NUI.Object.GetProperty(SwigCPtr, PathConstrainer.Property.POINTS))
+                {
+                    prop.Get(temp);
+                }
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, PathConstrainer.Property.POINTS, new Tizen.NUI.PropertyValue(value));
+                using var pv = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, PathConstrainer.Property.POINTS, pv);
             }
         }
 
@@ -105,12 +113,16 @@ namespace Tizen.NUI
             get
             {
                 Tizen.NUI.PropertyArray temp = new Tizen.NUI.PropertyArray();
-                Tizen.NUI.Object.GetProperty(SwigCPtr, PathConstrainer.Property.ControlPoints).Get(temp);
+                using (var prop = Tizen.NUI.Object.GetProperty(SwigCPtr, PathConstrainer.Property.ControlPoints))
+                {
+                    prop.Get(temp);
+                }
                 return temp;
             }
             set
             {
-                Tizen.NUI.Object.SetProperty(SwigCPtr, PathConstrainer.Property.ControlPoints, new Tizen.NUI.PropertyValue(value));
+                using var pv = new Tizen.NUI.PropertyValue(value);
+                Tizen.NUI.Object.SetProperty(SwigCPtr, PathConstrainer.Property.ControlPoints, pv);
             }
         }
     }
index 8b9f33ff668a1eec5c9ae57c2f723bceacb4863c..ea1ff232d1df6568593fd8a49103b3be7255e8ac 100755 (executable)
@@ -114,13 +114,14 @@ namespace Tizen.NUI
             if (ret != null)
             {
                 Interop.BaseHandle.DeleteBaseHandle(new global::System.Runtime.InteropServices.HandleRef(this, cPtr));
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
             }
             else
             {
                 ret = new View(cPtr, true);
+                return ret;
             }
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
         }
 
         public void SetExclusive(bool exclusive)
index 57cbb97efc121af6e1d9e92938e70fae9c59224e..2f532174f4614da4f6c335abc15ac216c7ad23b9 100755 (executable)
@@ -47,6 +47,7 @@ namespace Tizen.NUI
         [EditorBrowsable(EditorBrowsableState.Never)]
         public static RenderTaskList DownCast(BaseHandle handle)
         {
+            _ = handle ?? throw new System.ArgumentNullException(nameof(handle));
             RenderTaskList ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as RenderTaskList;
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
@@ -97,14 +98,14 @@ namespace Tizen.NUI
                 HandleRef CPtr = new HandleRef(this, cPtr);
                 Interop.BaseHandle.DeleteBaseHandle(CPtr);
                 CPtr = new HandleRef(null, global::System.IntPtr.Zero);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
             }
             else
             {
                 ret = new RenderTask(cPtr, true);
+                return ret;
             }
-
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
         }
     }
 }
index aec4a564c0f21d9fcdaba1a4973785ba487347d0..54fb92fbaa608c847d1a007e5f1e19345b3f6bdc 100755 (executable)
@@ -123,13 +123,14 @@ namespace Tizen.NUI
             if (ret != null)
             {
                 Interop.BaseHandle.DeleteBaseHandle(new HandleRef(this, cPtr));
+                NDalicPINVOKE.ThrowExceptionIfExists();
+                return ret;
             }
             else
             {
                 ret = new TransitionItemBase(cPtr, true);
+                return ret;
             }
-            NDalicPINVOKE.ThrowExceptionIfExists();
-            return ret;
         }
 
         public uint GetTransitionCount()
index e1ece10b1c5f4b467de450f7eed25c50885ab4c3..a156ca321f1e1b57685465d39a324185ed03604c 100755 (executable)
@@ -251,14 +251,14 @@ namespace Tizen.NUI
                 global::System.Runtime.InteropServices.HandleRef CPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
                 Interop.BaseHandle.DeleteBaseHandle(CPtr);
                 CPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
             }
             else
             {
                 ret = new PathConstrainer(cPtr, true);
+                return ret;
             }
-
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
         }
 
         internal LinearConstrainer GetLinearConstrainer(string linearConstrainerName)
@@ -271,14 +271,14 @@ namespace Tizen.NUI
                 global::System.Runtime.InteropServices.HandleRef CPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
                 Interop.BaseHandle.DeleteBaseHandle(CPtr);
                 CPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
             }
             else
             {
                 ret = new LinearConstrainer(cPtr, true);
+                return ret;
             }
-
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
         }
 
         public enum UIFormat
index bc7fa1212e01f54bb1a0445b1b140ab3eaf7da8e..c91921937af49b4db7f2431985ca496d0ef1f4f4 100755 (executable)
@@ -86,7 +86,8 @@ namespace Tizen.NUI
             //because the execution order of Finalizes is non-deterministic.
             if (finishedCallback != null)
             {
-                FinishedSignal().Disconnect(finishedCallback);
+                using var signal = FinishedSignal();
+                signal.Disconnect(finishedCallback);
             }
 
             base.Dispose(type);
@@ -109,7 +110,8 @@ namespace Tizen.NUI
                 if (finishedEventHandler == null)
                 {
                     finishedCallback = new FinishedCallbackType(OnFinished);
-                    FinishedSignal().Connect(finishedCallback);
+                    using var signal = FinishedSignal();
+                    signal.Connect(finishedCallback);
                 }
 
                 finishedEventHandler += value;
@@ -121,7 +123,8 @@ namespace Tizen.NUI
 
                 if (finishedEventHandler == null && finishedCallback != null)
                 {
-                    FinishedSignal().Disconnect(finishedCallback);
+                    using var signal = FinishedSignal();
+                    signal.Disconnect(finishedCallback);
                     finishedCallback = null;
                 }
             }
index d1ae506b66bb00bd2fd3e285592bf82b7417274f..0adc929b67841508967d9fec98b0d0be4c389bfd 100755 (executable)
@@ -22,7 +22,6 @@ namespace Tizen.NUI
 {
     internal class PageTurnView : View
     {
-
         internal PageTurnView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(cPtr, cMemoryOwn)
         {
         }
@@ -184,7 +183,8 @@ namespace Tizen.NUI
                     pageTurnViewPagePanStartedEventHandler += value;
 
                     pageTurnViewPagePanStartedCallbackDelegate = new PagePanStartedCallbackDelegate(OnPagePanStarted);
-                    this.PagePanStartedSignal().Connect(pageTurnViewPagePanStartedCallbackDelegate);
+                    using var signal = PagePanStartedSignal();
+                    signal.Connect(pageTurnViewPagePanStartedCallbackDelegate);
                 }
             }
 
@@ -192,7 +192,8 @@ namespace Tizen.NUI
             {
                 if (pageTurnViewPagePanStartedEventHandler != null)
                 {
-                    this.PagePanStartedSignal().Disconnect(pageTurnViewPagePanStartedCallbackDelegate);
+                    using var signal = PagePanStartedSignal();
+                    signal.Disconnect(pageTurnViewPagePanStartedCallbackDelegate);
                 }
 
                 pageTurnViewPagePanStartedEventHandler -= value;
@@ -224,7 +225,8 @@ namespace Tizen.NUI
                     pageTurnViewPagePanFinishedEventHandler += value;
 
                     pageTurnViewPagePanFinishedCallbackDelegate = new PagePanFinishedCallbackDelegate(OnPagePanFinished);
-                    this.PagePanFinishedSignal().Connect(pageTurnViewPagePanFinishedCallbackDelegate);
+                    using var signal = PagePanFinishedSignal();
+                    signal.Connect(pageTurnViewPagePanFinishedCallbackDelegate);
                 }
             }
 
@@ -232,7 +234,8 @@ namespace Tizen.NUI
             {
                 if (pageTurnViewPagePanFinishedEventHandler != null)
                 {
-                    this.PagePanFinishedSignal().Disconnect(pageTurnViewPagePanFinishedCallbackDelegate);
+                    using var signal = PagePanFinishedSignal();
+                    signal.Disconnect(pageTurnViewPagePanFinishedCallbackDelegate);
                 }
 
                 pageTurnViewPagePanFinishedEventHandler -= value;
@@ -265,7 +268,8 @@ namespace Tizen.NUI
                     pageTurnViewPageTurnStartedEventHandler += value;
 
                     pageTurnViewPageTurnStartedCallbackDelegate = new PageTurnStartedCallbackDelegate(OnPageTurnStarted);
-                    this.PageTurnStartedSignal().Connect(pageTurnViewPageTurnStartedCallbackDelegate);
+                    using var signal = PageTurnStartedSignal();
+                    signal.Connect(pageTurnViewPageTurnStartedCallbackDelegate);
                 }
             }
 
@@ -273,7 +277,8 @@ namespace Tizen.NUI
             {
                 if (pageTurnViewPageTurnStartedEventHandler != null)
                 {
-                    this.PageTurnStartedSignal().Disconnect(pageTurnViewPageTurnStartedCallbackDelegate);
+                    using var signal = PageTurnStartedSignal();
+                    signal.Disconnect(pageTurnViewPageTurnStartedCallbackDelegate);
                 }
 
                 pageTurnViewPageTurnStartedEventHandler -= value;
@@ -309,7 +314,8 @@ namespace Tizen.NUI
                     pageTurnViewPageTurnFinishedEventHandler += value;
 
                     pageTurnViewPageTurnFinishedCallbackDelegate = new PageTurnFinishedCallbackDelegate(OnPageTurnFinished);
-                    this.PageTurnFinishedSignal().Connect(pageTurnViewPageTurnFinishedCallbackDelegate);
+                    using var signal = PageTurnFinishedSignal();
+                    signal.Connect(pageTurnViewPageTurnFinishedCallbackDelegate);
                 }
             }
 
@@ -317,7 +323,8 @@ namespace Tizen.NUI
             {
                 if (pageTurnViewPageTurnFinishedEventHandler != null)
                 {
-                    this.PageTurnFinishedSignal().Disconnect(pageTurnViewPageTurnFinishedCallbackDelegate);
+                    using var signal = PageTurnFinishedSignal();
+                    signal.Disconnect(pageTurnViewPageTurnFinishedCallbackDelegate);
                 }
 
                 pageTurnViewPageTurnFinishedEventHandler -= value;
@@ -414,12 +421,16 @@ namespace Tizen.NUI
             get
             {
                 Vector2 temp = new Vector2(0.0f, 0.0f);
-                GetProperty(PageTurnView.Property.ViewPageSize).Get(temp);
+                using (var prop = GetProperty(PageTurnView.Property.ViewPageSize))
+                {
+                    prop.Get(temp);
+                }
                 return temp;
             }
             set
             {
-                SetProperty(PageTurnView.Property.ViewPageSize, new Tizen.NUI.PropertyValue(value));
+                using var pv = new Tizen.NUI.PropertyValue(value);
+                SetProperty(PageTurnView.Property.ViewPageSize, pv);
             }
         }
         public int CurrentPageId
@@ -427,12 +438,14 @@ namespace Tizen.NUI
             get
             {
                 int temp = 0;
-                GetProperty(PageTurnView.Property.CurrentPageId).Get(out temp);
+                using var prop = GetProperty(PageTurnView.Property.CurrentPageId);
+                prop.Get(out temp);
                 return temp;
             }
             set
             {
-                SetProperty(PageTurnView.Property.CurrentPageId, new Tizen.NUI.PropertyValue(value));
+                using var pv = new Tizen.NUI.PropertyValue(value);
+                SetProperty(PageTurnView.Property.CurrentPageId, pv);
             }
         }
         public Vector2 SpineShadow
@@ -440,12 +453,16 @@ namespace Tizen.NUI
             get
             {
                 Vector2 temp = new Vector2(0.0f, 0.0f);
-                GetProperty(PageTurnView.Property.SpineShadow).Get(temp);
+                using (var prop = GetProperty(PageTurnView.Property.SpineShadow))
+                {
+                    prop.Get(temp);
+                }
                 return temp;
             }
             set
             {
-                SetProperty(PageTurnView.Property.SpineShadow, new Tizen.NUI.PropertyValue(value));
+                using var pv = new Tizen.NUI.PropertyValue(value);
+                SetProperty(PageTurnView.Property.SpineShadow, pv);
             }
         }
     }
index 0433fb6ec4f304ccc68d7eebfb366c05e607cd71..9a678493a59382075cdbd1dbb8d9693dd29ee550 100644 (file)
@@ -515,9 +515,9 @@ namespace Tizen.NUI
         [EditorBrowsable(EditorBrowsableState.Never)]
         public static Size2D GetOriginalImageSize(string filename, bool orientationCorrection)
         {
-            var val = new Uint16Pair(Interop.ImageLoading.GetOriginalImageSize(filename, orientationCorrection), true);
-            Size2D ret = new Size2D(val.GetWidth(), val.GetHeight());
+            using var val = new Uint16Pair(Interop.ImageLoading.GetOriginalImageSize(filename, orientationCorrection), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            Size2D ret = new Size2D(val.GetWidth(), val.GetHeight());
             return ret;
         }
 
index 5088d5cf2c550981a5cbe9d0c0543cbe349b4153..af82a605884a2b11826d3e5b3f009d8a5b1a8e8b 100755 (executable)
@@ -215,7 +215,7 @@ namespace Tizen.NUI
         /// <since_tizen> 3 </since_tizen>
         public void GetBezierControlPoints(out Vector2 controlPoint0, out Vector2 controlPoint1)
         {
-            Vector4 ret = new Vector4(Interop.AlphaFunction.GetBezierControlPoints(SwigCPtr), true);
+            using Vector4 ret = new Vector4(Interop.AlphaFunction.GetBezierControlPoints(SwigCPtr), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
 
             controlPoint0 = new Vector2(ret.X, ret.Y);
index 5ea965e92b5d96e98caefb441495e32d1f173b35..ad4c48ec529a871b4b93664a4af6282333c2abb6 100755 (executable)
@@ -465,7 +465,8 @@ namespace Tizen.NUI.BaseComponents
                 // Sync as current properties
                 UpdateImage();
 
-                DoAction(Property.IMAGE, ActionJumpTo, new PropertyValue(value));
+                using var pv = new PropertyValue(value);
+                DoAction(Property.IMAGE, ActionJumpTo, pv);
             }
             get
             {
index 84b0fdd0dfe4ff25071943613060a36855f612b1..5b95edad183534bcd2a4639d099ad8a02674770f 100755 (executable)
@@ -632,11 +632,11 @@ namespace Tizen.NUI.BaseComponents
                 UpdateImage();
 
                 // Get current properties force.
-#pragma warning disable CA2000 // Dispose objects before losing scope
                 PropertyMap returnValue = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-                using var prop = Object.GetProperty(SwigCPtr, Property.IMAGE);
-                prop.Get(returnValue);
+                using (var prop = Object.GetProperty(SwigCPtr, Property.IMAGE))
+                {
+                    prop.Get(returnValue);
+                }
 
                 // Update cached property map
                 if (returnValue != null)
@@ -1618,7 +1618,8 @@ namespace Tizen.NUI.BaseComponents
                 transition.Add("initialValue", initValue);
                 transition.Add("targetValue", destValue);
 
-                SetProperty(ImageView.Property.TransitionEffectOption, new Tizen.NUI.PropertyValue(transition));
+                using var pv = new Tizen.NUI.PropertyValue(transition);
+                SetProperty(ImageView.Property.TransitionEffectOption, pv);
                 if (NDalicPINVOKE.SWIGPendingException.Pending)
                     throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
@@ -2363,7 +2364,7 @@ namespace Tizen.NUI.BaseComponents
             // Unregist and detach process only if previous resourceUrl was not empty
             if (!string.IsNullOrEmpty(_resourceUrl))
             {
-                PropertyValue emptyValue = new PropertyValue();
+                using PropertyValue emptyValue = new PropertyValue();
 
                 // Remove current registed Image.
                 SetProperty(ImageView.Property.IMAGE, emptyValue);
@@ -2426,7 +2427,8 @@ namespace Tizen.NUI.BaseComponents
                     }
                 }
 
-                SetProperty(ImageView.Property.IMAGE, new Tizen.NUI.PropertyValue(map));
+                using var pv = new Tizen.NUI.PropertyValue(map);
+                SetProperty(ImageView.Property.IMAGE, pv);
             }
             else
             {
index 03dc0bbff0e99dd4f6934e842f01e298a06df279..7dbdb428148dd6708c45449c2d710fa721167ae1 100755 (executable)
@@ -295,7 +295,8 @@ namespace Tizen.NUI.BaseComponents
                     scrollableStartedEventHandler += value;
 
                     scrollableStartedCallbackDelegate = new StartedCallbackDelegate(OnStarted);
-                    this.ScrollStartedSignal().Connect(scrollableStartedCallbackDelegate);
+                    using var signal = ScrollStartedSignal();
+                    signal.Connect(scrollableStartedCallbackDelegate);
                 }
             }
 
@@ -303,7 +304,8 @@ namespace Tizen.NUI.BaseComponents
             {
                 if (scrollableStartedEventHandler != null)
                 {
-                    this.ScrollStartedSignal().Disconnect(scrollableStartedCallbackDelegate);
+                    using var signal = ScrollStartedSignal();
+                    signal.Disconnect(scrollableStartedCallbackDelegate);
                 }
 
                 scrollableStartedEventHandler -= value;
@@ -326,7 +328,8 @@ namespace Tizen.NUI.BaseComponents
                     scrollableUpdatedEventHandler += value;
 
                     scrollableUpdatedCallbackDelegate = new UpdatedCallbackDelegate(OnUpdated);
-                    this.ScrollUpdatedSignal().Connect(scrollableUpdatedCallbackDelegate);
+                    using var signal = ScrollUpdatedSignal();
+                    signal.Connect(scrollableUpdatedCallbackDelegate);
                 }
             }
 
@@ -334,7 +337,8 @@ namespace Tizen.NUI.BaseComponents
             {
                 if (scrollableUpdatedEventHandler != null)
                 {
-                    this.ScrollUpdatedSignal().Disconnect(scrollableUpdatedCallbackDelegate);
+                    using var signal = ScrollUpdatedSignal();
+                    signal.Disconnect(scrollableUpdatedCallbackDelegate);
                 }
 
                 scrollableUpdatedEventHandler -= value;
@@ -358,7 +362,8 @@ namespace Tizen.NUI.BaseComponents
                     scrollableCompletedEventHandler += value;
 
                     scrollableCompletedCallbackDelegate = new CompletedCallbackDelegate(OnCompleted);
-                    this.ScrollCompletedSignal().Connect(scrollableCompletedCallbackDelegate);
+                    using var signal = ScrollCompletedSignal();
+                    signal.Connect(scrollableCompletedCallbackDelegate);
                 }
             }
 
@@ -366,7 +371,8 @@ namespace Tizen.NUI.BaseComponents
             {
                 if (scrollableCompletedEventHandler != null)
                 {
-                    this.ScrollCompletedSignal().Disconnect(scrollableCompletedCallbackDelegate);
+                    using var signal = ScrollCompletedSignal();
+                    signal.Disconnect(scrollableCompletedCallbackDelegate);
                 }
 
                 scrollableCompletedEventHandler -= value;
@@ -417,11 +423,11 @@ namespace Tizen.NUI.BaseComponents
 
         private Vector4 GetInternalOvershootEffectColor()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.OvershootEffectColor);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.OvershootEffectColor))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -563,11 +569,11 @@ namespace Tizen.NUI.BaseComponents
 
         private Vector2 GetInternalOvershootSize()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             Vector2 temp = new Vector2(0.0f, 0.0f);
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.OvershootSize);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.OvershootSize))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -662,11 +668,11 @@ namespace Tizen.NUI.BaseComponents
 
         private Vector2 GetInternalScrollRelativePosition()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             Vector2 temp = new Vector2(0.0f, 0.0f);
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.ScrollRelativePosition);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.ScrollRelativePosition))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -714,11 +720,11 @@ namespace Tizen.NUI.BaseComponents
 
         private Vector2 GetInternalScrollPositionMin()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             Vector2 temp = new Vector2(0.0f, 0.0f);
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.ScrollPositionMin);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.ScrollPositionMin))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -766,11 +772,11 @@ namespace Tizen.NUI.BaseComponents
 
         private Vector2 GetInternalScrollPositionMax()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             Vector2 temp = new Vector2(0.0f, 0.0f);
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.ScrollPositionMax);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.ScrollPositionMax))
+            {
+                prop?.Get(temp);
+            }
             return temp;
         }
 
index 79659411fabc4db5cd3e04435115ce6c14102495..77bc4e291efb8f96c72fdc9397da9e8e66ea2d3d 100755 (executable)
@@ -836,9 +836,10 @@ namespace Tizen.NUI.BaseComponents
         [EditorBrowsable(EditorBrowsableState.Never)]
         public static TOut Merge<TOut>(this TOut value, TOut other) where TOut : Tizen.NUI.BaseComponents.ViewStyle
         {
+            _ = value ?? throw new ArgumentNullException(nameof(value));
             var newStyle = value.Clone() as TOut;
 
-            newStyle?.CopyFrom(other);
+            newStyle.CopyFrom(other);
 
             return newStyle;
         }
index 6fa4fd447288cdb8d3968da076a85e5faf54ba51..aa6178a0cdfe92ea428c42f824f7ac7d073c6a1c 100755 (executable)
@@ -336,11 +336,11 @@ namespace Tizen.NUI.BaseComponents
 
         private Vector2 GetInternalCellPadding()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             Vector2 temp = new Vector2(0.0f, 0.0f);
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.CellPadding);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.CellPadding))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -386,11 +386,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalLayoutRows()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.LayoutRows);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.LayoutRows))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -436,11 +436,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalLayoutColumns()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.LayoutColumns);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.LayoutColumns))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
index e63875d0139fbbc8135ac35a796a9daf843e66e5..2a45d3cf4f42859719835767f55a9c4a93cc3319 100755 (executable)
@@ -583,11 +583,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalFontStyle()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.FontStyle);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.FontStyle))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -1271,11 +1271,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalSelectionPopupStyle()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.SelectionPopupStyle);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.SelectionPopupStyle))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -1326,11 +1326,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalSelectionHandleImageLeft()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.SelectionHandleImageLeft);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.SelectionHandleImageLeft))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -1383,11 +1383,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalSelectionHandleImageRight()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.SelectionHandleImageRight);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.SelectionHandleImageRight))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -1514,11 +1514,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalSelectionHandlePressedImageLeft()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.SelectionHandlePressedImageLeft);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.SelectionHandlePressedImageLeft))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -1569,11 +1569,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalSelectionHandlePressedImageRight()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.SelectionHandlePressedImageRight);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.SelectionHandlePressedImageRight))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -1700,11 +1700,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalSelectionHandleMarkerImageLeft()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.SelectionHandleMarkerImageLeft);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.SelectionHandleMarkerImageLeft))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -1755,11 +1755,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalSelectionHandleMarkerImageRight()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.SelectionHandleMarkerImageRight);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.SelectionHandleMarkerImageRight))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -1942,11 +1942,11 @@ namespace Tizen.NUI.BaseComponents
 
         private Rectangle GetInternalDecorationBoundingBox()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             Rectangle temp = new Rectangle(0, 0, 0, 0);
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.DecorationBoundingBox);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.DecorationBoundingBox))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -2142,11 +2142,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalInputFontStyle()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.InputFontStyle);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.InputFontStyle))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -2420,11 +2420,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalUnderline()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.UNDERLINE);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.UNDERLINE))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -2580,11 +2580,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalShadow()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.SHADOW);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.SHADOW))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -2828,11 +2828,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalOutline()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.OUTLINE);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.OUTLINE))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -3839,11 +3839,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalPlaceholder()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap map = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.PLACEHOLDER);
-            prop.Get(map);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.PLACEHOLDER))
+            {
+                prop.Get(map);
+            }
 
             string defalutText = "";
 
@@ -4372,11 +4372,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalInputMethodSettings()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.InputMethodSettings);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.InputMethodSettings))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -4800,32 +4800,38 @@ namespace Tizen.NUI.BaseComponents
             {
                 if (textEditorTextChangedCallbackDelegate != null)
                 {
-                    TextChangedSignal().Disconnect(textEditorTextChangedCallbackDelegate);
+                    using var signal = TextChangedSignal();
+                    signal.Disconnect(textEditorTextChangedCallbackDelegate);
                 }
 
                 if (textEditorMaxLengthReachedCallbackDelegate != null)
                 {
-                    this.MaxLengthReachedSignal().Disconnect(textEditorMaxLengthReachedCallbackDelegate);
+                    using var signal = MaxLengthReachedSignal();
+                    signal.Disconnect(textEditorMaxLengthReachedCallbackDelegate);
                 }
 
                 if (textEditorSelectionStartedCallbackDelegate != null)
                 {
-                    this.SelectionStartedSignal().Disconnect(textEditorSelectionStartedCallbackDelegate);
+                    using var signal = SelectionStartedSignal();
+                    signal.Disconnect(textEditorSelectionStartedCallbackDelegate);
                 }
 
                 if (textEditorSelectionClearedCallbackDelegate != null)
                 {
-                    this.SelectionClearedSignal().Disconnect(textEditorSelectionClearedCallbackDelegate);
+                    using var signal = SelectionClearedSignal();
+                    signal.Disconnect(textEditorSelectionClearedCallbackDelegate);
                 }
 
                 if (textEditorCursorPositionChangedCallbackDelegate != null)
                 {
-                    this.CursorPositionChangedSignal().Disconnect(textEditorCursorPositionChangedCallbackDelegate);
+                    using var signal = CursorPositionChangedSignal();
+                    signal.Disconnect(textEditorCursorPositionChangedCallbackDelegate);
                 }
 
                 if (textEditorSelectionChangedCallbackDelegate != null)
                 {
-                    this.SelectionChangedSignal().Disconnect(textEditorSelectionChangedCallbackDelegate);
+                    using var signal = SelectionChangedSignal();
+                    signal.Disconnect(textEditorSelectionChangedCallbackDelegate);
                 }
             }
 
@@ -4850,7 +4856,8 @@ namespace Tizen.NUI.BaseComponents
         internal void SetTextWithoutTextChanged(string text)
         {
             invokeTextChanged = false;
-            Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)SwigCPtr, TextEditor.Property.TEXT, new Tizen.NUI.PropertyValue(text));
+            using var pv = new Tizen.NUI.PropertyValue(text);
+            Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)SwigCPtr, TextEditor.Property.TEXT, pv);
             invokeTextChanged = true;
         }
 
index 7e3b554943b4ea4fb35041f826c4c591f24dfd28..f0b75a46c49e993f41ea692dc523506dd413f718 100755 (executable)
@@ -95,16 +95,18 @@ namespace Tizen.NUI.BaseComponents
                 if (textEditorTextChangedEventHandler == null)
                 {
                     textEditorTextChangedCallbackDelegate = (OnTextChanged);
-                    TextChangedSignal().Connect(textEditorTextChangedCallbackDelegate);
+                    using var signal = TextChangedSignal();
+                    signal.Connect(textEditorTextChangedCallbackDelegate);
                 }
                 textEditorTextChangedEventHandler += value;
             }
             remove
             {
                 textEditorTextChangedEventHandler -= value;
-                if (textEditorTextChangedEventHandler == null && TextChangedSignal().Empty() == false)
+                using var signal = TextChangedSignal();
+                if (textEditorTextChangedEventHandler == null && signal.Empty() == false)
                 {
-                    TextChangedSignal().Disconnect(textEditorTextChangedCallbackDelegate);
+                    signal.Disconnect(textEditorTextChangedCallbackDelegate);
                 }
             }
         }
@@ -121,16 +123,18 @@ namespace Tizen.NUI.BaseComponents
                 if (textEditorScrollStateChangedEventHandler == null)
                 {
                     textEditorScrollStateChangedCallbackDelegate = OnScrollStateChanged;
-                    ScrollStateChangedSignal(this).Connect(textEditorScrollStateChangedCallbackDelegate);
+                    using var signal = ScrollStateChangedSignal(this);
+                    signal.Connect(textEditorScrollStateChangedCallbackDelegate);
                 }
                 textEditorScrollStateChangedEventHandler += value;
             }
             remove
             {
                 textEditorScrollStateChangedEventHandler -= value;
-                if (textEditorScrollStateChangedEventHandler == null && ScrollStateChangedSignal(this).Empty() == false)
+                using var signal = ScrollStateChangedSignal(this);
+                if (textEditorScrollStateChangedEventHandler == null && signal.Empty() == false)
                 {
-                    ScrollStateChangedSignal(this).Disconnect(textEditorScrollStateChangedCallbackDelegate);
+                    signal.Disconnect(textEditorScrollStateChangedCallbackDelegate);
                 }
             }
         }
@@ -146,15 +150,17 @@ namespace Tizen.NUI.BaseComponents
                 if (textEditorCursorPositionChangedEventHandler == null)
                 {
                     textEditorCursorPositionChangedCallbackDelegate = (OnCursorPositionChanged);
-                    CursorPositionChangedSignal().Connect(textEditorCursorPositionChangedCallbackDelegate);
+                    using var signal = CursorPositionChangedSignal();
+                    signal.Connect(textEditorCursorPositionChangedCallbackDelegate);
                 }
                 textEditorCursorPositionChangedEventHandler += value;
             }
             remove
             {
-                if (textEditorCursorPositionChangedEventHandler == null && CursorPositionChangedSignal().Empty() == false)
+                using var signal = CursorPositionChangedSignal();
+                if (textEditorCursorPositionChangedEventHandler == null && signal.Empty() == false)
                 {
-                    this.CursorPositionChangedSignal().Disconnect(textEditorCursorPositionChangedCallbackDelegate);
+                    signal.Disconnect(textEditorCursorPositionChangedCallbackDelegate);
                 }
                 textEditorCursorPositionChangedEventHandler -= value;
             }
@@ -172,15 +178,17 @@ namespace Tizen.NUI.BaseComponents
                 if (textEditorMaxLengthReachedEventHandler == null)
                 {
                     textEditorMaxLengthReachedCallbackDelegate = (OnMaxLengthReached);
-                    MaxLengthReachedSignal().Connect(textEditorMaxLengthReachedCallbackDelegate);
+                    using var signal = MaxLengthReachedSignal();
+                    signal.Connect(textEditorMaxLengthReachedCallbackDelegate);
                 }
                 textEditorMaxLengthReachedEventHandler += value;
             }
             remove
             {
-                if (textEditorMaxLengthReachedEventHandler == null && MaxLengthReachedSignal().Empty() == false)
+                using var signal = MaxLengthReachedSignal();
+                if (textEditorMaxLengthReachedEventHandler == null && signal.Empty() == false)
                 {
-                    this.MaxLengthReachedSignal().Disconnect(textEditorMaxLengthReachedCallbackDelegate);
+                    signal.Disconnect(textEditorMaxLengthReachedCallbackDelegate);
                 }
                 textEditorMaxLengthReachedEventHandler -= value;
             }
@@ -197,16 +205,18 @@ namespace Tizen.NUI.BaseComponents
                 if (textEditorAnchorClickedEventHandler == null)
                 {
                     textEditorAnchorClickedCallbackDelegate = (OnAnchorClicked);
-                    AnchorClickedSignal().Connect(textEditorAnchorClickedCallbackDelegate);
+                    using var signal = AnchorClickedSignal();
+                    signal.Connect(textEditorAnchorClickedCallbackDelegate);
                 }
                 textEditorAnchorClickedEventHandler += value;
             }
             remove
             {
                 textEditorAnchorClickedEventHandler -= value;
-                if (textEditorAnchorClickedEventHandler == null && AnchorClickedSignal().Empty() == false)
+                using var signal = AnchorClickedSignal();
+                if (textEditorAnchorClickedEventHandler == null && signal.Empty() == false)
                 {
-                    AnchorClickedSignal().Disconnect(textEditorAnchorClickedCallbackDelegate);
+                    signal.Disconnect(textEditorAnchorClickedCallbackDelegate);
                 }
             }
         }
@@ -222,15 +232,17 @@ namespace Tizen.NUI.BaseComponents
                 if (textEditorSelectionStartedEventHandler == null)
                 {
                     textEditorSelectionStartedCallbackDelegate = (OnSelectionStarted);
-                    SelectionStartedSignal().Connect(textEditorSelectionStartedCallbackDelegate);
+                    using var signal = SelectionStartedSignal();
+                    signal.Connect(textEditorSelectionStartedCallbackDelegate);
                 }
                 textEditorSelectionStartedEventHandler += value;
             }
             remove
             {
-                if (textEditorSelectionStartedEventHandler == null && SelectionStartedSignal().Empty() == false)
+                using var signal = SelectionStartedSignal();
+                if (textEditorSelectionStartedEventHandler == null && signal.Empty() == false)
                 {
-                    this.SelectionStartedSignal().Disconnect(textEditorSelectionStartedCallbackDelegate);
+                    signal.Disconnect(textEditorSelectionStartedCallbackDelegate);
                 }
                 textEditorSelectionStartedEventHandler -= value;
             }
@@ -247,15 +259,17 @@ namespace Tizen.NUI.BaseComponents
                 if (textEditorSelectionClearedEventHandler == null)
                 {
                     textEditorSelectionClearedCallbackDelegate = (OnSelectionCleared);
-                    SelectionClearedSignal().Connect(textEditorSelectionClearedCallbackDelegate);
+                    using var signal = SelectionClearedSignal();
+                    signal.Connect(textEditorSelectionClearedCallbackDelegate);
                 }
                 textEditorSelectionClearedEventHandler += value;
             }
             remove
             {
-                if (textEditorSelectionClearedEventHandler == null && SelectionClearedSignal().Empty() == false)
+                using var signal = SelectionClearedSignal();
+                if (textEditorSelectionClearedEventHandler == null && signal.Empty() == false)
                 {
-                    this.SelectionClearedSignal().Disconnect(textEditorSelectionClearedCallbackDelegate);
+                    signal.Disconnect(textEditorSelectionClearedCallbackDelegate);
                 }
                 textEditorSelectionClearedEventHandler -= value;
             }
@@ -272,15 +286,17 @@ namespace Tizen.NUI.BaseComponents
                 if (textEditorSelectionChangedEventHandler == null)
                 {
                     textEditorSelectionChangedCallbackDelegate = (OnSelectionChanged);
-                    SelectionChangedSignal().Connect(textEditorSelectionChangedCallbackDelegate);
+                    using var signal = SelectionChangedSignal();
+                    signal.Connect(textEditorSelectionChangedCallbackDelegate);
                 }
                 textEditorSelectionChangedEventHandler += value;
             }
             remove
             {
-                if (textEditorSelectionChangedEventHandler == null && SelectionChangedSignal().Empty() == false)
+                using var signal = SelectionChangedSignal();
+                if (textEditorSelectionChangedEventHandler == null && signal.Empty() == false)
                 {
-                    this.SelectionChangedSignal().Disconnect(textEditorSelectionChangedCallbackDelegate);
+                    signal.Disconnect(textEditorSelectionChangedCallbackDelegate);
                 }
                 textEditorSelectionChangedEventHandler -= value;
             }
@@ -316,16 +332,18 @@ namespace Tizen.NUI.BaseComponents
                 if (textEditorInputFilteredEventHandler == null)
                 {
                     textEditorInputFilteredCallbackDelegate = (OnInputFiltered);
-                    InputFilteredSignal().Connect(textEditorInputFilteredCallbackDelegate);
+                    using var signal = InputFilteredSignal();
+                    signal.Connect(textEditorInputFilteredCallbackDelegate);
                 }
                 textEditorInputFilteredEventHandler += value;
             }
             remove
             {
                 textEditorInputFilteredEventHandler -= value;
-                if (textEditorInputFilteredEventHandler == null && InputFilteredSignal().Empty() == false)
+                using var signal = InputFilteredSignal();
+                if (textEditorInputFilteredEventHandler == null && signal.Empty() == false)
                 {
-                    InputFilteredSignal().Disconnect(textEditorInputFilteredCallbackDelegate);
+                    signal.Disconnect(textEditorInputFilteredCallbackDelegate);
                 }
             }
         }
index 302076e3a332319c684dc7a186f65f18d98eb8e5..a82c0822e4208109c78dfe0d281ee7080920022e 100755 (executable)
@@ -743,11 +743,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalFontStyle()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.FontStyle);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.FontStyle))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -1770,11 +1770,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalSelectionPopupStyle()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.SelectionPopupStyle);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.SelectionPopupStyle))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -1825,11 +1825,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalSelectionHandleImageLeft()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.SelectionHandleImageLeft);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.SelectionHandleImageLeft))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -1880,11 +1880,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalSelectionHandleImageRight()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.SelectionHandleImageRight);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.SelectionHandleImageRight))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -2011,11 +2011,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalSelectionHandlePressedImageLeft()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.SelectionHandlePressedImageLeft);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.SelectionHandlePressedImageLeft))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -2066,11 +2066,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalSelectionHandlePressedImageRight()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.SelectionHandlePressedImageRight);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.SelectionHandlePressedImageRight))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -2197,11 +2197,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalSelectionHandleMarkerImageLeft()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.SelectionHandleMarkerImageLeft);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.SelectionHandleMarkerImageLeft))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -2252,11 +2252,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalSelectionHandleMarkerImageRight()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.SelectionHandleMarkerImageRight);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.SelectionHandleMarkerImageRight))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -2439,11 +2439,11 @@ namespace Tizen.NUI.BaseComponents
 
         private Rectangle GetInternalDecorationBoundingBox()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             Rectangle temp = new Rectangle(0, 0, 0, 0);
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.DecorationBoundingBox);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.DecorationBoundingBox))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -2504,11 +2504,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalInputMethodSettings()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.InputMethodSettings);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.InputMethodSettings))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -2704,11 +2704,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalInputFontStyle()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.InputFontStyle);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.InputFontStyle))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -2862,11 +2862,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalUnderline()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.UNDERLINE);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.UNDERLINE))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -3022,11 +3022,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalShadow()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.SHADOW);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.SHADOW))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -3270,11 +3270,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalOutline()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.OUTLINE);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.OUTLINE))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -3442,11 +3442,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalHiddenInputSettings()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.HiddenInputSettings);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.HiddenInputSettings))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -4158,11 +4158,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalPlaceholder()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap map = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.PLACEHOLDER);
-            prop.Get(map);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.PLACEHOLDER))
+            {
+                prop.Get(map);
+            }
 
             string defalutText = "";
 
@@ -4750,32 +4750,38 @@ namespace Tizen.NUI.BaseComponents
             {
                 if (textFieldCursorPositionChangedCallbackDelegate != null)
                 {
-                    this.CursorPositionChangedSignal().Disconnect(textFieldCursorPositionChangedCallbackDelegate);
+                    using var signal = CursorPositionChangedSignal();
+                    signal.Disconnect(textFieldCursorPositionChangedCallbackDelegate);
                 }
 
                 if (textFieldMaxLengthReachedCallbackDelegate != null)
                 {
-                    this.MaxLengthReachedSignal().Disconnect(textFieldMaxLengthReachedCallbackDelegate);
+                    using var signal = MaxLengthReachedSignal();
+                    signal.Disconnect(textFieldMaxLengthReachedCallbackDelegate);
                 }
 
                 if (textFieldSelectionStartedCallbackDelegate != null)
                 {
-                    this.SelectionStartedSignal().Disconnect(textFieldSelectionStartedCallbackDelegate);
+                    using var signal = SelectionStartedSignal();
+                    signal.Disconnect(textFieldSelectionStartedCallbackDelegate);
                 }
 
                 if (textFieldSelectionClearedCallbackDelegate != null)
                 {
-                    this.SelectionClearedSignal().Disconnect(textFieldSelectionClearedCallbackDelegate);
+                    using var signal = SelectionClearedSignal();
+                    signal.Disconnect(textFieldSelectionClearedCallbackDelegate);
                 }
 
                 if (textFieldSelectionChangedCallbackDelegate != null)
                 {
-                    this.SelectionChangedSignal().Disconnect(textFieldSelectionChangedCallbackDelegate);
+                    using var signal = SelectionChangedSignal();
+                    signal.Disconnect(textFieldSelectionChangedCallbackDelegate);
                 }
 
                 if (textFieldTextChangedCallbackDelegate != null)
                 {
-                    TextChangedSignal().Disconnect(textFieldTextChangedCallbackDelegate);
+                    using var signal = TextChangedSignal();
+                    signal.Disconnect(textFieldTextChangedCallbackDelegate);
                 }
             }
 
@@ -4800,7 +4806,8 @@ namespace Tizen.NUI.BaseComponents
         internal void SetTextWithoutTextChanged(string text)
         {
             invokeTextChanged = false;
-            Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)SwigCPtr, TextField.Property.TEXT, new Tizen.NUI.PropertyValue(text));
+            using var pv = new Tizen.NUI.PropertyValue(text);
+            Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)SwigCPtr, TextField.Property.TEXT, pv);
             invokeTextChanged = true;
         }
 
index 9d5ff072d75295fadbd9b5c5e552df025d9c2ab0..5039fe2285ed497054c77b91742c8f313dea8202 100755 (executable)
@@ -84,16 +84,18 @@ namespace Tizen.NUI.BaseComponents
                 if (textFieldTextChangedEventHandler == null)
                 {
                     textFieldTextChangedCallbackDelegate = (OnTextChanged);
-                    TextChangedSignal().Connect(textFieldTextChangedCallbackDelegate);
+                    using var signal = TextChangedSignal();
+                    signal.Connect(textFieldTextChangedCallbackDelegate);
                 }
                 textFieldTextChangedEventHandler += value;
             }
             remove
             {
                 textFieldTextChangedEventHandler -= value;
-                if (textFieldTextChangedEventHandler == null && TextChangedSignal().Empty() == false)
+                using var signal = TextChangedSignal();
+                if (textFieldTextChangedEventHandler == null && signal.Empty() == false)
                 {
-                    TextChangedSignal().Disconnect(textFieldTextChangedCallbackDelegate);
+                    signal.Disconnect(textFieldTextChangedCallbackDelegate);
                 }
             }
         }
@@ -109,15 +111,17 @@ namespace Tizen.NUI.BaseComponents
                 if (textFieldCursorPositionChangedEventHandler == null)
                 {
                     textFieldCursorPositionChangedCallbackDelegate = (OnCursorPositionChanged);
-                    CursorPositionChangedSignal().Connect(textFieldCursorPositionChangedCallbackDelegate);
+                    using var signal = CursorPositionChangedSignal();
+                    signal.Connect(textFieldCursorPositionChangedCallbackDelegate);
                 }
                 textFieldCursorPositionChangedEventHandler += value;
             }
             remove
             {
-                if (textFieldCursorPositionChangedEventHandler == null && CursorPositionChangedSignal().Empty() == false)
+                using var signal = CursorPositionChangedSignal();
+                if (textFieldCursorPositionChangedEventHandler == null && signal.Empty() == false)
                 {
-                    this.CursorPositionChangedSignal().Disconnect(textFieldCursorPositionChangedCallbackDelegate);
+                    signal.Disconnect(textFieldCursorPositionChangedCallbackDelegate);
                 }
                 textFieldCursorPositionChangedEventHandler -= value;
             }
@@ -134,15 +138,17 @@ namespace Tizen.NUI.BaseComponents
                 if (textFieldMaxLengthReachedEventHandler == null)
                 {
                     textFieldMaxLengthReachedCallbackDelegate = (OnMaxLengthReached);
-                    MaxLengthReachedSignal().Connect(textFieldMaxLengthReachedCallbackDelegate);
+                    using var signal = MaxLengthReachedSignal();
+                    signal.Connect(textFieldMaxLengthReachedCallbackDelegate);
                 }
                 textFieldMaxLengthReachedEventHandler += value;
             }
             remove
             {
-                if (textFieldMaxLengthReachedEventHandler == null && MaxLengthReachedSignal().Empty() == false)
+                using var signal = MaxLengthReachedSignal();
+                if (textFieldMaxLengthReachedEventHandler == null && signal.Empty() == false)
                 {
-                    this.MaxLengthReachedSignal().Disconnect(textFieldMaxLengthReachedCallbackDelegate);
+                    signal.Disconnect(textFieldMaxLengthReachedCallbackDelegate);
                 }
                 textFieldMaxLengthReachedEventHandler -= value;
             }
@@ -159,15 +165,17 @@ namespace Tizen.NUI.BaseComponents
                 if (textFieldSelectionStartedEventHandler == null)
                 {
                     textFieldSelectionStartedCallbackDelegate = (OnSelectionStarted);
-                    SelectionStartedSignal().Connect(textFieldSelectionStartedCallbackDelegate);
+                    using var signal = SelectionStartedSignal();
+                    signal.Connect(textFieldSelectionStartedCallbackDelegate);
                 }
                 textFieldSelectionStartedEventHandler += value;
             }
             remove
             {
-                if (textFieldSelectionStartedEventHandler == null && SelectionStartedSignal().Empty() == false)
+                using var signal = SelectionStartedSignal();
+                if (textFieldSelectionStartedEventHandler == null && signal.Empty() == false)
                 {
-                    this.SelectionStartedSignal().Disconnect(textFieldSelectionStartedCallbackDelegate);
+                    signal.Disconnect(textFieldSelectionStartedCallbackDelegate);
                 }
                 textFieldSelectionStartedEventHandler -= value;
             }
@@ -184,15 +192,17 @@ namespace Tizen.NUI.BaseComponents
                 if (textFieldSelectionClearedEventHandler == null)
                 {
                     textFieldSelectionClearedCallbackDelegate = (OnSelectionCleared);
-                    SelectionClearedSignal().Connect(textFieldSelectionClearedCallbackDelegate);
+                    using var signal = SelectionClearedSignal();
+                    signal.Connect(textFieldSelectionClearedCallbackDelegate);
                 }
                 textFieldSelectionClearedEventHandler += value;
             }
             remove
             {
-                if (textFieldSelectionClearedEventHandler == null && SelectionClearedSignal().Empty() == false)
+                using var signal = SelectionClearedSignal();
+                if (textFieldSelectionClearedEventHandler == null && signal.Empty() == false)
                 {
-                    this.SelectionClearedSignal().Disconnect(textFieldSelectionClearedCallbackDelegate);
+                    signal.Disconnect(textFieldSelectionClearedCallbackDelegate);
                 }
                 textFieldSelectionClearedEventHandler -= value;
             }
@@ -209,16 +219,18 @@ namespace Tizen.NUI.BaseComponents
                 if (textFieldAnchorClickedEventHandler == null)
                 {
                     textFieldAnchorClickedCallbackDelegate = (OnAnchorClicked);
-                    AnchorClickedSignal().Connect(textFieldAnchorClickedCallbackDelegate);
+                    using var signal = AnchorClickedSignal();
+                    signal.Connect(textFieldAnchorClickedCallbackDelegate);
                 }
                 textFieldAnchorClickedEventHandler += value;
             }
             remove
             {
                 textFieldAnchorClickedEventHandler -= value;
-                if (textFieldAnchorClickedEventHandler == null && AnchorClickedSignal().Empty() == false)
+                using var signal = AnchorClickedSignal();
+                if (textFieldAnchorClickedEventHandler == null && signal.Empty() == false)
                 {
-                    AnchorClickedSignal().Disconnect(textFieldAnchorClickedCallbackDelegate);
+                    signal.Disconnect(textFieldAnchorClickedCallbackDelegate);
                 }
             }
         }
@@ -234,15 +246,17 @@ namespace Tizen.NUI.BaseComponents
                 if (textFieldSelectionChangedEventHandler == null)
                 {
                     textFieldSelectionChangedCallbackDelegate = (OnSelectionChanged);
-                    SelectionChangedSignal().Connect(textFieldSelectionChangedCallbackDelegate);
+                    using var signal = SelectionChangedSignal();
+                    signal.Connect(textFieldSelectionChangedCallbackDelegate);
                 }
                 textFieldSelectionChangedEventHandler += value;
             }
             remove
             {
-                if (textFieldSelectionChangedEventHandler == null && SelectionChangedSignal().Empty() == false)
+                using var signal = SelectionChangedSignal();
+                if (textFieldSelectionChangedEventHandler == null && signal.Empty() == false)
                 {
-                    this.SelectionChangedSignal().Disconnect(textFieldSelectionChangedCallbackDelegate);
+                    signal.Disconnect(textFieldSelectionChangedCallbackDelegate);
                 }
                 textFieldSelectionChangedEventHandler -= value;
             }
@@ -278,16 +292,18 @@ namespace Tizen.NUI.BaseComponents
                 if (textFieldInputFilteredEventHandler == null)
                 {
                     textFieldInputFilteredCallbackDelegate = (OnInputFiltered);
-                    InputFilteredSignal().Connect(textFieldInputFilteredCallbackDelegate);
+                    using var signal = InputFilteredSignal();
+                    signal.Connect(textFieldInputFilteredCallbackDelegate);
                 }
                 textFieldInputFilteredEventHandler += value;
             }
             remove
             {
                 textFieldInputFilteredEventHandler -= value;
-                if (textFieldInputFilteredEventHandler == null && InputFilteredSignal().Empty() == false)
+                using var signal = InputFilteredSignal();
+                if (textFieldInputFilteredEventHandler == null && signal.Empty() == false)
                 {
-                    InputFilteredSignal().Disconnect(textFieldInputFilteredCallbackDelegate);
+                    signal.Disconnect(textFieldInputFilteredCallbackDelegate);
                 }
             }
         }
index 815f09908d91ebd8e3a0ddefbb8b5915065372a4..ce930ad95a010405ab06e5997ed093cff84f1741 100755 (executable)
@@ -655,11 +655,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalFontStyle()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.FontStyle);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.FontStyle))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -1686,11 +1686,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalUnderline()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.UNDERLINE);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.UNDERLINE))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -1801,11 +1801,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalShadow()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.SHADOW);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.SHADOW))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -1906,9 +1906,7 @@ namespace Tizen.NUI.BaseComponents
 
         private TextShadow GetInternalTextShadow()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
-            PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
+            using PropertyMap temp = new PropertyMap();
             using var prop = Object.GetProperty(SwigCPtr, Property.SHADOW);
             prop.Get(temp);
             return temp.Empty() ? null : new TextShadow(temp);
@@ -2008,11 +2006,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalOutline()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.OUTLINE);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.OUTLINE))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -2562,11 +2560,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalTextFit()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.TextFit);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.TextFit))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -3351,12 +3349,14 @@ namespace Tizen.NUI.BaseComponents
             {
                 if (textLabelAnchorClickedCallbackDelegate != null)
                 {
-                    AnchorClickedSignal().Disconnect(textLabelAnchorClickedCallbackDelegate);
+                    using var signal = AnchorClickedSignal();
+                    signal.Disconnect(textLabelAnchorClickedCallbackDelegate);
                 }
 
                 if (textLabelTextFitChangedCallbackDelegate != null)
                 {
-                    TextFitChangedSignal().Disconnect(textLabelTextFitChangedCallbackDelegate);
+                    using var signal = TextFitChangedSignal();
+                    signal.Disconnect(textLabelTextFitChangedCallbackDelegate);
                 }
 
                 if (textLabelAsyncTextRenderedCallbackDelegate != null)
index 66fa17c0b9160f26388a7ca117873c69c02a8f1f..6843de5380673127759258981f628d6b1c4a5750 100755 (executable)
@@ -881,7 +881,8 @@ namespace Tizen.NUI.BaseComponents
                 }
 
                 Color color = new Color();
-                if (!GetProperty(TextLabel.Property.TextColor).Get(color))
+                using var prop = GetProperty(TextLabel.Property.TextColor);
+                if (!prop.Get(color))
                 {
                     return null;
                 }
@@ -981,7 +982,8 @@ namespace Tizen.NUI.BaseComponents
         {
             if (value != null)
             {
-                Object.SetProperty((System.Runtime.InteropServices.HandleRef)SwigCPtr, Property.SHADOW, TextShadow.ToPropertyValue(value));
+                using var pv = TextShadow.ToPropertyValue(value);
+                Object.SetProperty((System.Runtime.InteropServices.HandleRef)SwigCPtr, Property.SHADOW, pv);
             }
         }
     }
index 86ad557d5282fc826b336cc0ac453e9f0536f119..eb4bacd8822678d2d31e895e45d4976409456cc0 100644 (file)
@@ -203,16 +203,18 @@ namespace Tizen.NUI.BaseComponents
                 if (textLabelAnchorClickedEventHandler == null)
                 {
                     textLabelAnchorClickedCallbackDelegate = (OnAnchorClicked);
-                    AnchorClickedSignal().Connect(textLabelAnchorClickedCallbackDelegate);
+                    using var signal = AnchorClickedSignal();
+                    signal.Connect(textLabelAnchorClickedCallbackDelegate);
                 }
                 textLabelAnchorClickedEventHandler += value;
             }
             remove
             {
                 textLabelAnchorClickedEventHandler -= value;
-                if (textLabelAnchorClickedEventHandler == null && AnchorClickedSignal().Empty() == false)
+                using var signal = AnchorClickedSignal();
+                if (textLabelAnchorClickedEventHandler == null && signal.Empty() == false)
                 {
-                    AnchorClickedSignal().Disconnect(textLabelAnchorClickedCallbackDelegate);
+                    signal.Disconnect(textLabelAnchorClickedCallbackDelegate);
                 }
             }
         }
@@ -254,16 +256,18 @@ namespace Tizen.NUI.BaseComponents
                 if (textLabelTextFitChangedEventHandler == null)
                 {
                     textLabelTextFitChangedCallbackDelegate = (OnTextFitChanged);
-                    TextFitChangedSignal().Connect(textLabelTextFitChangedCallbackDelegate);
+                    using var signal = TextFitChangedSignal();
+                    signal.Connect(textLabelTextFitChangedCallbackDelegate);
                 }
                 textLabelTextFitChangedEventHandler += value;
             }
             remove
             {
                 textLabelTextFitChangedEventHandler -= value;
-                if (textLabelTextFitChangedEventHandler == null && TextFitChangedSignal().Empty() == false)
+                using var signal = TextFitChangedSignal();
+                if (textLabelTextFitChangedEventHandler == null && signal.Empty() == false)
                 {
-                    TextFitChangedSignal().Disconnect(textLabelTextFitChangedCallbackDelegate);
+                    signal.Disconnect(textLabelTextFitChangedCallbackDelegate);
                 }
             }
         }
index 8da86abffb4c1a05678604f08f8164e804f1c37e..a48cbbc7792d766a49a3d6369956ddaec453b59c 100755 (executable)
@@ -1142,8 +1142,8 @@ namespace Tizen.NUI.BaseComponents
                 textFitArray.Enable = TextMapHelper.GetBoolFromMap(textFitArrayMap, "enable", false);
                 textFitArray.OptionList = new List<TextFitArrayOption>();
 
-                var pointSizeArray = TextMapHelper.GetArrayFromMap(textFitArrayMap, "pointSizeArray");
-                var minLineSizeArray = TextMapHelper.GetArrayFromMap(textFitArrayMap, "minLineSizeArray");
+                using var pointSizeArray = TextMapHelper.GetArrayFromMap(textFitArrayMap, "pointSizeArray");
+                using var minLineSizeArray = TextMapHelper.GetArrayFromMap(textFitArrayMap, "minLineSizeArray");
 
                 if (pointSizeArray != null && minLineSizeArray != null && pointSizeArray.Count() == minLineSizeArray.Count())
                 {
index 0becbc6c70d5ccabd269005d7b32de4ed16e469d..b26640476aece5d140ca2592baefac82e4a6dfe0 100755 (executable)
@@ -82,12 +82,13 @@ namespace Tizen.NUI.BaseComponents.VectorGraphics
                     HandleRef CPtr = new HandleRef(this, cPtr);
                     Interop.BaseHandle.DeleteBaseHandle(CPtr);
                     CPtr = new HandleRef(null, global::System.IntPtr.Zero);
+                    return ret;
                 }
                 else
                 {
                     ret = new Gradient(cPtr, true);
+                    return ret;
                 }
-                return ret;
             }
             set
             {
@@ -170,12 +171,13 @@ namespace Tizen.NUI.BaseComponents.VectorGraphics
                     HandleRef CPtr = new HandleRef(this, cPtr);
                     Interop.BaseHandle.DeleteBaseHandle(CPtr);
                     CPtr = new HandleRef(null, global::System.IntPtr.Zero);
+                    return ret;
                 }
                 else
                 {
                     ret = new Gradient(cPtr, true);
+                    return ret;
                 }
-                return ret;
             }
             set
             {
index e49146b1d1b4eee831e50d462df630d7fa571095..74b6fd282fdbe19424402a759a2d1668d1702584 100755 (executable)
@@ -232,16 +232,18 @@ namespace Tizen.NUI.BaseComponents
                 if (videoViewFinishedEventHandler == null)
                 {
                     videoViewFinishedCallbackDelegate = (OnFinished);
-                    FinishedSignal().Connect(videoViewFinishedCallbackDelegate);
+                    using var signal = FinishedSignal();
+                    signal.Connect(videoViewFinishedCallbackDelegate);
                 }
                 videoViewFinishedEventHandler += value;
             }
             remove
             {
                 videoViewFinishedEventHandler -= value;
-                if (videoViewFinishedEventHandler == null && FinishedSignal().Empty() == false)
+                using var signal = FinishedSignal();
+                if (videoViewFinishedEventHandler == null && signal.Empty() == false)
                 {
-                    FinishedSignal().Disconnect(videoViewFinishedCallbackDelegate);
+                    signal.Disconnect(videoViewFinishedCallbackDelegate);
                 }
             }
         }
@@ -288,11 +290,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalVideo()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.VIDEO);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.VIDEO))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -428,11 +430,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalVolume()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.VOLUME);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.VOLUME))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -683,7 +685,8 @@ namespace Tizen.NUI.BaseComponents
 
             if (this != null && videoViewFinishedCallbackDelegate != null)
             {
-                FinishedSignal().Disconnect(videoViewFinishedCallbackDelegate);
+                using var signal = FinishedSignal();
+                signal.Disconnect(videoViewFinishedCallbackDelegate);
             }
 
             base.Dispose(type);
index b2cead4fb503f4afae69601a762cf0a954b60a30..aee02eaf1950693efb38d74ecd2beb0765665a8e 100755 (executable)
@@ -1898,11 +1898,11 @@ namespace Tizen.NUI.BaseComponents
 
         private PropertyMap GetInternalTooltip()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyMap temp = new PropertyMap();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var pv = Object.GetProperty(SwigCPtr, Property.TOOLTIP);
-            pv.Get(temp);
+            using (var pv = Object.GetProperty(SwigCPtr, Property.TOOLTIP))
+            {
+                pv.Get(temp);
+            }
             return temp;
         }
 
@@ -3908,11 +3908,11 @@ namespace Tizen.NUI.BaseComponents
 
         private Rotation GetInternalOrientation()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             Rotation temp = new Rotation();
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var pv = Object.GetProperty(SwigCPtr, Property.ORIENTATION);
-            pv.Get(temp);
+            using (var pv = Object.GetProperty(SwigCPtr, Property.ORIENTATION))
+            {
+                pv.Get(temp);
+            }
             return temp;
         }
 
index caa78a40a9e22b119a96ff9b77767fd8f57690a9..fc07ceb34279a1fe178f5888eece3a6e8d67c544 100755 (executable)
@@ -79,14 +79,14 @@ namespace Tizen.NUI
                 HandleRef CPtr = new HandleRef(dummyObect, cPtr);
                 Interop.BaseHandle.DeleteBaseHandle(CPtr);
                 CPtr = new HandleRef(null, global::System.IntPtr.Zero);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
             }
             else
             {
                 ret = new Clipboard(cPtr, true);
+                return ret;
             }
-
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
         }
 
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -219,13 +219,15 @@ namespace Tizen.NUI
             {
                 if (clipboardDataReceivedCallback != null)
                 {
-                    this.ClipboardDataReceivedSignal().Disconnect(clipboardDataReceivedCallback);
+                    using var signal = ClipboardDataReceivedSignal();
+                    signal.Disconnect(clipboardDataReceivedCallback);
                     clipboardDataReceivedCallback = null;
                 }
 
                 if (clipboardDataSelectedCallback != null)
                 {
-                    this.ClipboardDataSelectedSignal().Disconnect(clipboardDataSelectedCallback);
+                    using var signal = ClipboardDataSelectedSignal();
+                    signal.Disconnect(clipboardDataSelectedCallback);
                     clipboardDataSelectedCallback = null;
                 }
             }
index c8583347d276f9e5f6d6572e262a8b586b5d53f3..1d59c53601def4b45a7246372a13823ba6302918 100755 (executable)
@@ -114,7 +114,8 @@ namespace Tizen.NUI
                 if (clipboardDataSelectedEventHandler == null)
                 {
                     clipboardDataSelectedCallback = (OnClipboardDataSelected);
-                    ClipboardDataSelectedSignal().Connect(clipboardDataSelectedCallback);
+                    using var signal = ClipboardDataSelectedSignal();
+                    signal.Connect(clipboardDataSelectedCallback);
                 }
                 clipboardDataSelectedEventHandler += value;
             }
@@ -123,7 +124,8 @@ namespace Tizen.NUI
                 clipboardDataSelectedEventHandler -= value;
                 if (clipboardDataSelectedEventHandler == null && clipboardDataSelectedCallback != null)
                 {
-                    ClipboardDataSelectedSignal().Disconnect(clipboardDataSelectedCallback);
+                    using var signal = ClipboardDataSelectedSignal();
+                    signal.Disconnect(clipboardDataSelectedCallback);
                     clipboardDataSelectedCallback = null;
                 }
             }
@@ -136,7 +138,8 @@ namespace Tizen.NUI
                 if (clipboardDataReceivedEventHandler == null)
                 {
                     clipboardDataReceivedCallback = (OnClipboardDataReceived);
-                    ClipboardDataReceivedSignal().Connect(clipboardDataReceivedCallback);
+                    using var signal = ClipboardDataReceivedSignal();
+                    signal.Connect(clipboardDataReceivedCallback);
                 }
                 clipboardDataReceivedEventHandler += value;
             }
@@ -145,7 +148,8 @@ namespace Tizen.NUI
                 clipboardDataReceivedEventHandler -= value;
                 if (clipboardDataReceivedEventHandler == null && clipboardDataReceivedCallback != null)
                 {
-                    ClipboardDataReceivedSignal().Disconnect(clipboardDataReceivedCallback);
+                    using var signal = ClipboardDataReceivedSignal();
+                    signal.Disconnect(clipboardDataReceivedCallback);
                     clipboardDataReceivedCallback = null;
                 }
             }
index 7fac08a39f7917564cd773e9e90d760b55a30dfc..bcb18a82427d7c29e46e61aceac1f5f7d6c24f76 100755 (executable)
@@ -1273,7 +1273,7 @@ namespace Tizen.NUI
             {
                 throw new ArgumentNullException(nameof(arg1));
             }
-            Color result = arg1.Add(arg2);
+            using Color result = arg1.Add(arg2);
             return ValueCheck(result);
         }
 
@@ -1291,7 +1291,7 @@ namespace Tizen.NUI
             {
                 throw new ArgumentNullException(nameof(arg1));
             }
-            Color result = arg1.Subtract(arg2);
+            using Color result = arg1.Subtract(arg2);
             return ValueCheck(result);
         }
 
@@ -1308,7 +1308,7 @@ namespace Tizen.NUI
             {
                 throw new ArgumentNullException(nameof(arg1));
             }
-            Color result = arg1.Subtract();
+            using Color result = arg1.Subtract();
             return ValueCheck(result);
         }
 
@@ -1326,7 +1326,7 @@ namespace Tizen.NUI
             {
                 throw new ArgumentNullException(nameof(arg1));
             }
-            Color result = arg1.Multiply(arg2);
+            using Color result = arg1.Multiply(arg2);
             return ValueCheck(result);
         }
 
@@ -1344,7 +1344,7 @@ namespace Tizen.NUI
             {
                 throw new ArgumentNullException(nameof(arg1));
             }
-            Color result = arg1.Multiply(arg2);
+            using Color result = arg1.Multiply(arg2);
             return ValueCheck(result);
         }
 
@@ -1362,7 +1362,7 @@ namespace Tizen.NUI
             {
                 throw new ArgumentNullException(nameof(arg1));
             }
-            Color result = arg1.Divide(arg2);
+            using Color result = arg1.Divide(arg2);
             return ValueCheck(result);
         }
 
@@ -1380,7 +1380,7 @@ namespace Tizen.NUI
             {
                 throw new ArgumentNullException(nameof(arg1));
             }
-            Color result = arg1.Divide(arg2);
+            using Color result = arg1.Divide(arg2);
             return ValueCheck(result);
         }
 
index dd592955d8eb54e8b1799219f2812dcf05af8e62..fa107c80d4e1d568cc24f4edaff9184c4df7837f 100755 (executable)
@@ -500,9 +500,7 @@ namespace Tizen.NUI
         /// <since_tizen> 3 </since_tizen>
         public PropertyValue GetValue(uint position)
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyValue ret = new PropertyValue(Interop.PropertyMap.GetValue(SwigCPtr, position), false);
-#pragma warning restore CA2000 // Dispose objects before losing scope
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
         }
@@ -515,9 +513,7 @@ namespace Tizen.NUI
         /// <since_tizen> 3 </since_tizen>
         public PropertyKey GetKeyAt(uint position)
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyKey ret = new PropertyKey(Interop.PropertyMap.GetKeyAt(SwigCPtr, position), true);
-#pragma warning restore CA2000 // Dispose objects before losing scope
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
         }
@@ -531,9 +527,7 @@ namespace Tizen.NUI
         public PropertyValue Find(string stringKey)
         {
             global::System.IntPtr cPtr = Interop.PropertyMap.Find(SwigCPtr, stringKey);
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyValue ret = (cPtr == global::System.IntPtr.Zero) ? null : new PropertyValue(cPtr, false);
-#pragma warning restore CA2000 // Dispose objects before losing scope
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
         }
@@ -547,9 +541,7 @@ namespace Tizen.NUI
         public PropertyValue Find(int key)
         {
             global::System.IntPtr cPtr = Interop.PropertyMap.Find(SwigCPtr, key);
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyValue ret = (cPtr == global::System.IntPtr.Zero) ? null : new PropertyValue(cPtr, false);
-#pragma warning restore CA2000 // Dispose objects before losing scope
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
         }
@@ -564,9 +556,7 @@ namespace Tizen.NUI
         public PropertyValue Find(int indexKey, string stringKey)
         {
             global::System.IntPtr cPtr = Interop.PropertyMap.Find(SwigCPtr, indexKey, stringKey);
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyValue ret = (cPtr == global::System.IntPtr.Zero) ? null : new PropertyValue(cPtr, false);
-#pragma warning restore CA2000 // Dispose objects before losing scope
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
         }
@@ -605,9 +595,7 @@ namespace Tizen.NUI
         /// <returns>The value for the element with the specified key.</returns>
         internal PropertyValue ValueOfIndex(string key)
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyValue ret = new PropertyValue(Interop.PropertyMap.ValueOfIndex(SwigCPtr, key), false);
-#pragma warning restore CA2000 // Dispose objects before losing scope
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
         }
@@ -619,9 +607,7 @@ namespace Tizen.NUI
         /// <returns>The value for the element with the specified key.</returns>
         internal PropertyValue ValueOfIndex(int key)
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             PropertyValue ret = new PropertyValue(Interop.PropertyMap.ValueOfIndex(SwigCPtr, key), false);
-#pragma warning restore CA2000 // Dispose objects before losing scope
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
         }
index 5abe8edd285a08f18475b065474c5d4118ff808e..c0ed3fd84eb11b4c6ad9791cbbba0c4adee1ee98 100755 (executable)
@@ -182,14 +182,14 @@ namespace Tizen.NUI
                 global::System.Runtime.InteropServices.HandleRef CPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr);
                 Interop.BaseHandle.DeleteBaseHandle(CPtr);
                 CPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
             }
             else
             {
                 ret = new PropertyCondition(cPtr, true);
+                return ret;
             }
-
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
         }
 
         /// <summary>
index a9d02a2220e65e3919f264c3211a40594457c320..08f71fd46f15dea6024ee9b0a2866eb4d23cdabc 100755 (executable)
@@ -361,126 +361,151 @@ namespace Tizen.NUI
             }
 
             System.Type type = obj.GetType();
-            PropertyValue value;
             if (type.IsEnum)
             {
-                value = new PropertyValue((int)obj);//Enum.Parse(type, str);
+                PropertyValue value = new PropertyValue((int)obj);//Enum.Parse(type, str);
+                return value;
             }
             else if (type.Equals(typeof(int)))
             {
-                value = new PropertyValue((int)obj);
+                PropertyValue value = new PropertyValue((int)obj);
+                return value;
             }
             else if (type.Equals(typeof(System.Int32)))
             {
-                value = new PropertyValue((int)obj);
+                PropertyValue value = new PropertyValue((int)obj);
+                return value;
             }
             else if (type.Equals(typeof(bool)))
             {
-                value = new PropertyValue((bool)obj);
+                PropertyValue value = new PropertyValue((bool)obj);
+                return value;
             }
             else if (type.Equals(typeof(float)))
             {
-                value = new PropertyValue((float)obj);
+                PropertyValue value = new PropertyValue((float)obj);
+                return value;
             }
             else if (type.Equals(typeof(string)))
             {
-                value = new PropertyValue((string)obj);
+                PropertyValue value = new PropertyValue((string)obj);
+                return value;
             }
             else if (type.Equals(typeof(Vector2)))
             {
-                value = new PropertyValue((Vector2)obj);
+                PropertyValue value = new PropertyValue((Vector2)obj);
+                return value;
             }
             else if (type.Equals(typeof(Vector3)))
             {
-                value = new PropertyValue((Vector3)obj);
+                PropertyValue value = new PropertyValue((Vector3)obj);
+                return value;
             }
             else if (type.Equals(typeof(Vector4)))
             {
-                value = new PropertyValue((Vector4)obj);
+                PropertyValue value = new PropertyValue((Vector4)obj);
+                return value;
             }
             else if (type.Equals(typeof(Position)))
             {
-                value = new PropertyValue((Position)obj);
+                PropertyValue value = new PropertyValue((Position)obj);
+                return value;
             }
             else if (type.Equals(typeof(Position2D)))
             {
-                value = new PropertyValue((Position2D)obj);
+                PropertyValue value = new PropertyValue((Position2D)obj);
+                return value;
             }
             else if (type.Equals(typeof(Size)))
             {
-                value = new PropertyValue((Size)obj);
+                PropertyValue value = new PropertyValue((Size)obj);
+                return value;
             }
             else if (type.Equals(typeof(Size2D)))
             {
-                value = new PropertyValue((Size2D)obj);
+                PropertyValue value = new PropertyValue((Size2D)obj);
+                return value;
             }
             else if (type.Equals(typeof(Color)))
             {
-                value = new PropertyValue((Color)obj);
+                PropertyValue value = new PropertyValue((Color)obj);
+                return value;
             }
             else if (type.Equals(typeof(Rotation)))
             {
-                value = new PropertyValue((Rotation)obj);
+                PropertyValue value = new PropertyValue((Rotation)obj);
+                return value;
             }
             else if (type.Equals(typeof(RelativeVector2)))
             {
-                value = new PropertyValue((RelativeVector2)obj);
+                PropertyValue value = new PropertyValue((RelativeVector2)obj);
+                return value;
             }
             else if (type.Equals(typeof(RelativeVector3)))
             {
-                value = new PropertyValue((RelativeVector3)obj);
+                PropertyValue value = new PropertyValue((RelativeVector3)obj);
+                return value;
             }
             else if (type.Equals(typeof(RelativeVector4)))
             {
-                value = new PropertyValue((RelativeVector4)obj);
+                PropertyValue value = new PropertyValue((RelativeVector4)obj);
+                return value;
             }
             else if (type.Equals(typeof(Extents)))
             {
-                value = new PropertyValue((Extents)obj);
+                PropertyValue value = new PropertyValue((Extents)obj);
+                return value;
             }
             else if (type.Equals(typeof(Rectangle)))
             {
-                value = new PropertyValue((Rectangle)obj);
+                PropertyValue value = new PropertyValue((Rectangle)obj);
+                return value;
             }
             else if (type.Equals(typeof(PropertyArray)))
             {
-                value = new PropertyValue((PropertyArray)obj);
+                PropertyValue value = new PropertyValue((PropertyArray)obj);
+                return value;
             }
             else if (type.Equals(typeof(PropertyMap)))
             {
-                value = new PropertyValue((PropertyMap)obj);
+                PropertyValue value = new PropertyValue((PropertyMap)obj);
+                return value;
             }
             else if (type.Equals(typeof(UIColor)))
             {
                 UIColor color = ((UIColor)obj);
-                value = new PropertyValue(color.R, color.G, color.B, color.A);
+                PropertyValue value = new PropertyValue(color.R, color.G, color.B, color.A);
+                return value;
             }
             else if (type.Equals(typeof(UICorner)))
             {
                 UICorner corner = ((UICorner)obj);
-                value = new PropertyValue(corner.TopLeft, corner.TopRight, corner.BottomRight, corner.BottomLeft);
+                PropertyValue value = new PropertyValue(corner.TopLeft, corner.TopRight, corner.BottomRight, corner.BottomLeft);
+                return value;
             }
             else if (type.Equals(typeof(UIExtents)))
             {
                 // TODO Do not create Extents instance
                 using Extents extents = ((UIExtents)obj).ToReferenceType();
-                value = new PropertyValue(extents);
+                PropertyValue value = new PropertyValue(extents);
+                return value;
             }
             else if (type.Equals(typeof(UIVector2)))
             {
                 UIVector2 vector2 = ((UIVector2)obj);
-                value = new PropertyValue(vector2.X, vector2.Y);
+                PropertyValue value = new PropertyValue(vector2.X, vector2.Y);
+                return value;
             }
             else if (type.Equals(typeof(UIVector3)))
             {
                 UIVector3 vector3 = ((UIVector3)obj);
-                value = new PropertyValue(vector3.X, vector3.Y, vector3.Z);
+                PropertyValue value = new PropertyValue(vector3.X, vector3.Y, vector3.Z);
+                return value;
             }
             else
             {
                 throw new global::System.InvalidOperationException("Unimplemented type for Property Value :" + type.Name);
             }
-            return value;
         }
 
 
index 55a759665e2cfce8a40567e4dc4ec5c895d1825c..351a97eedbe2d8268b8ccc7cec3e9e5f59ff9b83 100755 (executable)
@@ -66,16 +66,18 @@ namespace Tizen.NUI
                 if (styleManagerStyleChangedEventHandler == null)
                 {
                     styleManagerStyleChangedCallbackDelegate = (OnStyleChanged);
-                    StyleChangedSignal().Connect(styleManagerStyleChangedCallbackDelegate);
+                    using var signal = StyleChangedSignal();
+                    signal.Connect(styleManagerStyleChangedCallbackDelegate);
                 }
                 styleManagerStyleChangedEventHandler += value;
             }
             remove
             {
                 styleManagerStyleChangedEventHandler -= value;
-                if (styleManagerStyleChangedEventHandler == null && StyleChangedSignal().Empty() == false)
+                using var signal = StyleChangedSignal();
+                if (styleManagerStyleChangedEventHandler == null && signal.Empty() == false)
                 {
-                    StyleChangedSignal().Disconnect(styleManagerStyleChangedCallbackDelegate);
+                    signal.Disconnect(styleManagerStyleChangedCallbackDelegate);
                 }
             }
         }
@@ -124,14 +126,14 @@ namespace Tizen.NUI
                 HandleRef CPtr = new HandleRef(dummyObect, cPtr);
                 Interop.BaseHandle.DeleteBaseHandle(CPtr);
                 CPtr = new HandleRef(null, global::System.IntPtr.Zero);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
             }
             else
             {
                 ret = new StyleManager(cPtr, true);
+                return ret;
             }
-
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
         }
 
         [EditorBrowsable(EditorBrowsableState.Never)]
index 376d220896eb84fe50e6d3a9bff53546e48afdad..0b57a531ee035caba21ae99aad1df2b77b33e69f 100755 (executable)
@@ -102,7 +102,8 @@ namespace Tizen.NUI
                 if (detectedEventHandler == null)
                 {
                     detectedCallback = OnLongPressGestureDetected;
-                    DetectedSignal().Connect(detectedCallback);
+                    using var signal = DetectedSignal();
+                    signal.Connect(detectedCallback);
                 }
 
                 detectedEventHandler += value;
@@ -111,10 +112,10 @@ namespace Tizen.NUI
             remove
             {
                 detectedEventHandler -= value;
-
-                if (detectedEventHandler == null && DetectedSignal().Empty() == false)
+                using var signal = DetectedSignal();
+                if (detectedEventHandler == null && signal.Empty() == false)
                 {
-                    DetectedSignal().Disconnect(detectedCallback);
+                    signal.Disconnect(detectedCallback);
                 }
             }
         }
index 0d30808039fd75fcbe9791fd44639ba356a34889..589531ebc78f778d46b3e8acb756f2a09a285981 100755 (executable)
@@ -75,7 +75,8 @@ namespace Tizen.NUI
                 if (detectedEventHandler == null)
                 {
                     detectedCallback = OnPinchGestureDetected;
-                    DetectedSignal().Connect(detectedCallback);
+                    using var signal = DetectedSignal();
+                    signal.Connect(detectedCallback);
                 }
 
                 detectedEventHandler += value;
@@ -84,10 +85,10 @@ namespace Tizen.NUI
             remove
             {
                 detectedEventHandler -= value;
-
-                if (detectedEventHandler == null && DetectedSignal().Empty() == false)
+                using var signal = DetectedSignal();
+                if (detectedEventHandler == null && signal.Empty() == false)
                 {
-                    DetectedSignal().Disconnect(detectedCallback);
+                    signal.Disconnect(detectedCallback);
                 }
             }
         }
index f4e7f084ae6b600c979c81a00b09f646a55332a6..7a2ba6603295c74990fcf4b12e1539c902698c40 100755 (executable)
@@ -75,7 +75,8 @@ namespace Tizen.NUI
                 if (detectedEventHandler == null)
                 {
                     detectedCallback = OnRotationGestureDetected;
-                    DetectedSignal().Connect(detectedCallback);
+                    using var signal = DetectedSignal();
+                    signal.Connect(detectedCallback);
                 }
 
                 detectedEventHandler += value;
@@ -84,10 +85,10 @@ namespace Tizen.NUI
             remove
             {
                 detectedEventHandler -= value;
-
-                if (detectedEventHandler == null && DetectedSignal().Empty() == false)
+                using var signal = DetectedSignal();
+                if (detectedEventHandler == null && signal.Empty() == false)
                 {
-                    DetectedSignal().Disconnect(detectedCallback);
+                    signal.Disconnect(detectedCallback);
                 }
             }
         }
index 8749b0bc88a64479f0c6bf8ee1f41c6b757385e8..610aef64ae8f1212bdf69244e1f81e63123120f1 100755 (executable)
@@ -87,7 +87,8 @@ namespace Tizen.NUI
                 if (_detectedEventHandler == null)
                 {
                     _detectedCallback = OnTapGestureDetected;
-                    DetectedSignal().Connect(_detectedCallback);
+                    using var signal = DetectedSignal();
+                    signal.Connect(_detectedCallback);
                 }
 
                 _detectedEventHandler += value;
@@ -96,10 +97,10 @@ namespace Tizen.NUI
             remove
             {
                 _detectedEventHandler -= value;
-
-                if (_detectedEventHandler == null && DetectedSignal().Empty() == false)
+                using var signal = DetectedSignal();
+                if (_detectedEventHandler == null && signal.Empty() == false)
                 {
-                    DetectedSignal().Disconnect(_detectedCallback);
+                    signal.Disconnect(_detectedCallback);
                 }
             }
         }
index 7169673c520bc631bea49fb2d4a44766c78e6556..ca56016256064c6615caf3a80677171e76799711 100755 (executable)
@@ -629,19 +629,24 @@ namespace Tizen.NUI
                 global::System.Runtime.InteropServices.HandleRef CPtr = new global::System.Runtime.InteropServices.HandleRef(dummyObect, cPtr);
                 Interop.BaseHandle.DeleteBaseHandle(CPtr);
                 CPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+
+#if !PROFILE_TV
+                //tv profile never use default focus indicator, so this is not needed!
+                ret.FocusIndicator = ret.GetDefaultFocusIndicator();
+#endif
+                return ret;
             }
             else
             {
                 ret = new FocusManager(cPtr, true);
-            }
-
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
 
 #if !PROFILE_TV
-            //tv profile never use default focus indicator, so this is not needed!
-            ret.FocusIndicator = ret.GetDefaultFocusIndicator();
+                //tv profile never use default focus indicator, so this is not needed!
+                ret.FocusIndicator = ret.GetDefaultFocusIndicator();
 #endif
-            return ret;
+                return ret;
+            }
         }
 
         [EditorBrowsable(EditorBrowsableState.Never)]
index df439a19531fd6a61ec2c24bc669a06b96af25a3..ba1da192974485a6ee75bc426c7eeac3ac4fa2c9 100755 (executable)
@@ -78,7 +78,8 @@ namespace Tizen.NUI
                 if (activatedEventHandler == null)
                 {
                     CreateSafeCallback(OnActivated, out activatedEventCallback);
-                    ActivatedSignal().Connect(activatedEventCallback);
+                    using var signal = ActivatedSignal();
+                    signal.Connect(activatedEventCallback);
                 }
 
                 activatedEventHandler += value;
@@ -89,7 +90,8 @@ namespace Tizen.NUI
 
                 if (activatedEventHandler == null && activatedEventCallback != null)
                 {
-                    ActivatedSignal().Disconnect(activatedEventCallback);
+                    using var signal = ActivatedSignal();
+                    signal.Disconnect(activatedEventCallback);
                     ReleaseSafeCallback(ref activatedEventCallback);
                 }
             }
@@ -106,7 +108,8 @@ namespace Tizen.NUI
                 if (eventReceivedEventHandler == null)
                 {
                     CreateSafeCallback(OnEventReceived, out eventReceivedEventCallback);
-                    EventReceivedSignal().Connect(eventReceivedEventCallback);
+                    using var signal = EventReceivedSignal();
+                    signal.Connect(eventReceivedEventCallback);
                 }
 
                 eventReceivedEventHandler += value;
@@ -117,7 +120,8 @@ namespace Tizen.NUI
 
                 if (eventReceivedEventHandler == null && eventReceivedEventCallback != null)
                 {
-                    EventReceivedSignal().Disconnect(eventReceivedEventCallback);
+                    using var signal = EventReceivedSignal();
+                    signal.Disconnect(eventReceivedEventCallback);
                     ReleaseSafeCallback(ref eventReceivedEventCallback);
                 }
             }
@@ -134,7 +138,8 @@ namespace Tizen.NUI
                 if (statusChangedEventHandler == null)
                 {
                     CreateSafeCallback(OnStatusChanged, out statusChangedEventCallback);
-                    StatusChangedSignal().Connect(statusChangedEventCallback);
+                    using var signal = StatusChangedSignal();
+                    signal.Connect(statusChangedEventCallback);
                 }
 
                 statusChangedEventHandler += value;
@@ -145,7 +150,8 @@ namespace Tizen.NUI
 
                 if (statusChangedEventHandler == null && statusChangedEventCallback != null)
                 {
-                    StatusChangedSignal().Disconnect(statusChangedEventCallback);
+                    using var signal = StatusChangedSignal();
+                    signal.Disconnect(statusChangedEventCallback);
                     ReleaseSafeCallback(ref statusChangedEventCallback);
                 }
             }
@@ -162,7 +168,8 @@ namespace Tizen.NUI
                 if (resizedEventHandler == null)
                 {
                     CreateSafeCallback(OnResized, out resizedEventCallback);
-                    ResizedSignal().Connect(resizedEventCallback);
+                    using var signal = ResizedSignal();
+                    signal.Connect(resizedEventCallback);
                 }
 
                 resizedEventHandler += value;
@@ -173,7 +180,8 @@ namespace Tizen.NUI
 
                 if (resizedEventHandler == null && resizedEventCallback != null)
                 {
-                    ResizedSignal().Disconnect(resizedEventCallback);
+                    using var signal = ResizedSignal();
+                    signal.Disconnect(resizedEventCallback);
                     ReleaseSafeCallback(ref resizedEventCallback);
                 }
             }
@@ -190,7 +198,8 @@ namespace Tizen.NUI
                 if (languageChangedEventHandler == null)
                 {
                     CreateSafeCallback(OnLanguageChanged, out languageChangedEventCallback);
-                    LanguageChangedSignal().Connect(languageChangedEventCallback);
+                    using var signal = LanguageChangedSignal();
+                    signal.Connect(languageChangedEventCallback);
                 }
 
                 languageChangedEventHandler += value;
@@ -201,7 +210,8 @@ namespace Tizen.NUI
 
                 if (languageChangedEventHandler == null && languageChangedEventCallback != null)
                 {
-                    LanguageChangedSignal().Disconnect(languageChangedEventCallback);
+                    using var signal = LanguageChangedSignal();
+                    signal.Disconnect(languageChangedEventCallback);
                     ReleaseSafeCallback(ref languageChangedEventCallback);
                 }
             }
@@ -218,7 +228,8 @@ namespace Tizen.NUI
                 if (keyboardTypeChangedEventHandler == null)
                 {
                     CreateSafeCallback(OnKeyboardTypeChanged, out keyboardTypeChangedEventCallback);
-                    KeyboardTypeChangedSignal().Connect(keyboardTypeChangedEventCallback);
+                    using var signal = KeyboardTypeChangedSignal();
+                    signal.Connect(keyboardTypeChangedEventCallback);
                 }
 
                 keyboardTypeChangedEventHandler += value;
@@ -229,7 +240,8 @@ namespace Tizen.NUI
 
                 if (keyboardTypeChangedEventHandler == null && keyboardTypeChangedEventCallback != null)
                 {
-                    KeyboardTypeChangedSignal().Disconnect(keyboardTypeChangedEventCallback);
+                    using var signal = KeyboardTypeChangedSignal();
+                    signal.Disconnect(keyboardTypeChangedEventCallback);
                     ReleaseSafeCallback(ref keyboardTypeChangedEventCallback);
                 }
             }
@@ -247,7 +259,8 @@ namespace Tizen.NUI
                 if (contentReceivedEventHandler == null)
                 {
                     CreateSafeCallback(OnContentReceived, out contentReceivedEventCallback);
-                    ContentReceivedSignal().Connect(contentReceivedEventCallback);
+                    using var signal = ContentReceivedSignal();
+                    signal.Connect(contentReceivedEventCallback);
                 }
 
                 contentReceivedEventHandler += value;
@@ -258,7 +271,8 @@ namespace Tizen.NUI
 
                 if (contentReceivedEventHandler == null && contentReceivedEventCallback != null)
                 {
-                    ContentReceivedSignal().Disconnect(contentReceivedEventCallback);
+                    using var signal = ContentReceivedSignal();
+                    signal.Disconnect(contentReceivedEventCallback);
                     ReleaseSafeCallback(ref contentReceivedEventCallback);
                 }
             }
@@ -928,43 +942,50 @@ namespace Tizen.NUI
 
             if (activatedEventCallback != null)
             {
-                ActivatedSignal().Disconnect(activatedEventCallback);
+                using var signal = ActivatedSignal();
+                signal.Disconnect(activatedEventCallback);
                 activatedEventCallback = null;
             }
 
             if (eventReceivedEventCallback != null)
             {
-                EventReceivedSignal().Disconnect(eventReceivedEventCallback);
+                using var signal = EventReceivedSignal();
+                signal.Disconnect(eventReceivedEventCallback);
                 eventReceivedEventCallback = null;
             }
 
             if (statusChangedEventCallback != null)
             {
-                StatusChangedSignal().Disconnect(statusChangedEventCallback);
+                using var signal = StatusChangedSignal();
+                signal.Disconnect(statusChangedEventCallback);
                 statusChangedEventCallback = null;
             }
 
             if (resizedEventCallback != null)
             {
-                ResizedSignal().Disconnect(resizedEventCallback);
+                using var signal = ResizedSignal();
+                signal.Disconnect(resizedEventCallback);
                 resizedEventCallback = null;
             }
 
             if (languageChangedEventCallback != null)
             {
-                LanguageChangedSignal().Disconnect(languageChangedEventCallback);
+                using var signal = LanguageChangedSignal();
+                signal.Disconnect(languageChangedEventCallback);
                 languageChangedEventCallback = null;
             }
 
             if (keyboardTypeChangedEventCallback != null)
             {
-                KeyboardTypeChangedSignal().Disconnect(keyboardTypeChangedEventCallback);
+                using var signal = KeyboardTypeChangedSignal();
+                signal.Disconnect(keyboardTypeChangedEventCallback);
                 keyboardTypeChangedEventCallback = null;
             }
 
             if (contentReceivedEventCallback != null)
             {
-                ContentReceivedSignal().Disconnect(contentReceivedEventCallback);
+                using var signal = ContentReceivedSignal();
+                signal.Disconnect(contentReceivedEventCallback);
                 contentReceivedEventCallback = null;
             }
         }
index 1d34e8b0f8cae69675d53408f0645989e2013ce5..6899b0d28c198f09a995a86b5ab8710ba957e926 100755 (executable)
@@ -506,13 +506,14 @@ namespace Tizen.NUI
             if (ret != null)
             {
                 Interop.BaseHandle.DeleteBaseHandle(new global::System.Runtime.InteropServices.HandleRef(this, cPtr));
+                NDalicPINVOKE.ThrowExceptionIfExists();
+                return ret;
             }
             else
             {
                 ret = new TextureSet(cPtr, true);
+                return ret;
             }
-            NDalicPINVOKE.ThrowExceptionIfExists();
-            return ret;
         }
 
         internal Renderable(global::System.IntPtr cPtr, bool cMemoryOwn) : base(cPtr, cMemoryOwn)
index ef9b70d50610ff3e5632afcb0d62176ba3f6beb6..a1d5584dddb3fa7f0e9cf5d9bdc2aed95de94ff3 100755 (executable)
@@ -73,13 +73,14 @@ namespace Tizen.NUI
             if (ret != null)
             {
                 Interop.BaseHandle.DeleteBaseHandle(new global::System.Runtime.InteropServices.HandleRef(this, cPtr));
+                NDalicPINVOKE.ThrowExceptionIfExists();
+                return ret;
             }
             else
             {
                 ret = new Texture(cPtr, true);
+                return ret;
             }
-            NDalicPINVOKE.ThrowExceptionIfExists();
-            return ret;
         }
 
         /// <summary>
@@ -107,13 +108,14 @@ namespace Tizen.NUI
             if (ret != null)
             {
                 Interop.BaseHandle.DeleteBaseHandle(new global::System.Runtime.InteropServices.HandleRef(this, cPtr));
+                NDalicPINVOKE.ThrowExceptionIfExists();
+                return ret;
             }
             else
             {
                 ret = new Sampler(cPtr, true);
+                return ret;
             }
-            NDalicPINVOKE.ThrowExceptionIfExists();
-            return ret;
         }
 
         /// <summary>
index f2f66fbab48ffd0925113e5ecd7abadd009a3d67..1a884df20faba8bdeef25608b58391147bb7d67b 100755 (executable)
@@ -310,14 +310,14 @@ namespace Tizen.NUI
                 global::System.Runtime.InteropServices.HandleRef CPtr = new global::System.Runtime.InteropServices.HandleRef(dummyObect, cPtr);
                 Interop.BaseHandle.DeleteBaseHandle(CPtr);
                 CPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
             }
             else
             {
                 ret = new FontClient(cPtr, true);
+                return ret;
             }
-
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
         }
 
         [EditorBrowsable(EditorBrowsableState.Never)]
index 967090f0d48947b0a959659a531a9dc059ef2c71..c6aa7833ff32b2ae1ccd3e37283357713ba7b211 100755 (executable)
@@ -63,7 +63,8 @@ namespace Tizen.NUI
                 if (stateChangedEventHandler == null)
                 {
                     stateChangedEventCallback = OnStateChanged;
-                    StateChangedSignal().Connect(stateChangedEventCallback);
+                    using var signal = StateChangedSignal();
+                    signal.Connect(stateChangedEventCallback);
                 }
 
                 stateChangedEventHandler += value;
@@ -71,10 +72,10 @@ namespace Tizen.NUI
             remove
             {
                 stateChangedEventHandler -= value;
-
-                if (stateChangedEventHandler == null && StateChangedSignal().Empty() == false && stateChangedEventCallback != null)
+                using var signal = StateChangedSignal();
+                if (stateChangedEventHandler == null && signal.Empty() == false && stateChangedEventCallback != null)
                 {
-                    StateChangedSignal().Disconnect(stateChangedEventCallback);
+                    signal.Disconnect(stateChangedEventCallback);
                 }
             }
         }
@@ -180,14 +181,14 @@ namespace Tizen.NUI
                 HandleRef CPtr = new HandleRef(dummyObect, cPtr);
                 Interop.BaseHandle.DeleteBaseHandle(CPtr);
                 CPtr = new HandleRef(null, global::System.IntPtr.Zero);
+                if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+                return ret;
             }
             else
             {
                 ret = new TTSPlayer(cPtr, true);
+                return ret;
             }
-
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
         }
 
         [EditorBrowsable(EditorBrowsableState.Never)]
index 77003003c8cc1ada4f4dbaee687c292ffffb1089..9bf6b1e427e98f4bf0c8dac5a6177584911d6c9c 100755 (executable)
@@ -92,16 +92,18 @@ namespace Tizen.NUI
             {
                 if (timerTickEventHandler == null && disposed == false)
                 {
-                    TickSignal().Connect(timerTickCallbackOfNative);
+                    using var signal = TickSignal();
+                    signal.Connect(timerTickCallbackOfNative);
                 }
                 timerTickEventHandler += value;
             }
             remove
             {
                 timerTickEventHandler -= value;
-                if (timerTickEventHandler == null && TickSignal().Empty() == false)
+                using var signal = TickSignal();
+                if (timerTickEventHandler == null && signal.Empty() == false)
                 {
-                    TickSignal().Disconnect(timerTickCallbackOfNative);
+                    signal.Disconnect(timerTickCallbackOfNative);
                 }
             }
         }
@@ -272,7 +274,8 @@ namespace Tizen.NUI
 
             if (this != null && timerTickCallbackDelegate != null)
             {
-                TickSignal().Disconnect(timerTickCallbackOfNative);
+                using var signal = TickSignal();
+                signal.Disconnect(timerTickCallbackOfNative);
             }
 
             if (disposed)
index 5f42da352d9ba415ef5070fc162c5c3049216ce6..5023f2cb63c08c144308a22139d83e775efd7658 100755 (executable)
@@ -60,7 +60,7 @@ namespace Tizen.NUI
             Offset = new Vector2(noOffset);
             Extents = new Vector2(noExtents);
 
-            var transformProperty = propertyMap.Find(Visual.Property.Transform);
+            var transformProperty = propertyMap?.Find(Visual.Property.Transform);
 
             if (transformProperty == null)
             {
index d8217d7b322ffe8fc51978f6317842e6ff3c5511..ab63f84d32a42245decaff89390b3e4db4dc0eda 100644 (file)
@@ -105,8 +105,10 @@ namespace Tizen.NUI.Visuals
             get
             {
                 Vector4 ret = new Vector4();
-                using var propertyValue = GetCachedVisualProperty((int)Tizen.NUI.Visual.Property.CornerRadius);
-                propertyValue?.Get(ret);
+                using (var propertyValue = GetCachedVisualProperty((int)Tizen.NUI.Visual.Property.CornerRadius))
+                {
+                    propertyValue?.Get(ret);
+                }
                 return ret;
             }
         }
@@ -147,8 +149,10 @@ namespace Tizen.NUI.Visuals
             get
             {
                 Vector4 ret = new Vector4();
-                using var propertyValue = GetCachedVisualProperty((int)Tizen.NUI.Visual.Property.CornerSquareness);
-                propertyValue?.Get(ret);
+                using (var propertyValue = GetCachedVisualProperty((int)Tizen.NUI.Visual.Property.CornerSquareness))
+                {
+                    propertyValue?.Get(ret);
+                }
                 return ret;
             }
         }
@@ -186,8 +190,10 @@ namespace Tizen.NUI.Visuals
             get
             {
                 Color ret = new Color(0.0f, 0.0f, 0.0f, 1.0f);
-                using var propertyValue = GetCachedVisualProperty((int)Tizen.NUI.Visual.Property.BorderlineColor);
-                propertyValue?.Get(ret);
+                using (var propertyValue = GetCachedVisualProperty((int)Tizen.NUI.Visual.Property.BorderlineColor))
+                {
+                    propertyValue?.Get(ret);
+                }
                 return ret;
             }
         }
index 3a2b656ace89f3ddb6b7739c8ee2a4210646a5e2..e7b0fdc030efab9514cef5f574656965f59f1206 100644 (file)
@@ -108,8 +108,10 @@ namespace Tizen.NUI.Visuals
             get
             {
                 Vector4 ret = new Vector4(0.0f, 0.0f, 1.0f, 1.0f);
-                using var propertyValue = GetCachedVisualProperty((int)Tizen.NUI.ImageVisualProperty.PixelArea);
-                propertyValue?.Get(ret);
+                using (var propertyValue = GetCachedVisualProperty((int)Tizen.NUI.ImageVisualProperty.PixelArea))
+                {
+                    propertyValue?.Get(ret);
+                }
                 return ret;
             }
         }
@@ -495,8 +497,10 @@ namespace Tizen.NUI.Visuals
             get
             {
                 Vector4 ret = new Vector4();
-                using var propertyValue = GetCachedVisualProperty((int)Tizen.NUI.Visual.Property.CornerRadius);
-                propertyValue?.Get(ret);
+                using (var propertyValue = GetCachedVisualProperty((int)Tizen.NUI.Visual.Property.CornerRadius))
+                {
+                    propertyValue?.Get(ret);
+                }
                 return ret;
             }
         }
@@ -537,8 +541,10 @@ namespace Tizen.NUI.Visuals
             get
             {
                 Vector4 ret = new Vector4();
-                using var propertyValue = GetCachedVisualProperty((int)Tizen.NUI.Visual.Property.CornerSquareness);
-                propertyValue?.Get(ret);
+                using (var propertyValue = GetCachedVisualProperty((int)Tizen.NUI.Visual.Property.CornerSquareness))
+                {
+                    propertyValue?.Get(ret);
+                }
                 return ret;
             }
         }
@@ -576,8 +582,10 @@ namespace Tizen.NUI.Visuals
             get
             {
                 Color ret = new Color(0.0f, 0.0f, 0.0f, 1.0f);
-                using var propertyValue = GetCachedVisualProperty((int)Tizen.NUI.Visual.Property.BorderlineColor);
-                propertyValue?.Get(ret);
+                using (var propertyValue = GetCachedVisualProperty((int)Tizen.NUI.Visual.Property.BorderlineColor))
+                {
+                    propertyValue?.Get(ret);
+                }
                 return ret;
             }
         }
index e45537d8235402ef9e00daadccb0aeea80c1d78f..02d2733e6165cd36e88f60cce33025d01c5ba385 100644 (file)
@@ -93,8 +93,10 @@ namespace Tizen.NUI.Visuals
             get
             {
                 Rectangle ret = new Rectangle();
-                using var propertyValue = GetCachedVisualProperty((int)Tizen.NUI.NpatchImageVisualProperty.Border);
-                propertyValue?.Get(ret);
+                using (var propertyValue = GetCachedVisualProperty((int)Tizen.NUI.NpatchImageVisualProperty.Border))
+                {
+                    propertyValue?.Get(ret);
+                }
                 return ret;
             }
         }
index 5130b89fcc0a4dc7cc04baa37834fe13358233ba..7c2ab28e2341e4c1a70e9000506f400897f19655 100644 (file)
@@ -175,8 +175,10 @@ namespace Tizen.NUI.Visuals
             get
             {
                 Tizen.NUI.Color ret = new Color(0.0f, 0.0f, 0.0f, 1.0f);
-                using var propertyValue = GetCachedVisualProperty((int)Tizen.NUI.TextVisualProperty.TextColor);
-                propertyValue?.Get(ret);
+                using (var propertyValue = GetCachedVisualProperty((int)Tizen.NUI.TextVisualProperty.TextColor))
+                {
+                    propertyValue?.Get(ret);
+                }
                 return ret;
             }
         }
index 24d91ae7c8cda5619b287b2c4bd2ae8f9f53eebe..c1591efacf61915cfb572a5404fdb4865f40edf8 100644 (file)
@@ -142,72 +142,74 @@ namespace Tizen.NUI.Visuals
 
             internal void ConvertFromPropertyMap(PropertyMap inputMap)
             {
-#pragma warning disable CA2000 // Dispose objects before losing scope
-                PropertyValue value = null;
-
-                if ((value = inputMap?.Find((int)VisualTransformPropertyType.Size)) != null)
-                {
-                    using var size = new Size();
-                    if (value.Get(size))
+                using (PropertyValue value = inputMap?.Find((int)VisualTransformPropertyType.Size))
+                    if (value != null)
                     {
-                        width = size.Width;
-                        height = size.Height;
+                        using var size = new Size();
+                        if (value.Get(size))
+                        {
+                            width = size.Width;
+                            height = size.Height;
+                        }
                     }
-                }
-                if ((value = inputMap?.Find((int)VisualTransformPropertyType.Offset)) != null)
-                {
-                    using var offset = new Position();
-                    if (value.Get(offset))
+                using (PropertyValue value = inputMap?.Find((int)VisualTransformPropertyType.Offset))
+                    if (value != null)
                     {
-                        offsetX = offset.X;
-                        offsetY = offset.Y;
+                        using var offset = new Position();
+                        if (value.Get(offset))
+                        {
+                            offsetX = offset.X;
+                            offsetY = offset.Y;
+                        }
                     }
-                }
-                if ((value = inputMap?.Find((int)VisualTransformPropertyType.SizePolicy)) != null)
-                {
-                    using var policyValue = new Vector2();
-                    if (value.Get(policyValue))
+                using (PropertyValue value = inputMap?.Find((int)VisualTransformPropertyType.SizePolicy))
+                    if (value != null)
                     {
-                        widthPolicy = (VisualTransformPolicyType)policyValue.X;
-                        heightPolicy = (VisualTransformPolicyType)policyValue.Y;
+                        using var policyValue = new Vector2();
+                        if (value.Get(policyValue))
+                        {
+                            widthPolicy = (VisualTransformPolicyType)policyValue.X;
+                            heightPolicy = (VisualTransformPolicyType)policyValue.Y;
+                        }
                     }
-                }
-                if ((value = inputMap?.Find((int)VisualTransformPropertyType.OffsetPolicy)) != null)
-                {
-                    using var policyValue = new Vector2();
-                    if (value.Get(policyValue))
+                using (PropertyValue value = inputMap?.Find((int)VisualTransformPropertyType.OffsetPolicy))
+                    if (value != null)
                     {
-                        offsetXPolicy = (VisualTransformPolicyType)policyValue.X;
-                        offsetYPolicy = (VisualTransformPolicyType)policyValue.Y;
+                        using var policyValue = new Vector2();
+                        if (value.Get(policyValue))
+                        {
+                            offsetXPolicy = (VisualTransformPolicyType)policyValue.X;
+                            offsetYPolicy = (VisualTransformPolicyType)policyValue.Y;
+                        }
                     }
-                }
-                if ((value = inputMap?.Find((int)VisualTransformPropertyType.Origin)) != null)
-                {
-                    int ret = 0;
-                    if (value.Get(out ret))
+                using (PropertyValue value = inputMap?.Find((int)VisualTransformPropertyType.Origin))
+                    if (value != null)
                     {
-                        origin = (Visual.AlignType)ret;
+                        int ret = 0;
+                        if (value.Get(out ret))
+                        {
+                            origin = (Visual.AlignType)ret;
+                        }
                     }
-                }
-                if ((value = inputMap?.Find((int)VisualTransformPropertyType.AnchorPoint)) != null)
-                {
-                    int ret = 0;
-                    if (value.Get(out ret))
+                using (PropertyValue value = inputMap?.Find((int)VisualTransformPropertyType.AnchorPoint))
+                    if (value != null)
                     {
-                        pivotPoint = (Visual.AlignType)ret;
+                        int ret = 0;
+                        if (value.Get(out ret))
+                        {
+                            pivotPoint = (Visual.AlignType)ret;
+                        }
                     }
-                }
-                if ((value = inputMap?.Find((int)VisualTransformPropertyType.ExtraSize)) != null)
-                {
-                    using var extraValue = new Vector2();
-                    if (value.Get(extraValue))
+                using (PropertyValue value = inputMap?.Find((int)VisualTransformPropertyType.ExtraSize))
+                    if (value != null)
                     {
-                        extraWidth = extraValue.Width;
-                        extraHeight = extraValue.Height;
+                        using var extraValue = new Vector2();
+                        if (value.Get(extraValue))
+                        {
+                            extraWidth = extraValue.Width;
+                            extraHeight = extraValue.Height;
+                        }
                     }
-                }
-                value?.Dispose();
-#pragma warning restore CA2000 // Dispose objects before losing scope
             }
         };
         internal VisualTransformInfo transformInfo;
@@ -341,11 +343,11 @@ namespace Tizen.NUI.Visuals
             }
             get
             {
-#pragma warning disable CA2000 // Dispose objects before losing scope
                 Tizen.NUI.Color ret = new Tizen.NUI.Color(1.0f, 1.0f, 1.0f, 1.0f);
-#pragma warning restore CA2000 // Dispose objects before losing scope
-                using var propertyValue = GetCachedVisualProperty((int)Tizen.NUI.Visual.Property.MixColor);
-                propertyValue?.Get(ret);
+                using (var propertyValue = GetCachedVisualProperty((int)Tizen.NUI.Visual.Property.MixColor))
+                {
+                    propertyValue?.Get(ret);
+                }
                 return ret;
             }
         }
index d1df64a704307e8df54268479f4b8b9984e6f93a..1c998ca7b06e619126102bd582783e313c8bc8ab 100755 (executable)
@@ -1816,11 +1816,11 @@ namespace Tizen.NUI.BaseComponents
 
         private Vector2 GetInternalScrollSize()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             Vector2 temp = new Vector2(0.0f, 0.0f);
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.ScrollSize);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.ScrollSize))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
@@ -1847,11 +1847,11 @@ namespace Tizen.NUI.BaseComponents
 
         private Vector2 GetInternalContentSize()
         {
-#pragma warning disable CA2000 // Dispose objects before losing scope
             Vector2 temp = new Vector2(0.0f, 0.0f);
-#pragma warning restore CA2000 // Dispose objects before losing scope
-            using var prop = Object.GetProperty(SwigCPtr, Property.ContentSize);
-            prop.Get(temp);
+            using (var prop = Object.GetProperty(SwigCPtr, Property.ContentSize))
+            {
+                prop.Get(temp);
+            }
             return temp;
         }
 
index 021070497e99daf51ad943dd605fd185de41b358..636a188f6db82324710594972b696b4659fe5994 100755 (executable)
@@ -47,7 +47,8 @@ namespace Tizen.NUI
                 if (focusChangedEventCallback == null)
                 {
                     focusChangedEventCallback = OnWindowFocusedChanged;
-                    FocusChangedSignal().Connect(focusChangedEventCallback);
+                    using var signal = FocusChangedSignal();
+                    signal.Connect(focusChangedEventCallback);
                 }
 
                 focusChangedEventHandler += value;
@@ -55,10 +56,10 @@ namespace Tizen.NUI
             remove
             {
                 focusChangedEventHandler -= value;
-
-                if (focusChangedEventHandler == null && FocusChangedSignal().Empty() == false && focusChangedEventCallback != null)
+                using var signal = FocusChangedSignal();
+                if (focusChangedEventHandler == null && signal.Empty() == false && focusChangedEventCallback != null)
                 {
-                    FocusChangedSignal().Disconnect(focusChangedEventCallback);
+                    signal.Disconnect(focusChangedEventCallback);
                 }
             }
         }
@@ -105,16 +106,18 @@ namespace Tizen.NUI
                 if (stageKeyHandler == null)
                 {
                     windowKeyCallbackDelegate = OnStageKey;
-                    KeyEventSignal().Connect(windowKeyCallbackDelegate);
+                    using var signal = KeyEventSignal();
+                    signal.Connect(windowKeyCallbackDelegate);
                 }
                 stageKeyHandler += value;
             }
             remove
             {
                 stageKeyHandler -= value;
-                if (stageKeyHandler == null && KeyEventSignal().Empty() == false)
+                using var signal = KeyEventSignal();
+                if (stageKeyHandler == null && signal.Empty() == false)
                 {
-                    KeyEventSignal().Disconnect(windowKeyCallbackDelegate);
+                    signal.Disconnect(windowKeyCallbackDelegate);
                 }
             }
         }
@@ -130,7 +133,8 @@ namespace Tizen.NUI
                 if (windowResizedEventHandler == null)
                 {
                     windowResizedEventCallback = OnResized;
-                    GLWindowResizedSignal().Connect(windowResizedEventCallback);
+                    using var signal = GLWindowResizedSignal();
+                    signal.Connect(windowResizedEventCallback);
                 }
 
                 windowResizedEventHandler += value;
@@ -138,10 +142,10 @@ namespace Tizen.NUI
             remove
             {
                 windowResizedEventHandler -= value;
-
-                if (windowResizedEventHandler == null && GLWindowResizedSignal().Empty() == false && windowResizedEventCallback != null)
+                using var signal = GLWindowResizedSignal();
+                if (windowResizedEventHandler == null && signal.Empty() == false && windowResizedEventCallback != null)
                 {
-                    GLWindowResizedSignal().Disconnect(windowResizedEventCallback);
+                    signal.Disconnect(windowResizedEventCallback);
                 }
             }
         }
@@ -179,7 +183,8 @@ namespace Tizen.NUI
         {
             if (focusChangedEventCallback != null)
             {
-                FocusChangedSignal().Disconnect(focusChangedEventCallback);
+                using var signal = FocusChangedSignal();
+                signal.Disconnect(focusChangedEventCallback);
             }
 
             if (windowTouchDataCallback != null)
@@ -190,12 +195,14 @@ namespace Tizen.NUI
 
             if (windowKeyCallbackDelegate != null)
             {
-                KeyEventSignal().Disconnect(windowKeyCallbackDelegate);
+                using var signal = KeyEventSignal();
+                signal.Disconnect(windowKeyCallbackDelegate);
             }
 
             if (windowResizedEventCallback != null)
             {
-                GLWindowResizedSignal().Disconnect(windowResizedEventCallback);
+                using var signal = GLWindowResizedSignal();
+                signal.Disconnect(windowResizedEventCallback);
             }
         }