Skip to content

Commit cae8967

Browse files
mappumappu
authored
Merge pull request #160 from mappu/miqt-fix-go-names-change
Fix unexpected change in Go function names for overriding subclass methods
2 parents 4eb07a1 + bea571e commit cae8967

File tree

591 files changed

+19874
-19874
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

591 files changed

+19874
-19874
lines changed

‎cmd/genbindings/emitgo.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1052,7 +1052,7 @@ import "C"
10521052
goCbType += gfs.emitParametersGo(m.Parameters)
10531053
goCbType += `) ` + m.ReturnType.renderReturnTypeGo(&gfs)
10541054
callbackName := cabiCallbackName(c, m)
1055-
ret.WriteString(`func (this *` + goClassName + `) On` + m.SafeMethodName() + `(slot ` + goCbType + `) {
1055+
ret.WriteString(`func (this *` + goClassName + `) On` + m.goMethodName() + `(slot ` + goCbType + `) {
10561056
ok := C.` + cabiOverrideVirtualName(c, m) + `(unsafe.Pointer(this.h), C.intptr_t(cgo.NewHandle(slot)) )
10571057
if !ok {
10581058
panic("miqt: can only override virtual methods for directly constructed types")

‎qt-extras/scintillaedit/gen_ScintillaEdit.go

+113-113
Large diffs are not rendered by default.

‎qt-restricted-extras/qscintilla/gen_qsciabstractapis.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ func QsciAbstractAPIs_TrUtf83(s string, c string, n int) string {
193193
C.free(unsafe.Pointer(_ms.data))
194194
return _ret
195195
}
196-
func (this *QsciAbstractAPIs) OnupdateAutoCompletionList(slot func(context []string, list []string)) {
196+
func (this *QsciAbstractAPIs) OnUpdateAutoCompletionList(slot func(context []string, list []string)) {
197197
ok := C.QsciAbstractAPIs_override_virtual_updateAutoCompletionList(unsafe.Pointer(this.h), C.intptr_t(cgo.NewHandle(slot)))
198198
if !ok {
199199
panic("miqt: can only override virtual methods for directly constructed types")
@@ -243,7 +243,7 @@ func (this *QsciAbstractAPIs) callVirtualBase_AutoCompletionSelected(selection s
243243
C.QsciAbstractAPIs_virtualbase_autoCompletionSelected(unsafe.Pointer(this.h), selection_ms)
244244

245245
}
246-
func (this *QsciAbstractAPIs) OnautoCompletionSelected(slot func(super func(selection string), selection string)) {
246+
func (this *QsciAbstractAPIs) OnAutoCompletionSelected(slot func(super func(selection string), selection string)) {
247247
ok := C.QsciAbstractAPIs_override_virtual_autoCompletionSelected(unsafe.Pointer(this.h), C.intptr_t(cgo.NewHandle(slot)))
248248
if !ok {
249249
panic("miqt: can only override virtual methods for directly constructed types")
@@ -266,7 +266,7 @@ func miqt_exec_callback_QsciAbstractAPIs_autoCompletionSelected(self *C.QsciAbst
266266
gofunc((&QsciAbstractAPIs{h: self}).callVirtualBase_AutoCompletionSelected, slotval1)
267267

268268
}
269-
func (this *QsciAbstractAPIs) OncallTips(slot func(context []string, commas int, style QsciScintilla__CallTipsStyle, shifts []int) []string) {
269+
func (this *QsciAbstractAPIs) OnCallTips(slot func(context []string, commas int, style QsciScintilla__CallTipsStyle, shifts []int) []string) {
270270
ok := C.QsciAbstractAPIs_override_virtual_callTips(unsafe.Pointer(this.h), C.intptr_t(cgo.NewHandle(slot)))
271271
if !ok {
272272
panic("miqt: can only override virtual methods for directly constructed types")
@@ -325,7 +325,7 @@ func (this *QsciAbstractAPIs) callVirtualBase_Event(event *qt.QEvent) bool {
325325
return (bool)(C.QsciAbstractAPIs_virtualbase_event(unsafe.Pointer(this.h), (*C.QEvent)(event.UnsafePointer())))
326326

327327
}
328-
func (this *QsciAbstractAPIs) Onevent(slot func(super func(event *qt.QEvent) bool, event *qt.QEvent) bool) {
328+
func (this *QsciAbstractAPIs) OnEvent(slot func(super func(event *qt.QEvent) bool, event *qt.QEvent) bool) {
329329
ok := C.QsciAbstractAPIs_override_virtual_event(unsafe.Pointer(this.h), C.intptr_t(cgo.NewHandle(slot)))
330330
if !ok {
331331
panic("miqt: can only override virtual methods for directly constructed types")
@@ -353,7 +353,7 @@ func (this *QsciAbstractAPIs) callVirtualBase_EventFilter(watched *qt.QObject, e
353353
return (bool)(C.QsciAbstractAPIs_virtualbase_eventFilter(unsafe.Pointer(this.h), (*C.QObject)(watched.UnsafePointer()), (*C.QEvent)(event.UnsafePointer())))
354354

355355
}
356-
func (this *QsciAbstractAPIs) OneventFilter(slot func(super func(watched *qt.QObject, event *qt.QEvent) bool, watched *qt.QObject, event *qt.QEvent) bool) {
356+
func (this *QsciAbstractAPIs) OnEventFilter(slot func(super func(watched *qt.QObject, event *qt.QEvent) bool, watched *qt.QObject, event *qt.QEvent) bool) {
357357
ok := C.QsciAbstractAPIs_override_virtual_eventFilter(unsafe.Pointer(this.h), C.intptr_t(cgo.NewHandle(slot)))
358358
if !ok {
359359
panic("miqt: can only override virtual methods for directly constructed types")
@@ -383,7 +383,7 @@ func (this *QsciAbstractAPIs) callVirtualBase_TimerEvent(event *qt.QTimerEvent)
383383
C.QsciAbstractAPIs_virtualbase_timerEvent(unsafe.Pointer(this.h), (*C.QTimerEvent)(event.UnsafePointer()))
384384

385385
}
386-
func (this *QsciAbstractAPIs) OntimerEvent(slot func(super func(event *qt.QTimerEvent), event *qt.QTimerEvent)) {
386+
func (this *QsciAbstractAPIs) OnTimerEvent(slot func(super func(event *qt.QTimerEvent), event *qt.QTimerEvent)) {
387387
ok := C.QsciAbstractAPIs_override_virtual_timerEvent(unsafe.Pointer(this.h), C.intptr_t(cgo.NewHandle(slot)))
388388
if !ok {
389389
panic("miqt: can only override virtual methods for directly constructed types")
@@ -409,7 +409,7 @@ func (this *QsciAbstractAPIs) callVirtualBase_ChildEvent(event *qt.QChildEvent)
409409
C.QsciAbstractAPIs_virtualbase_childEvent(unsafe.Pointer(this.h), (*C.QChildEvent)(event.UnsafePointer()))
410410

411411
}
412-
func (this *QsciAbstractAPIs) OnchildEvent(slot func(super func(event *qt.QChildEvent), event *qt.QChildEvent)) {
412+
func (this *QsciAbstractAPIs) OnChildEvent(slot func(super func(event *qt.QChildEvent), event *qt.QChildEvent)) {
413413
ok := C.QsciAbstractAPIs_override_virtual_childEvent(unsafe.Pointer(this.h), C.intptr_t(cgo.NewHandle(slot)))
414414
if !ok {
415415
panic("miqt: can only override virtual methods for directly constructed types")
@@ -435,7 +435,7 @@ func (this *QsciAbstractAPIs) callVirtualBase_CustomEvent(event *qt.QEvent) {
435435
C.QsciAbstractAPIs_virtualbase_customEvent(unsafe.Pointer(this.h), (*C.QEvent)(event.UnsafePointer()))
436436

437437
}
438-
func (this *QsciAbstractAPIs) OncustomEvent(slot func(super func(event *qt.QEvent), event *qt.QEvent)) {
438+
func (this *QsciAbstractAPIs) OnCustomEvent(slot func(super func(event *qt.QEvent), event *qt.QEvent)) {
439439
ok := C.QsciAbstractAPIs_override_virtual_customEvent(unsafe.Pointer(this.h), C.intptr_t(cgo.NewHandle(slot)))
440440
if !ok {
441441
panic("miqt: can only override virtual methods for directly constructed types")
@@ -461,7 +461,7 @@ func (this *QsciAbstractAPIs) callVirtualBase_ConnectNotify(signal *qt.QMetaMeth
461461
C.QsciAbstractAPIs_virtualbase_connectNotify(unsafe.Pointer(this.h), (*C.QMetaMethod)(signal.UnsafePointer()))
462462

463463
}
464-
func (this *QsciAbstractAPIs) OnconnectNotify(slot func(super func(signal *qt.QMetaMethod), signal *qt.QMetaMethod)) {
464+
func (this *QsciAbstractAPIs) OnConnectNotify(slot func(super func(signal *qt.QMetaMethod), signal *qt.QMetaMethod)) {
465465
ok := C.QsciAbstractAPIs_override_virtual_connectNotify(unsafe.Pointer(this.h), C.intptr_t(cgo.NewHandle(slot)))
466466
if !ok {
467467
panic("miqt: can only override virtual methods for directly constructed types")
@@ -487,7 +487,7 @@ func (this *QsciAbstractAPIs) callVirtualBase_DisconnectNotify(signal *qt.QMetaM
487487
C.QsciAbstractAPIs_virtualbase_disconnectNotify(unsafe.Pointer(this.h), (*C.QMetaMethod)(signal.UnsafePointer()))
488488

489489
}
490-
func (this *QsciAbstractAPIs) OndisconnectNotify(slot func(super func(signal *qt.QMetaMethod), signal *qt.QMetaMethod)) {
490+
func (this *QsciAbstractAPIs) OnDisconnectNotify(slot func(super func(signal *qt.QMetaMethod), signal *qt.QMetaMethod)) {
491491
ok := C.QsciAbstractAPIs_override_virtual_disconnectNotify(unsafe.Pointer(this.h), C.intptr_t(cgo.NewHandle(slot)))
492492
if !ok {
493493
panic("miqt: can only override virtual methods for directly constructed types")

‎qt-restricted-extras/qscintilla/gen_qsciapis.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ func (this *QsciAPIs) callVirtualBase_UpdateAutoCompletionList(context []string,
362362
C.QsciAPIs_virtualbase_updateAutoCompletionList(unsafe.Pointer(this.h), context_ma, list_ma)
363363

364364
}
365-
func (this *QsciAPIs) OnupdateAutoCompletionList(slot func(super func(context []string, list []string), context []string, list []string)) {
365+
func (this *QsciAPIs) OnUpdateAutoCompletionList(slot func(super func(context []string, list []string), context []string, list []string)) {
366366
ok := C.QsciAPIs_override_virtual_updateAutoCompletionList(unsafe.Pointer(this.h), C.intptr_t(cgo.NewHandle(slot)))
367367
if !ok {
368368
panic("miqt: can only override virtual methods for directly constructed types")
@@ -412,7 +412,7 @@ func (this *QsciAPIs) callVirtualBase_AutoCompletionSelected(sel string) {
412412
C.QsciAPIs_virtualbase_autoCompletionSelected(unsafe.Pointer(this.h), sel_ms)
413413

414414
}
415-
func (this *QsciAPIs) OnautoCompletionSelected(slot func(super func(sel string), sel string)) {
415+
func (this *QsciAPIs) OnAutoCompletionSelected(slot func(super func(sel string), sel string)) {
416416
ok := C.QsciAPIs_override_virtual_autoCompletionSelected(unsafe.Pointer(this.h), C.intptr_t(cgo.NewHandle(slot)))
417417
if !ok {
418418
panic("miqt: can only override virtual methods for directly constructed types")
@@ -466,7 +466,7 @@ func (this *QsciAPIs) callVirtualBase_CallTips(context []string, commas int, sty
466466
return _ret
467467

468468
}
469-
func (this *QsciAPIs) OncallTips(slot func(super func(context []string, commas int, style QsciScintilla__CallTipsStyle, shifts []int) []string, context []string, commas int, style QsciScintilla__CallTipsStyle, shifts []int) []string) {
469+
func (this *QsciAPIs) OnCallTips(slot func(super func(context []string, commas int, style QsciScintilla__CallTipsStyle, shifts []int) []string, context []string, commas int, style QsciScintilla__CallTipsStyle, shifts []int) []string) {
470470
ok := C.QsciAPIs_override_virtual_callTips(unsafe.Pointer(this.h), C.intptr_t(cgo.NewHandle(slot)))
471471
if !ok {
472472
panic("miqt: can only override virtual methods for directly constructed types")
@@ -525,7 +525,7 @@ func (this *QsciAPIs) callVirtualBase_Event(e *qt.QEvent) bool {
525525
return (bool)(C.QsciAPIs_virtualbase_event(unsafe.Pointer(this.h), (*C.QEvent)(e.UnsafePointer())))
526526

527527
}
528-
func (this *QsciAPIs) Onevent(slot func(super func(e *qt.QEvent) bool, e *qt.QEvent) bool) {
528+
func (this *QsciAPIs) OnEvent(slot func(super func(e *qt.QEvent) bool, e *qt.QEvent) bool) {
529529
ok := C.QsciAPIs_override_virtual_event(unsafe.Pointer(this.h), C.intptr_t(cgo.NewHandle(slot)))
530530
if !ok {
531531
panic("miqt: can only override virtual methods for directly constructed types")
@@ -553,7 +553,7 @@ func (this *QsciAPIs) callVirtualBase_EventFilter(watched *qt.QObject, event *qt
553553
return (bool)(C.QsciAPIs_virtualbase_eventFilter(unsafe.Pointer(this.h), (*C.QObject)(watched.UnsafePointer()), (*C.QEvent)(event.UnsafePointer())))
554554

555555
}
556-
func (this *QsciAPIs) OneventFilter(slot func(super func(watched *qt.QObject, event *qt.QEvent) bool, watched *qt.QObject, event *qt.QEvent) bool) {
556+
func (this *QsciAPIs) OnEventFilter(slot func(super func(watched *qt.QObject, event *qt.QEvent) bool, watched *qt.QObject, event *qt.QEvent) bool) {
557557
ok := C.QsciAPIs_override_virtual_eventFilter(unsafe.Pointer(this.h), C.intptr_t(cgo.NewHandle(slot)))
558558
if !ok {
559559
panic("miqt: can only override virtual methods for directly constructed types")
@@ -583,7 +583,7 @@ func (this *QsciAPIs) callVirtualBase_TimerEvent(event *qt.QTimerEvent) {
583583
C.QsciAPIs_virtualbase_timerEvent(unsafe.Pointer(this.h), (*C.QTimerEvent)(event.UnsafePointer()))
584584

585585
}
586-
func (this *QsciAPIs) OntimerEvent(slot func(super func(event *qt.QTimerEvent), event *qt.QTimerEvent)) {
586+
func (this *QsciAPIs) OnTimerEvent(slot func(super func(event *qt.QTimerEvent), event *qt.QTimerEvent)) {
587587
ok := C.QsciAPIs_override_virtual_timerEvent(unsafe.Pointer(this.h), C.intptr_t(cgo.NewHandle(slot)))
588588
if !ok {
589589
panic("miqt: can only override virtual methods for directly constructed types")
@@ -609,7 +609,7 @@ func (this *QsciAPIs) callVirtualBase_ChildEvent(event *qt.QChildEvent) {
609609
C.QsciAPIs_virtualbase_childEvent(unsafe.Pointer(this.h), (*C.QChildEvent)(event.UnsafePointer()))
610610

611611
}
612-
func (this *QsciAPIs) OnchildEvent(slot func(super func(event *qt.QChildEvent), event *qt.QChildEvent)) {
612+
func (this *QsciAPIs) OnChildEvent(slot func(super func(event *qt.QChildEvent), event *qt.QChildEvent)) {
613613
ok := C.QsciAPIs_override_virtual_childEvent(unsafe.Pointer(this.h), C.intptr_t(cgo.NewHandle(slot)))
614614
if !ok {
615615
panic("miqt: can only override virtual methods for directly constructed types")
@@ -635,7 +635,7 @@ func (this *QsciAPIs) callVirtualBase_CustomEvent(event *qt.QEvent) {
635635
C.QsciAPIs_virtualbase_customEvent(unsafe.Pointer(this.h), (*C.QEvent)(event.UnsafePointer()))
636636

637637
}
638-
func (this *QsciAPIs) OncustomEvent(slot func(super func(event *qt.QEvent), event *qt.QEvent)) {
638+
func (this *QsciAPIs) OnCustomEvent(slot func(super func(event *qt.QEvent), event *qt.QEvent)) {
639639
ok := C.QsciAPIs_override_virtual_customEvent(unsafe.Pointer(this.h), C.intptr_t(cgo.NewHandle(slot)))
640640
if !ok {
641641
panic("miqt: can only override virtual methods for directly constructed types")
@@ -661,7 +661,7 @@ func (this *QsciAPIs) callVirtualBase_ConnectNotify(signal *qt.QMetaMethod) {
661661
C.QsciAPIs_virtualbase_connectNotify(unsafe.Pointer(this.h), (*C.QMetaMethod)(signal.UnsafePointer()))
662662

663663
}
664-
func (this *QsciAPIs) OnconnectNotify(slot func(super func(signal *qt.QMetaMethod), signal *qt.QMetaMethod)) {
664+
func (this *QsciAPIs) OnConnectNotify(slot func(super func(signal *qt.QMetaMethod), signal *qt.QMetaMethod)) {
665665
ok := C.QsciAPIs_override_virtual_connectNotify(unsafe.Pointer(this.h), C.intptr_t(cgo.NewHandle(slot)))
666666
if !ok {
667667
panic("miqt: can only override virtual methods for directly constructed types")
@@ -687,7 +687,7 @@ func (this *QsciAPIs) callVirtualBase_DisconnectNotify(signal *qt.QMetaMethod) {
687687
C.QsciAPIs_virtualbase_disconnectNotify(unsafe.Pointer(this.h), (*C.QMetaMethod)(signal.UnsafePointer()))
688688

689689
}
690-
func (this *QsciAPIs) OndisconnectNotify(slot func(super func(signal *qt.QMetaMethod), signal *qt.QMetaMethod)) {
690+
func (this *QsciAPIs) OnDisconnectNotify(slot func(super func(signal *qt.QMetaMethod), signal *qt.QMetaMethod)) {
691691
ok := C.QsciAPIs_override_virtual_disconnectNotify(unsafe.Pointer(this.h), C.intptr_t(cgo.NewHandle(slot)))
692692
if !ok {
693693
panic("miqt: can only override virtual methods for directly constructed types")

0 commit comments

Comments
 (0)