Skip to content

Commit d509ac6

Browse files
ddobrevddobrev
committed
Updated to the latest C++# to use the handling of array parameters.
Signed-off-by: Dimitar Dobrev <[email protected]>
1 parent e50d94f commit d509ac6

File tree

11 files changed

+68
-104
lines changed

11 files changed

+68
-104
lines changed

‎CHANGELOG

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
0.7.2 - 18.9.2017
2+
Added:
3+
- Bindings for the constructors of QImage and QPixmap taking arrays;
4+
- Bindings for QGraphicsScene::drawItems, QGraphicsView::drawItems and QAbstractVideoBuffer::mapPlanes.
5+
16
0.7.1 - 10.2.2017
27
Fixed:
38
- Crashes when calling certain constructors and destructors.

‎QtSharp.CLI/QtSharp.CLI.csproj

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,28 +63,22 @@
6363
</PropertyGroup>
6464
<ItemGroup>
6565
<Reference Include="CppSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
66-
<HintPath>..\packages\CppSharp.0.8.13\lib\CppSharp.dll</HintPath>
67-
<Private>True</Private>
66+
<HintPath>..\packages\CppSharp.0.8.14\lib\CppSharp.dll</HintPath>
6867
</Reference>
6968
<Reference Include="CppSharp.AST, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
70-
<HintPath>..\packages\CppSharp.0.8.13\lib\CppSharp.AST.dll</HintPath>
71-
<Private>True</Private>
69+
<HintPath>..\packages\CppSharp.0.8.14\lib\CppSharp.AST.dll</HintPath>
7270
</Reference>
7371
<Reference Include="CppSharp.Generator, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
74-
<HintPath>..\packages\CppSharp.0.8.13\lib\CppSharp.Generator.dll</HintPath>
75-
<Private>True</Private>
72+
<HintPath>..\packages\CppSharp.0.8.14\lib\CppSharp.Generator.dll</HintPath>
7673
</Reference>
7774
<Reference Include="CppSharp.Parser, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
78-
<HintPath>..\packages\CppSharp.0.8.13\lib\CppSharp.Parser.dll</HintPath>
79-
<Private>True</Private>
75+
<HintPath>..\packages\CppSharp.0.8.14\lib\CppSharp.Parser.dll</HintPath>
8076
</Reference>
81-
<Reference Include="CppSharp.Parser.CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
82-
<HintPath>..\packages\CppSharp.0.8.13\lib\CppSharp.Parser.CSharp.dll</HintPath>
83-
<Private>True</Private>
77+
<Reference Include="CppSharp.Parser.CLI, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
78+
<HintPath>..\packages\CppSharp.0.8.14\lib\CppSharp.Parser.CLI.dll</HintPath>
8479
</Reference>
8580
<Reference Include="CppSharp.Runtime, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
86-
<HintPath>..\packages\CppSharp.0.8.13\lib\CppSharp.Runtime.dll</HintPath>
87-
<Private>True</Private>
81+
<HintPath>..\packages\CppSharp.0.8.14\lib\CppSharp.Runtime.dll</HintPath>
8882
</Reference>
8983
<Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
9084
<HintPath>..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.dll</HintPath>

‎QtSharp.CLI/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Baseclass.Contrib.Nuget.Output" version="2.3.0" targetFramework="net461" />
4-
<package id="CppSharp" version="0.8.13" targetFramework="net461" developmentDependency="true" />
4+
<package id="CppSharp" version="0.8.14" targetFramework="net461" developmentDependency="true" />
55
<package id="Mono.Cecil" version="0.9.6.4" targetFramework="net461" />
66
</packages>

‎QtSharp/DocGeneration/Documentation.cs

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -252,14 +252,19 @@ private void CollectTypesDocumentation(HtmlNode documentRoot, string docFile)
252252

253253
public void DocumentFunction(Function function)
254254
{
255-
if (!this.functionNodes.ContainsKey(function.OriginalName))
255+
var nodeKey = function.OriginalName;
256+
if (function.IsDependent && !function.IsOperator && nodeKey.Contains('<'))
257+
{
258+
nodeKey = nodeKey.Substring(0, nodeKey.IndexOf('<'));
259+
}
260+
if (!this.functionNodes.ContainsKey(nodeKey))
256261
{
257262
return;
258263
}
259264

260265
var lineStart = function.LineNumberStart;
261266
var lineEnd = function.LineNumberEnd;
262-
var functions = this.functionNodes[function.OriginalName];
267+
var functions = this.functionNodes[nodeKey];
263268
var unit = function.OriginalNamespace.TranslationUnit;
264269
var location = unit.FileName;
265270
FunctionDocIndexNode node = null;
@@ -313,8 +318,7 @@ public void DocumentFunction(Function function)
313318
var i = 0;
314319
// HACK: work around https://bugreports.qt.io/browse/QTBUG-53941
315320
if (function.Namespace.Name == "QByteArray" &&
316-
((function.OriginalName == "qCompress" && @params.Count == 2) ||
317-
(function.OriginalName == "qUncompress" && @params.Count == 1)))
321+
function.OriginalName == "qCompress" && @params.Count == 2)
318322
{
319323
docs = this.membersDocumentation[file][key + "-hack"];
320324
}
@@ -344,6 +348,14 @@ public void DocumentFunction(Function function)
344348
{
345349
AddObsoleteAttribute(function);
346350
}
351+
var @event = function.Namespace.Events.FirstOrDefault(e => e.OriginalDeclaration == function);
352+
if (@event != null)
353+
{
354+
for (i = 0; i < function.Parameters.Count; i++)
355+
{
356+
@event.Parameters[i].Name = function.Parameters[i].Name;
357+
}
358+
}
347359
}
348360
}
349361
}
@@ -451,7 +463,11 @@ public void DocumentProperty(Property property)
451463
{
452464
if (property.IsOverride)
453465
{
454-
comment.BriefText = ((Class) property.Namespace).GetBaseProperty(property).Comment.BriefText;
466+
Property baseProperty = ((Class) property.Namespace).GetBaseProperty(property);
467+
if (baseProperty.Comment != null)
468+
{
469+
comment.BriefText = baseProperty.Comment.BriefText;
470+
}
455471
}
456472
if (string.IsNullOrEmpty(comment.BriefText))
457473
{
@@ -545,7 +561,7 @@ public void DocumentType(Class type)
545561
summary.Content.Add(new TextComment { Text = briefText });
546562
type.Comment.FullComment.Blocks.Add(summary);
547563
var remarks = new ParagraphComment();
548-
remarks.Content.AddRange(text.Split('\n').Select(t => new TextComment { Text = t }));
564+
remarks.Content.AddRange(text.Split('\n').Select(t => new TextComment { Text = t, HasTrailingNewline = true }));
549565
type.Comment.FullComment.Blocks.Add(remarks);
550566
}
551567
}

‎QtSharp/GenerateEventEventsPass.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,7 @@ public override bool VisitMethodDecl(Method method)
9090
{
9191
var name = char.ToUpperInvariant(method.Name[0]) + method.Name.Substring(1);
9292
method.Name = "on" + name;
93-
Method baseMethod;
94-
if (!method.IsOverride ||
95-
(baseMethod = ((Class) method.Namespace).GetBaseMethod(method, true, true)) == null ||
96-
baseMethod.IsPure)
93+
if (!method.IsOverride || method.BaseMethod.IsPure)
9794
{
9895
this.events.Add(method);
9996
this.Context.Options.ExplicitlyPatchedVirtualFunctions.Add(method.QualifiedOriginalName);

‎QtSharp/GenerateSignalEventsPass.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,14 @@ from e in @event.Parameters
108108
}
109109
block.WriteLine(string.Format(@"public event {0} {1}
110110
{{
111-
add
112-
{{
111+
add
112+
{{
113113
ConnectDynamicSlot(this, ""{2}"", value);
114-
}}
115-
remove
116-
{{
114+
}}
115+
remove
116+
{{
117117
DisconnectDynamicSlot(this, ""{2}"", value);
118-
}}
118+
}}
119119
}}", fullNameBuilder, finalName, signature));
120120
}
121121
}
@@ -184,9 +184,10 @@ private void HandleQSignal(Class @class, Method method)
184184
Name = method.Name,
185185
OriginalName = method.OriginalName,
186186
Namespace = method.Namespace,
187-
QualifiedType = new QualifiedType(method.FunctionType.Type),
188-
Parameters = method.Parameters
187+
QualifiedType = new QualifiedType(method.FunctionType.Type)
189188
};
189+
@event.Parameters.AddRange(method.Parameters.Select(
190+
p => new Parameter(p) { Namespace = @event }));
190191
if (method.IsGenerated)
191192
{
192193
method.ExplicitlyIgnore();

‎QtSharp/QFlags.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ public override void CSharpMarshalToManaged(CSharpMarshalContext ctx)
5050
}
5151
}
5252

53+
public override bool IsIgnored => Type != null ? Type.IsDependent : Declaration.IsDependent;
54+
5355
private static Type GetEnumType(Type mappedType)
5456
{
5557
var type = mappedType.Desugar();

‎QtSharp/QString.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ public override string CSharpSignature(TypePrinterContext ctx)
1313
{
1414
if (ctx.Kind == TypePrinterContextKind.Native)
1515
{
16-
return string.Format("QtCore.QString.{0}{1}", Helpers.InternalStruct, ctx.Type.IsAddress() ? "*" : string.Empty);
16+
return $"QtCore.QString.{Helpers.InternalStruct}{(ctx.Type.IsAddress() ? "*" : string.Empty)}";
1717
}
1818
return "string";
1919
}
2020

2121
public override void CSharpMarshalToNative(CSharpMarshalContext ctx)
2222
{
23-
var type = ctx.Parameter.Type.Desugar();
24-
var finalType = (type.GetFinalPointee() ?? type).Desugar();
23+
var type = ctx.Parameter.Type.Desugar(false);
24+
var finalType = (type.GetFinalPointee() ?? type).Desugar(false);
2525
var substitution = finalType as TemplateParameterSubstitutionType;
2626
string param;
2727
if (substitution != null)
@@ -57,13 +57,13 @@ public override void CSharpMarshalToNative(CSharpMarshalContext ctx)
5757

5858
public override void CSharpMarshalToManaged(CSharpMarshalContext ctx)
5959
{
60-
var type = ctx.ReturnType.Type.Desugar();
61-
var finalType = (type.GetFinalPointee() ?? type).Desugar();
62-
var substitution = finalType as TemplateParameterSubstitutionType;
60+
var type = ctx.ReturnType.Type.Desugar(false);
61+
var finalType = (type.GetFinalPointee() ?? type).Desugar(false);
62+
var templateParameter = finalType as TemplateParameterType;
6363
string cast = string.Empty;
64-
if (substitution != null)
64+
if (templateParameter != null)
6565
{
66-
cast = $"({substitution.ReplacedParameter.Parameter.Name}) (object) ";
66+
cast = $"({templateParameter.Parameter.Name}) (object) ";
6767
}
6868
ctx.Return.Write($@"{cast}Marshal.PtrToStringUni(new IntPtr(QtCore.QString.{
6969
Helpers.CreateInstanceIdentifier}({ctx.ReturnVarName}).Utf16))");

‎QtSharp/QtSharp.cs

Lines changed: 2 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -92,34 +92,6 @@ where string.IsNullOrEmpty(@enum.Name)
9292
{
9393
enumeration.Name = "TypeEnum";
9494
}
95-
96-
// HACK: work around https://github.com/mono/CppSharp/issues/692
97-
foreach (var name in new[] { "QImage", "QPixmap" })
98-
{
99-
var @class = lib.FindCompleteClass(name);
100-
var ctorWithArray = @class.Constructors.FirstOrDefault(
101-
c => c.Parameters.Count == 1 && c.Parameters[0].Type.Desugar() is ArrayType);
102-
if (ctorWithArray != null)
103-
{
104-
ctorWithArray.ExplicitlyIgnore();
105-
}
106-
}
107-
foreach (var name in new[] { "QGraphicsScene", "QGraphicsView" })
108-
{
109-
var @class = lib.FindCompleteClass(name);
110-
var drawItems = @class.Methods.FirstOrDefault(m => m.OriginalName == "drawItems");
111-
if (drawItems != null)
112-
{
113-
drawItems.ExplicitlyIgnore();
114-
}
115-
}
116-
lib.FindCompleteClass("QAbstractPlanarVideoBuffer").ExplicitlyIgnore();
117-
var qAbstractVideoBuffer = lib.FindCompleteClass("QAbstractVideoBuffer");
118-
var mapPlanes = qAbstractVideoBuffer.Methods.FirstOrDefault(m => m.OriginalName == "mapPlanes");
119-
if (mapPlanes != null)
120-
{
121-
mapPlanes.ExplicitlyIgnore();
122-
}
12395
}
12496

12597
public void Postprocess(Driver driver, ASTContext lib)
@@ -224,6 +196,7 @@ public void Setup(Driver driver)
224196
module.Libraries.Add(libFile);
225197
if (moduleName == "Core")
226198
{
199+
module.Headers.Insert(0, "guiddef.h");
227200
module.CodeFiles.Add(Path.Combine(dir, "QObject.cs"));
228201
module.CodeFiles.Add(Path.Combine(dir, "QChar.cs"));
229202
module.CodeFiles.Add(Path.Combine(dir, "QEvent.cs"));
@@ -243,9 +216,6 @@ public void Setup(Driver driver)
243216
driver.ParserOptions.AddIncludeDirs(qtInfo.Headers);
244217

245218
driver.ParserOptions.AddLibraryDirs(Platform.IsWindows ? qtInfo.Bins : qtInfo.Libs);
246-
247-
// Qt defines its own GUID with the same header guard as the system GUID, so ensure the system GUID is read first
248-
driver.Project.AddFile("guiddef.h");
249219
}
250220

251221
public static string GetModuleNameFromLibFile(string libFile)
@@ -322,21 +292,7 @@ private void CompileMakefile(GenerateSymbolsPass.SymbolsCodeEventArgs e)
322292
proBuilder.Append("LIBS += -loleaut32 -lole32");
323293
}
324294
File.WriteAllText(path, proBuilder.ToString());
325-
// HACK: work around https://bugreports.qt.io/browse/QTBUG-55952
326-
if (e.Module.LibraryName == "Qt3DRender.Sharp")
327-
{
328-
var cpp = Path.ChangeExtension(pro, "cpp");
329-
var unlinkable = new[]
330-
{
331-
"&Qt3DRender::QSortCriterion::tr;",
332-
"&Qt3DRender::QSortCriterion::trUtf8;",
333-
"&Qt3DRender::qt_getEnumMetaObject;"
334-
};
335-
var linkable = (from line in File.ReadLines(cpp)
336-
where unlinkable.All(ul => !line.EndsWith(ul, StringComparison.Ordinal))
337-
select line).ToList();
338-
File.WriteAllLines(cpp, linkable);
339-
}
295+
340296
int error;
341297
string errorMessage;
342298
ProcessHelper.Run(this.qtInfo.QMake, $"\"{path}\"", out error, out errorMessage);

‎QtSharp/QtSharp.csproj

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,32 +38,25 @@
3838
</PropertyGroup>
3939
<ItemGroup>
4040
<Reference Include="CppSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\CppSharp.0.8.13\lib\CppSharp.dll</HintPath>
42-
<Private>True</Private>
41+
<HintPath>..\packages\CppSharp.0.8.14\lib\CppSharp.dll</HintPath>
4342
</Reference>
4443
<Reference Include="CppSharp.AST, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\CppSharp.0.8.13\lib\CppSharp.AST.dll</HintPath>
46-
<Private>True</Private>
44+
<HintPath>..\packages\CppSharp.0.8.14\lib\CppSharp.AST.dll</HintPath>
4745
</Reference>
4846
<Reference Include="CppSharp.Generator, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\CppSharp.0.8.13\lib\CppSharp.Generator.dll</HintPath>
50-
<Private>True</Private>
47+
<HintPath>..\packages\CppSharp.0.8.14\lib\CppSharp.Generator.dll</HintPath>
5148
</Reference>
5249
<Reference Include="CppSharp.Parser, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
53-
<HintPath>..\packages\CppSharp.0.8.13\lib\CppSharp.Parser.dll</HintPath>
54-
<Private>True</Private>
50+
<HintPath>..\packages\CppSharp.0.8.14\lib\CppSharp.Parser.dll</HintPath>
5551
</Reference>
56-
<Reference Include="CppSharp.Parser.CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
57-
<HintPath>..\packages\CppSharp.0.8.13\lib\CppSharp.Parser.CSharp.dll</HintPath>
58-
<Private>True</Private>
52+
<Reference Include="CppSharp.Parser.CLI, Version=0.0.0.0, Culture=neutral, processorArchitecture=AMD64">
53+
<HintPath>..\packages\CppSharp.0.8.14\lib\CppSharp.Parser.CLI.dll</HintPath>
5954
</Reference>
6055
<Reference Include="CppSharp.Runtime, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
61-
<HintPath>..\packages\CppSharp.0.8.13\lib\CppSharp.Runtime.dll</HintPath>
62-
<Private>True</Private>
56+
<HintPath>..\packages\CppSharp.0.8.14\lib\CppSharp.Runtime.dll</HintPath>
6357
</Reference>
64-
<Reference Include="HtmlAgilityPack, Version=1.5.1.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
65-
<HintPath>..\packages\HtmlAgilityPack.1.5.1\lib\Net45\HtmlAgilityPack.dll</HintPath>
66-
<Private>True</Private>
58+
<Reference Include="HtmlAgilityPack, Version=1.5.5.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
59+
<HintPath>..\packages\HtmlAgilityPack.1.5.5\lib\Net45\HtmlAgilityPack.dll</HintPath>
6760
</Reference>
6861
<Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
6962
<HintPath>..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.dll</HintPath>

‎QtSharp/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Baseclass.Contrib.Nuget.Output" version="2.3.0" targetFramework="net461" />
4-
<package id="CppSharp" version="0.8.13" targetFramework="net461" developmentDependency="true" />
5-
<package id="HtmlAgilityPack" version="1.5.1" targetFramework="net461" />
4+
<package id="CppSharp" version="0.8.14" targetFramework="net461" developmentDependency="true" />
5+
<package id="HtmlAgilityPack" version="1.5.5" targetFramework="net461" />
66
<package id="Mono.Cecil" version="0.9.6.4" targetFramework="net461" />
77
<package id="zlib.net" version="1.0.4" targetFramework="net451" />
88
</packages>

0 commit comments

Comments
 (0)