Updated to the latest C++#.

Signed-off-by: Dimitar Dobrev <[email protected]>
ddobrev · Oct 25, 2016 · c87bf12 · c87bf12
1 parent 06dc367
commit c87bf12
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 21 deletions.
diff --git a/QtSharp.CLI/QtSharp.CLI.csproj b/QtSharp.CLI/QtSharp.CLI.csproj
@@ -63,27 +63,27 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="CppSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\CppSharp.0.7.3\lib\CppSharp.dll</HintPath>
+      <HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="CppSharp.AST, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\CppSharp.0.7.3\lib\CppSharp.AST.dll</HintPath>
+      <HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.AST.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="CppSharp.Generator, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\CppSharp.0.7.3\lib\CppSharp.Generator.dll</HintPath>
+      <HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.Generator.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="CppSharp.Parser, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\CppSharp.0.7.3\lib\CppSharp.Parser.dll</HintPath>
+      <HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.Parser.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="CppSharp.Parser.CLI, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\CppSharp.0.7.3\lib\CppSharp.Parser.CLI.dll</HintPath>
+      <HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.Parser.CLI.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="CppSharp.Runtime, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\CppSharp.0.7.3\lib\CppSharp.Runtime.dll</HintPath>
+      <HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.Runtime.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/QtSharp.CLI/packages.config b/QtSharp.CLI/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Baseclass.Contrib.Nuget.Output" version="2.1.0" targetFramework="net451" />
-  <package id="CppSharp" version="0.7.3" targetFramework="net451" developmentDependency="true" />
+  <package id="CppSharp" version="0.7.4" targetFramework="net451" developmentDependency="true" />
 </packages>
diff --git a/QtSharp/CompileInlinesPass.cs b/QtSharp/CompileInlinesPass.cs
@@ -20,7 +20,7 @@ public CompileInlinesPass(string qmake, string make)
             this.make = make;
         }
 
-        public override bool VisitLibrary(ASTContext context)
+        public override bool VisitASTContext(ASTContext context)
         {
             string error;
             const string qtVersionVariable = "QT_VERSION";

diff --git a/QtSharp/GetCommentsFromQtDocsPass.cs b/QtSharp/GetCommentsFromQtDocsPass.cs
@@ -19,9 +19,9 @@ public GetCommentsFromQtDocsPass(string docsPath, IEnumerable<string> modules)
             this.VisitOptions.VisitClassFields = false;
         }
 
-        public override bool VisitLibrary(ASTContext context)
+        public override bool VisitASTContext(ASTContext context)
         {
-            return this.documentation.Exists && base.VisitLibrary(context);
+            return this.documentation.Exists && base.VisitASTContext(context);
         }
 
         public override bool VisitTranslationUnit(TranslationUnit unit)

diff --git a/QtSharp/QtSharp.cs b/QtSharp/QtSharp.cs
@@ -183,15 +183,15 @@ private static void IgnorePrivateDeclaration(Declaration declaration)
 
         public void Postprocess(Driver driver, ASTContext lib)
         {
-            new ClearCommentsPass().VisitLibrary(driver.Context.ASTContext);
+            new ClearCommentsPass().VisitASTContext(driver.Context.ASTContext);
             var modules = this.qtInfo.LibFiles.Select(l => GetModuleNameFromLibFile(l));
             var s = System.Diagnostics.Stopwatch.StartNew();
-            new GetCommentsFromQtDocsPass(this.qtInfo.Docs, modules).VisitLibrary(driver.Context.ASTContext);
+            new GetCommentsFromQtDocsPass(this.qtInfo.Docs, modules).VisitASTContext(driver.Context.ASTContext);
             System.Console.WriteLine("Documentation done in: {0}", s.Elapsed);
             new CaseRenamePass(
                 RenameTargets.Function | RenameTargets.Method | RenameTargets.Property | RenameTargets.Delegate |
                 RenameTargets.Field | RenameTargets.Variable,
-                RenameCasePattern.UpperCamelCase).VisitLibrary(driver.Context.ASTContext);
+                RenameCasePattern.UpperCamelCase).VisitASTContext(driver.Context.ASTContext);
 
             var qChar = lib.FindCompleteClass("QChar");
             var op = qChar.FindOperator(CXXOperatorKind.ExplicitConversion)
@@ -230,7 +230,6 @@ public void Setup(Driver driver)
             driver.ParserOptions.Verbose = true;
             driver.ParserOptions.addDefines("__float128=void");
             driver.Options.GeneratorKind = GeneratorKind.CSharp;
-            driver.Options.GenerateInterfacesForMultipleInheritance = true;
             driver.Options.GeneratePropertiesAdvanced = true;
             driver.Options.UnityBuild = true;
             driver.Options.IgnoreParseWarnings = true;

diff --git a/QtSharp/QtSharp.csproj b/QtSharp/QtSharp.csproj
@@ -38,27 +38,27 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="CppSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\CppSharp.0.7.3\lib\CppSharp.dll</HintPath>
+      <HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="CppSharp.AST, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\CppSharp.0.7.3\lib\CppSharp.AST.dll</HintPath>
+      <HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.AST.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="CppSharp.Generator, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\CppSharp.0.7.3\lib\CppSharp.Generator.dll</HintPath>
+      <HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.Generator.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="CppSharp.Parser, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\CppSharp.0.7.3\lib\CppSharp.Parser.dll</HintPath>
+      <HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.Parser.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="CppSharp.Parser.CLI, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\CppSharp.0.7.3\lib\CppSharp.Parser.CLI.dll</HintPath>
+      <HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.Parser.CLI.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="CppSharp.Runtime, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\CppSharp.0.7.3\lib\CppSharp.Runtime.dll</HintPath>
+      <HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.Runtime.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.4.9.5, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">

diff --git a/QtSharp/packages.config b/QtSharp/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Baseclass.Contrib.Nuget.Output" version="2.1.0" targetFramework="net451" />
-  <package id="CppSharp" version="0.7.3" targetFramework="net451" developmentDependency="true" />
+  <package id="CppSharp" version="0.7.4" targetFramework="net451" developmentDependency="true" />
   <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net451" />
   <package id="zlib.net" version="1.0.4" targetFramework="net451" />
 </packages>