Merge pull request #278 from ddobrev/master

Simplified the getting of a function type now that the more complex (native) type is no longer used for abstract impls

src/AST/Function.cs

@@ -211,7 +211,7 @@ namespace CppSharp.AST
         public Type Type { get { return ReturnType.Type; } }
         public QualifiedType QualifiedType { get { return ReturnType; } }
 
-        public virtual QualifiedType GetFunctionType()
+        public FunctionType GetFunctionType()
         {
             var functionType = new FunctionType
                                 {
@@ -222,12 +222,7 @@ namespace CppSharp.AST
             functionType.Parameters.AddRange(Parameters);
             ReplaceIndirectReturnParamWithRegular(functionType);
 
-            var pointerType = new PointerType
-                {
-                    QualifiedPointee = new QualifiedType(functionType)
-                };
-
-            return new QualifiedType(pointerType);
+            return functionType;
         }
 
         static void ReplaceIndirectReturnParamWithRegular(FunctionType functionType)

src/AST/Method.cs

@@ -151,23 +151,5 @@ namespace CppSharp.AST
         {
             return visitor.VisitMethodDecl(this);
         }
-
-        public override QualifiedType GetFunctionType()
-        {
-            var qualifiedType = base.GetFunctionType();
-            if (!IsStatic)
-            {
-                FunctionType functionType;
-                qualifiedType.Type.IsPointerTo(out functionType);
-                var instance = new Parameter
-                                {
-                                    Name = "instance",
-                                    QualifiedType = new QualifiedType(
-                                        new BuiltinType(PrimitiveType.IntPtr))
-                                };
-                functionType.Parameters.Insert(0, instance);
-            }
-            return qualifiedType;
-        }
     }
 }