Fix Naming/inherit error

 - Resolve name conflict : Layout::GetData -> Layout::GetEdjeData
 - Resolve method hiding issue : EvasObject::Layout add virtual, Window::Layout add override

Change-Id: I87b7ed00eb769c762358c6b5aa4b138ca4fce010

diff --git a/src/ElmSharp/ElmSharp/EvasObject.cs b/src/ElmSharp/ElmSharp/EvasObject.cs
old mode 100755 (executable)
new mode 100644 (file)
index 4693486..0a40609
--- a/src/ElmSharp/ElmSharp/EvasObject.cs
+++ b/src/ElmSharp/ElmSharp/EvasObject.cs
@@ -575,7 +575,7 @@ namespace ElmSharp
         /// <summary>
         /// Sets or gets the layer of its canvas that the given object will be part of.
         /// </summary>
-        public int Layer
+        public virtual int Layer
         {
             get
             {

diff --git a/src/ElmSharp/ElmSharp/Layout.cs b/src/ElmSharp/ElmSharp/Layout.cs
old mode 100755 (executable)
new mode 100644 (file)
index 3de5e8e..9a45bbe
--- a/src/ElmSharp/ElmSharp/Layout.cs
+++ b/src/ElmSharp/ElmSharp/Layout.cs
@@ -138,7 +138,7 @@ namespace ElmSharp
         /// </summary>
         /// <param name="key">The data key</param>
         /// <returns>The data</returns>
-        public string GetData(string key)
+        public string GetEdjeData(string key)
         {
             return Interop.Elementary.elm_layout_data_get(RealHandle, key);
         }

diff --git a/src/ElmSharp/ElmSharp/Window.cs b/src/ElmSharp/ElmSharp/Window.cs
old mode 100755 (executable)
new mode 100644 (file)
index d3628f3..71d18f5
--- a/src/ElmSharp/ElmSharp/Window.cs
+++ b/src/ElmSharp/ElmSharp/Window.cs
@@ -693,7 +693,7 @@ namespace ElmSharp
         /// more than 5 means that the window will be placed above all others,
         /// and anything else means that the window will be placed in the default layer.
         /// </summary>
-        public int Layer
+        public override int Layer
         {
             get
             {