From c472643edfca58236e2bc1756f0f8513071f986e Mon Sep 17 00:00:00 2001 From: Dimitar Dobrev Date: Thu, 8 Dec 2016 15:35:40 +0200 Subject: [PATCH] Deleted more redundant code. Signed-off-by: Dimitar Dobrev --- src/Generator/Passes/DelegatesPass.cs | 30 ------------------- .../Passes/GetterSetterToPropertyPass.cs | 10 ++----- 2 files changed, 2 insertions(+), 38 deletions(-) diff --git a/src/Generator/Passes/DelegatesPass.cs b/src/Generator/Passes/DelegatesPass.cs index c30d2755..810400e0 100644 --- a/src/Generator/Passes/DelegatesPass.cs +++ b/src/Generator/Passes/DelegatesPass.cs @@ -53,36 +53,6 @@ namespace CppSharp.Passes return result; } - public override bool VisitClassDecl(Class @class) - { - if (!base.VisitClassDecl(@class)) - return false; - - // dependent types with virtuals have no own virtual layouts - // so virtuals are considered different objects in template instantiations - // therefore the method itself won't be visited, so let's visit it through the v-table - if (Context.ParserOptions.IsMicrosoftAbi) - { - foreach (var method in from vfTable in @class.Layout.VFTables - from component in vfTable.Layout.Components - where component.Method != null - select component.Method) - VisitMethodDecl(method); - } - else - { - if (@class.Layout.Layout == null) - return false; - - foreach (var method in from component in @class.Layout.Layout.Components - where component.Method != null - select component.Method) - VisitMethodDecl(method); - } - - return true; - } - public override bool VisitMethodDecl(Method method) { if (!base.VisitMethodDecl(method) || !method.IsVirtual || method.Ignore) diff --git a/src/Generator/Passes/GetterSetterToPropertyPass.cs b/src/Generator/Passes/GetterSetterToPropertyPass.cs index 8d354a1e..dcb331ce 100644 --- a/src/Generator/Passes/GetterSetterToPropertyPass.cs +++ b/src/Generator/Passes/GetterSetterToPropertyPass.cs @@ -330,6 +330,7 @@ namespace CppSharp.Passes { VisitOptions.VisitClassFields = false; VisitOptions.VisitClassProperties = false; + VisitOptions.VisitClassMethods = false; VisitOptions.VisitNamespaceEnums = false; VisitOptions.VisitNamespaceTemplates = false; VisitOptions.VisitNamespaceTypedefs = false; @@ -341,15 +342,8 @@ namespace CppSharp.Passes public override bool VisitClassDecl(Class @class) { - if (VisitDeclarationContext(@class)) - { - if (VisitOptions.VisitClassBases) - foreach (var baseClass in @class.Bases) - if (baseClass.IsClass) - VisitClassDecl(baseClass.Class); - + if (base.VisitClassDecl(@class)) new PropertyGenerator(@class).GenerateProperties(); - } return false; } }