Removed sealed overrides from the bindings by updating C++#.

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

Hide file tree

Showing 6 changed files with 16 additions and 16 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.2\lib\CppSharp.dll</HintPath>
+      <HintPath>..\packages\CppSharp.0.7.3\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.2\lib\CppSharp.AST.dll</HintPath>
+      <HintPath>..\packages\CppSharp.0.7.3\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.2\lib\CppSharp.Generator.dll</HintPath>
+      <HintPath>..\packages\CppSharp.0.7.3\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.2\lib\CppSharp.Parser.dll</HintPath>
+      <HintPath>..\packages\CppSharp.0.7.3\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.2\lib\CppSharp.Parser.CLI.dll</HintPath>
+      <HintPath>..\packages\CppSharp.0.7.3\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.2\lib\CppSharp.Runtime.dll</HintPath>
+      <HintPath>..\packages\CppSharp.0.7.3\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.2" targetFramework="net451" developmentDependency="true" />
+  <package id="CppSharp" version="0.7.3" targetFramework="net451" developmentDependency="true" />
 </packages>
diff --git a/QtSharp/DocGeneration/Documentation.cs b/QtSharp/DocGeneration/Documentation.cs
@@ -408,7 +408,7 @@ public void DocumentProperty(Property property)
 
             var properties = expansions.Where(e => e.Text.Contains("Q_PROPERTY") || e.Text.Contains("QDOC_PROPERTY"));
             string alternativeName = property.Name.Length == 1 ? property.Name :
-                                     "is" + StringHelpers.UppercaseFirst(property.Name);
+                                     "is" + StringHelpers.Capitalize(property.Name);
 	        foreach (var macroExpansion in properties)
 	        {
 		        var name = macroExpansion.Text.Split(' ')[1];

diff --git a/QtSharp/QtSharp.cs b/QtSharp/QtSharp.cs
@@ -249,7 +249,7 @@ public void Setup(Driver driver)
                 module.Headers.Add(qtModule);
                 var moduleName = qtModule.Substring(qt.Length);
                 // some Qt modules have their own name-spaces
-                if (moduleName == "Charts" || moduleName == "QtDataVisualization" ||
+                if (moduleName == "Charts" || moduleName == "DataVisualization" ||
                     moduleName.StartsWith("3D", System.StringComparison.Ordinal))
                 {
                     module.OutputNamespace = string.Empty;

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.2\lib\CppSharp.dll</HintPath>
+      <HintPath>..\packages\CppSharp.0.7.3\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.2\lib\CppSharp.AST.dll</HintPath>
+      <HintPath>..\packages\CppSharp.0.7.3\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.2\lib\CppSharp.Generator.dll</HintPath>
+      <HintPath>..\packages\CppSharp.0.7.3\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.2\lib\CppSharp.Parser.dll</HintPath>
+      <HintPath>..\packages\CppSharp.0.7.3\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.2\lib\CppSharp.Parser.CLI.dll</HintPath>
+      <HintPath>..\packages\CppSharp.0.7.3\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.2\lib\CppSharp.Runtime.dll</HintPath>
+      <HintPath>..\packages\CppSharp.0.7.3\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.2" targetFramework="net451" developmentDependency="true" />
+  <package id="CppSharp" version="0.7.3" 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>