Skip to content

Commit c87bf12

Browse files
ddobrevddobrev
committed
Updated to the latest C++#.
Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>
1 parent 06dc367 commit c87bf12

7 files changed

+20
-21
lines changed

‎QtSharp.CLI/QtSharp.CLI.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -63,27 +63,27 @@
6363
</PropertyGroup>
6464
<ItemGroup>
6565
<Reference Include="CppSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
66-
<HintPath>..\packages\CppSharp.0.7.3\lib\CppSharp.dll</HintPath>
66+
<HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.dll</HintPath>
6767
<Private>True</Private>
6868
</Reference>
6969
<Reference Include="CppSharp.AST, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
70-
<HintPath>..\packages\CppSharp.0.7.3\lib\CppSharp.AST.dll</HintPath>
70+
<HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.AST.dll</HintPath>
7171
<Private>True</Private>
7272
</Reference>
7373
<Reference Include="CppSharp.Generator, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
74-
<HintPath>..\packages\CppSharp.0.7.3\lib\CppSharp.Generator.dll</HintPath>
74+
<HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.Generator.dll</HintPath>
7575
<Private>True</Private>
7676
</Reference>
7777
<Reference Include="CppSharp.Parser, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
78-
<HintPath>..\packages\CppSharp.0.7.3\lib\CppSharp.Parser.dll</HintPath>
78+
<HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.Parser.dll</HintPath>
7979
<Private>True</Private>
8080
</Reference>
8181
<Reference Include="CppSharp.Parser.CLI, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
82-
<HintPath>..\packages\CppSharp.0.7.3\lib\CppSharp.Parser.CLI.dll</HintPath>
82+
<HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.Parser.CLI.dll</HintPath>
8383
<Private>True</Private>
8484
</Reference>
8585
<Reference Include="CppSharp.Runtime, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
86-
<HintPath>..\packages\CppSharp.0.7.3\lib\CppSharp.Runtime.dll</HintPath>
86+
<HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.Runtime.dll</HintPath>
8787
<Private>True</Private>
8888
</Reference>
8989
<Reference Include="System" />

‎QtSharp.CLI/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Baseclass.Contrib.Nuget.Output" version="2.1.0" targetFramework="net451" />
4-
<package id="CppSharp" version="0.7.3" targetFramework="net451" developmentDependency="true" />
4+
<package id="CppSharp" version="0.7.4" targetFramework="net451" developmentDependency="true" />
55
</packages>

‎QtSharp/CompileInlinesPass.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public CompileInlinesPass(string qmake, string make)
2020
this.make = make;
2121
}
2222

23-
public override bool VisitLibrary(ASTContext context)
23+
public override bool VisitASTContext(ASTContext context)
2424
{
2525
string error;
2626
const string qtVersionVariable = "QT_VERSION";

‎QtSharp/GetCommentsFromQtDocsPass.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ public GetCommentsFromQtDocsPass(string docsPath, IEnumerable<string> modules)
1919
this.VisitOptions.VisitClassFields = false;
2020
}
2121

22-
public override bool VisitLibrary(ASTContext context)
22+
public override bool VisitASTContext(ASTContext context)
2323
{
24-
return this.documentation.Exists && base.VisitLibrary(context);
24+
return this.documentation.Exists && base.VisitASTContext(context);
2525
}
2626

2727
public override bool VisitTranslationUnit(TranslationUnit unit)

‎QtSharp/QtSharp.cs

+3-4
Original file line numberDiff line numberDiff line change
@@ -183,15 +183,15 @@ private static void IgnorePrivateDeclaration(Declaration declaration)
183183

184184
public void Postprocess(Driver driver, ASTContext lib)
185185
{
186-
new ClearCommentsPass().VisitLibrary(driver.Context.ASTContext);
186+
new ClearCommentsPass().VisitASTContext(driver.Context.ASTContext);
187187
var modules = this.qtInfo.LibFiles.Select(l => GetModuleNameFromLibFile(l));
188188
var s = System.Diagnostics.Stopwatch.StartNew();
189-
new GetCommentsFromQtDocsPass(this.qtInfo.Docs, modules).VisitLibrary(driver.Context.ASTContext);
189+
new GetCommentsFromQtDocsPass(this.qtInfo.Docs, modules).VisitASTContext(driver.Context.ASTContext);
190190
System.Console.WriteLine("Documentation done in: {0}", s.Elapsed);
191191
new CaseRenamePass(
192192
RenameTargets.Function | RenameTargets.Method | RenameTargets.Property | RenameTargets.Delegate |
193193
RenameTargets.Field | RenameTargets.Variable,
194-
RenameCasePattern.UpperCamelCase).VisitLibrary(driver.Context.ASTContext);
194+
RenameCasePattern.UpperCamelCase).VisitASTContext(driver.Context.ASTContext);
195195

196196
var qChar = lib.FindCompleteClass("QChar");
197197
var op = qChar.FindOperator(CXXOperatorKind.ExplicitConversion)
@@ -230,7 +230,6 @@ public void Setup(Driver driver)
230230
driver.ParserOptions.Verbose = true;
231231
driver.ParserOptions.addDefines("__float128=void");
232232
driver.Options.GeneratorKind = GeneratorKind.CSharp;
233-
driver.Options.GenerateInterfacesForMultipleInheritance = true;
234233
driver.Options.GeneratePropertiesAdvanced = true;
235234
driver.Options.UnityBuild = true;
236235
driver.Options.IgnoreParseWarnings = true;

‎QtSharp/QtSharp.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -38,27 +38,27 @@
3838
</PropertyGroup>
3939
<ItemGroup>
4040
<Reference Include="CppSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\CppSharp.0.7.3\lib\CppSharp.dll</HintPath>
41+
<HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.dll</HintPath>
4242
<Private>True</Private>
4343
</Reference>
4444
<Reference Include="CppSharp.AST, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\CppSharp.0.7.3\lib\CppSharp.AST.dll</HintPath>
45+
<HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.AST.dll</HintPath>
4646
<Private>True</Private>
4747
</Reference>
4848
<Reference Include="CppSharp.Generator, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\CppSharp.0.7.3\lib\CppSharp.Generator.dll</HintPath>
49+
<HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.Generator.dll</HintPath>
5050
<Private>True</Private>
5151
</Reference>
5252
<Reference Include="CppSharp.Parser, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
53-
<HintPath>..\packages\CppSharp.0.7.3\lib\CppSharp.Parser.dll</HintPath>
53+
<HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.Parser.dll</HintPath>
5454
<Private>True</Private>
5555
</Reference>
5656
<Reference Include="CppSharp.Parser.CLI, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
57-
<HintPath>..\packages\CppSharp.0.7.3\lib\CppSharp.Parser.CLI.dll</HintPath>
57+
<HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.Parser.CLI.dll</HintPath>
5858
<Private>True</Private>
5959
</Reference>
6060
<Reference Include="CppSharp.Runtime, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
61-
<HintPath>..\packages\CppSharp.0.7.3\lib\CppSharp.Runtime.dll</HintPath>
61+
<HintPath>..\packages\CppSharp.0.7.4\lib\CppSharp.Runtime.dll</HintPath>
6262
<Private>True</Private>
6363
</Reference>
6464
<Reference Include="HtmlAgilityPack, Version=1.4.9.5, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">

‎QtSharp/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Baseclass.Contrib.Nuget.Output" version="2.1.0" targetFramework="net451" />
4-
<package id="CppSharp" version="0.7.3" targetFramework="net451" developmentDependency="true" />
4+
<package id="CppSharp" version="0.7.4" targetFramework="net451" developmentDependency="true" />
55
<package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net451" />
66
<package id="zlib.net" version="1.0.4" targetFramework="net451" />
77
</packages>

0 commit comments

Comments
 (0)