From 34ed304228c3fbf74346e979b56074287ac1bc85 Mon Sep 17 00:00:00 2001
From: Joao Matos <joao@tritao.eu>
Date: Fri, 3 Feb 2017 14:28:00 +0000
Subject: [PATCH] Renamed Template to CodeTemplate due to conflict with AST
 templates.

---
 src/Generator/Generator.cs                                | 6 +++---
 src/Generator/Generators/CLI/CLIGenerator.cs              | 6 +++---
 src/Generator/Generators/CLI/CLITemplate.cs               | 4 ++--
 src/Generator/Generators/CSharp/CSharpGenerator.cs        | 6 +++---
 src/Generator/Generators/CSharp/CSharpSources.cs          | 4 ++--
 src/Generator/Generators/{Template.cs => CodeTemplate.cs} | 6 +++---
 6 files changed, 16 insertions(+), 16 deletions(-)
 rename src/Generator/Generators/{Template.cs => CodeTemplate.cs} (95%)

diff --git a/src/Generator/Generator.cs b/src/Generator/Generator.cs
index f4d85976..9ab1ac46 100644
--- a/src/Generator/Generator.cs
+++ b/src/Generator/Generator.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using CppSharp.AST;
@@ -31,7 +31,7 @@ namespace CppSharp.Generators
         /// <summary>
         /// Text templates with generated output.
         /// </summary>
-        public List<Template> Templates;
+        public List<CodeTemplate> Templates;
     }
 
     /// <summary>
@@ -134,7 +134,7 @@ namespace CppSharp.Generators
         /// <summary>
         /// Generates the outputs for a given translation unit.
         /// </summary>
-        public abstract List<Template> Generate(IEnumerable<TranslationUnit> units);
+        public abstract List<CodeTemplate> Generate(IEnumerable<TranslationUnit> units);
 
         protected abstract string TypePrinterDelegate(CppSharp.AST.Type type);
 
diff --git a/src/Generator/Generators/CLI/CLIGenerator.cs b/src/Generator/Generators/CLI/CLIGenerator.cs
index ef343360..436604f6 100644
--- a/src/Generator/Generators/CLI/CLIGenerator.cs
+++ b/src/Generator/Generators/CLI/CLIGenerator.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using CppSharp.AST;
 
 namespace CppSharp.Generators.CLI
@@ -16,9 +16,9 @@ namespace CppSharp.Generators.CLI
             typePrinter = new CLITypePrinter(context);
         }
 
-        public override List<Template> Generate(IEnumerable<TranslationUnit> units)
+        public override List<CodeTemplate> Generate(IEnumerable<TranslationUnit> units)
         {
-            var outputs = new List<Template>();
+            var outputs = new List<CodeTemplate>();
 
             var header = new CLIHeaders(Context, units);
             outputs.Add(header);
diff --git a/src/Generator/Generators/CLI/CLITemplate.cs b/src/Generator/Generators/CLI/CLITemplate.cs
index d41c5bc4..75a7e5c7 100644
--- a/src/Generator/Generators/CLI/CLITemplate.cs
+++ b/src/Generator/Generators/CLI/CLITemplate.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using CppSharp.AST;
 
@@ -55,7 +55,7 @@ namespace CppSharp.Generators.CLI
     /// for source (CLISources) and header (CLIHeaders)
     /// files.
     /// </summary>
-    public abstract class CLITemplate : Template
+    public abstract class CLITemplate : CodeTemplate
     {
         public CLITypePrinter TypePrinter { get; set; }
 
diff --git a/src/Generator/Generators/CSharp/CSharpGenerator.cs b/src/Generator/Generators/CSharp/CSharpGenerator.cs
index 6f3c7cbe..b9644b40 100644
--- a/src/Generator/Generators/CSharp/CSharpGenerator.cs
+++ b/src/Generator/Generators/CSharp/CSharpGenerator.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using CppSharp.AST;
 using CppSharp.Passes;
 
@@ -15,9 +15,9 @@ namespace CppSharp.Generators.CSharp
             expressionPrinter = new CSharpExpressionPrinter(typePrinter);
         }
 
-        public override List<Template> Generate(IEnumerable<TranslationUnit> units)
+        public override List<CodeTemplate> Generate(IEnumerable<TranslationUnit> units)
         {
-            var outputs = new List<Template>();
+            var outputs = new List<CodeTemplate>();
 
             var template = new CSharpSources(Context, units, typePrinter, expressionPrinter);
             outputs.Add(template);
diff --git a/src/Generator/Generators/CSharp/CSharpSources.cs b/src/Generator/Generators/CSharp/CSharpSources.cs
index 53dc2c1e..9ea867c0 100644
--- a/src/Generator/Generators/CSharp/CSharpSources.cs
+++ b/src/Generator/Generators/CSharp/CSharpSources.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@@ -122,7 +122,7 @@ namespace CppSharp.Generators.CSharp
         public const int Finalizer = FIRST + 19;
     }
 
-    public class CSharpSources : Template
+    public class CSharpSources : CodeTemplate
     {
         public CSharpTypePrinter TypePrinter { get; private set; }
         public CSharpExpressionPrinter ExpressionPrinter { get; private set; }
diff --git a/src/Generator/Generators/Template.cs b/src/Generator/Generators/CodeTemplate.cs
similarity index 95%
rename from src/Generator/Generators/Template.cs
rename to src/Generator/Generators/CodeTemplate.cs
index 35a1500a..81945f86 100644
--- a/src/Generator/Generators/Template.cs
+++ b/src/Generator/Generators/CodeTemplate.cs
@@ -4,7 +4,7 @@ using CppSharp.AST;
 
 namespace CppSharp.Generators
 {
-    public abstract class Template : BlockGenerator, IDeclVisitor<bool>
+    public abstract class CodeTemplate : BlockGenerator, IDeclVisitor<bool>
     {
         public BindingContext Context { get; private set; }
 
@@ -16,12 +16,12 @@ namespace CppSharp.Generators
 
         public abstract string FileExtension { get; }
 
-        protected Template(BindingContext context, TranslationUnit unit)
+        protected CodeTemplate(BindingContext context, TranslationUnit unit)
             : this(context, new List<TranslationUnit> { unit })
         {
         }
 
-        protected Template(BindingContext context, IEnumerable<TranslationUnit> units)
+        protected CodeTemplate(BindingContext context, IEnumerable<TranslationUnit> units)
         {
             Context = context;
             TranslationUnits = new List<TranslationUnit>(units);