code.ivysaur.me/miqt
1
0
Fork 0
mirror of https://github.com/mappu/miqt.git synced 2024-12-22 00:48:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

genbindings: fix trying to add super parameters for pure virtual methods

Browse Source
This commit is contained in:
mappu 2024-11-23 19:34:22 +13:00
parent 756086cd50
commit a5dafbf132
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/genbindings/emitgo.go
View File

@ -965,8 +965,9 @@ import "C"
// Add a package-private function to call the C++ base class method // Add a package-private function to call the C++ base class method
// QWidget_virtualbase_PaintEvent // QWidget_virtualbase_PaintEvent
// This is only possible if the function is not pure-virtual
{ if !m.IsPureVirtual {
preamble, forwarding := gfs.emitParametersGo2CABIForwarding(m) preamble, forwarding := gfs.emitParametersGo2CABIForwarding(m)
forwarding = "unsafe.Pointer(this.h)" + strings.TrimPrefix(forwarding, `this.h`) // TODO integrate properly forwarding = "unsafe.Pointer(this.h)" + strings.TrimPrefix(forwarding, `this.h`) // TODO integrate properly
@ -989,7 +990,10 @@ import "C"
{ {
var cgoNamedParams []string var cgoNamedParams []string
var paramNames []string = []string{"(&" + goClassName + "{h: self}).callVirtualBase_" + m.SafeMethodName()} var paramNames []string
if !m.IsPureVirtual {
paramNames = append(paramNames, "(&"+goClassName+"{h: self}).callVirtualBase_"+m.SafeMethodName())
}
conversion := "" conversion := ""
if len(m.Parameters) > 0 { if len(m.Parameters) > 0 {
@ -1009,10 +1013,14 @@ import "C"
superCbType := `func(` + gfs.emitParametersGo(m.Parameters) + `) ` + m.ReturnType.renderReturnTypeGo(&gfs) superCbType := `func(` + gfs.emitParametersGo(m.Parameters) + `) ` + m.ReturnType.renderReturnTypeGo(&gfs)
goCbType := `func(super ` + superCbType goCbType := `func(`
if len(m.Parameters) > 0 { if !m.IsPureVirtual {
goCbType += `, ` + gfs.emitParametersGo(m.Parameters) goCbType += `super ` + superCbType
if len(m.Parameters) > 0 {
goCbType += `, `
}
} }
goCbType += gfs.emitParametersGo(m.Parameters)
goCbType += `) ` + m.ReturnType.renderReturnTypeGo(&gfs) goCbType += `) ` + m.ReturnType.renderReturnTypeGo(&gfs)
ret.WriteString(`func (this *` + goClassName + `) On` + m.SafeMethodName() + `(slot ` + goCbType + `) { ret.WriteString(`func (this *` + goClassName + `) On` + m.SafeMethodName() + `(slot ` + goCbType + `) {