From: Piotr Sawicki Date: Fri, 20 Oct 2017 08:22:00 +0000 (+0000) Subject: Merge "Add new Tizen.Security.PrivacyPrivilegeManager API PS1: Review Tizen.Security... X-Git-Tag: preview1-00324^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=62a0e6ead2b720e518745e88c1f15af6e4e729ed;hp=cf0758758bb4e097ff25065d99aee16ddad0b745;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git Merge "Add new Tizen.Security.PrivacyPrivilegeManager API PS1: Review Tizen.Security.PrivacyPriviledgeManager API cs files" --- diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs index f312226..36f88a7 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/View.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs @@ -158,12 +158,6 @@ namespace Tizen.NUI.BaseComponents base.Dispose(type); - // Dispose all Children of this View. - foreach (View childView in Children) - { - childView?.Dispose(); - } - Children.Clear(); } private void DisConnectFromSignals() diff --git a/src/Tizen.NUI/src/public/BaseHandle.cs b/src/Tizen.NUI/src/public/BaseHandle.cs index 7aacc31..d7a1b7e 100755 --- a/src/Tizen.NUI/src/public/BaseHandle.cs +++ b/src/Tizen.NUI/src/public/BaseHandle.cs @@ -296,53 +296,6 @@ namespace Tizen.NUI } /// - /// Equals - /// - /// The object should be compared. - /// True if equal. - /// 4 - public override bool Equals(object o) - { - if(o == null) - { - return false; - } - if(!(o is BaseHandle)) - { - return false; - } - BaseHandle b = (BaseHandle)o; - if (!BaseHandle.ReferenceEquals(this, null) && !BaseHandle.ReferenceEquals(b, null)) - { - // drop into native code to see if both handles point to the same body - return this.IsEqual(b); - } - - if (BaseHandle.ReferenceEquals(this, null) && !BaseHandle.ReferenceEquals(b, null)) - { - if (b.HasBody()) return false; - else return true; - } - if (!BaseHandle.ReferenceEquals(this, null) && BaseHandle.ReferenceEquals(b, null)) - { - if (this.HasBody()) return false; - else return true; - } - - return false; - } - - /// - /// Gets the the hash code of this baseHandle. - /// - /// The Hash Code. - /// 4 - public override int GetHashCode() - { - return base.GetHashCode(); - } - - /// /// Create an instance of BaseHandle. /// /// 3 diff --git a/src/Tizen.NUI/src/public/Layer.cs b/src/Tizen.NUI/src/public/Layer.cs index e7f3391..659aac0 100755 --- a/src/Tizen.NUI/src/public/Layer.cs +++ b/src/Tizen.NUI/src/public/Layer.cs @@ -143,12 +143,6 @@ namespace Tizen.NUI base.Dispose(type); - // Dispose all Children of this Layer. - foreach (View childView in Children) - { - childView?.Dispose(); - } - Children.Clear(); }