From: Daniel Kolesa <d.kolesa@osg.samsung.com>
Date: Thu, 23 Feb 2017 15:41:43 +0000 (+0100)
Subject: docgen: merge methods and properties in listing
X-Git-Tag: upstream/1.20.0~1913
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=96c1c30db43fb2bfbd1899839c9960dc9623c6bc;p=platform%2Fupstream%2Fefl.git

docgen: merge methods and properties in listing
---

diff --git a/src/scripts/elua/apps/gendoc.lua b/src/scripts/elua/apps/gendoc.lua
index cb7c1df..f86bf41 100644
--- a/src/scripts/elua/apps/gendoc.lua
+++ b/src/scripts/elua/apps/gendoc.lua
@@ -808,27 +808,17 @@ local build_class = function(cl)
     f:write_editable(cln, "description")
     f:write_nl()
 
-    local meths, props, methos, propos = {}, {}, {}, {}
+    local meths, methos = {}, {}
     for i, impl in ipairs(cl:implements_get()) do
-        if impl:is_prop_get() or impl:is_prop_set() then
-            if impl:is_overridden(cl) then
-                propos[#propos + 1] = impl
-            else
-                props[#props + 1] = impl
-            end
+        if impl:is_overridden(cl) then
+            methos[#methos + 1] = impl
         else
-            if impl:is_overridden(cl) then
-                methos[#methos + 1] = impl
-            else
-                meths[#meths + 1] = impl
-            end
+            meths[#meths + 1] = impl
         end
     end
 
-    build_functable(f, "Methods", cl, meths, false)
-    build_functable(f, "Properties", cl, props, false)
-    build_functable(f, "Overridden Methods", cl, methos, true)
-    build_functable(f, "Overridden Properties", cl, propos, true)
+    build_functable(f, "Members", cl, meths, false)
+    build_functable(f, "Overrides", cl, methos, true)
 
     f:write_h("Events", 2)
     local evs = cl:events_get()