qt: rebuild (marshal slot callbacks with intptr_t)

qt/gen_qabstractanimation.cpp

@@ -82,7 +82,7 @@ void QAbstractAnimation_Finished(QAbstractAnimation* self) {
 	self->finished();
 }
 
-void QAbstractAnimation_connect_Finished(QAbstractAnimation* self, void* slot) {
+void QAbstractAnimation_connect_Finished(QAbstractAnimation* self, intptr_t slot) {
 	QAbstractAnimation::connect(self, static_cast<void (QAbstractAnimation::*)()>(&QAbstractAnimation::finished), self, [=]() {
 		miqt_exec_callback_QAbstractAnimation_Finished(slot);
 	});
@@ -92,7 +92,7 @@ void QAbstractAnimation_StateChanged(QAbstractAnimation* self, int newState, int
 	self->stateChanged(static_cast<QAbstractAnimation::State>(newState), static_cast<QAbstractAnimation::State>(oldState));
 }
 
-void QAbstractAnimation_connect_StateChanged(QAbstractAnimation* self, void* slot) {
+void QAbstractAnimation_connect_StateChanged(QAbstractAnimation* self, intptr_t slot) {
 	QAbstractAnimation::connect(self, static_cast<void (QAbstractAnimation::*)(QAbstractAnimation::State, QAbstractAnimation::State)>(&QAbstractAnimation::stateChanged), self, [=](QAbstractAnimation::State newState, QAbstractAnimation::State oldState) {
 		QAbstractAnimation::State newState_ret = newState;
 		int sigval1 = static_cast<int>(newState_ret);
@@ -106,7 +106,7 @@ void QAbstractAnimation_CurrentLoopChanged(QAbstractAnimation* self, int current
 	self->currentLoopChanged(static_cast<int>(currentLoop));
 }
 
-void QAbstractAnimation_connect_CurrentLoopChanged(QAbstractAnimation* self, void* slot) {
+void QAbstractAnimation_connect_CurrentLoopChanged(QAbstractAnimation* self, intptr_t slot) {
 	QAbstractAnimation::connect(self, static_cast<void (QAbstractAnimation::*)(int)>(&QAbstractAnimation::currentLoopChanged), self, [=](int currentLoop) {
 		int sigval1 = currentLoop;
 		miqt_exec_callback_QAbstractAnimation_CurrentLoopChanged(slot, sigval1);
@@ -117,7 +117,7 @@ void QAbstractAnimation_DirectionChanged(QAbstractAnimation* self, int param1) {
 	self->directionChanged(static_cast<QAbstractAnimation::Direction>(param1));
 }
 
-void QAbstractAnimation_connect_DirectionChanged(QAbstractAnimation* self, void* slot) {
+void QAbstractAnimation_connect_DirectionChanged(QAbstractAnimation* self, intptr_t slot) {
 	QAbstractAnimation::connect(self, static_cast<void (QAbstractAnimation::*)(QAbstractAnimation::Direction)>(&QAbstractAnimation::directionChanged), self, [=](QAbstractAnimation::Direction param1) {
 		QAbstractAnimation::Direction param1_ret = param1;
 		int sigval1 = static_cast<int>(param1_ret);
@@ -249,7 +249,7 @@ void QAnimationDriver_Started(QAnimationDriver* self) {
 	self->started();
 }
 
-void QAnimationDriver_connect_Started(QAnimationDriver* self, void* slot) {
+void QAnimationDriver_connect_Started(QAnimationDriver* self, intptr_t slot) {
 	QAnimationDriver::connect(self, static_cast<void (QAnimationDriver::*)()>(&QAnimationDriver::started), self, [=]() {
 		miqt_exec_callback_QAnimationDriver_Started(slot);
 	});
@@ -259,7 +259,7 @@ void QAnimationDriver_Stopped(QAnimationDriver* self) {
 	self->stopped();
 }
 
-void QAnimationDriver_connect_Stopped(QAnimationDriver* self, void* slot) {
+void QAnimationDriver_connect_Stopped(QAnimationDriver* self, intptr_t slot) {
 	QAnimationDriver::connect(self, static_cast<void (QAnimationDriver::*)()>(&QAnimationDriver::stopped), self, [=]() {
 		miqt_exec_callback_QAnimationDriver_Stopped(slot);
 	});

qt/gen_qabstractanimation.go

@@ -135,12 +135,12 @@ func (this *QAbstractAnimation) Finished() {
 	C.QAbstractAnimation_Finished(this.h)
 }
 func (this *QAbstractAnimation) OnFinished(slot func()) {
-	C.QAbstractAnimation_connect_Finished(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractAnimation_connect_Finished(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractAnimation_Finished
-func miqt_exec_callback_QAbstractAnimation_Finished(cb *C.void) {
+func miqt_exec_callback_QAbstractAnimation_Finished(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -152,12 +152,12 @@ func (this *QAbstractAnimation) StateChanged(newState QAbstractAnimation__State,
 	C.QAbstractAnimation_StateChanged(this.h, (C.int)(newState), (C.int)(oldState))
 }
 func (this *QAbstractAnimation) OnStateChanged(slot func(newState QAbstractAnimation__State, oldState QAbstractAnimation__State)) {
-	C.QAbstractAnimation_connect_StateChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractAnimation_connect_StateChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractAnimation_StateChanged
-func miqt_exec_callback_QAbstractAnimation_StateChanged(cb *C.void, newState C.int, oldState C.int) {
+func miqt_exec_callback_QAbstractAnimation_StateChanged(cb C.intptr_t, newState C.int, oldState C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(newState QAbstractAnimation__State, oldState QAbstractAnimation__State))
+	gofunc, ok := cgo.Handle(cb).Value().(func(newState QAbstractAnimation__State, oldState QAbstractAnimation__State))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -174,12 +174,12 @@ func (this *QAbstractAnimation) CurrentLoopChanged(currentLoop int) {
 	C.QAbstractAnimation_CurrentLoopChanged(this.h, (C.int)(currentLoop))
 }
 func (this *QAbstractAnimation) OnCurrentLoopChanged(slot func(currentLoop int)) {
-	C.QAbstractAnimation_connect_CurrentLoopChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractAnimation_connect_CurrentLoopChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractAnimation_CurrentLoopChanged
-func miqt_exec_callback_QAbstractAnimation_CurrentLoopChanged(cb *C.void, currentLoop C.int) {
+func miqt_exec_callback_QAbstractAnimation_CurrentLoopChanged(cb C.intptr_t, currentLoop C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(currentLoop int))
+	gofunc, ok := cgo.Handle(cb).Value().(func(currentLoop int))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -194,12 +194,12 @@ func (this *QAbstractAnimation) DirectionChanged(param1 QAbstractAnimation__Dire
 	C.QAbstractAnimation_DirectionChanged(this.h, (C.int)(param1))
 }
 func (this *QAbstractAnimation) OnDirectionChanged(slot func(param1 QAbstractAnimation__Direction)) {
-	C.QAbstractAnimation_connect_DirectionChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractAnimation_connect_DirectionChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractAnimation_DirectionChanged
-func miqt_exec_callback_QAbstractAnimation_DirectionChanged(cb *C.void, param1 C.int) {
+func miqt_exec_callback_QAbstractAnimation_DirectionChanged(cb C.intptr_t, param1 C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 QAbstractAnimation__Direction))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 QAbstractAnimation__Direction))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -391,12 +391,12 @@ func (this *QAnimationDriver) Started() {
 	C.QAnimationDriver_Started(this.h)
 }
 func (this *QAnimationDriver) OnStarted(slot func()) {
-	C.QAnimationDriver_connect_Started(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAnimationDriver_connect_Started(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAnimationDriver_Started
-func miqt_exec_callback_QAnimationDriver_Started(cb *C.void) {
+func miqt_exec_callback_QAnimationDriver_Started(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -408,12 +408,12 @@ func (this *QAnimationDriver) Stopped() {
 	C.QAnimationDriver_Stopped(this.h)
 }
 func (this *QAnimationDriver) OnStopped(slot func()) {
-	C.QAnimationDriver_connect_Stopped(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAnimationDriver_connect_Stopped(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAnimationDriver_Stopped
-func miqt_exec_callback_QAnimationDriver_Stopped(cb *C.void) {
+func miqt_exec_callback_QAnimationDriver_Stopped(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qabstractanimation.h

@@ -43,13 +43,13 @@ int QAbstractAnimation_CurrentLoop(const QAbstractAnimation* self);
 int QAbstractAnimation_Duration(const QAbstractAnimation* self);
 int QAbstractAnimation_TotalDuration(const QAbstractAnimation* self);
 void QAbstractAnimation_Finished(QAbstractAnimation* self);
-void QAbstractAnimation_connect_Finished(QAbstractAnimation* self, void* slot);
+void QAbstractAnimation_connect_Finished(QAbstractAnimation* self, intptr_t slot);
 void QAbstractAnimation_StateChanged(QAbstractAnimation* self, int newState, int oldState);
-void QAbstractAnimation_connect_StateChanged(QAbstractAnimation* self, void* slot);
+void QAbstractAnimation_connect_StateChanged(QAbstractAnimation* self, intptr_t slot);
 void QAbstractAnimation_CurrentLoopChanged(QAbstractAnimation* self, int currentLoop);
-void QAbstractAnimation_connect_CurrentLoopChanged(QAbstractAnimation* self, void* slot);
+void QAbstractAnimation_connect_CurrentLoopChanged(QAbstractAnimation* self, intptr_t slot);
 void QAbstractAnimation_DirectionChanged(QAbstractAnimation* self, int param1);
-void QAbstractAnimation_connect_DirectionChanged(QAbstractAnimation* self, void* slot);
+void QAbstractAnimation_connect_DirectionChanged(QAbstractAnimation* self, intptr_t slot);
 void QAbstractAnimation_Start(QAbstractAnimation* self);
 void QAbstractAnimation_Pause(QAbstractAnimation* self);
 void QAbstractAnimation_Resume(QAbstractAnimation* self);
@@ -77,9 +77,9 @@ long long QAnimationDriver_Elapsed(const QAnimationDriver* self);
 void QAnimationDriver_SetStartTime(QAnimationDriver* self, long long startTime);
 long long QAnimationDriver_StartTime(const QAnimationDriver* self);
 void QAnimationDriver_Started(QAnimationDriver* self);
-void QAnimationDriver_connect_Started(QAnimationDriver* self, void* slot);
+void QAnimationDriver_connect_Started(QAnimationDriver* self, intptr_t slot);
 void QAnimationDriver_Stopped(QAnimationDriver* self);
-void QAnimationDriver_connect_Stopped(QAnimationDriver* self, void* slot);
+void QAnimationDriver_connect_Stopped(QAnimationDriver* self, intptr_t slot);
 struct miqt_string* QAnimationDriver_Tr2(const char* s, const char* c);
 struct miqt_string* QAnimationDriver_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QAnimationDriver_TrUtf82(const char* s, const char* c);

qt/gen_qabstractbutton.cpp

@@ -145,7 +145,7 @@ void QAbstractButton_Pressed(QAbstractButton* self) {
 	self->pressed();
 }
 
-void QAbstractButton_connect_Pressed(QAbstractButton* self, void* slot) {
+void QAbstractButton_connect_Pressed(QAbstractButton* self, intptr_t slot) {
 	QAbstractButton::connect(self, static_cast<void (QAbstractButton::*)()>(&QAbstractButton::pressed), self, [=]() {
 		miqt_exec_callback_QAbstractButton_Pressed(slot);
 	});
@@ -155,7 +155,7 @@ void QAbstractButton_Released(QAbstractButton* self) {
 	self->released();
 }
 
-void QAbstractButton_connect_Released(QAbstractButton* self, void* slot) {
+void QAbstractButton_connect_Released(QAbstractButton* self, intptr_t slot) {
 	QAbstractButton::connect(self, static_cast<void (QAbstractButton::*)()>(&QAbstractButton::released), self, [=]() {
 		miqt_exec_callback_QAbstractButton_Released(slot);
 	});
@@ -165,7 +165,7 @@ void QAbstractButton_Clicked(QAbstractButton* self) {
 	self->clicked();
 }
 
-void QAbstractButton_connect_Clicked(QAbstractButton* self, void* slot) {
+void QAbstractButton_connect_Clicked(QAbstractButton* self, intptr_t slot) {
 	QAbstractButton::connect(self, static_cast<void (QAbstractButton::*)(bool)>(&QAbstractButton::clicked), self, [=]() {
 		miqt_exec_callback_QAbstractButton_Clicked(slot);
 	});
@@ -175,7 +175,7 @@ void QAbstractButton_Toggled(QAbstractButton* self, bool checked) {
 	self->toggled(checked);
 }
 
-void QAbstractButton_connect_Toggled(QAbstractButton* self, void* slot) {
+void QAbstractButton_connect_Toggled(QAbstractButton* self, intptr_t slot) {
 	QAbstractButton::connect(self, static_cast<void (QAbstractButton::*)(bool)>(&QAbstractButton::toggled), self, [=](bool checked) {
 		bool sigval1 = checked;
 		miqt_exec_callback_QAbstractButton_Toggled(slot, sigval1);
@@ -218,7 +218,7 @@ void QAbstractButton_Clicked1(QAbstractButton* self, bool checked) {
 	self->clicked(checked);
 }
 
-void QAbstractButton_connect_Clicked1(QAbstractButton* self, void* slot) {
+void QAbstractButton_connect_Clicked1(QAbstractButton* self, intptr_t slot) {
 	QAbstractButton::connect(self, static_cast<void (QAbstractButton::*)(bool)>(&QAbstractButton::clicked), self, [=](bool checked) {
 		bool sigval1 = checked;
 		miqt_exec_callback_QAbstractButton_Clicked1(slot, sigval1);

qt/gen_qabstractbutton.go

@@ -187,12 +187,12 @@ func (this *QAbstractButton) Pressed() {
 	C.QAbstractButton_Pressed(this.h)
 }
 func (this *QAbstractButton) OnPressed(slot func()) {
-	C.QAbstractButton_connect_Pressed(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractButton_connect_Pressed(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractButton_Pressed
-func miqt_exec_callback_QAbstractButton_Pressed(cb *C.void) {
+func miqt_exec_callback_QAbstractButton_Pressed(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -204,12 +204,12 @@ func (this *QAbstractButton) Released() {
 	C.QAbstractButton_Released(this.h)
 }
 func (this *QAbstractButton) OnReleased(slot func()) {
-	C.QAbstractButton_connect_Released(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractButton_connect_Released(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractButton_Released
-func miqt_exec_callback_QAbstractButton_Released(cb *C.void) {
+func miqt_exec_callback_QAbstractButton_Released(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -221,12 +221,12 @@ func (this *QAbstractButton) Clicked() {
 	C.QAbstractButton_Clicked(this.h)
 }
 func (this *QAbstractButton) OnClicked(slot func()) {
-	C.QAbstractButton_connect_Clicked(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractButton_connect_Clicked(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractButton_Clicked
-func miqt_exec_callback_QAbstractButton_Clicked(cb *C.void) {
+func miqt_exec_callback_QAbstractButton_Clicked(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -238,12 +238,12 @@ func (this *QAbstractButton) Toggled(checked bool) {
 	C.QAbstractButton_Toggled(this.h, (C.bool)(checked))
 }
 func (this *QAbstractButton) OnToggled(slot func(checked bool)) {
-	C.QAbstractButton_connect_Toggled(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractButton_connect_Toggled(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractButton_Toggled
-func miqt_exec_callback_QAbstractButton_Toggled(cb *C.void, checked C.bool) {
+func miqt_exec_callback_QAbstractButton_Toggled(cb C.intptr_t, checked C.bool) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(checked bool))
+	gofunc, ok := cgo.Handle(cb).Value().(func(checked bool))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -306,12 +306,12 @@ func (this *QAbstractButton) Clicked1(checked bool) {
 	C.QAbstractButton_Clicked1(this.h, (C.bool)(checked))
 }
 func (this *QAbstractButton) OnClicked1(slot func(checked bool)) {
-	C.QAbstractButton_connect_Clicked1(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractButton_connect_Clicked1(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractButton_Clicked1
-func miqt_exec_callback_QAbstractButton_Clicked1(cb *C.void, checked C.bool) {
+func miqt_exec_callback_QAbstractButton_Clicked1(cb C.intptr_t, checked C.bool) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(checked bool))
+	gofunc, ok := cgo.Handle(cb).Value().(func(checked bool))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qabstractbutton.h

@@ -60,20 +60,20 @@ void QAbstractButton_Click(QAbstractButton* self);
 void QAbstractButton_Toggle(QAbstractButton* self);
 void QAbstractButton_SetChecked(QAbstractButton* self, bool checked);
 void QAbstractButton_Pressed(QAbstractButton* self);
-void QAbstractButton_connect_Pressed(QAbstractButton* self, void* slot);
+void QAbstractButton_connect_Pressed(QAbstractButton* self, intptr_t slot);
 void QAbstractButton_Released(QAbstractButton* self);
-void QAbstractButton_connect_Released(QAbstractButton* self, void* slot);
+void QAbstractButton_connect_Released(QAbstractButton* self, intptr_t slot);
 void QAbstractButton_Clicked(QAbstractButton* self);
-void QAbstractButton_connect_Clicked(QAbstractButton* self, void* slot);
+void QAbstractButton_connect_Clicked(QAbstractButton* self, intptr_t slot);
 void QAbstractButton_Toggled(QAbstractButton* self, bool checked);
-void QAbstractButton_connect_Toggled(QAbstractButton* self, void* slot);
+void QAbstractButton_connect_Toggled(QAbstractButton* self, intptr_t slot);
 struct miqt_string* QAbstractButton_Tr2(const char* s, const char* c);
 struct miqt_string* QAbstractButton_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QAbstractButton_TrUtf82(const char* s, const char* c);
 struct miqt_string* QAbstractButton_TrUtf83(const char* s, const char* c, int n);
 void QAbstractButton_AnimateClick1(QAbstractButton* self, int msec);
 void QAbstractButton_Clicked1(QAbstractButton* self, bool checked);
-void QAbstractButton_connect_Clicked1(QAbstractButton* self, void* slot);
+void QAbstractButton_connect_Clicked1(QAbstractButton* self, intptr_t slot);
 void QAbstractButton_Delete(QAbstractButton* self);
 
 #ifdef __cplusplus

qt/gen_qabstracteventdispatcher.cpp

@@ -125,7 +125,7 @@ void QAbstractEventDispatcher_AboutToBlock(QAbstractEventDispatcher* self) {
 	self->aboutToBlock();
 }
 
-void QAbstractEventDispatcher_connect_AboutToBlock(QAbstractEventDispatcher* self, void* slot) {
+void QAbstractEventDispatcher_connect_AboutToBlock(QAbstractEventDispatcher* self, intptr_t slot) {
 	QAbstractEventDispatcher::connect(self, static_cast<void (QAbstractEventDispatcher::*)()>(&QAbstractEventDispatcher::aboutToBlock), self, [=]() {
 		miqt_exec_callback_QAbstractEventDispatcher_AboutToBlock(slot);
 	});
@@ -135,7 +135,7 @@ void QAbstractEventDispatcher_Awake(QAbstractEventDispatcher* self) {
 	self->awake();
 }
 
-void QAbstractEventDispatcher_connect_Awake(QAbstractEventDispatcher* self, void* slot) {
+void QAbstractEventDispatcher_connect_Awake(QAbstractEventDispatcher* self, intptr_t slot) {
 	QAbstractEventDispatcher::connect(self, static_cast<void (QAbstractEventDispatcher::*)()>(&QAbstractEventDispatcher::awake), self, [=]() {
 		miqt_exec_callback_QAbstractEventDispatcher_Awake(slot);
 	});

qt/gen_qabstracteventdispatcher.go

@@ -155,12 +155,12 @@ func (this *QAbstractEventDispatcher) AboutToBlock() {
 	C.QAbstractEventDispatcher_AboutToBlock(this.h)
 }
 func (this *QAbstractEventDispatcher) OnAboutToBlock(slot func()) {
-	C.QAbstractEventDispatcher_connect_AboutToBlock(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractEventDispatcher_connect_AboutToBlock(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractEventDispatcher_AboutToBlock
-func miqt_exec_callback_QAbstractEventDispatcher_AboutToBlock(cb *C.void) {
+func miqt_exec_callback_QAbstractEventDispatcher_AboutToBlock(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -172,12 +172,12 @@ func (this *QAbstractEventDispatcher) Awake() {
 	C.QAbstractEventDispatcher_Awake(this.h)
 }
 func (this *QAbstractEventDispatcher) OnAwake(slot func()) {
-	C.QAbstractEventDispatcher_connect_Awake(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractEventDispatcher_connect_Awake(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractEventDispatcher_Awake
-func miqt_exec_callback_QAbstractEventDispatcher_Awake(cb *C.void) {
+func miqt_exec_callback_QAbstractEventDispatcher_Awake(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qabstracteventdispatcher.h

@@ -61,9 +61,9 @@ void QAbstractEventDispatcher_InstallNativeEventFilter(QAbstractEventDispatcher*
 void QAbstractEventDispatcher_RemoveNativeEventFilter(QAbstractEventDispatcher* self, QAbstractNativeEventFilter* filterObj);
 bool QAbstractEventDispatcher_FilterNativeEvent(QAbstractEventDispatcher* self, QByteArray* eventType, void* message, long* result);
 void QAbstractEventDispatcher_AboutToBlock(QAbstractEventDispatcher* self);
-void QAbstractEventDispatcher_connect_AboutToBlock(QAbstractEventDispatcher* self, void* slot);
+void QAbstractEventDispatcher_connect_AboutToBlock(QAbstractEventDispatcher* self, intptr_t slot);
 void QAbstractEventDispatcher_Awake(QAbstractEventDispatcher* self);
-void QAbstractEventDispatcher_connect_Awake(QAbstractEventDispatcher* self, void* slot);
+void QAbstractEventDispatcher_connect_Awake(QAbstractEventDispatcher* self, intptr_t slot);
 struct miqt_string* QAbstractEventDispatcher_Tr2(const char* s, const char* c);
 struct miqt_string* QAbstractEventDispatcher_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QAbstractEventDispatcher_TrUtf82(const char* s, const char* c);

qt/gen_qabstractitemdelegate.cpp

@@ -101,7 +101,7 @@ void QAbstractItemDelegate_CommitData(QAbstractItemDelegate* self, QWidget* edit
 	self->commitData(editor);
 }
 
-void QAbstractItemDelegate_connect_CommitData(QAbstractItemDelegate* self, void* slot) {
+void QAbstractItemDelegate_connect_CommitData(QAbstractItemDelegate* self, intptr_t slot) {
 	QAbstractItemDelegate::connect(self, static_cast<void (QAbstractItemDelegate::*)(QWidget*)>(&QAbstractItemDelegate::commitData), self, [=](QWidget* editor) {
 		QWidget* sigval1 = editor;
 		miqt_exec_callback_QAbstractItemDelegate_CommitData(slot, sigval1);
@@ -112,7 +112,7 @@ void QAbstractItemDelegate_CloseEditor(QAbstractItemDelegate* self, QWidget* edi
 	self->closeEditor(editor);
 }
 
-void QAbstractItemDelegate_connect_CloseEditor(QAbstractItemDelegate* self, void* slot) {
+void QAbstractItemDelegate_connect_CloseEditor(QAbstractItemDelegate* self, intptr_t slot) {
 	QAbstractItemDelegate::connect(self, static_cast<void (QAbstractItemDelegate::*)(QWidget*, QAbstractItemDelegate::EndEditHint)>(&QAbstractItemDelegate::closeEditor), self, [=](QWidget* editor) {
 		QWidget* sigval1 = editor;
 		miqt_exec_callback_QAbstractItemDelegate_CloseEditor(slot, sigval1);
@@ -123,7 +123,7 @@ void QAbstractItemDelegate_SizeHintChanged(QAbstractItemDelegate* self, QModelIn
 	self->sizeHintChanged(*param1);
 }
 
-void QAbstractItemDelegate_connect_SizeHintChanged(QAbstractItemDelegate* self, void* slot) {
+void QAbstractItemDelegate_connect_SizeHintChanged(QAbstractItemDelegate* self, intptr_t slot) {
 	QAbstractItemDelegate::connect(self, static_cast<void (QAbstractItemDelegate::*)(const QModelIndex&)>(&QAbstractItemDelegate::sizeHintChanged), self, [=](const QModelIndex& param1) {
 		const QModelIndex& param1_ret = param1;
 		// Cast returned reference into pointer
@@ -164,7 +164,7 @@ void QAbstractItemDelegate_CloseEditor2(QAbstractItemDelegate* self, QWidget* ed
 	self->closeEditor(editor, static_cast<QAbstractItemDelegate::EndEditHint>(hint));
 }
 
-void QAbstractItemDelegate_connect_CloseEditor2(QAbstractItemDelegate* self, void* slot) {
+void QAbstractItemDelegate_connect_CloseEditor2(QAbstractItemDelegate* self, intptr_t slot) {
 	QAbstractItemDelegate::connect(self, static_cast<void (QAbstractItemDelegate::*)(QWidget*, QAbstractItemDelegate::EndEditHint)>(&QAbstractItemDelegate::closeEditor), self, [=](QWidget* editor, QAbstractItemDelegate::EndEditHint hint) {
 		QWidget* sigval1 = editor;
 		QAbstractItemDelegate::EndEditHint hint_ret = hint;

qt/gen_qabstractitemdelegate.go

@@ -138,12 +138,12 @@ func (this *QAbstractItemDelegate) CommitData(editor *QWidget) {
 	C.QAbstractItemDelegate_CommitData(this.h, editor.cPointer())
 }
 func (this *QAbstractItemDelegate) OnCommitData(slot func(editor *QWidget)) {
-	C.QAbstractItemDelegate_connect_CommitData(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractItemDelegate_connect_CommitData(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractItemDelegate_CommitData
-func miqt_exec_callback_QAbstractItemDelegate_CommitData(cb *C.void, editor *C.QWidget) {
+func miqt_exec_callback_QAbstractItemDelegate_CommitData(cb C.intptr_t, editor *C.QWidget) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(editor *QWidget))
+	gofunc, ok := cgo.Handle(cb).Value().(func(editor *QWidget))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -158,12 +158,12 @@ func (this *QAbstractItemDelegate) CloseEditor(editor *QWidget) {
 	C.QAbstractItemDelegate_CloseEditor(this.h, editor.cPointer())
 }
 func (this *QAbstractItemDelegate) OnCloseEditor(slot func(editor *QWidget)) {
-	C.QAbstractItemDelegate_connect_CloseEditor(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractItemDelegate_connect_CloseEditor(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractItemDelegate_CloseEditor
-func miqt_exec_callback_QAbstractItemDelegate_CloseEditor(cb *C.void, editor *C.QWidget) {
+func miqt_exec_callback_QAbstractItemDelegate_CloseEditor(cb C.intptr_t, editor *C.QWidget) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(editor *QWidget))
+	gofunc, ok := cgo.Handle(cb).Value().(func(editor *QWidget))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -178,12 +178,12 @@ func (this *QAbstractItemDelegate) SizeHintChanged(param1 *QModelIndex) {
 	C.QAbstractItemDelegate_SizeHintChanged(this.h, param1.cPointer())
 }
 func (this *QAbstractItemDelegate) OnSizeHintChanged(slot func(param1 *QModelIndex)) {
-	C.QAbstractItemDelegate_connect_SizeHintChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractItemDelegate_connect_SizeHintChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractItemDelegate_SizeHintChanged
-func miqt_exec_callback_QAbstractItemDelegate_SizeHintChanged(cb *C.void, param1 *C.QModelIndex) {
+func miqt_exec_callback_QAbstractItemDelegate_SizeHintChanged(cb C.intptr_t, param1 *C.QModelIndex) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 *QModelIndex))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 *QModelIndex))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -242,12 +242,12 @@ func (this *QAbstractItemDelegate) CloseEditor2(editor *QWidget, hint QAbstractI
 	C.QAbstractItemDelegate_CloseEditor2(this.h, editor.cPointer(), (C.int)(hint))
 }
 func (this *QAbstractItemDelegate) OnCloseEditor2(slot func(editor *QWidget, hint QAbstractItemDelegate__EndEditHint)) {
-	C.QAbstractItemDelegate_connect_CloseEditor2(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractItemDelegate_connect_CloseEditor2(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractItemDelegate_CloseEditor2
-func miqt_exec_callback_QAbstractItemDelegate_CloseEditor2(cb *C.void, editor *C.QWidget, hint C.int) {
+func miqt_exec_callback_QAbstractItemDelegate_CloseEditor2(cb C.intptr_t, editor *C.QWidget, hint C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(editor *QWidget, hint QAbstractItemDelegate__EndEditHint))
+	gofunc, ok := cgo.Handle(cb).Value().(func(editor *QWidget, hint QAbstractItemDelegate__EndEditHint))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qabstractitemdelegate.h

@@ -57,17 +57,17 @@ struct miqt_string* QAbstractItemDelegate_ElidedText(QFontMetrics* fontMetrics,
 bool QAbstractItemDelegate_HelpEvent(QAbstractItemDelegate* self, QHelpEvent* event, QAbstractItemView* view, QStyleOptionViewItem* option, QModelIndex* index);
 struct miqt_array* QAbstractItemDelegate_PaintingRoles(const QAbstractItemDelegate* self);
 void QAbstractItemDelegate_CommitData(QAbstractItemDelegate* self, QWidget* editor);
-void QAbstractItemDelegate_connect_CommitData(QAbstractItemDelegate* self, void* slot);
+void QAbstractItemDelegate_connect_CommitData(QAbstractItemDelegate* self, intptr_t slot);
 void QAbstractItemDelegate_CloseEditor(QAbstractItemDelegate* self, QWidget* editor);
-void QAbstractItemDelegate_connect_CloseEditor(QAbstractItemDelegate* self, void* slot);
+void QAbstractItemDelegate_connect_CloseEditor(QAbstractItemDelegate* self, intptr_t slot);
 void QAbstractItemDelegate_SizeHintChanged(QAbstractItemDelegate* self, QModelIndex* param1);
-void QAbstractItemDelegate_connect_SizeHintChanged(QAbstractItemDelegate* self, void* slot);
+void QAbstractItemDelegate_connect_SizeHintChanged(QAbstractItemDelegate* self, intptr_t slot);
 struct miqt_string* QAbstractItemDelegate_Tr2(const char* s, const char* c);
 struct miqt_string* QAbstractItemDelegate_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QAbstractItemDelegate_TrUtf82(const char* s, const char* c);
 struct miqt_string* QAbstractItemDelegate_TrUtf83(const char* s, const char* c, int n);
 void QAbstractItemDelegate_CloseEditor2(QAbstractItemDelegate* self, QWidget* editor, int hint);
-void QAbstractItemDelegate_connect_CloseEditor2(QAbstractItemDelegate* self, void* slot);
+void QAbstractItemDelegate_connect_CloseEditor2(QAbstractItemDelegate* self, intptr_t slot);
 void QAbstractItemDelegate_Delete(QAbstractItemDelegate* self);
 
 #ifdef __cplusplus

qt/gen_qabstractitemmodel.cpp

@@ -399,7 +399,7 @@ void QAbstractItemModel_DataChanged(QAbstractItemModel* self, QModelIndex* topLe
 	self->dataChanged(*topLeft, *bottomRight);
 }
 
-void QAbstractItemModel_connect_DataChanged(QAbstractItemModel* self, void* slot) {
+void QAbstractItemModel_connect_DataChanged(QAbstractItemModel* self, intptr_t slot) {
 	QAbstractItemModel::connect(self, static_cast<void (QAbstractItemModel::*)(const QModelIndex&, const QModelIndex&, const QVector<int>&)>(&QAbstractItemModel::dataChanged), self, [=](const QModelIndex& topLeft, const QModelIndex& bottomRight) {
 		const QModelIndex& topLeft_ret = topLeft;
 		// Cast returned reference into pointer
@@ -415,7 +415,7 @@ void QAbstractItemModel_HeaderDataChanged(QAbstractItemModel* self, int orientat
 	self->headerDataChanged(static_cast<Qt::Orientation>(orientation), static_cast<int>(first), static_cast<int>(last));
 }
 
-void QAbstractItemModel_connect_HeaderDataChanged(QAbstractItemModel* self, void* slot) {
+void QAbstractItemModel_connect_HeaderDataChanged(QAbstractItemModel* self, intptr_t slot) {
 	QAbstractItemModel::connect(self, static_cast<void (QAbstractItemModel::*)(Qt::Orientation, int, int)>(&QAbstractItemModel::headerDataChanged), self, [=](Qt::Orientation orientation, int first, int last) {
 		Qt::Orientation orientation_ret = orientation;
 		int sigval1 = static_cast<int>(orientation_ret);
@@ -429,7 +429,7 @@ void QAbstractItemModel_LayoutChanged(QAbstractItemModel* self) {
 	self->layoutChanged();
 }
 
-void QAbstractItemModel_connect_LayoutChanged(QAbstractItemModel* self, void* slot) {
+void QAbstractItemModel_connect_LayoutChanged(QAbstractItemModel* self, intptr_t slot) {
 	QAbstractItemModel::connect(self, static_cast<void (QAbstractItemModel::*)(const QList<QPersistentModelIndex>&, QAbstractItemModel::LayoutChangeHint)>(&QAbstractItemModel::layoutChanged), self, [=]() {
 		miqt_exec_callback_QAbstractItemModel_LayoutChanged(slot);
 	});
@@ -439,7 +439,7 @@ void QAbstractItemModel_LayoutAboutToBeChanged(QAbstractItemModel* self) {
 	self->layoutAboutToBeChanged();
 }
 
-void QAbstractItemModel_connect_LayoutAboutToBeChanged(QAbstractItemModel* self, void* slot) {
+void QAbstractItemModel_connect_LayoutAboutToBeChanged(QAbstractItemModel* self, intptr_t slot) {
 	QAbstractItemModel::connect(self, static_cast<void (QAbstractItemModel::*)(const QList<QPersistentModelIndex>&, QAbstractItemModel::LayoutChangeHint)>(&QAbstractItemModel::layoutAboutToBeChanged), self, [=]() {
 		miqt_exec_callback_QAbstractItemModel_LayoutAboutToBeChanged(slot);
 	});
@@ -593,7 +593,7 @@ void QAbstractItemModel_DataChanged3(QAbstractItemModel* self, QModelIndex* topL
 	self->dataChanged(*topLeft, *bottomRight, roles_QList);
 }
 
-void QAbstractItemModel_connect_DataChanged3(QAbstractItemModel* self, void* slot) {
+void QAbstractItemModel_connect_DataChanged3(QAbstractItemModel* self, intptr_t slot) {
 	QAbstractItemModel::connect(self, static_cast<void (QAbstractItemModel::*)(const QModelIndex&, const QModelIndex&, const QVector<int>&)>(&QAbstractItemModel::dataChanged), self, [=](const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles) {
 		const QModelIndex& topLeft_ret = topLeft;
 		// Cast returned reference into pointer
@@ -625,7 +625,7 @@ void QAbstractItemModel_LayoutChanged1(QAbstractItemModel* self, struct miqt_arr
 	self->layoutChanged(parents_QList);
 }
 
-void QAbstractItemModel_connect_LayoutChanged1(QAbstractItemModel* self, void* slot) {
+void QAbstractItemModel_connect_LayoutChanged1(QAbstractItemModel* self, intptr_t slot) {
 	QAbstractItemModel::connect(self, static_cast<void (QAbstractItemModel::*)(const QList<QPersistentModelIndex>&, QAbstractItemModel::LayoutChangeHint)>(&QAbstractItemModel::layoutChanged), self, [=](const QList<QPersistentModelIndex>& parents) {
 		const QList<QPersistentModelIndex>& parents_ret = parents;
 		// Convert QList<> from C++ memory to manually-managed C memory
@@ -651,7 +651,7 @@ void QAbstractItemModel_LayoutChanged2(QAbstractItemModel* self, struct miqt_arr
 	self->layoutChanged(parents_QList, static_cast<QAbstractItemModel::LayoutChangeHint>(hint));
 }
 
-void QAbstractItemModel_connect_LayoutChanged2(QAbstractItemModel* self, void* slot) {
+void QAbstractItemModel_connect_LayoutChanged2(QAbstractItemModel* self, intptr_t slot) {
 	QAbstractItemModel::connect(self, static_cast<void (QAbstractItemModel::*)(const QList<QPersistentModelIndex>&, QAbstractItemModel::LayoutChangeHint)>(&QAbstractItemModel::layoutChanged), self, [=](const QList<QPersistentModelIndex>& parents, QAbstractItemModel::LayoutChangeHint hint) {
 		const QList<QPersistentModelIndex>& parents_ret = parents;
 		// Convert QList<> from C++ memory to manually-managed C memory
@@ -679,7 +679,7 @@ void QAbstractItemModel_LayoutAboutToBeChanged1(QAbstractItemModel* self, struct
 	self->layoutAboutToBeChanged(parents_QList);
 }
 
-void QAbstractItemModel_connect_LayoutAboutToBeChanged1(QAbstractItemModel* self, void* slot) {
+void QAbstractItemModel_connect_LayoutAboutToBeChanged1(QAbstractItemModel* self, intptr_t slot) {
 	QAbstractItemModel::connect(self, static_cast<void (QAbstractItemModel::*)(const QList<QPersistentModelIndex>&, QAbstractItemModel::LayoutChangeHint)>(&QAbstractItemModel::layoutAboutToBeChanged), self, [=](const QList<QPersistentModelIndex>& parents) {
 		const QList<QPersistentModelIndex>& parents_ret = parents;
 		// Convert QList<> from C++ memory to manually-managed C memory
@@ -705,7 +705,7 @@ void QAbstractItemModel_LayoutAboutToBeChanged2(QAbstractItemModel* self, struct
 	self->layoutAboutToBeChanged(parents_QList, static_cast<QAbstractItemModel::LayoutChangeHint>(hint));
 }
 
-void QAbstractItemModel_connect_LayoutAboutToBeChanged2(QAbstractItemModel* self, void* slot) {
+void QAbstractItemModel_connect_LayoutAboutToBeChanged2(QAbstractItemModel* self, intptr_t slot) {
 	QAbstractItemModel::connect(self, static_cast<void (QAbstractItemModel::*)(const QList<QPersistentModelIndex>&, QAbstractItemModel::LayoutChangeHint)>(&QAbstractItemModel::layoutAboutToBeChanged), self, [=](const QList<QPersistentModelIndex>& parents, QAbstractItemModel::LayoutChangeHint hint) {
 		const QList<QPersistentModelIndex>& parents_ret = parents;
 		// Convert QList<> from C++ memory to manually-managed C memory

qt/gen_qabstractitemmodel.go

@@ -569,12 +569,12 @@ func (this *QAbstractItemModel) DataChanged(topLeft *QModelIndex, bottomRight *Q
 	C.QAbstractItemModel_DataChanged(this.h, topLeft.cPointer(), bottomRight.cPointer())
 }
 func (this *QAbstractItemModel) OnDataChanged(slot func(topLeft *QModelIndex, bottomRight *QModelIndex)) {
-	C.QAbstractItemModel_connect_DataChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractItemModel_connect_DataChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractItemModel_DataChanged
-func miqt_exec_callback_QAbstractItemModel_DataChanged(cb *C.void, topLeft *C.QModelIndex, bottomRight *C.QModelIndex) {
+func miqt_exec_callback_QAbstractItemModel_DataChanged(cb C.intptr_t, topLeft *C.QModelIndex, bottomRight *C.QModelIndex) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(topLeft *QModelIndex, bottomRight *QModelIndex))
+	gofunc, ok := cgo.Handle(cb).Value().(func(topLeft *QModelIndex, bottomRight *QModelIndex))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -590,12 +590,12 @@ func (this *QAbstractItemModel) HeaderDataChanged(orientation Orientation, first
 	C.QAbstractItemModel_HeaderDataChanged(this.h, (C.int)(orientation), (C.int)(first), (C.int)(last))
 }
 func (this *QAbstractItemModel) OnHeaderDataChanged(slot func(orientation Orientation, first int, last int)) {
-	C.QAbstractItemModel_connect_HeaderDataChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractItemModel_connect_HeaderDataChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractItemModel_HeaderDataChanged
-func miqt_exec_callback_QAbstractItemModel_HeaderDataChanged(cb *C.void, orientation C.int, first C.int, last C.int) {
+func miqt_exec_callback_QAbstractItemModel_HeaderDataChanged(cb C.intptr_t, orientation C.int, first C.int, last C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(orientation Orientation, first int, last int))
+	gofunc, ok := cgo.Handle(cb).Value().(func(orientation Orientation, first int, last int))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -614,12 +614,12 @@ func (this *QAbstractItemModel) LayoutChanged() {
 	C.QAbstractItemModel_LayoutChanged(this.h)
 }
 func (this *QAbstractItemModel) OnLayoutChanged(slot func()) {
-	C.QAbstractItemModel_connect_LayoutChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractItemModel_connect_LayoutChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractItemModel_LayoutChanged
-func miqt_exec_callback_QAbstractItemModel_LayoutChanged(cb *C.void) {
+func miqt_exec_callback_QAbstractItemModel_LayoutChanged(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -631,12 +631,12 @@ func (this *QAbstractItemModel) LayoutAboutToBeChanged() {
 	C.QAbstractItemModel_LayoutAboutToBeChanged(this.h)
 }
 func (this *QAbstractItemModel) OnLayoutAboutToBeChanged(slot func()) {
-	C.QAbstractItemModel_connect_LayoutAboutToBeChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractItemModel_connect_LayoutAboutToBeChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractItemModel_LayoutAboutToBeChanged
-func miqt_exec_callback_QAbstractItemModel_LayoutAboutToBeChanged(cb *C.void) {
+func miqt_exec_callback_QAbstractItemModel_LayoutAboutToBeChanged(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -821,12 +821,12 @@ func (this *QAbstractItemModel) DataChanged3(topLeft *QModelIndex, bottomRight *
 	C.QAbstractItemModel_DataChanged3(this.h, topLeft.cPointer(), bottomRight.cPointer(), roles_ma)
 }
 func (this *QAbstractItemModel) OnDataChanged3(slot func(topLeft *QModelIndex, bottomRight *QModelIndex, roles []int)) {
-	C.QAbstractItemModel_connect_DataChanged3(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractItemModel_connect_DataChanged3(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractItemModel_DataChanged3
-func miqt_exec_callback_QAbstractItemModel_DataChanged3(cb *C.void, topLeft *C.QModelIndex, bottomRight *C.QModelIndex, roles *C.struct_miqt_array) {
+func miqt_exec_callback_QAbstractItemModel_DataChanged3(cb C.intptr_t, topLeft *C.QModelIndex, bottomRight *C.QModelIndex, roles *C.struct_miqt_array) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(topLeft *QModelIndex, bottomRight *QModelIndex, roles []int))
+	gofunc, ok := cgo.Handle(cb).Value().(func(topLeft *QModelIndex, bottomRight *QModelIndex, roles []int))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -858,12 +858,12 @@ func (this *QAbstractItemModel) LayoutChanged1(parents []QPersistentModelIndex)
 	C.QAbstractItemModel_LayoutChanged1(this.h, parents_ma)
 }
 func (this *QAbstractItemModel) OnLayoutChanged1(slot func(parents []QPersistentModelIndex)) {
-	C.QAbstractItemModel_connect_LayoutChanged1(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractItemModel_connect_LayoutChanged1(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractItemModel_LayoutChanged1
-func miqt_exec_callback_QAbstractItemModel_LayoutChanged1(cb *C.void, parents *C.struct_miqt_array) {
+func miqt_exec_callback_QAbstractItemModel_LayoutChanged1(cb C.intptr_t, parents *C.struct_miqt_array) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(parents []QPersistentModelIndex))
+	gofunc, ok := cgo.Handle(cb).Value().(func(parents []QPersistentModelIndex))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -896,12 +896,12 @@ func (this *QAbstractItemModel) LayoutChanged2(parents []QPersistentModelIndex,
 	C.QAbstractItemModel_LayoutChanged2(this.h, parents_ma, (C.int)(hint))
 }
 func (this *QAbstractItemModel) OnLayoutChanged2(slot func(parents []QPersistentModelIndex, hint QAbstractItemModel__LayoutChangeHint)) {
-	C.QAbstractItemModel_connect_LayoutChanged2(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractItemModel_connect_LayoutChanged2(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractItemModel_LayoutChanged2
-func miqt_exec_callback_QAbstractItemModel_LayoutChanged2(cb *C.void, parents *C.struct_miqt_array, hint C.int) {
+func miqt_exec_callback_QAbstractItemModel_LayoutChanged2(cb C.intptr_t, parents *C.struct_miqt_array, hint C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(parents []QPersistentModelIndex, hint QAbstractItemModel__LayoutChangeHint))
+	gofunc, ok := cgo.Handle(cb).Value().(func(parents []QPersistentModelIndex, hint QAbstractItemModel__LayoutChangeHint))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -936,12 +936,12 @@ func (this *QAbstractItemModel) LayoutAboutToBeChanged1(parents []QPersistentMod
 	C.QAbstractItemModel_LayoutAboutToBeChanged1(this.h, parents_ma)
 }
 func (this *QAbstractItemModel) OnLayoutAboutToBeChanged1(slot func(parents []QPersistentModelIndex)) {
-	C.QAbstractItemModel_connect_LayoutAboutToBeChanged1(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractItemModel_connect_LayoutAboutToBeChanged1(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractItemModel_LayoutAboutToBeChanged1
-func miqt_exec_callback_QAbstractItemModel_LayoutAboutToBeChanged1(cb *C.void, parents *C.struct_miqt_array) {
+func miqt_exec_callback_QAbstractItemModel_LayoutAboutToBeChanged1(cb C.intptr_t, parents *C.struct_miqt_array) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(parents []QPersistentModelIndex))
+	gofunc, ok := cgo.Handle(cb).Value().(func(parents []QPersistentModelIndex))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -974,12 +974,12 @@ func (this *QAbstractItemModel) LayoutAboutToBeChanged2(parents []QPersistentMod
 	C.QAbstractItemModel_LayoutAboutToBeChanged2(this.h, parents_ma, (C.int)(hint))
 }
 func (this *QAbstractItemModel) OnLayoutAboutToBeChanged2(slot func(parents []QPersistentModelIndex, hint QAbstractItemModel__LayoutChangeHint)) {
-	C.QAbstractItemModel_connect_LayoutAboutToBeChanged2(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractItemModel_connect_LayoutAboutToBeChanged2(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractItemModel_LayoutAboutToBeChanged2
-func miqt_exec_callback_QAbstractItemModel_LayoutAboutToBeChanged2(cb *C.void, parents *C.struct_miqt_array, hint C.int) {
+func miqt_exec_callback_QAbstractItemModel_LayoutAboutToBeChanged2(cb C.intptr_t, parents *C.struct_miqt_array, hint C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(parents []QPersistentModelIndex, hint QAbstractItemModel__LayoutChangeHint))
+	gofunc, ok := cgo.Handle(cb).Value().(func(parents []QPersistentModelIndex, hint QAbstractItemModel__LayoutChangeHint))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qabstractitemmodel.h

@@ -123,13 +123,13 @@ struct miqt_array* QAbstractItemModel_Match(const QAbstractItemModel* self, QMod
 QSize* QAbstractItemModel_Span(const QAbstractItemModel* self, QModelIndex* index);
 bool QAbstractItemModel_CheckIndex(const QAbstractItemModel* self, QModelIndex* index);
 void QAbstractItemModel_DataChanged(QAbstractItemModel* self, QModelIndex* topLeft, QModelIndex* bottomRight);
-void QAbstractItemModel_connect_DataChanged(QAbstractItemModel* self, void* slot);
+void QAbstractItemModel_connect_DataChanged(QAbstractItemModel* self, intptr_t slot);
 void QAbstractItemModel_HeaderDataChanged(QAbstractItemModel* self, int orientation, int first, int last);
-void QAbstractItemModel_connect_HeaderDataChanged(QAbstractItemModel* self, void* slot);
+void QAbstractItemModel_connect_HeaderDataChanged(QAbstractItemModel* self, intptr_t slot);
 void QAbstractItemModel_LayoutChanged(QAbstractItemModel* self);
-void QAbstractItemModel_connect_LayoutChanged(QAbstractItemModel* self, void* slot);
+void QAbstractItemModel_connect_LayoutChanged(QAbstractItemModel* self, intptr_t slot);
 void QAbstractItemModel_LayoutAboutToBeChanged(QAbstractItemModel* self);
-void QAbstractItemModel_connect_LayoutAboutToBeChanged(QAbstractItemModel* self, void* slot);
+void QAbstractItemModel_connect_LayoutAboutToBeChanged(QAbstractItemModel* self, intptr_t slot);
 bool QAbstractItemModel_Submit(QAbstractItemModel* self);
 void QAbstractItemModel_Revert(QAbstractItemModel* self);
 struct miqt_string* QAbstractItemModel_Tr2(const char* s, const char* c);
@@ -158,15 +158,15 @@ struct miqt_array* QAbstractItemModel_Match4(const QAbstractItemModel* self, QMo
 struct miqt_array* QAbstractItemModel_Match5(const QAbstractItemModel* self, QModelIndex* start, int role, QVariant* value, int hits, int flags);
 bool QAbstractItemModel_CheckIndex2(const QAbstractItemModel* self, QModelIndex* index, int options);
 void QAbstractItemModel_DataChanged3(QAbstractItemModel* self, QModelIndex* topLeft, QModelIndex* bottomRight, struct miqt_array* /* of int */ roles);
-void QAbstractItemModel_connect_DataChanged3(QAbstractItemModel* self, void* slot);
+void QAbstractItemModel_connect_DataChanged3(QAbstractItemModel* self, intptr_t slot);
 void QAbstractItemModel_LayoutChanged1(QAbstractItemModel* self, struct miqt_array* /* of QPersistentModelIndex* */ parents);
-void QAbstractItemModel_connect_LayoutChanged1(QAbstractItemModel* self, void* slot);
+void QAbstractItemModel_connect_LayoutChanged1(QAbstractItemModel* self, intptr_t slot);
 void QAbstractItemModel_LayoutChanged2(QAbstractItemModel* self, struct miqt_array* /* of QPersistentModelIndex* */ parents, int hint);
-void QAbstractItemModel_connect_LayoutChanged2(QAbstractItemModel* self, void* slot);
+void QAbstractItemModel_connect_LayoutChanged2(QAbstractItemModel* self, intptr_t slot);
 void QAbstractItemModel_LayoutAboutToBeChanged1(QAbstractItemModel* self, struct miqt_array* /* of QPersistentModelIndex* */ parents);
-void QAbstractItemModel_connect_LayoutAboutToBeChanged1(QAbstractItemModel* self, void* slot);
+void QAbstractItemModel_connect_LayoutAboutToBeChanged1(QAbstractItemModel* self, intptr_t slot);
 void QAbstractItemModel_LayoutAboutToBeChanged2(QAbstractItemModel* self, struct miqt_array* /* of QPersistentModelIndex* */ parents, int hint);
-void QAbstractItemModel_connect_LayoutAboutToBeChanged2(QAbstractItemModel* self, void* slot);
+void QAbstractItemModel_connect_LayoutAboutToBeChanged2(QAbstractItemModel* self, intptr_t slot);
 void QAbstractItemModel_Delete(QAbstractItemModel* self);
 
 QMetaObject* QAbstractTableModel_MetaObject(const QAbstractTableModel* self);

qt/gen_qabstractitemview.cpp

@@ -331,7 +331,7 @@ void QAbstractItemView_Pressed(QAbstractItemView* self, QModelIndex* index) {
 	self->pressed(*index);
 }
 
-void QAbstractItemView_connect_Pressed(QAbstractItemView* self, void* slot) {
+void QAbstractItemView_connect_Pressed(QAbstractItemView* self, intptr_t slot) {
 	QAbstractItemView::connect(self, static_cast<void (QAbstractItemView::*)(const QModelIndex&)>(&QAbstractItemView::pressed), self, [=](const QModelIndex& index) {
 		const QModelIndex& index_ret = index;
 		// Cast returned reference into pointer
@@ -344,7 +344,7 @@ void QAbstractItemView_Clicked(QAbstractItemView* self, QModelIndex* index) {
 	self->clicked(*index);
 }
 
-void QAbstractItemView_connect_Clicked(QAbstractItemView* self, void* slot) {
+void QAbstractItemView_connect_Clicked(QAbstractItemView* self, intptr_t slot) {
 	QAbstractItemView::connect(self, static_cast<void (QAbstractItemView::*)(const QModelIndex&)>(&QAbstractItemView::clicked), self, [=](const QModelIndex& index) {
 		const QModelIndex& index_ret = index;
 		// Cast returned reference into pointer
@@ -357,7 +357,7 @@ void QAbstractItemView_DoubleClicked(QAbstractItemView* self, QModelIndex* index
 	self->doubleClicked(*index);
 }
 
-void QAbstractItemView_connect_DoubleClicked(QAbstractItemView* self, void* slot) {
+void QAbstractItemView_connect_DoubleClicked(QAbstractItemView* self, intptr_t slot) {
 	QAbstractItemView::connect(self, static_cast<void (QAbstractItemView::*)(const QModelIndex&)>(&QAbstractItemView::doubleClicked), self, [=](const QModelIndex& index) {
 		const QModelIndex& index_ret = index;
 		// Cast returned reference into pointer
@@ -370,7 +370,7 @@ void QAbstractItemView_Activated(QAbstractItemView* self, QModelIndex* index) {
 	self->activated(*index);
 }
 
-void QAbstractItemView_connect_Activated(QAbstractItemView* self, void* slot) {
+void QAbstractItemView_connect_Activated(QAbstractItemView* self, intptr_t slot) {
 	QAbstractItemView::connect(self, static_cast<void (QAbstractItemView::*)(const QModelIndex&)>(&QAbstractItemView::activated), self, [=](const QModelIndex& index) {
 		const QModelIndex& index_ret = index;
 		// Cast returned reference into pointer
@@ -383,7 +383,7 @@ void QAbstractItemView_Entered(QAbstractItemView* self, QModelIndex* index) {
 	self->entered(*index);
 }
 
-void QAbstractItemView_connect_Entered(QAbstractItemView* self, void* slot) {
+void QAbstractItemView_connect_Entered(QAbstractItemView* self, intptr_t slot) {
 	QAbstractItemView::connect(self, static_cast<void (QAbstractItemView::*)(const QModelIndex&)>(&QAbstractItemView::entered), self, [=](const QModelIndex& index) {
 		const QModelIndex& index_ret = index;
 		// Cast returned reference into pointer
@@ -396,7 +396,7 @@ void QAbstractItemView_ViewportEntered(QAbstractItemView* self) {
 	self->viewportEntered();
 }
 
-void QAbstractItemView_connect_ViewportEntered(QAbstractItemView* self, void* slot) {
+void QAbstractItemView_connect_ViewportEntered(QAbstractItemView* self, intptr_t slot) {
 	QAbstractItemView::connect(self, static_cast<void (QAbstractItemView::*)()>(&QAbstractItemView::viewportEntered), self, [=]() {
 		miqt_exec_callback_QAbstractItemView_ViewportEntered(slot);
 	});
@@ -406,7 +406,7 @@ void QAbstractItemView_IconSizeChanged(QAbstractItemView* self, QSize* size) {
 	self->iconSizeChanged(*size);
 }
 
-void QAbstractItemView_connect_IconSizeChanged(QAbstractItemView* self, void* slot) {
+void QAbstractItemView_connect_IconSizeChanged(QAbstractItemView* self, intptr_t slot) {
 	QAbstractItemView::connect(self, static_cast<void (QAbstractItemView::*)(const QSize&)>(&QAbstractItemView::iconSizeChanged), self, [=](const QSize& size) {
 		const QSize& size_ret = size;
 		// Cast returned reference into pointer

qt/gen_qabstractitemview.go

@@ -428,12 +428,12 @@ func (this *QAbstractItemView) Pressed(index *QModelIndex) {
 	C.QAbstractItemView_Pressed(this.h, index.cPointer())
 }
 func (this *QAbstractItemView) OnPressed(slot func(index *QModelIndex)) {
-	C.QAbstractItemView_connect_Pressed(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractItemView_connect_Pressed(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractItemView_Pressed
-func miqt_exec_callback_QAbstractItemView_Pressed(cb *C.void, index *C.QModelIndex) {
+func miqt_exec_callback_QAbstractItemView_Pressed(cb C.intptr_t, index *C.QModelIndex) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(index *QModelIndex))
+	gofunc, ok := cgo.Handle(cb).Value().(func(index *QModelIndex))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -448,12 +448,12 @@ func (this *QAbstractItemView) Clicked(index *QModelIndex) {
 	C.QAbstractItemView_Clicked(this.h, index.cPointer())
 }
 func (this *QAbstractItemView) OnClicked(slot func(index *QModelIndex)) {
-	C.QAbstractItemView_connect_Clicked(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractItemView_connect_Clicked(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractItemView_Clicked
-func miqt_exec_callback_QAbstractItemView_Clicked(cb *C.void, index *C.QModelIndex) {
+func miqt_exec_callback_QAbstractItemView_Clicked(cb C.intptr_t, index *C.QModelIndex) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(index *QModelIndex))
+	gofunc, ok := cgo.Handle(cb).Value().(func(index *QModelIndex))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -468,12 +468,12 @@ func (this *QAbstractItemView) DoubleClicked(index *QModelIndex) {
 	C.QAbstractItemView_DoubleClicked(this.h, index.cPointer())
 }
 func (this *QAbstractItemView) OnDoubleClicked(slot func(index *QModelIndex)) {
-	C.QAbstractItemView_connect_DoubleClicked(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractItemView_connect_DoubleClicked(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractItemView_DoubleClicked
-func miqt_exec_callback_QAbstractItemView_DoubleClicked(cb *C.void, index *C.QModelIndex) {
+func miqt_exec_callback_QAbstractItemView_DoubleClicked(cb C.intptr_t, index *C.QModelIndex) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(index *QModelIndex))
+	gofunc, ok := cgo.Handle(cb).Value().(func(index *QModelIndex))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -488,12 +488,12 @@ func (this *QAbstractItemView) Activated(index *QModelIndex) {
 	C.QAbstractItemView_Activated(this.h, index.cPointer())
 }
 func (this *QAbstractItemView) OnActivated(slot func(index *QModelIndex)) {
-	C.QAbstractItemView_connect_Activated(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractItemView_connect_Activated(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractItemView_Activated
-func miqt_exec_callback_QAbstractItemView_Activated(cb *C.void, index *C.QModelIndex) {
+func miqt_exec_callback_QAbstractItemView_Activated(cb C.intptr_t, index *C.QModelIndex) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(index *QModelIndex))
+	gofunc, ok := cgo.Handle(cb).Value().(func(index *QModelIndex))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -508,12 +508,12 @@ func (this *QAbstractItemView) Entered(index *QModelIndex) {
 	C.QAbstractItemView_Entered(this.h, index.cPointer())
 }
 func (this *QAbstractItemView) OnEntered(slot func(index *QModelIndex)) {
-	C.QAbstractItemView_connect_Entered(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractItemView_connect_Entered(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractItemView_Entered
-func miqt_exec_callback_QAbstractItemView_Entered(cb *C.void, index *C.QModelIndex) {
+func miqt_exec_callback_QAbstractItemView_Entered(cb C.intptr_t, index *C.QModelIndex) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(index *QModelIndex))
+	gofunc, ok := cgo.Handle(cb).Value().(func(index *QModelIndex))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -528,12 +528,12 @@ func (this *QAbstractItemView) ViewportEntered() {
 	C.QAbstractItemView_ViewportEntered(this.h)
 }
 func (this *QAbstractItemView) OnViewportEntered(slot func()) {
-	C.QAbstractItemView_connect_ViewportEntered(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractItemView_connect_ViewportEntered(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractItemView_ViewportEntered
-func miqt_exec_callback_QAbstractItemView_ViewportEntered(cb *C.void) {
+func miqt_exec_callback_QAbstractItemView_ViewportEntered(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -545,12 +545,12 @@ func (this *QAbstractItemView) IconSizeChanged(size *QSize) {
 	C.QAbstractItemView_IconSizeChanged(this.h, size.cPointer())
 }
 func (this *QAbstractItemView) OnIconSizeChanged(slot func(size *QSize)) {
-	C.QAbstractItemView_connect_IconSizeChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractItemView_connect_IconSizeChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractItemView_IconSizeChanged
-func miqt_exec_callback_QAbstractItemView_IconSizeChanged(cb *C.void, size *C.QSize) {
+func miqt_exec_callback_QAbstractItemView_IconSizeChanged(cb C.intptr_t, size *C.QSize) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(size *QSize))
+	gofunc, ok := cgo.Handle(cb).Value().(func(size *QSize))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qabstractitemview.h

@@ -114,19 +114,19 @@ void QAbstractItemView_ScrollToTop(QAbstractItemView* self);
 void QAbstractItemView_ScrollToBottom(QAbstractItemView* self);
 void QAbstractItemView_Update(QAbstractItemView* self, QModelIndex* index);
 void QAbstractItemView_Pressed(QAbstractItemView* self, QModelIndex* index);
-void QAbstractItemView_connect_Pressed(QAbstractItemView* self, void* slot);
+void QAbstractItemView_connect_Pressed(QAbstractItemView* self, intptr_t slot);
 void QAbstractItemView_Clicked(QAbstractItemView* self, QModelIndex* index);
-void QAbstractItemView_connect_Clicked(QAbstractItemView* self, void* slot);
+void QAbstractItemView_connect_Clicked(QAbstractItemView* self, intptr_t slot);
 void QAbstractItemView_DoubleClicked(QAbstractItemView* self, QModelIndex* index);
-void QAbstractItemView_connect_DoubleClicked(QAbstractItemView* self, void* slot);
+void QAbstractItemView_connect_DoubleClicked(QAbstractItemView* self, intptr_t slot);
 void QAbstractItemView_Activated(QAbstractItemView* self, QModelIndex* index);
-void QAbstractItemView_connect_Activated(QAbstractItemView* self, void* slot);
+void QAbstractItemView_connect_Activated(QAbstractItemView* self, intptr_t slot);
 void QAbstractItemView_Entered(QAbstractItemView* self, QModelIndex* index);
-void QAbstractItemView_connect_Entered(QAbstractItemView* self, void* slot);
+void QAbstractItemView_connect_Entered(QAbstractItemView* self, intptr_t slot);
 void QAbstractItemView_ViewportEntered(QAbstractItemView* self);
-void QAbstractItemView_connect_ViewportEntered(QAbstractItemView* self, void* slot);
+void QAbstractItemView_connect_ViewportEntered(QAbstractItemView* self, intptr_t slot);
 void QAbstractItemView_IconSizeChanged(QAbstractItemView* self, QSize* size);
-void QAbstractItemView_connect_IconSizeChanged(QAbstractItemView* self, void* slot);
+void QAbstractItemView_connect_IconSizeChanged(QAbstractItemView* self, intptr_t slot);
 struct miqt_string* QAbstractItemView_Tr2(const char* s, const char* c);
 struct miqt_string* QAbstractItemView_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QAbstractItemView_TrUtf82(const char* s, const char* c);

qt/gen_qabstractslider.cpp

@@ -139,7 +139,7 @@ void QAbstractSlider_ValueChanged(QAbstractSlider* self, int value) {
 	self->valueChanged(static_cast<int>(value));
 }
 
-void QAbstractSlider_connect_ValueChanged(QAbstractSlider* self, void* slot) {
+void QAbstractSlider_connect_ValueChanged(QAbstractSlider* self, intptr_t slot) {
 	QAbstractSlider::connect(self, static_cast<void (QAbstractSlider::*)(int)>(&QAbstractSlider::valueChanged), self, [=](int value) {
 		int sigval1 = value;
 		miqt_exec_callback_QAbstractSlider_ValueChanged(slot, sigval1);
@@ -150,7 +150,7 @@ void QAbstractSlider_SliderPressed(QAbstractSlider* self) {
 	self->sliderPressed();
 }
 
-void QAbstractSlider_connect_SliderPressed(QAbstractSlider* self, void* slot) {
+void QAbstractSlider_connect_SliderPressed(QAbstractSlider* self, intptr_t slot) {
 	QAbstractSlider::connect(self, static_cast<void (QAbstractSlider::*)()>(&QAbstractSlider::sliderPressed), self, [=]() {
 		miqt_exec_callback_QAbstractSlider_SliderPressed(slot);
 	});
@@ -160,7 +160,7 @@ void QAbstractSlider_SliderMoved(QAbstractSlider* self, int position) {
 	self->sliderMoved(static_cast<int>(position));
 }
 
-void QAbstractSlider_connect_SliderMoved(QAbstractSlider* self, void* slot) {
+void QAbstractSlider_connect_SliderMoved(QAbstractSlider* self, intptr_t slot) {
 	QAbstractSlider::connect(self, static_cast<void (QAbstractSlider::*)(int)>(&QAbstractSlider::sliderMoved), self, [=](int position) {
 		int sigval1 = position;
 		miqt_exec_callback_QAbstractSlider_SliderMoved(slot, sigval1);
@@ -171,7 +171,7 @@ void QAbstractSlider_SliderReleased(QAbstractSlider* self) {
 	self->sliderReleased();
 }
 
-void QAbstractSlider_connect_SliderReleased(QAbstractSlider* self, void* slot) {
+void QAbstractSlider_connect_SliderReleased(QAbstractSlider* self, intptr_t slot) {
 	QAbstractSlider::connect(self, static_cast<void (QAbstractSlider::*)()>(&QAbstractSlider::sliderReleased), self, [=]() {
 		miqt_exec_callback_QAbstractSlider_SliderReleased(slot);
 	});
@@ -181,7 +181,7 @@ void QAbstractSlider_RangeChanged(QAbstractSlider* self, int min, int max) {
 	self->rangeChanged(static_cast<int>(min), static_cast<int>(max));
 }
 
-void QAbstractSlider_connect_RangeChanged(QAbstractSlider* self, void* slot) {
+void QAbstractSlider_connect_RangeChanged(QAbstractSlider* self, intptr_t slot) {
 	QAbstractSlider::connect(self, static_cast<void (QAbstractSlider::*)(int, int)>(&QAbstractSlider::rangeChanged), self, [=](int min, int max) {
 		int sigval1 = min;
 		int sigval2 = max;
@@ -193,7 +193,7 @@ void QAbstractSlider_ActionTriggered(QAbstractSlider* self, int action) {
 	self->actionTriggered(static_cast<int>(action));
 }
 
-void QAbstractSlider_connect_ActionTriggered(QAbstractSlider* self, void* slot) {
+void QAbstractSlider_connect_ActionTriggered(QAbstractSlider* self, intptr_t slot) {
 	QAbstractSlider::connect(self, static_cast<void (QAbstractSlider::*)(int)>(&QAbstractSlider::actionTriggered), self, [=](int action) {
 		int sigval1 = action;
 		miqt_exec_callback_QAbstractSlider_ActionTriggered(slot, sigval1);

qt/gen_qabstractslider.go

@@ -190,12 +190,12 @@ func (this *QAbstractSlider) ValueChanged(value int) {
 	C.QAbstractSlider_ValueChanged(this.h, (C.int)(value))
 }
 func (this *QAbstractSlider) OnValueChanged(slot func(value int)) {
-	C.QAbstractSlider_connect_ValueChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractSlider_connect_ValueChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractSlider_ValueChanged
-func miqt_exec_callback_QAbstractSlider_ValueChanged(cb *C.void, value C.int) {
+func miqt_exec_callback_QAbstractSlider_ValueChanged(cb C.intptr_t, value C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(value int))
+	gofunc, ok := cgo.Handle(cb).Value().(func(value int))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -210,12 +210,12 @@ func (this *QAbstractSlider) SliderPressed() {
 	C.QAbstractSlider_SliderPressed(this.h)
 }
 func (this *QAbstractSlider) OnSliderPressed(slot func()) {
-	C.QAbstractSlider_connect_SliderPressed(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractSlider_connect_SliderPressed(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractSlider_SliderPressed
-func miqt_exec_callback_QAbstractSlider_SliderPressed(cb *C.void) {
+func miqt_exec_callback_QAbstractSlider_SliderPressed(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -227,12 +227,12 @@ func (this *QAbstractSlider) SliderMoved(position int) {
 	C.QAbstractSlider_SliderMoved(this.h, (C.int)(position))
 }
 func (this *QAbstractSlider) OnSliderMoved(slot func(position int)) {
-	C.QAbstractSlider_connect_SliderMoved(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractSlider_connect_SliderMoved(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractSlider_SliderMoved
-func miqt_exec_callback_QAbstractSlider_SliderMoved(cb *C.void, position C.int) {
+func miqt_exec_callback_QAbstractSlider_SliderMoved(cb C.intptr_t, position C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(position int))
+	gofunc, ok := cgo.Handle(cb).Value().(func(position int))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -247,12 +247,12 @@ func (this *QAbstractSlider) SliderReleased() {
 	C.QAbstractSlider_SliderReleased(this.h)
 }
 func (this *QAbstractSlider) OnSliderReleased(slot func()) {
-	C.QAbstractSlider_connect_SliderReleased(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractSlider_connect_SliderReleased(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractSlider_SliderReleased
-func miqt_exec_callback_QAbstractSlider_SliderReleased(cb *C.void) {
+func miqt_exec_callback_QAbstractSlider_SliderReleased(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -264,12 +264,12 @@ func (this *QAbstractSlider) RangeChanged(min int, max int) {
 	C.QAbstractSlider_RangeChanged(this.h, (C.int)(min), (C.int)(max))
 }
 func (this *QAbstractSlider) OnRangeChanged(slot func(min int, max int)) {
-	C.QAbstractSlider_connect_RangeChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractSlider_connect_RangeChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractSlider_RangeChanged
-func miqt_exec_callback_QAbstractSlider_RangeChanged(cb *C.void, min C.int, max C.int) {
+func miqt_exec_callback_QAbstractSlider_RangeChanged(cb C.intptr_t, min C.int, max C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(min int, max int))
+	gofunc, ok := cgo.Handle(cb).Value().(func(min int, max int))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -286,12 +286,12 @@ func (this *QAbstractSlider) ActionTriggered(action int) {
 	C.QAbstractSlider_ActionTriggered(this.h, (C.int)(action))
 }
 func (this *QAbstractSlider) OnActionTriggered(slot func(action int)) {
-	C.QAbstractSlider_connect_ActionTriggered(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractSlider_connect_ActionTriggered(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractSlider_ActionTriggered
-func miqt_exec_callback_QAbstractSlider_ActionTriggered(cb *C.void, action C.int) {
+func miqt_exec_callback_QAbstractSlider_ActionTriggered(cb C.intptr_t, action C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(action int))
+	gofunc, ok := cgo.Handle(cb).Value().(func(action int))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qabstractslider.h

@@ -54,17 +54,17 @@ void QAbstractSlider_SetValue(QAbstractSlider* self, int value);
 void QAbstractSlider_SetOrientation(QAbstractSlider* self, int orientation);
 void QAbstractSlider_SetRange(QAbstractSlider* self, int min, int max);
 void QAbstractSlider_ValueChanged(QAbstractSlider* self, int value);
-void QAbstractSlider_connect_ValueChanged(QAbstractSlider* self, void* slot);
+void QAbstractSlider_connect_ValueChanged(QAbstractSlider* self, intptr_t slot);
 void QAbstractSlider_SliderPressed(QAbstractSlider* self);
-void QAbstractSlider_connect_SliderPressed(QAbstractSlider* self, void* slot);
+void QAbstractSlider_connect_SliderPressed(QAbstractSlider* self, intptr_t slot);
 void QAbstractSlider_SliderMoved(QAbstractSlider* self, int position);
-void QAbstractSlider_connect_SliderMoved(QAbstractSlider* self, void* slot);
+void QAbstractSlider_connect_SliderMoved(QAbstractSlider* self, intptr_t slot);
 void QAbstractSlider_SliderReleased(QAbstractSlider* self);
-void QAbstractSlider_connect_SliderReleased(QAbstractSlider* self, void* slot);
+void QAbstractSlider_connect_SliderReleased(QAbstractSlider* self, intptr_t slot);
 void QAbstractSlider_RangeChanged(QAbstractSlider* self, int min, int max);
-void QAbstractSlider_connect_RangeChanged(QAbstractSlider* self, void* slot);
+void QAbstractSlider_connect_RangeChanged(QAbstractSlider* self, intptr_t slot);
 void QAbstractSlider_ActionTriggered(QAbstractSlider* self, int action);
-void QAbstractSlider_connect_ActionTriggered(QAbstractSlider* self, void* slot);
+void QAbstractSlider_connect_ActionTriggered(QAbstractSlider* self, intptr_t slot);
 struct miqt_string* QAbstractSlider_Tr2(const char* s, const char* c);
 struct miqt_string* QAbstractSlider_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QAbstractSlider_TrUtf82(const char* s, const char* c);

qt/gen_qabstractspinbox.cpp

@@ -194,7 +194,7 @@ void QAbstractSpinBox_EditingFinished(QAbstractSpinBox* self) {
 	self->editingFinished();
 }
 
-void QAbstractSpinBox_connect_EditingFinished(QAbstractSpinBox* self, void* slot) {
+void QAbstractSpinBox_connect_EditingFinished(QAbstractSpinBox* self, intptr_t slot) {
 	QAbstractSpinBox::connect(self, static_cast<void (QAbstractSpinBox::*)()>(&QAbstractSpinBox::editingFinished), self, [=]() {
 		miqt_exec_callback_QAbstractSpinBox_EditingFinished(slot);
 	});

qt/gen_qabstractspinbox.go

@@ -268,12 +268,12 @@ func (this *QAbstractSpinBox) EditingFinished() {
 	C.QAbstractSpinBox_EditingFinished(this.h)
 }
 func (this *QAbstractSpinBox) OnEditingFinished(slot func()) {
-	C.QAbstractSpinBox_connect_EditingFinished(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractSpinBox_connect_EditingFinished(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractSpinBox_EditingFinished
-func miqt_exec_callback_QAbstractSpinBox_EditingFinished(cb *C.void) {
+func miqt_exec_callback_QAbstractSpinBox_EditingFinished(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qabstractspinbox.h

@@ -70,7 +70,7 @@ void QAbstractSpinBox_StepDown(QAbstractSpinBox* self);
 void QAbstractSpinBox_SelectAll(QAbstractSpinBox* self);
 void QAbstractSpinBox_Clear(QAbstractSpinBox* self);
 void QAbstractSpinBox_EditingFinished(QAbstractSpinBox* self);
-void QAbstractSpinBox_connect_EditingFinished(QAbstractSpinBox* self, void* slot);
+void QAbstractSpinBox_connect_EditingFinished(QAbstractSpinBox* self, intptr_t slot);
 struct miqt_string* QAbstractSpinBox_Tr2(const char* s, const char* c);
 struct miqt_string* QAbstractSpinBox_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QAbstractSpinBox_TrUtf82(const char* s, const char* c);

qt/gen_qabstractstate.cpp

@@ -47,7 +47,7 @@ void QAbstractState_ActiveChanged(QAbstractState* self, bool active) {
 	self->activeChanged(active);
 }
 
-void QAbstractState_connect_ActiveChanged(QAbstractState* self, void* slot) {
+void QAbstractState_connect_ActiveChanged(QAbstractState* self, intptr_t slot) {
 	QAbstractState::connect(self, static_cast<void (QAbstractState::*)(bool)>(&QAbstractState::activeChanged), self, [=](bool active) {
 		bool sigval1 = active;
 		miqt_exec_callback_QAbstractState_ActiveChanged(slot, sigval1);

qt/gen_qabstractstate.go

@@ -81,12 +81,12 @@ func (this *QAbstractState) ActiveChanged(active bool) {
 	C.QAbstractState_ActiveChanged(this.h, (C.bool)(active))
 }
 func (this *QAbstractState) OnActiveChanged(slot func(active bool)) {
-	C.QAbstractState_connect_ActiveChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractState_connect_ActiveChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractState_ActiveChanged
-func miqt_exec_callback_QAbstractState_ActiveChanged(cb *C.void, active C.bool) {
+func miqt_exec_callback_QAbstractState_ActiveChanged(cb C.intptr_t, active C.bool) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(active bool))
+	gofunc, ok := cgo.Handle(cb).Value().(func(active bool))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qabstractstate.h

@@ -33,7 +33,7 @@ QState* QAbstractState_ParentState(const QAbstractState* self);
 QStateMachine* QAbstractState_Machine(const QAbstractState* self);
 bool QAbstractState_Active(const QAbstractState* self);
 void QAbstractState_ActiveChanged(QAbstractState* self, bool active);
-void QAbstractState_connect_ActiveChanged(QAbstractState* self, void* slot);
+void QAbstractState_connect_ActiveChanged(QAbstractState* self, intptr_t slot);
 struct miqt_string* QAbstractState_Tr2(const char* s, const char* c);
 struct miqt_string* QAbstractState_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QAbstractState_TrUtf82(const char* s, const char* c);

qt/gen_qabstracttextdocumentlayout.cpp

@@ -116,7 +116,7 @@ void QAbstractTextDocumentLayout_Update(QAbstractTextDocumentLayout* self) {
 	self->update();
 }
 
-void QAbstractTextDocumentLayout_connect_Update(QAbstractTextDocumentLayout* self, void* slot) {
+void QAbstractTextDocumentLayout_connect_Update(QAbstractTextDocumentLayout* self, intptr_t slot) {
 	QAbstractTextDocumentLayout::connect(self, static_cast<void (QAbstractTextDocumentLayout::*)(const QRectF&)>(&QAbstractTextDocumentLayout::update), self, [=]() {
 		miqt_exec_callback_QAbstractTextDocumentLayout_Update(slot);
 	});
@@ -126,7 +126,7 @@ void QAbstractTextDocumentLayout_UpdateBlock(QAbstractTextDocumentLayout* self,
 	self->updateBlock(*block);
 }
 
-void QAbstractTextDocumentLayout_connect_UpdateBlock(QAbstractTextDocumentLayout* self, void* slot) {
+void QAbstractTextDocumentLayout_connect_UpdateBlock(QAbstractTextDocumentLayout* self, intptr_t slot) {
 	QAbstractTextDocumentLayout::connect(self, static_cast<void (QAbstractTextDocumentLayout::*)(const QTextBlock&)>(&QAbstractTextDocumentLayout::updateBlock), self, [=](const QTextBlock& block) {
 		const QTextBlock& block_ret = block;
 		// Cast returned reference into pointer
@@ -139,7 +139,7 @@ void QAbstractTextDocumentLayout_DocumentSizeChanged(QAbstractTextDocumentLayout
 	self->documentSizeChanged(*newSize);
 }
 
-void QAbstractTextDocumentLayout_connect_DocumentSizeChanged(QAbstractTextDocumentLayout* self, void* slot) {
+void QAbstractTextDocumentLayout_connect_DocumentSizeChanged(QAbstractTextDocumentLayout* self, intptr_t slot) {
 	QAbstractTextDocumentLayout::connect(self, static_cast<void (QAbstractTextDocumentLayout::*)(const QSizeF&)>(&QAbstractTextDocumentLayout::documentSizeChanged), self, [=](const QSizeF& newSize) {
 		const QSizeF& newSize_ret = newSize;
 		// Cast returned reference into pointer
@@ -152,7 +152,7 @@ void QAbstractTextDocumentLayout_PageCountChanged(QAbstractTextDocumentLayout* s
 	self->pageCountChanged(static_cast<int>(newPages));
 }
 
-void QAbstractTextDocumentLayout_connect_PageCountChanged(QAbstractTextDocumentLayout* self, void* slot) {
+void QAbstractTextDocumentLayout_connect_PageCountChanged(QAbstractTextDocumentLayout* self, intptr_t slot) {
 	QAbstractTextDocumentLayout::connect(self, static_cast<void (QAbstractTextDocumentLayout::*)(int)>(&QAbstractTextDocumentLayout::pageCountChanged), self, [=](int newPages) {
 		int sigval1 = newPages;
 		miqt_exec_callback_QAbstractTextDocumentLayout_PageCountChanged(slot, sigval1);
@@ -195,7 +195,7 @@ void QAbstractTextDocumentLayout_Update1(QAbstractTextDocumentLayout* self, QRec
 	self->update(*param1);
 }
 
-void QAbstractTextDocumentLayout_connect_Update1(QAbstractTextDocumentLayout* self, void* slot) {
+void QAbstractTextDocumentLayout_connect_Update1(QAbstractTextDocumentLayout* self, intptr_t slot) {
 	QAbstractTextDocumentLayout::connect(self, static_cast<void (QAbstractTextDocumentLayout::*)(const QRectF&)>(&QAbstractTextDocumentLayout::update), self, [=](const QRectF& param1) {
 		const QRectF& param1_ret = param1;
 		// Cast returned reference into pointer

qt/gen_qabstracttextdocumentlayout.go

@@ -154,12 +154,12 @@ func (this *QAbstractTextDocumentLayout) Update() {
 	C.QAbstractTextDocumentLayout_Update(this.h)
 }
 func (this *QAbstractTextDocumentLayout) OnUpdate(slot func()) {
-	C.QAbstractTextDocumentLayout_connect_Update(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractTextDocumentLayout_connect_Update(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractTextDocumentLayout_Update
-func miqt_exec_callback_QAbstractTextDocumentLayout_Update(cb *C.void) {
+func miqt_exec_callback_QAbstractTextDocumentLayout_Update(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -171,12 +171,12 @@ func (this *QAbstractTextDocumentLayout) UpdateBlock(block *QTextBlock) {
 	C.QAbstractTextDocumentLayout_UpdateBlock(this.h, block.cPointer())
 }
 func (this *QAbstractTextDocumentLayout) OnUpdateBlock(slot func(block *QTextBlock)) {
-	C.QAbstractTextDocumentLayout_connect_UpdateBlock(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractTextDocumentLayout_connect_UpdateBlock(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractTextDocumentLayout_UpdateBlock
-func miqt_exec_callback_QAbstractTextDocumentLayout_UpdateBlock(cb *C.void, block *C.QTextBlock) {
+func miqt_exec_callback_QAbstractTextDocumentLayout_UpdateBlock(cb C.intptr_t, block *C.QTextBlock) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(block *QTextBlock))
+	gofunc, ok := cgo.Handle(cb).Value().(func(block *QTextBlock))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -191,12 +191,12 @@ func (this *QAbstractTextDocumentLayout) DocumentSizeChanged(newSize *QSizeF) {
 	C.QAbstractTextDocumentLayout_DocumentSizeChanged(this.h, newSize.cPointer())
 }
 func (this *QAbstractTextDocumentLayout) OnDocumentSizeChanged(slot func(newSize *QSizeF)) {
-	C.QAbstractTextDocumentLayout_connect_DocumentSizeChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractTextDocumentLayout_connect_DocumentSizeChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractTextDocumentLayout_DocumentSizeChanged
-func miqt_exec_callback_QAbstractTextDocumentLayout_DocumentSizeChanged(cb *C.void, newSize *C.QSizeF) {
+func miqt_exec_callback_QAbstractTextDocumentLayout_DocumentSizeChanged(cb C.intptr_t, newSize *C.QSizeF) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(newSize *QSizeF))
+	gofunc, ok := cgo.Handle(cb).Value().(func(newSize *QSizeF))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -211,12 +211,12 @@ func (this *QAbstractTextDocumentLayout) PageCountChanged(newPages int) {
 	C.QAbstractTextDocumentLayout_PageCountChanged(this.h, (C.int)(newPages))
 }
 func (this *QAbstractTextDocumentLayout) OnPageCountChanged(slot func(newPages int)) {
-	C.QAbstractTextDocumentLayout_connect_PageCountChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractTextDocumentLayout_connect_PageCountChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractTextDocumentLayout_PageCountChanged
-func miqt_exec_callback_QAbstractTextDocumentLayout_PageCountChanged(cb *C.void, newPages C.int) {
+func miqt_exec_callback_QAbstractTextDocumentLayout_PageCountChanged(cb C.intptr_t, newPages C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(newPages int))
+	gofunc, ok := cgo.Handle(cb).Value().(func(newPages int))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -279,12 +279,12 @@ func (this *QAbstractTextDocumentLayout) Update1(param1 *QRectF) {
 	C.QAbstractTextDocumentLayout_Update1(this.h, param1.cPointer())
 }
 func (this *QAbstractTextDocumentLayout) OnUpdate1(slot func(param1 *QRectF)) {
-	C.QAbstractTextDocumentLayout_connect_Update1(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAbstractTextDocumentLayout_connect_Update1(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAbstractTextDocumentLayout_Update1
-func miqt_exec_callback_QAbstractTextDocumentLayout_Update1(cb *C.void, param1 *C.QRectF) {
+func miqt_exec_callback_QAbstractTextDocumentLayout_Update1(cb C.intptr_t, param1 *C.QRectF) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 *QRectF))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 *QRectF))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qabstracttextdocumentlayout.h

@@ -76,20 +76,20 @@ void QAbstractTextDocumentLayout_RegisterHandler(QAbstractTextDocumentLayout* se
 void QAbstractTextDocumentLayout_UnregisterHandler(QAbstractTextDocumentLayout* self, int objectType);
 QTextObjectInterface* QAbstractTextDocumentLayout_HandlerForObject(const QAbstractTextDocumentLayout* self, int objectType);
 void QAbstractTextDocumentLayout_Update(QAbstractTextDocumentLayout* self);
-void QAbstractTextDocumentLayout_connect_Update(QAbstractTextDocumentLayout* self, void* slot);
+void QAbstractTextDocumentLayout_connect_Update(QAbstractTextDocumentLayout* self, intptr_t slot);
 void QAbstractTextDocumentLayout_UpdateBlock(QAbstractTextDocumentLayout* self, QTextBlock* block);
-void QAbstractTextDocumentLayout_connect_UpdateBlock(QAbstractTextDocumentLayout* self, void* slot);
+void QAbstractTextDocumentLayout_connect_UpdateBlock(QAbstractTextDocumentLayout* self, intptr_t slot);
 void QAbstractTextDocumentLayout_DocumentSizeChanged(QAbstractTextDocumentLayout* self, QSizeF* newSize);
-void QAbstractTextDocumentLayout_connect_DocumentSizeChanged(QAbstractTextDocumentLayout* self, void* slot);
+void QAbstractTextDocumentLayout_connect_DocumentSizeChanged(QAbstractTextDocumentLayout* self, intptr_t slot);
 void QAbstractTextDocumentLayout_PageCountChanged(QAbstractTextDocumentLayout* self, int newPages);
-void QAbstractTextDocumentLayout_connect_PageCountChanged(QAbstractTextDocumentLayout* self, void* slot);
+void QAbstractTextDocumentLayout_connect_PageCountChanged(QAbstractTextDocumentLayout* self, intptr_t slot);
 struct miqt_string* QAbstractTextDocumentLayout_Tr2(const char* s, const char* c);
 struct miqt_string* QAbstractTextDocumentLayout_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QAbstractTextDocumentLayout_TrUtf82(const char* s, const char* c);
 struct miqt_string* QAbstractTextDocumentLayout_TrUtf83(const char* s, const char* c, int n);
 void QAbstractTextDocumentLayout_UnregisterHandler2(QAbstractTextDocumentLayout* self, int objectType, QObject* component);
 void QAbstractTextDocumentLayout_Update1(QAbstractTextDocumentLayout* self, QRectF* param1);
-void QAbstractTextDocumentLayout_connect_Update1(QAbstractTextDocumentLayout* self, void* slot);
+void QAbstractTextDocumentLayout_connect_Update1(QAbstractTextDocumentLayout* self, intptr_t slot);
 void QAbstractTextDocumentLayout_Delete(QAbstractTextDocumentLayout* self);
 
 QSizeF* QTextObjectInterface_IntrinsicSize(QTextObjectInterface* self, QTextDocument* doc, int posInDocument, QTextFormat* format);

qt/gen_qaction.cpp

@@ -351,7 +351,7 @@ void QAction_Changed(QAction* self) {
 	self->changed();
 }
 
-void QAction_connect_Changed(QAction* self, void* slot) {
+void QAction_connect_Changed(QAction* self, intptr_t slot) {
 	QAction::connect(self, static_cast<void (QAction::*)()>(&QAction::changed), self, [=]() {
 		miqt_exec_callback_QAction_Changed(slot);
 	});
@@ -361,7 +361,7 @@ void QAction_Triggered(QAction* self) {
 	self->triggered();
 }
 
-void QAction_connect_Triggered(QAction* self, void* slot) {
+void QAction_connect_Triggered(QAction* self, intptr_t slot) {
 	QAction::connect(self, static_cast<void (QAction::*)(bool)>(&QAction::triggered), self, [=]() {
 		miqt_exec_callback_QAction_Triggered(slot);
 	});
@@ -371,7 +371,7 @@ void QAction_Hovered(QAction* self) {
 	self->hovered();
 }
 
-void QAction_connect_Hovered(QAction* self, void* slot) {
+void QAction_connect_Hovered(QAction* self, intptr_t slot) {
 	QAction::connect(self, static_cast<void (QAction::*)()>(&QAction::hovered), self, [=]() {
 		miqt_exec_callback_QAction_Hovered(slot);
 	});
@@ -381,7 +381,7 @@ void QAction_Toggled(QAction* self, bool param1) {
 	self->toggled(param1);
 }
 
-void QAction_connect_Toggled(QAction* self, void* slot) {
+void QAction_connect_Toggled(QAction* self, intptr_t slot) {
 	QAction::connect(self, static_cast<void (QAction::*)(bool)>(&QAction::toggled), self, [=](bool param1) {
 		bool sigval1 = param1;
 		miqt_exec_callback_QAction_Toggled(slot, sigval1);
@@ -424,7 +424,7 @@ void QAction_Triggered1(QAction* self, bool checked) {
 	self->triggered(checked);
 }
 
-void QAction_connect_Triggered1(QAction* self, void* slot) {
+void QAction_connect_Triggered1(QAction* self, intptr_t slot) {
 	QAction::connect(self, static_cast<void (QAction::*)(bool)>(&QAction::triggered), self, [=](bool checked) {
 		bool sigval1 = checked;
 		miqt_exec_callback_QAction_Triggered1(slot, sigval1);

qt/gen_qaction.go

@@ -433,12 +433,12 @@ func (this *QAction) Changed() {
 	C.QAction_Changed(this.h)
 }
 func (this *QAction) OnChanged(slot func()) {
-	C.QAction_connect_Changed(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAction_connect_Changed(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAction_Changed
-func miqt_exec_callback_QAction_Changed(cb *C.void) {
+func miqt_exec_callback_QAction_Changed(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -450,12 +450,12 @@ func (this *QAction) Triggered() {
 	C.QAction_Triggered(this.h)
 }
 func (this *QAction) OnTriggered(slot func()) {
-	C.QAction_connect_Triggered(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAction_connect_Triggered(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAction_Triggered
-func miqt_exec_callback_QAction_Triggered(cb *C.void) {
+func miqt_exec_callback_QAction_Triggered(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -467,12 +467,12 @@ func (this *QAction) Hovered() {
 	C.QAction_Hovered(this.h)
 }
 func (this *QAction) OnHovered(slot func()) {
-	C.QAction_connect_Hovered(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAction_connect_Hovered(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAction_Hovered
-func miqt_exec_callback_QAction_Hovered(cb *C.void) {
+func miqt_exec_callback_QAction_Hovered(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -484,12 +484,12 @@ func (this *QAction) Toggled(param1 bool) {
 	C.QAction_Toggled(this.h, (C.bool)(param1))
 }
 func (this *QAction) OnToggled(slot func(param1 bool)) {
-	C.QAction_connect_Toggled(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAction_connect_Toggled(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAction_Toggled
-func miqt_exec_callback_QAction_Toggled(cb *C.void, param1 C.bool) {
+func miqt_exec_callback_QAction_Toggled(cb C.intptr_t, param1 C.bool) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 bool))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 bool))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -552,12 +552,12 @@ func (this *QAction) Triggered1(checked bool) {
 	C.QAction_Triggered1(this.h, (C.bool)(checked))
 }
 func (this *QAction) OnTriggered1(slot func(checked bool)) {
-	C.QAction_connect_Triggered1(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QAction_connect_Triggered1(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QAction_Triggered1
-func miqt_exec_callback_QAction_Triggered1(cb *C.void, checked C.bool) {
+func miqt_exec_callback_QAction_Triggered1(cb C.intptr_t, checked C.bool) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(checked bool))
+	gofunc, ok := cgo.Handle(cb).Value().(func(checked bool))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qaction.h

@@ -106,20 +106,20 @@ void QAction_SetEnabled(QAction* self, bool enabled);
 void QAction_SetDisabled(QAction* self, bool b);
 void QAction_SetVisible(QAction* self, bool visible);
 void QAction_Changed(QAction* self);
-void QAction_connect_Changed(QAction* self, void* slot);
+void QAction_connect_Changed(QAction* self, intptr_t slot);
 void QAction_Triggered(QAction* self);
-void QAction_connect_Triggered(QAction* self, void* slot);
+void QAction_connect_Triggered(QAction* self, intptr_t slot);
 void QAction_Hovered(QAction* self);
-void QAction_connect_Hovered(QAction* self, void* slot);
+void QAction_connect_Hovered(QAction* self, intptr_t slot);
 void QAction_Toggled(QAction* self, bool param1);
-void QAction_connect_Toggled(QAction* self, void* slot);
+void QAction_connect_Toggled(QAction* self, intptr_t slot);
 struct miqt_string* QAction_Tr2(const char* s, const char* c);
 struct miqt_string* QAction_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QAction_TrUtf82(const char* s, const char* c);
 struct miqt_string* QAction_TrUtf83(const char* s, const char* c, int n);
 bool QAction_ShowStatusText1(QAction* self, QWidget* widget);
 void QAction_Triggered1(QAction* self, bool checked);
-void QAction_connect_Triggered1(QAction* self, void* slot);
+void QAction_connect_Triggered1(QAction* self, intptr_t slot);
 void QAction_Delete(QAction* self);
 
 #ifdef __cplusplus

qt/gen_qactiongroup.cpp

@@ -113,7 +113,7 @@ void QActionGroup_Triggered(QActionGroup* self, QAction* param1) {
 	self->triggered(param1);
 }
 
-void QActionGroup_connect_Triggered(QActionGroup* self, void* slot) {
+void QActionGroup_connect_Triggered(QActionGroup* self, intptr_t slot) {
 	QActionGroup::connect(self, static_cast<void (QActionGroup::*)(QAction*)>(&QActionGroup::triggered), self, [=](QAction* param1) {
 		QAction* sigval1 = param1;
 		miqt_exec_callback_QActionGroup_Triggered(slot, sigval1);
@@ -124,7 +124,7 @@ void QActionGroup_Hovered(QActionGroup* self, QAction* param1) {
 	self->hovered(param1);
 }
 
-void QActionGroup_connect_Hovered(QActionGroup* self, void* slot) {
+void QActionGroup_connect_Hovered(QActionGroup* self, intptr_t slot) {
 	QActionGroup::connect(self, static_cast<void (QActionGroup::*)(QAction*)>(&QActionGroup::hovered), self, [=](QAction* param1) {
 		QAction* sigval1 = param1;
 		miqt_exec_callback_QActionGroup_Hovered(slot, sigval1);

qt/gen_qactiongroup.go

@@ -154,12 +154,12 @@ func (this *QActionGroup) Triggered(param1 *QAction) {
 	C.QActionGroup_Triggered(this.h, param1.cPointer())
 }
 func (this *QActionGroup) OnTriggered(slot func(param1 *QAction)) {
-	C.QActionGroup_connect_Triggered(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QActionGroup_connect_Triggered(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QActionGroup_Triggered
-func miqt_exec_callback_QActionGroup_Triggered(cb *C.void, param1 *C.QAction) {
+func miqt_exec_callback_QActionGroup_Triggered(cb C.intptr_t, param1 *C.QAction) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 *QAction))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 *QAction))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -174,12 +174,12 @@ func (this *QActionGroup) Hovered(param1 *QAction) {
 	C.QActionGroup_Hovered(this.h, param1.cPointer())
 }
 func (this *QActionGroup) OnHovered(slot func(param1 *QAction)) {
-	C.QActionGroup_connect_Hovered(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QActionGroup_connect_Hovered(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QActionGroup_Hovered
-func miqt_exec_callback_QActionGroup_Hovered(cb *C.void, param1 *C.QAction) {
+func miqt_exec_callback_QActionGroup_Hovered(cb C.intptr_t, param1 *C.QAction) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 *QAction))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 *QAction))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qactiongroup.h

@@ -48,9 +48,9 @@ void QActionGroup_SetVisible(QActionGroup* self, bool visible);
 void QActionGroup_SetExclusive(QActionGroup* self, bool exclusive);
 void QActionGroup_SetExclusionPolicy(QActionGroup* self, int policy);
 void QActionGroup_Triggered(QActionGroup* self, QAction* param1);
-void QActionGroup_connect_Triggered(QActionGroup* self, void* slot);
+void QActionGroup_connect_Triggered(QActionGroup* self, intptr_t slot);
 void QActionGroup_Hovered(QActionGroup* self, QAction* param1);
-void QActionGroup_connect_Hovered(QActionGroup* self, void* slot);
+void QActionGroup_connect_Hovered(QActionGroup* self, intptr_t slot);
 struct miqt_string* QActionGroup_Tr2(const char* s, const char* c);
 struct miqt_string* QActionGroup_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QActionGroup_TrUtf82(const char* s, const char* c);

qt/gen_qapplication.cpp

@@ -260,7 +260,7 @@ void QApplication_FocusChanged(QApplication* self, QWidget* old, QWidget* now) {
 	self->focusChanged(old, now);
 }
 
-void QApplication_connect_FocusChanged(QApplication* self, void* slot) {
+void QApplication_connect_FocusChanged(QApplication* self, intptr_t slot) {
 	QApplication::connect(self, static_cast<void (QApplication::*)(QWidget*, QWidget*)>(&QApplication::focusChanged), self, [=](QWidget* old, QWidget* now) {
 		QWidget* sigval1 = old;
 		QWidget* sigval2 = now;

qt/gen_qapplication.go

@@ -335,12 +335,12 @@ func (this *QApplication) FocusChanged(old *QWidget, now *QWidget) {
 	C.QApplication_FocusChanged(this.h, old.cPointer(), now.cPointer())
 }
 func (this *QApplication) OnFocusChanged(slot func(old *QWidget, now *QWidget)) {
-	C.QApplication_connect_FocusChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QApplication_connect_FocusChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QApplication_FocusChanged
-func miqt_exec_callback_QApplication_FocusChanged(cb *C.void, old *C.QWidget, now *C.QWidget) {
+func miqt_exec_callback_QApplication_FocusChanged(cb C.intptr_t, old *C.QWidget, now *C.QWidget) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(old *QWidget, now *QWidget))
+	gofunc, ok := cgo.Handle(cb).Value().(func(old *QWidget, now *QWidget))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qapplication.h

@@ -97,7 +97,7 @@ void QApplication_SetEffectEnabled(int param1);
 int QApplication_Exec();
 bool QApplication_Notify(QApplication* self, QObject* param1, QEvent* param2);
 void QApplication_FocusChanged(QApplication* self, QWidget* old, QWidget* now);
-void QApplication_connect_FocusChanged(QApplication* self, void* slot);
+void QApplication_connect_FocusChanged(QApplication* self, intptr_t slot);
 struct miqt_string* QApplication_StyleSheet(const QApplication* self);
 void QApplication_SetStyleSheet(QApplication* self, struct miqt_string* sheet);
 void QApplication_SetAutoSipEnabled(QApplication* self, const bool enabled);

qt/gen_qbuttongroup.cpp

@@ -93,7 +93,7 @@ void QButtonGroup_ButtonClicked(QButtonGroup* self, QAbstractButton* param1) {
 	self->buttonClicked(param1);
 }
 
-void QButtonGroup_connect_ButtonClicked(QButtonGroup* self, void* slot) {
+void QButtonGroup_connect_ButtonClicked(QButtonGroup* self, intptr_t slot) {
 	QButtonGroup::connect(self, static_cast<void (QButtonGroup::*)(QAbstractButton*)>(&QButtonGroup::buttonClicked), self, [=](QAbstractButton* param1) {
 		QAbstractButton* sigval1 = param1;
 		miqt_exec_callback_QButtonGroup_ButtonClicked(slot, sigval1);
@@ -104,7 +104,7 @@ void QButtonGroup_ButtonPressed(QButtonGroup* self, QAbstractButton* param1) {
 	self->buttonPressed(param1);
 }
 
-void QButtonGroup_connect_ButtonPressed(QButtonGroup* self, void* slot) {
+void QButtonGroup_connect_ButtonPressed(QButtonGroup* self, intptr_t slot) {
 	QButtonGroup::connect(self, static_cast<void (QButtonGroup::*)(QAbstractButton*)>(&QButtonGroup::buttonPressed), self, [=](QAbstractButton* param1) {
 		QAbstractButton* sigval1 = param1;
 		miqt_exec_callback_QButtonGroup_ButtonPressed(slot, sigval1);
@@ -115,7 +115,7 @@ void QButtonGroup_ButtonReleased(QButtonGroup* self, QAbstractButton* param1) {
 	self->buttonReleased(param1);
 }
 
-void QButtonGroup_connect_ButtonReleased(QButtonGroup* self, void* slot) {
+void QButtonGroup_connect_ButtonReleased(QButtonGroup* self, intptr_t slot) {
 	QButtonGroup::connect(self, static_cast<void (QButtonGroup::*)(QAbstractButton*)>(&QButtonGroup::buttonReleased), self, [=](QAbstractButton* param1) {
 		QAbstractButton* sigval1 = param1;
 		miqt_exec_callback_QButtonGroup_ButtonReleased(slot, sigval1);
@@ -126,7 +126,7 @@ void QButtonGroup_ButtonToggled(QButtonGroup* self, QAbstractButton* param1, boo
 	self->buttonToggled(param1, param2);
 }
 
-void QButtonGroup_connect_ButtonToggled(QButtonGroup* self, void* slot) {
+void QButtonGroup_connect_ButtonToggled(QButtonGroup* self, intptr_t slot) {
 	QButtonGroup::connect(self, static_cast<void (QButtonGroup::*)(QAbstractButton*, bool)>(&QButtonGroup::buttonToggled), self, [=](QAbstractButton* param1, bool param2) {
 		QAbstractButton* sigval1 = param1;
 		bool sigval2 = param2;
@@ -138,7 +138,7 @@ void QButtonGroup_IdClicked(QButtonGroup* self, int param1) {
 	self->idClicked(static_cast<int>(param1));
 }
 
-void QButtonGroup_connect_IdClicked(QButtonGroup* self, void* slot) {
+void QButtonGroup_connect_IdClicked(QButtonGroup* self, intptr_t slot) {
 	QButtonGroup::connect(self, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::idClicked), self, [=](int param1) {
 		int sigval1 = param1;
 		miqt_exec_callback_QButtonGroup_IdClicked(slot, sigval1);
@@ -149,7 +149,7 @@ void QButtonGroup_IdPressed(QButtonGroup* self, int param1) {
 	self->idPressed(static_cast<int>(param1));
 }
 
-void QButtonGroup_connect_IdPressed(QButtonGroup* self, void* slot) {
+void QButtonGroup_connect_IdPressed(QButtonGroup* self, intptr_t slot) {
 	QButtonGroup::connect(self, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::idPressed), self, [=](int param1) {
 		int sigval1 = param1;
 		miqt_exec_callback_QButtonGroup_IdPressed(slot, sigval1);
@@ -160,7 +160,7 @@ void QButtonGroup_IdReleased(QButtonGroup* self, int param1) {
 	self->idReleased(static_cast<int>(param1));
 }
 
-void QButtonGroup_connect_IdReleased(QButtonGroup* self, void* slot) {
+void QButtonGroup_connect_IdReleased(QButtonGroup* self, intptr_t slot) {
 	QButtonGroup::connect(self, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::idReleased), self, [=](int param1) {
 		int sigval1 = param1;
 		miqt_exec_callback_QButtonGroup_IdReleased(slot, sigval1);
@@ -171,7 +171,7 @@ void QButtonGroup_IdToggled(QButtonGroup* self, int param1, bool param2) {
 	self->idToggled(static_cast<int>(param1), param2);
 }
 
-void QButtonGroup_connect_IdToggled(QButtonGroup* self, void* slot) {
+void QButtonGroup_connect_IdToggled(QButtonGroup* self, intptr_t slot) {
 	QButtonGroup::connect(self, static_cast<void (QButtonGroup::*)(int, bool)>(&QButtonGroup::idToggled), self, [=](int param1, bool param2) {
 		int sigval1 = param1;
 		bool sigval2 = param2;
@@ -183,7 +183,7 @@ void QButtonGroup_ButtonClickedWithInt(QButtonGroup* self, int param1) {
 	self->buttonClicked(static_cast<int>(param1));
 }
 
-void QButtonGroup_connect_ButtonClickedWithInt(QButtonGroup* self, void* slot) {
+void QButtonGroup_connect_ButtonClickedWithInt(QButtonGroup* self, intptr_t slot) {
 	QButtonGroup::connect(self, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked), self, [=](int param1) {
 		int sigval1 = param1;
 		miqt_exec_callback_QButtonGroup_ButtonClickedWithInt(slot, sigval1);
@@ -194,7 +194,7 @@ void QButtonGroup_ButtonPressedWithInt(QButtonGroup* self, int param1) {
 	self->buttonPressed(static_cast<int>(param1));
 }
 
-void QButtonGroup_connect_ButtonPressedWithInt(QButtonGroup* self, void* slot) {
+void QButtonGroup_connect_ButtonPressedWithInt(QButtonGroup* self, intptr_t slot) {
 	QButtonGroup::connect(self, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonPressed), self, [=](int param1) {
 		int sigval1 = param1;
 		miqt_exec_callback_QButtonGroup_ButtonPressedWithInt(slot, sigval1);
@@ -205,7 +205,7 @@ void QButtonGroup_ButtonReleasedWithInt(QButtonGroup* self, int param1) {
 	self->buttonReleased(static_cast<int>(param1));
 }
 
-void QButtonGroup_connect_ButtonReleasedWithInt(QButtonGroup* self, void* slot) {
+void QButtonGroup_connect_ButtonReleasedWithInt(QButtonGroup* self, intptr_t slot) {
 	QButtonGroup::connect(self, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonReleased), self, [=](int param1) {
 		int sigval1 = param1;
 		miqt_exec_callback_QButtonGroup_ButtonReleasedWithInt(slot, sigval1);
@@ -216,7 +216,7 @@ void QButtonGroup_ButtonToggled2(QButtonGroup* self, int param1, bool param2) {
 	self->buttonToggled(static_cast<int>(param1), param2);
 }
 
-void QButtonGroup_connect_ButtonToggled2(QButtonGroup* self, void* slot) {
+void QButtonGroup_connect_ButtonToggled2(QButtonGroup* self, intptr_t slot) {
 	QButtonGroup::connect(self, static_cast<void (QButtonGroup::*)(int, bool)>(&QButtonGroup::buttonToggled), self, [=](int param1, bool param2) {
 		int sigval1 = param1;
 		bool sigval2 = param2;

qt/gen_qbuttongroup.go

@@ -128,12 +128,12 @@ func (this *QButtonGroup) ButtonClicked(param1 *QAbstractButton) {
 	C.QButtonGroup_ButtonClicked(this.h, param1.cPointer())
 }
 func (this *QButtonGroup) OnButtonClicked(slot func(param1 *QAbstractButton)) {
-	C.QButtonGroup_connect_ButtonClicked(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QButtonGroup_connect_ButtonClicked(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QButtonGroup_ButtonClicked
-func miqt_exec_callback_QButtonGroup_ButtonClicked(cb *C.void, param1 *C.QAbstractButton) {
+func miqt_exec_callback_QButtonGroup_ButtonClicked(cb C.intptr_t, param1 *C.QAbstractButton) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 *QAbstractButton))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 *QAbstractButton))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -148,12 +148,12 @@ func (this *QButtonGroup) ButtonPressed(param1 *QAbstractButton) {
 	C.QButtonGroup_ButtonPressed(this.h, param1.cPointer())
 }
 func (this *QButtonGroup) OnButtonPressed(slot func(param1 *QAbstractButton)) {
-	C.QButtonGroup_connect_ButtonPressed(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QButtonGroup_connect_ButtonPressed(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QButtonGroup_ButtonPressed
-func miqt_exec_callback_QButtonGroup_ButtonPressed(cb *C.void, param1 *C.QAbstractButton) {
+func miqt_exec_callback_QButtonGroup_ButtonPressed(cb C.intptr_t, param1 *C.QAbstractButton) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 *QAbstractButton))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 *QAbstractButton))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -168,12 +168,12 @@ func (this *QButtonGroup) ButtonReleased(param1 *QAbstractButton) {
 	C.QButtonGroup_ButtonReleased(this.h, param1.cPointer())
 }
 func (this *QButtonGroup) OnButtonReleased(slot func(param1 *QAbstractButton)) {
-	C.QButtonGroup_connect_ButtonReleased(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QButtonGroup_connect_ButtonReleased(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QButtonGroup_ButtonReleased
-func miqt_exec_callback_QButtonGroup_ButtonReleased(cb *C.void, param1 *C.QAbstractButton) {
+func miqt_exec_callback_QButtonGroup_ButtonReleased(cb C.intptr_t, param1 *C.QAbstractButton) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 *QAbstractButton))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 *QAbstractButton))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -188,12 +188,12 @@ func (this *QButtonGroup) ButtonToggled(param1 *QAbstractButton, param2 bool) {
 	C.QButtonGroup_ButtonToggled(this.h, param1.cPointer(), (C.bool)(param2))
 }
 func (this *QButtonGroup) OnButtonToggled(slot func(param1 *QAbstractButton, param2 bool)) {
-	C.QButtonGroup_connect_ButtonToggled(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QButtonGroup_connect_ButtonToggled(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QButtonGroup_ButtonToggled
-func miqt_exec_callback_QButtonGroup_ButtonToggled(cb *C.void, param1 *C.QAbstractButton, param2 C.bool) {
+func miqt_exec_callback_QButtonGroup_ButtonToggled(cb C.intptr_t, param1 *C.QAbstractButton, param2 C.bool) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 *QAbstractButton, param2 bool))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 *QAbstractButton, param2 bool))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -209,12 +209,12 @@ func (this *QButtonGroup) IdClicked(param1 int) {
 	C.QButtonGroup_IdClicked(this.h, (C.int)(param1))
 }
 func (this *QButtonGroup) OnIdClicked(slot func(param1 int)) {
-	C.QButtonGroup_connect_IdClicked(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QButtonGroup_connect_IdClicked(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QButtonGroup_IdClicked
-func miqt_exec_callback_QButtonGroup_IdClicked(cb *C.void, param1 C.int) {
+func miqt_exec_callback_QButtonGroup_IdClicked(cb C.intptr_t, param1 C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 int))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 int))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -229,12 +229,12 @@ func (this *QButtonGroup) IdPressed(param1 int) {
 	C.QButtonGroup_IdPressed(this.h, (C.int)(param1))
 }
 func (this *QButtonGroup) OnIdPressed(slot func(param1 int)) {
-	C.QButtonGroup_connect_IdPressed(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QButtonGroup_connect_IdPressed(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QButtonGroup_IdPressed
-func miqt_exec_callback_QButtonGroup_IdPressed(cb *C.void, param1 C.int) {
+func miqt_exec_callback_QButtonGroup_IdPressed(cb C.intptr_t, param1 C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 int))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 int))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -249,12 +249,12 @@ func (this *QButtonGroup) IdReleased(param1 int) {
 	C.QButtonGroup_IdReleased(this.h, (C.int)(param1))
 }
 func (this *QButtonGroup) OnIdReleased(slot func(param1 int)) {
-	C.QButtonGroup_connect_IdReleased(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QButtonGroup_connect_IdReleased(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QButtonGroup_IdReleased
-func miqt_exec_callback_QButtonGroup_IdReleased(cb *C.void, param1 C.int) {
+func miqt_exec_callback_QButtonGroup_IdReleased(cb C.intptr_t, param1 C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 int))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 int))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -269,12 +269,12 @@ func (this *QButtonGroup) IdToggled(param1 int, param2 bool) {
 	C.QButtonGroup_IdToggled(this.h, (C.int)(param1), (C.bool)(param2))
 }
 func (this *QButtonGroup) OnIdToggled(slot func(param1 int, param2 bool)) {
-	C.QButtonGroup_connect_IdToggled(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QButtonGroup_connect_IdToggled(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QButtonGroup_IdToggled
-func miqt_exec_callback_QButtonGroup_IdToggled(cb *C.void, param1 C.int, param2 C.bool) {
+func miqt_exec_callback_QButtonGroup_IdToggled(cb C.intptr_t, param1 C.int, param2 C.bool) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 int, param2 bool))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 int, param2 bool))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -291,12 +291,12 @@ func (this *QButtonGroup) ButtonClickedWithInt(param1 int) {
 	C.QButtonGroup_ButtonClickedWithInt(this.h, (C.int)(param1))
 }
 func (this *QButtonGroup) OnButtonClickedWithInt(slot func(param1 int)) {
-	C.QButtonGroup_connect_ButtonClickedWithInt(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QButtonGroup_connect_ButtonClickedWithInt(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QButtonGroup_ButtonClickedWithInt
-func miqt_exec_callback_QButtonGroup_ButtonClickedWithInt(cb *C.void, param1 C.int) {
+func miqt_exec_callback_QButtonGroup_ButtonClickedWithInt(cb C.intptr_t, param1 C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 int))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 int))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -311,12 +311,12 @@ func (this *QButtonGroup) ButtonPressedWithInt(param1 int) {
 	C.QButtonGroup_ButtonPressedWithInt(this.h, (C.int)(param1))
 }
 func (this *QButtonGroup) OnButtonPressedWithInt(slot func(param1 int)) {
-	C.QButtonGroup_connect_ButtonPressedWithInt(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QButtonGroup_connect_ButtonPressedWithInt(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QButtonGroup_ButtonPressedWithInt
-func miqt_exec_callback_QButtonGroup_ButtonPressedWithInt(cb *C.void, param1 C.int) {
+func miqt_exec_callback_QButtonGroup_ButtonPressedWithInt(cb C.intptr_t, param1 C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 int))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 int))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -331,12 +331,12 @@ func (this *QButtonGroup) ButtonReleasedWithInt(param1 int) {
 	C.QButtonGroup_ButtonReleasedWithInt(this.h, (C.int)(param1))
 }
 func (this *QButtonGroup) OnButtonReleasedWithInt(slot func(param1 int)) {
-	C.QButtonGroup_connect_ButtonReleasedWithInt(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QButtonGroup_connect_ButtonReleasedWithInt(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QButtonGroup_ButtonReleasedWithInt
-func miqt_exec_callback_QButtonGroup_ButtonReleasedWithInt(cb *C.void, param1 C.int) {
+func miqt_exec_callback_QButtonGroup_ButtonReleasedWithInt(cb C.intptr_t, param1 C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 int))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 int))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -351,12 +351,12 @@ func (this *QButtonGroup) ButtonToggled2(param1 int, param2 bool) {
 	C.QButtonGroup_ButtonToggled2(this.h, (C.int)(param1), (C.bool)(param2))
 }
 func (this *QButtonGroup) OnButtonToggled2(slot func(param1 int, param2 bool)) {
-	C.QButtonGroup_connect_ButtonToggled2(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QButtonGroup_connect_ButtonToggled2(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QButtonGroup_ButtonToggled2
-func miqt_exec_callback_QButtonGroup_ButtonToggled2(cb *C.void, param1 C.int, param2 C.bool) {
+func miqt_exec_callback_QButtonGroup_ButtonToggled2(cb C.intptr_t, param1 C.int, param2 C.bool) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 int, param2 bool))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 int, param2 bool))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qbuttongroup.h

@@ -42,29 +42,29 @@ void QButtonGroup_SetId(QButtonGroup* self, QAbstractButton* button, int id);
 int QButtonGroup_Id(const QButtonGroup* self, QAbstractButton* button);
 int QButtonGroup_CheckedId(const QButtonGroup* self);
 void QButtonGroup_ButtonClicked(QButtonGroup* self, QAbstractButton* param1);
-void QButtonGroup_connect_ButtonClicked(QButtonGroup* self, void* slot);
+void QButtonGroup_connect_ButtonClicked(QButtonGroup* self, intptr_t slot);
 void QButtonGroup_ButtonPressed(QButtonGroup* self, QAbstractButton* param1);
-void QButtonGroup_connect_ButtonPressed(QButtonGroup* self, void* slot);
+void QButtonGroup_connect_ButtonPressed(QButtonGroup* self, intptr_t slot);
 void QButtonGroup_ButtonReleased(QButtonGroup* self, QAbstractButton* param1);
-void QButtonGroup_connect_ButtonReleased(QButtonGroup* self, void* slot);
+void QButtonGroup_connect_ButtonReleased(QButtonGroup* self, intptr_t slot);
 void QButtonGroup_ButtonToggled(QButtonGroup* self, QAbstractButton* param1, bool param2);
-void QButtonGroup_connect_ButtonToggled(QButtonGroup* self, void* slot);
+void QButtonGroup_connect_ButtonToggled(QButtonGroup* self, intptr_t slot);
 void QButtonGroup_IdClicked(QButtonGroup* self, int param1);
-void QButtonGroup_connect_IdClicked(QButtonGroup* self, void* slot);
+void QButtonGroup_connect_IdClicked(QButtonGroup* self, intptr_t slot);
 void QButtonGroup_IdPressed(QButtonGroup* self, int param1);
-void QButtonGroup_connect_IdPressed(QButtonGroup* self, void* slot);
+void QButtonGroup_connect_IdPressed(QButtonGroup* self, intptr_t slot);
 void QButtonGroup_IdReleased(QButtonGroup* self, int param1);
-void QButtonGroup_connect_IdReleased(QButtonGroup* self, void* slot);
+void QButtonGroup_connect_IdReleased(QButtonGroup* self, intptr_t slot);
 void QButtonGroup_IdToggled(QButtonGroup* self, int param1, bool param2);
-void QButtonGroup_connect_IdToggled(QButtonGroup* self, void* slot);
+void QButtonGroup_connect_IdToggled(QButtonGroup* self, intptr_t slot);
 void QButtonGroup_ButtonClickedWithInt(QButtonGroup* self, int param1);
-void QButtonGroup_connect_ButtonClickedWithInt(QButtonGroup* self, void* slot);
+void QButtonGroup_connect_ButtonClickedWithInt(QButtonGroup* self, intptr_t slot);
 void QButtonGroup_ButtonPressedWithInt(QButtonGroup* self, int param1);
-void QButtonGroup_connect_ButtonPressedWithInt(QButtonGroup* self, void* slot);
+void QButtonGroup_connect_ButtonPressedWithInt(QButtonGroup* self, intptr_t slot);
 void QButtonGroup_ButtonReleasedWithInt(QButtonGroup* self, int param1);
-void QButtonGroup_connect_ButtonReleasedWithInt(QButtonGroup* self, void* slot);
+void QButtonGroup_connect_ButtonReleasedWithInt(QButtonGroup* self, intptr_t slot);
 void QButtonGroup_ButtonToggled2(QButtonGroup* self, int param1, bool param2);
-void QButtonGroup_connect_ButtonToggled2(QButtonGroup* self, void* slot);
+void QButtonGroup_connect_ButtonToggled2(QButtonGroup* self, intptr_t slot);
 struct miqt_string* QButtonGroup_Tr2(const char* s, const char* c);
 struct miqt_string* QButtonGroup_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QButtonGroup_TrUtf82(const char* s, const char* c);

qt/gen_qcalendarwidget.cpp

@@ -218,7 +218,7 @@ void QCalendarWidget_SelectionChanged(QCalendarWidget* self) {
 	self->selectionChanged();
 }
 
-void QCalendarWidget_connect_SelectionChanged(QCalendarWidget* self, void* slot) {
+void QCalendarWidget_connect_SelectionChanged(QCalendarWidget* self, intptr_t slot) {
 	QCalendarWidget::connect(self, static_cast<void (QCalendarWidget::*)()>(&QCalendarWidget::selectionChanged), self, [=]() {
 		miqt_exec_callback_QCalendarWidget_SelectionChanged(slot);
 	});
@@ -228,7 +228,7 @@ void QCalendarWidget_Clicked(QCalendarWidget* self, QDate* date) {
 	self->clicked(*date);
 }
 
-void QCalendarWidget_connect_Clicked(QCalendarWidget* self, void* slot) {
+void QCalendarWidget_connect_Clicked(QCalendarWidget* self, intptr_t slot) {
 	QCalendarWidget::connect(self, static_cast<void (QCalendarWidget::*)(const QDate&)>(&QCalendarWidget::clicked), self, [=](const QDate& date) {
 		const QDate& date_ret = date;
 		// Cast returned reference into pointer
@@ -241,7 +241,7 @@ void QCalendarWidget_Activated(QCalendarWidget* self, QDate* date) {
 	self->activated(*date);
 }
 
-void QCalendarWidget_connect_Activated(QCalendarWidget* self, void* slot) {
+void QCalendarWidget_connect_Activated(QCalendarWidget* self, intptr_t slot) {
 	QCalendarWidget::connect(self, static_cast<void (QCalendarWidget::*)(const QDate&)>(&QCalendarWidget::activated), self, [=](const QDate& date) {
 		const QDate& date_ret = date;
 		// Cast returned reference into pointer
@@ -254,7 +254,7 @@ void QCalendarWidget_CurrentPageChanged(QCalendarWidget* self, int year, int mon
 	self->currentPageChanged(static_cast<int>(year), static_cast<int>(month));
 }
 
-void QCalendarWidget_connect_CurrentPageChanged(QCalendarWidget* self, void* slot) {
+void QCalendarWidget_connect_CurrentPageChanged(QCalendarWidget* self, intptr_t slot) {
 	QCalendarWidget::connect(self, static_cast<void (QCalendarWidget::*)(int, int)>(&QCalendarWidget::currentPageChanged), self, [=](int year, int month) {
 		int sigval1 = year;
 		int sigval2 = month;

qt/gen_qcalendarwidget.go

@@ -299,12 +299,12 @@ func (this *QCalendarWidget) SelectionChanged() {
 	C.QCalendarWidget_SelectionChanged(this.h)
 }
 func (this *QCalendarWidget) OnSelectionChanged(slot func()) {
-	C.QCalendarWidget_connect_SelectionChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QCalendarWidget_connect_SelectionChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QCalendarWidget_SelectionChanged
-func miqt_exec_callback_QCalendarWidget_SelectionChanged(cb *C.void) {
+func miqt_exec_callback_QCalendarWidget_SelectionChanged(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -316,12 +316,12 @@ func (this *QCalendarWidget) Clicked(date *QDate) {
 	C.QCalendarWidget_Clicked(this.h, date.cPointer())
 }
 func (this *QCalendarWidget) OnClicked(slot func(date *QDate)) {
-	C.QCalendarWidget_connect_Clicked(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QCalendarWidget_connect_Clicked(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QCalendarWidget_Clicked
-func miqt_exec_callback_QCalendarWidget_Clicked(cb *C.void, date *C.QDate) {
+func miqt_exec_callback_QCalendarWidget_Clicked(cb C.intptr_t, date *C.QDate) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(date *QDate))
+	gofunc, ok := cgo.Handle(cb).Value().(func(date *QDate))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -336,12 +336,12 @@ func (this *QCalendarWidget) Activated(date *QDate) {
 	C.QCalendarWidget_Activated(this.h, date.cPointer())
 }
 func (this *QCalendarWidget) OnActivated(slot func(date *QDate)) {
-	C.QCalendarWidget_connect_Activated(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QCalendarWidget_connect_Activated(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QCalendarWidget_Activated
-func miqt_exec_callback_QCalendarWidget_Activated(cb *C.void, date *C.QDate) {
+func miqt_exec_callback_QCalendarWidget_Activated(cb C.intptr_t, date *C.QDate) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(date *QDate))
+	gofunc, ok := cgo.Handle(cb).Value().(func(date *QDate))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -356,12 +356,12 @@ func (this *QCalendarWidget) CurrentPageChanged(year int, month int) {
 	C.QCalendarWidget_CurrentPageChanged(this.h, (C.int)(year), (C.int)(month))
 }
 func (this *QCalendarWidget) OnCurrentPageChanged(slot func(year int, month int)) {
-	C.QCalendarWidget_connect_CurrentPageChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QCalendarWidget_connect_CurrentPageChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QCalendarWidget_CurrentPageChanged
-func miqt_exec_callback_QCalendarWidget_CurrentPageChanged(cb *C.void, year C.int, month C.int) {
+func miqt_exec_callback_QCalendarWidget_CurrentPageChanged(cb C.intptr_t, year C.int, month C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(year int, month int))
+	gofunc, ok := cgo.Handle(cb).Value().(func(year int, month int))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qcalendarwidget.h

@@ -80,13 +80,13 @@ void QCalendarWidget_ShowPreviousYear(QCalendarWidget* self);
 void QCalendarWidget_ShowSelectedDate(QCalendarWidget* self);
 void QCalendarWidget_ShowToday(QCalendarWidget* self);
 void QCalendarWidget_SelectionChanged(QCalendarWidget* self);
-void QCalendarWidget_connect_SelectionChanged(QCalendarWidget* self, void* slot);
+void QCalendarWidget_connect_SelectionChanged(QCalendarWidget* self, intptr_t slot);
 void QCalendarWidget_Clicked(QCalendarWidget* self, QDate* date);
-void QCalendarWidget_connect_Clicked(QCalendarWidget* self, void* slot);
+void QCalendarWidget_connect_Clicked(QCalendarWidget* self, intptr_t slot);
 void QCalendarWidget_Activated(QCalendarWidget* self, QDate* date);
-void QCalendarWidget_connect_Activated(QCalendarWidget* self, void* slot);
+void QCalendarWidget_connect_Activated(QCalendarWidget* self, intptr_t slot);
 void QCalendarWidget_CurrentPageChanged(QCalendarWidget* self, int year, int month);
-void QCalendarWidget_connect_CurrentPageChanged(QCalendarWidget* self, void* slot);
+void QCalendarWidget_connect_CurrentPageChanged(QCalendarWidget* self, intptr_t slot);
 struct miqt_string* QCalendarWidget_Tr2(const char* s, const char* c);
 struct miqt_string* QCalendarWidget_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QCalendarWidget_TrUtf82(const char* s, const char* c);

qt/gen_qcheckbox.cpp

@@ -78,7 +78,7 @@ void QCheckBox_StateChanged(QCheckBox* self, int param1) {
 	self->stateChanged(static_cast<int>(param1));
 }
 
-void QCheckBox_connect_StateChanged(QCheckBox* self, void* slot) {
+void QCheckBox_connect_StateChanged(QCheckBox* self, intptr_t slot) {
 	QCheckBox::connect(self, static_cast<void (QCheckBox::*)(int)>(&QCheckBox::stateChanged), self, [=](int param1) {
 		int sigval1 = param1;
 		miqt_exec_callback_QCheckBox_StateChanged(slot, sigval1);

qt/gen_qcheckbox.go

@@ -127,12 +127,12 @@ func (this *QCheckBox) StateChanged(param1 int) {
 	C.QCheckBox_StateChanged(this.h, (C.int)(param1))
 }
 func (this *QCheckBox) OnStateChanged(slot func(param1 int)) {
-	C.QCheckBox_connect_StateChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QCheckBox_connect_StateChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QCheckBox_StateChanged
-func miqt_exec_callback_QCheckBox_StateChanged(cb *C.void, param1 C.int) {
+func miqt_exec_callback_QCheckBox_StateChanged(cb C.intptr_t, param1 C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 int))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 int))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qcheckbox.h

@@ -40,7 +40,7 @@ bool QCheckBox_IsTristate(const QCheckBox* self);
 int QCheckBox_CheckState(const QCheckBox* self);
 void QCheckBox_SetCheckState(QCheckBox* self, int state);
 void QCheckBox_StateChanged(QCheckBox* self, int param1);
-void QCheckBox_connect_StateChanged(QCheckBox* self, void* slot);
+void QCheckBox_connect_StateChanged(QCheckBox* self, intptr_t slot);
 struct miqt_string* QCheckBox_Tr2(const char* s, const char* c);
 struct miqt_string* QCheckBox_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QCheckBox_TrUtf82(const char* s, const char* c);

qt/gen_qclipboard.cpp

@@ -104,7 +104,7 @@ void QClipboard_Changed(QClipboard* self, int mode) {
 	self->changed(static_cast<QClipboard::Mode>(mode));
 }
 
-void QClipboard_connect_Changed(QClipboard* self, void* slot) {
+void QClipboard_connect_Changed(QClipboard* self, intptr_t slot) {
 	QClipboard::connect(self, static_cast<void (QClipboard::*)(QClipboard::Mode)>(&QClipboard::changed), self, [=](QClipboard::Mode mode) {
 		QClipboard::Mode mode_ret = mode;
 		int sigval1 = static_cast<int>(mode_ret);
@@ -116,7 +116,7 @@ void QClipboard_SelectionChanged(QClipboard* self) {
 	self->selectionChanged();
 }
 
-void QClipboard_connect_SelectionChanged(QClipboard* self, void* slot) {
+void QClipboard_connect_SelectionChanged(QClipboard* self, intptr_t slot) {
 	QClipboard::connect(self, static_cast<void (QClipboard::*)()>(&QClipboard::selectionChanged), self, [=]() {
 		miqt_exec_callback_QClipboard_SelectionChanged(slot);
 	});
@@ -126,7 +126,7 @@ void QClipboard_FindBufferChanged(QClipboard* self) {
 	self->findBufferChanged();
 }
 
-void QClipboard_connect_FindBufferChanged(QClipboard* self, void* slot) {
+void QClipboard_connect_FindBufferChanged(QClipboard* self, intptr_t slot) {
 	QClipboard::connect(self, static_cast<void (QClipboard::*)()>(&QClipboard::findBufferChanged), self, [=]() {
 		miqt_exec_callback_QClipboard_FindBufferChanged(slot);
 	});
@@ -136,7 +136,7 @@ void QClipboard_DataChanged(QClipboard* self) {
 	self->dataChanged();
 }
 
-void QClipboard_connect_DataChanged(QClipboard* self, void* slot) {
+void QClipboard_connect_DataChanged(QClipboard* self, intptr_t slot) {
 	QClipboard::connect(self, static_cast<void (QClipboard::*)()>(&QClipboard::dataChanged), self, [=]() {
 		miqt_exec_callback_QClipboard_DataChanged(slot);
 	});

qt/gen_qclipboard.go

@@ -153,12 +153,12 @@ func (this *QClipboard) Changed(mode QClipboard__Mode) {
 	C.QClipboard_Changed(this.h, (C.int)(mode))
 }
 func (this *QClipboard) OnChanged(slot func(mode QClipboard__Mode)) {
-	C.QClipboard_connect_Changed(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QClipboard_connect_Changed(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QClipboard_Changed
-func miqt_exec_callback_QClipboard_Changed(cb *C.void, mode C.int) {
+func miqt_exec_callback_QClipboard_Changed(cb C.intptr_t, mode C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(mode QClipboard__Mode))
+	gofunc, ok := cgo.Handle(cb).Value().(func(mode QClipboard__Mode))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -173,12 +173,12 @@ func (this *QClipboard) SelectionChanged() {
 	C.QClipboard_SelectionChanged(this.h)
 }
 func (this *QClipboard) OnSelectionChanged(slot func()) {
-	C.QClipboard_connect_SelectionChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QClipboard_connect_SelectionChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QClipboard_SelectionChanged
-func miqt_exec_callback_QClipboard_SelectionChanged(cb *C.void) {
+func miqt_exec_callback_QClipboard_SelectionChanged(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -190,12 +190,12 @@ func (this *QClipboard) FindBufferChanged() {
 	C.QClipboard_FindBufferChanged(this.h)
 }
 func (this *QClipboard) OnFindBufferChanged(slot func()) {
-	C.QClipboard_connect_FindBufferChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QClipboard_connect_FindBufferChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QClipboard_FindBufferChanged
-func miqt_exec_callback_QClipboard_FindBufferChanged(cb *C.void) {
+func miqt_exec_callback_QClipboard_FindBufferChanged(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -207,12 +207,12 @@ func (this *QClipboard) DataChanged() {
 	C.QClipboard_DataChanged(this.h)
 }
 func (this *QClipboard) OnDataChanged(slot func()) {
-	C.QClipboard_connect_DataChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QClipboard_connect_DataChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QClipboard_DataChanged
-func miqt_exec_callback_QClipboard_DataChanged(cb *C.void) {
+func miqt_exec_callback_QClipboard_DataChanged(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qclipboard.h

@@ -47,13 +47,13 @@ QPixmap* QClipboard_Pixmap(const QClipboard* self);
 void QClipboard_SetImage(QClipboard* self, QImage* param1);
 void QClipboard_SetPixmap(QClipboard* self, QPixmap* param1);
 void QClipboard_Changed(QClipboard* self, int mode);
-void QClipboard_connect_Changed(QClipboard* self, void* slot);
+void QClipboard_connect_Changed(QClipboard* self, intptr_t slot);
 void QClipboard_SelectionChanged(QClipboard* self);
-void QClipboard_connect_SelectionChanged(QClipboard* self, void* slot);
+void QClipboard_connect_SelectionChanged(QClipboard* self, intptr_t slot);
 void QClipboard_FindBufferChanged(QClipboard* self);
-void QClipboard_connect_FindBufferChanged(QClipboard* self, void* slot);
+void QClipboard_connect_FindBufferChanged(QClipboard* self, intptr_t slot);
 void QClipboard_DataChanged(QClipboard* self);
-void QClipboard_connect_DataChanged(QClipboard* self, void* slot);
+void QClipboard_connect_DataChanged(QClipboard* self, intptr_t slot);
 struct miqt_string* QClipboard_Tr2(const char* s, const char* c);
 struct miqt_string* QClipboard_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QClipboard_TrUtf82(const char* s, const char* c);

qt/gen_qcolordialog.cpp

@@ -113,7 +113,7 @@ void QColorDialog_CurrentColorChanged(QColorDialog* self, QColor* color) {
 	self->currentColorChanged(*color);
 }
 
-void QColorDialog_connect_CurrentColorChanged(QColorDialog* self, void* slot) {
+void QColorDialog_connect_CurrentColorChanged(QColorDialog* self, intptr_t slot) {
 	QColorDialog::connect(self, static_cast<void (QColorDialog::*)(const QColor&)>(&QColorDialog::currentColorChanged), self, [=](const QColor& color) {
 		const QColor& color_ret = color;
 		// Cast returned reference into pointer
@@ -126,7 +126,7 @@ void QColorDialog_ColorSelected(QColorDialog* self, QColor* color) {
 	self->colorSelected(*color);
 }
 
-void QColorDialog_connect_ColorSelected(QColorDialog* self, void* slot) {
+void QColorDialog_connect_ColorSelected(QColorDialog* self, intptr_t slot) {
 	QColorDialog::connect(self, static_cast<void (QColorDialog::*)(const QColor&)>(&QColorDialog::colorSelected), self, [=](const QColor& color) {
 		const QColor& color_ret = color;
 		// Cast returned reference into pointer

qt/gen_qcolordialog.go

@@ -176,12 +176,12 @@ func (this *QColorDialog) CurrentColorChanged(color *QColor) {
 	C.QColorDialog_CurrentColorChanged(this.h, color.cPointer())
 }
 func (this *QColorDialog) OnCurrentColorChanged(slot func(color *QColor)) {
-	C.QColorDialog_connect_CurrentColorChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QColorDialog_connect_CurrentColorChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QColorDialog_CurrentColorChanged
-func miqt_exec_callback_QColorDialog_CurrentColorChanged(cb *C.void, color *C.QColor) {
+func miqt_exec_callback_QColorDialog_CurrentColorChanged(cb C.intptr_t, color *C.QColor) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(color *QColor))
+	gofunc, ok := cgo.Handle(cb).Value().(func(color *QColor))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -196,12 +196,12 @@ func (this *QColorDialog) ColorSelected(color *QColor) {
 	C.QColorDialog_ColorSelected(this.h, color.cPointer())
 }
 func (this *QColorDialog) OnColorSelected(slot func(color *QColor)) {
-	C.QColorDialog_connect_ColorSelected(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QColorDialog_connect_ColorSelected(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QColorDialog_ColorSelected
-func miqt_exec_callback_QColorDialog_ColorSelected(cb *C.void, color *C.QColor) {
+func miqt_exec_callback_QColorDialog_ColorSelected(cb C.intptr_t, color *C.QColor) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(color *QColor))
+	gofunc, ok := cgo.Handle(cb).Value().(func(color *QColor))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qcolordialog.h

@@ -49,9 +49,9 @@ void QColorDialog_SetCustomColor(int index, QColor* color);
 QColor* QColorDialog_StandardColor(int index);
 void QColorDialog_SetStandardColor(int index, QColor* color);
 void QColorDialog_CurrentColorChanged(QColorDialog* self, QColor* color);
-void QColorDialog_connect_CurrentColorChanged(QColorDialog* self, void* slot);
+void QColorDialog_connect_CurrentColorChanged(QColorDialog* self, intptr_t slot);
 void QColorDialog_ColorSelected(QColorDialog* self, QColor* color);
-void QColorDialog_connect_ColorSelected(QColorDialog* self, void* slot);
+void QColorDialog_connect_ColorSelected(QColorDialog* self, intptr_t slot);
 struct miqt_string* QColorDialog_Tr2(const char* s, const char* c);
 struct miqt_string* QColorDialog_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QColorDialog_TrUtf82(const char* s, const char* c);

qt/gen_qcolumnview.cpp

@@ -49,7 +49,7 @@ void QColumnView_UpdatePreviewWidget(QColumnView* self, QModelIndex* index) {
 	self->updatePreviewWidget(*index);
 }
 
-void QColumnView_connect_UpdatePreviewWidget(QColumnView* self, void* slot) {
+void QColumnView_connect_UpdatePreviewWidget(QColumnView* self, intptr_t slot) {
 	QColumnView::connect(self, static_cast<void (QColumnView::*)(const QModelIndex&)>(&QColumnView::updatePreviewWidget), self, [=](const QModelIndex& index) {
 		const QModelIndex& index_ret = index;
 		// Cast returned reference into pointer

qt/gen_qcolumnview.go

@@ -81,12 +81,12 @@ func (this *QColumnView) UpdatePreviewWidget(index *QModelIndex) {
 	C.QColumnView_UpdatePreviewWidget(this.h, index.cPointer())
 }
 func (this *QColumnView) OnUpdatePreviewWidget(slot func(index *QModelIndex)) {
-	C.QColumnView_connect_UpdatePreviewWidget(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QColumnView_connect_UpdatePreviewWidget(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QColumnView_UpdatePreviewWidget
-func miqt_exec_callback_QColumnView_UpdatePreviewWidget(cb *C.void, index *C.QModelIndex) {
+func miqt_exec_callback_QColumnView_UpdatePreviewWidget(cb C.intptr_t, index *C.QModelIndex) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(index *QModelIndex))
+	gofunc, ok := cgo.Handle(cb).Value().(func(index *QModelIndex))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qcolumnview.h

@@ -42,7 +42,7 @@ void* QColumnView_Metacast(QColumnView* self, const char* param1);
 struct miqt_string* QColumnView_Tr(const char* s);
 struct miqt_string* QColumnView_TrUtf8(const char* s);
 void QColumnView_UpdatePreviewWidget(QColumnView* self, QModelIndex* index);
-void QColumnView_connect_UpdatePreviewWidget(QColumnView* self, void* slot);
+void QColumnView_connect_UpdatePreviewWidget(QColumnView* self, intptr_t slot);
 QModelIndex* QColumnView_IndexAt(const QColumnView* self, QPoint* point);
 void QColumnView_ScrollTo(QColumnView* self, QModelIndex* index);
 QSize* QColumnView_SizeHint(const QColumnView* self);

qt/gen_qcombobox.cpp

@@ -378,7 +378,7 @@ void QComboBox_EditTextChanged(QComboBox* self, struct miqt_string* param1) {
 	self->editTextChanged(param1_QString);
 }
 
-void QComboBox_connect_EditTextChanged(QComboBox* self, void* slot) {
+void QComboBox_connect_EditTextChanged(QComboBox* self, intptr_t slot) {
 	QComboBox::connect(self, static_cast<void (QComboBox::*)(const QString&)>(&QComboBox::editTextChanged), self, [=](const QString& param1) {
 		const QString param1_ret = param1;
 		// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
@@ -392,7 +392,7 @@ void QComboBox_Activated(QComboBox* self, int index) {
 	self->activated(static_cast<int>(index));
 }
 
-void QComboBox_connect_Activated(QComboBox* self, void* slot) {
+void QComboBox_connect_Activated(QComboBox* self, intptr_t slot) {
 	QComboBox::connect(self, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), self, [=](int index) {
 		int sigval1 = index;
 		miqt_exec_callback_QComboBox_Activated(slot, sigval1);
@@ -404,7 +404,7 @@ void QComboBox_TextActivated(QComboBox* self, struct miqt_string* param1) {
 	self->textActivated(param1_QString);
 }
 
-void QComboBox_connect_TextActivated(QComboBox* self, void* slot) {
+void QComboBox_connect_TextActivated(QComboBox* self, intptr_t slot) {
 	QComboBox::connect(self, static_cast<void (QComboBox::*)(const QString&)>(&QComboBox::textActivated), self, [=](const QString& param1) {
 		const QString param1_ret = param1;
 		// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
@@ -418,7 +418,7 @@ void QComboBox_Highlighted(QComboBox* self, int index) {
 	self->highlighted(static_cast<int>(index));
 }
 
-void QComboBox_connect_Highlighted(QComboBox* self, void* slot) {
+void QComboBox_connect_Highlighted(QComboBox* self, intptr_t slot) {
 	QComboBox::connect(self, static_cast<void (QComboBox::*)(int)>(&QComboBox::highlighted), self, [=](int index) {
 		int sigval1 = index;
 		miqt_exec_callback_QComboBox_Highlighted(slot, sigval1);
@@ -430,7 +430,7 @@ void QComboBox_TextHighlighted(QComboBox* self, struct miqt_string* param1) {
 	self->textHighlighted(param1_QString);
 }
 
-void QComboBox_connect_TextHighlighted(QComboBox* self, void* slot) {
+void QComboBox_connect_TextHighlighted(QComboBox* self, intptr_t slot) {
 	QComboBox::connect(self, static_cast<void (QComboBox::*)(const QString&)>(&QComboBox::textHighlighted), self, [=](const QString& param1) {
 		const QString param1_ret = param1;
 		// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
@@ -444,7 +444,7 @@ void QComboBox_CurrentIndexChanged(QComboBox* self, int index) {
 	self->currentIndexChanged(static_cast<int>(index));
 }
 
-void QComboBox_connect_CurrentIndexChanged(QComboBox* self, void* slot) {
+void QComboBox_connect_CurrentIndexChanged(QComboBox* self, intptr_t slot) {
 	QComboBox::connect(self, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), self, [=](int index) {
 		int sigval1 = index;
 		miqt_exec_callback_QComboBox_CurrentIndexChanged(slot, sigval1);
@@ -456,7 +456,7 @@ void QComboBox_CurrentIndexChangedWithQString(QComboBox* self, struct miqt_strin
 	self->currentIndexChanged(param1_QString);
 }
 
-void QComboBox_connect_CurrentIndexChangedWithQString(QComboBox* self, void* slot) {
+void QComboBox_connect_CurrentIndexChangedWithQString(QComboBox* self, intptr_t slot) {
 	QComboBox::connect(self, static_cast<void (QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged), self, [=](const QString& param1) {
 		const QString param1_ret = param1;
 		// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
@@ -471,7 +471,7 @@ void QComboBox_CurrentTextChanged(QComboBox* self, struct miqt_string* param1) {
 	self->currentTextChanged(param1_QString);
 }
 
-void QComboBox_connect_CurrentTextChanged(QComboBox* self, void* slot) {
+void QComboBox_connect_CurrentTextChanged(QComboBox* self, intptr_t slot) {
 	QComboBox::connect(self, static_cast<void (QComboBox::*)(const QString&)>(&QComboBox::currentTextChanged), self, [=](const QString& param1) {
 		const QString param1_ret = param1;
 		// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
@@ -486,7 +486,7 @@ void QComboBox_ActivatedWithQString(QComboBox* self, struct miqt_string* param1)
 	self->activated(param1_QString);
 }
 
-void QComboBox_connect_ActivatedWithQString(QComboBox* self, void* slot) {
+void QComboBox_connect_ActivatedWithQString(QComboBox* self, intptr_t slot) {
 	QComboBox::connect(self, static_cast<void (QComboBox::*)(const QString&)>(&QComboBox::activated), self, [=](const QString& param1) {
 		const QString param1_ret = param1;
 		// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
@@ -501,7 +501,7 @@ void QComboBox_HighlightedWithQString(QComboBox* self, struct miqt_string* param
 	self->highlighted(param1_QString);
 }
 
-void QComboBox_connect_HighlightedWithQString(QComboBox* self, void* slot) {
+void QComboBox_connect_HighlightedWithQString(QComboBox* self, intptr_t slot) {
 	QComboBox::connect(self, static_cast<void (QComboBox::*)(const QString&)>(&QComboBox::highlighted), self, [=](const QString& param1) {
 		const QString param1_ret = param1;
 		// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory

qt/gen_qcombobox.go

@@ -466,12 +466,12 @@ func (this *QComboBox) EditTextChanged(param1 string) {
 	C.QComboBox_EditTextChanged(this.h, (*C.struct_miqt_string)(param1_ms))
 }
 func (this *QComboBox) OnEditTextChanged(slot func(param1 string)) {
-	C.QComboBox_connect_EditTextChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QComboBox_connect_EditTextChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QComboBox_EditTextChanged
-func miqt_exec_callback_QComboBox_EditTextChanged(cb *C.void, param1 *C.struct_miqt_string) {
+func miqt_exec_callback_QComboBox_EditTextChanged(cb C.intptr_t, param1 *C.struct_miqt_string) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 string))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 string))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -489,12 +489,12 @@ func (this *QComboBox) Activated(index int) {
 	C.QComboBox_Activated(this.h, (C.int)(index))
 }
 func (this *QComboBox) OnActivated(slot func(index int)) {
-	C.QComboBox_connect_Activated(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QComboBox_connect_Activated(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QComboBox_Activated
-func miqt_exec_callback_QComboBox_Activated(cb *C.void, index C.int) {
+func miqt_exec_callback_QComboBox_Activated(cb C.intptr_t, index C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(index int))
+	gofunc, ok := cgo.Handle(cb).Value().(func(index int))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -511,12 +511,12 @@ func (this *QComboBox) TextActivated(param1 string) {
 	C.QComboBox_TextActivated(this.h, (*C.struct_miqt_string)(param1_ms))
 }
 func (this *QComboBox) OnTextActivated(slot func(param1 string)) {
-	C.QComboBox_connect_TextActivated(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QComboBox_connect_TextActivated(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QComboBox_TextActivated
-func miqt_exec_callback_QComboBox_TextActivated(cb *C.void, param1 *C.struct_miqt_string) {
+func miqt_exec_callback_QComboBox_TextActivated(cb C.intptr_t, param1 *C.struct_miqt_string) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 string))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 string))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -534,12 +534,12 @@ func (this *QComboBox) Highlighted(index int) {
 	C.QComboBox_Highlighted(this.h, (C.int)(index))
 }
 func (this *QComboBox) OnHighlighted(slot func(index int)) {
-	C.QComboBox_connect_Highlighted(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QComboBox_connect_Highlighted(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QComboBox_Highlighted
-func miqt_exec_callback_QComboBox_Highlighted(cb *C.void, index C.int) {
+func miqt_exec_callback_QComboBox_Highlighted(cb C.intptr_t, index C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(index int))
+	gofunc, ok := cgo.Handle(cb).Value().(func(index int))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -556,12 +556,12 @@ func (this *QComboBox) TextHighlighted(param1 string) {
 	C.QComboBox_TextHighlighted(this.h, (*C.struct_miqt_string)(param1_ms))
 }
 func (this *QComboBox) OnTextHighlighted(slot func(param1 string)) {
-	C.QComboBox_connect_TextHighlighted(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QComboBox_connect_TextHighlighted(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QComboBox_TextHighlighted
-func miqt_exec_callback_QComboBox_TextHighlighted(cb *C.void, param1 *C.struct_miqt_string) {
+func miqt_exec_callback_QComboBox_TextHighlighted(cb C.intptr_t, param1 *C.struct_miqt_string) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 string))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 string))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -579,12 +579,12 @@ func (this *QComboBox) CurrentIndexChanged(index int) {
 	C.QComboBox_CurrentIndexChanged(this.h, (C.int)(index))
 }
 func (this *QComboBox) OnCurrentIndexChanged(slot func(index int)) {
-	C.QComboBox_connect_CurrentIndexChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QComboBox_connect_CurrentIndexChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QComboBox_CurrentIndexChanged
-func miqt_exec_callback_QComboBox_CurrentIndexChanged(cb *C.void, index C.int) {
+func miqt_exec_callback_QComboBox_CurrentIndexChanged(cb C.intptr_t, index C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(index int))
+	gofunc, ok := cgo.Handle(cb).Value().(func(index int))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -601,12 +601,12 @@ func (this *QComboBox) CurrentIndexChangedWithQString(param1 string) {
 	C.QComboBox_CurrentIndexChangedWithQString(this.h, (*C.struct_miqt_string)(param1_ms))
 }
 func (this *QComboBox) OnCurrentIndexChangedWithQString(slot func(param1 string)) {
-	C.QComboBox_connect_CurrentIndexChangedWithQString(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QComboBox_connect_CurrentIndexChangedWithQString(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QComboBox_CurrentIndexChangedWithQString
-func miqt_exec_callback_QComboBox_CurrentIndexChangedWithQString(cb *C.void, param1 *C.struct_miqt_string) {
+func miqt_exec_callback_QComboBox_CurrentIndexChangedWithQString(cb C.intptr_t, param1 *C.struct_miqt_string) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 string))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 string))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -626,12 +626,12 @@ func (this *QComboBox) CurrentTextChanged(param1 string) {
 	C.QComboBox_CurrentTextChanged(this.h, (*C.struct_miqt_string)(param1_ms))
 }
 func (this *QComboBox) OnCurrentTextChanged(slot func(param1 string)) {
-	C.QComboBox_connect_CurrentTextChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QComboBox_connect_CurrentTextChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QComboBox_CurrentTextChanged
-func miqt_exec_callback_QComboBox_CurrentTextChanged(cb *C.void, param1 *C.struct_miqt_string) {
+func miqt_exec_callback_QComboBox_CurrentTextChanged(cb C.intptr_t, param1 *C.struct_miqt_string) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 string))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 string))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -651,12 +651,12 @@ func (this *QComboBox) ActivatedWithQString(param1 string) {
 	C.QComboBox_ActivatedWithQString(this.h, (*C.struct_miqt_string)(param1_ms))
 }
 func (this *QComboBox) OnActivatedWithQString(slot func(param1 string)) {
-	C.QComboBox_connect_ActivatedWithQString(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QComboBox_connect_ActivatedWithQString(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QComboBox_ActivatedWithQString
-func miqt_exec_callback_QComboBox_ActivatedWithQString(cb *C.void, param1 *C.struct_miqt_string) {
+func miqt_exec_callback_QComboBox_ActivatedWithQString(cb C.intptr_t, param1 *C.struct_miqt_string) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 string))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 string))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -676,12 +676,12 @@ func (this *QComboBox) HighlightedWithQString(param1 string) {
 	C.QComboBox_HighlightedWithQString(this.h, (*C.struct_miqt_string)(param1_ms))
 }
 func (this *QComboBox) OnHighlightedWithQString(slot func(param1 string)) {
-	C.QComboBox_connect_HighlightedWithQString(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QComboBox_connect_HighlightedWithQString(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QComboBox_HighlightedWithQString
-func miqt_exec_callback_QComboBox_HighlightedWithQString(cb *C.void, param1 *C.struct_miqt_string) {
+func miqt_exec_callback_QComboBox_HighlightedWithQString(cb C.intptr_t, param1 *C.struct_miqt_string) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 string))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 string))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qcombobox.h

@@ -124,25 +124,25 @@ void QComboBox_SetEditText(QComboBox* self, struct miqt_string* text);
 void QComboBox_SetCurrentIndex(QComboBox* self, int index);
 void QComboBox_SetCurrentText(QComboBox* self, struct miqt_string* text);
 void QComboBox_EditTextChanged(QComboBox* self, struct miqt_string* param1);
-void QComboBox_connect_EditTextChanged(QComboBox* self, void* slot);
+void QComboBox_connect_EditTextChanged(QComboBox* self, intptr_t slot);
 void QComboBox_Activated(QComboBox* self, int index);
-void QComboBox_connect_Activated(QComboBox* self, void* slot);
+void QComboBox_connect_Activated(QComboBox* self, intptr_t slot);
 void QComboBox_TextActivated(QComboBox* self, struct miqt_string* param1);
-void QComboBox_connect_TextActivated(QComboBox* self, void* slot);
+void QComboBox_connect_TextActivated(QComboBox* self, intptr_t slot);
 void QComboBox_Highlighted(QComboBox* self, int index);
-void QComboBox_connect_Highlighted(QComboBox* self, void* slot);
+void QComboBox_connect_Highlighted(QComboBox* self, intptr_t slot);
 void QComboBox_TextHighlighted(QComboBox* self, struct miqt_string* param1);
-void QComboBox_connect_TextHighlighted(QComboBox* self, void* slot);
+void QComboBox_connect_TextHighlighted(QComboBox* self, intptr_t slot);
 void QComboBox_CurrentIndexChanged(QComboBox* self, int index);
-void QComboBox_connect_CurrentIndexChanged(QComboBox* self, void* slot);
+void QComboBox_connect_CurrentIndexChanged(QComboBox* self, intptr_t slot);
 void QComboBox_CurrentIndexChangedWithQString(QComboBox* self, struct miqt_string* param1);
-void QComboBox_connect_CurrentIndexChangedWithQString(QComboBox* self, void* slot);
+void QComboBox_connect_CurrentIndexChangedWithQString(QComboBox* self, intptr_t slot);
 void QComboBox_CurrentTextChanged(QComboBox* self, struct miqt_string* param1);
-void QComboBox_connect_CurrentTextChanged(QComboBox* self, void* slot);
+void QComboBox_connect_CurrentTextChanged(QComboBox* self, intptr_t slot);
 void QComboBox_ActivatedWithQString(QComboBox* self, struct miqt_string* param1);
-void QComboBox_connect_ActivatedWithQString(QComboBox* self, void* slot);
+void QComboBox_connect_ActivatedWithQString(QComboBox* self, intptr_t slot);
 void QComboBox_HighlightedWithQString(QComboBox* self, struct miqt_string* param1);
-void QComboBox_connect_HighlightedWithQString(QComboBox* self, void* slot);
+void QComboBox_connect_HighlightedWithQString(QComboBox* self, intptr_t slot);
 struct miqt_string* QComboBox_Tr2(const char* s, const char* c);
 struct miqt_string* QComboBox_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QComboBox_TrUtf82(const char* s, const char* c);

qt/gen_qcompleter.cpp

@@ -238,7 +238,7 @@ void QCompleter_Activated(QCompleter* self, struct miqt_string* text) {
 	self->activated(text_QString);
 }
 
-void QCompleter_connect_Activated(QCompleter* self, void* slot) {
+void QCompleter_connect_Activated(QCompleter* self, intptr_t slot) {
 	QCompleter::connect(self, static_cast<void (QCompleter::*)(const QString&)>(&QCompleter::activated), self, [=](const QString& text) {
 		const QString text_ret = text;
 		// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
@@ -252,7 +252,7 @@ void QCompleter_ActivatedWithIndex(QCompleter* self, QModelIndex* index) {
 	self->activated(*index);
 }
 
-void QCompleter_connect_ActivatedWithIndex(QCompleter* self, void* slot) {
+void QCompleter_connect_ActivatedWithIndex(QCompleter* self, intptr_t slot) {
 	QCompleter::connect(self, static_cast<void (QCompleter::*)(const QModelIndex&)>(&QCompleter::activated), self, [=](const QModelIndex& index) {
 		const QModelIndex& index_ret = index;
 		// Cast returned reference into pointer
@@ -266,7 +266,7 @@ void QCompleter_Highlighted(QCompleter* self, struct miqt_string* text) {
 	self->highlighted(text_QString);
 }
 
-void QCompleter_connect_Highlighted(QCompleter* self, void* slot) {
+void QCompleter_connect_Highlighted(QCompleter* self, intptr_t slot) {
 	QCompleter::connect(self, static_cast<void (QCompleter::*)(const QString&)>(&QCompleter::highlighted), self, [=](const QString& text) {
 		const QString text_ret = text;
 		// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
@@ -280,7 +280,7 @@ void QCompleter_HighlightedWithIndex(QCompleter* self, QModelIndex* index) {
 	self->highlighted(*index);
 }
 
-void QCompleter_connect_HighlightedWithIndex(QCompleter* self, void* slot) {
+void QCompleter_connect_HighlightedWithIndex(QCompleter* self, intptr_t slot) {
 	QCompleter::connect(self, static_cast<void (QCompleter::*)(const QModelIndex&)>(&QCompleter::highlighted), self, [=](const QModelIndex& index) {
 		const QModelIndex& index_ret = index;
 		// Cast returned reference into pointer

qt/gen_qcompleter.go

@@ -301,12 +301,12 @@ func (this *QCompleter) Activated(text string) {
 	C.QCompleter_Activated(this.h, (*C.struct_miqt_string)(text_ms))
 }
 func (this *QCompleter) OnActivated(slot func(text string)) {
-	C.QCompleter_connect_Activated(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QCompleter_connect_Activated(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QCompleter_Activated
-func miqt_exec_callback_QCompleter_Activated(cb *C.void, text *C.struct_miqt_string) {
+func miqt_exec_callback_QCompleter_Activated(cb C.intptr_t, text *C.struct_miqt_string) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(text string))
+	gofunc, ok := cgo.Handle(cb).Value().(func(text string))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -324,12 +324,12 @@ func (this *QCompleter) ActivatedWithIndex(index *QModelIndex) {
 	C.QCompleter_ActivatedWithIndex(this.h, index.cPointer())
 }
 func (this *QCompleter) OnActivatedWithIndex(slot func(index *QModelIndex)) {
-	C.QCompleter_connect_ActivatedWithIndex(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QCompleter_connect_ActivatedWithIndex(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QCompleter_ActivatedWithIndex
-func miqt_exec_callback_QCompleter_ActivatedWithIndex(cb *C.void, index *C.QModelIndex) {
+func miqt_exec_callback_QCompleter_ActivatedWithIndex(cb C.intptr_t, index *C.QModelIndex) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(index *QModelIndex))
+	gofunc, ok := cgo.Handle(cb).Value().(func(index *QModelIndex))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -346,12 +346,12 @@ func (this *QCompleter) Highlighted(text string) {
 	C.QCompleter_Highlighted(this.h, (*C.struct_miqt_string)(text_ms))
 }
 func (this *QCompleter) OnHighlighted(slot func(text string)) {
-	C.QCompleter_connect_Highlighted(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QCompleter_connect_Highlighted(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QCompleter_Highlighted
-func miqt_exec_callback_QCompleter_Highlighted(cb *C.void, text *C.struct_miqt_string) {
+func miqt_exec_callback_QCompleter_Highlighted(cb C.intptr_t, text *C.struct_miqt_string) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(text string))
+	gofunc, ok := cgo.Handle(cb).Value().(func(text string))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -369,12 +369,12 @@ func (this *QCompleter) HighlightedWithIndex(index *QModelIndex) {
 	C.QCompleter_HighlightedWithIndex(this.h, index.cPointer())
 }
 func (this *QCompleter) OnHighlightedWithIndex(slot func(index *QModelIndex)) {
-	C.QCompleter_connect_HighlightedWithIndex(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QCompleter_connect_HighlightedWithIndex(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QCompleter_HighlightedWithIndex
-func miqt_exec_callback_QCompleter_HighlightedWithIndex(cb *C.void, index *C.QModelIndex) {
+func miqt_exec_callback_QCompleter_HighlightedWithIndex(cb C.intptr_t, index *C.QModelIndex) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(index *QModelIndex))
+	gofunc, ok := cgo.Handle(cb).Value().(func(index *QModelIndex))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qcompleter.h

@@ -77,13 +77,13 @@ void QCompleter_SetWrapAround(QCompleter* self, bool wrap);
 struct miqt_string* QCompleter_PathFromIndex(const QCompleter* self, QModelIndex* index);
 struct miqt_array* QCompleter_SplitPath(const QCompleter* self, struct miqt_string* path);
 void QCompleter_Activated(QCompleter* self, struct miqt_string* text);
-void QCompleter_connect_Activated(QCompleter* self, void* slot);
+void QCompleter_connect_Activated(QCompleter* self, intptr_t slot);
 void QCompleter_ActivatedWithIndex(QCompleter* self, QModelIndex* index);
-void QCompleter_connect_ActivatedWithIndex(QCompleter* self, void* slot);
+void QCompleter_connect_ActivatedWithIndex(QCompleter* self, intptr_t slot);
 void QCompleter_Highlighted(QCompleter* self, struct miqt_string* text);
-void QCompleter_connect_Highlighted(QCompleter* self, void* slot);
+void QCompleter_connect_Highlighted(QCompleter* self, intptr_t slot);
 void QCompleter_HighlightedWithIndex(QCompleter* self, QModelIndex* index);
-void QCompleter_connect_HighlightedWithIndex(QCompleter* self, void* slot);
+void QCompleter_connect_HighlightedWithIndex(QCompleter* self, intptr_t slot);
 struct miqt_string* QCompleter_Tr2(const char* s, const char* c);
 struct miqt_string* QCompleter_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QCompleter_TrUtf82(const char* s, const char* c);

qt/gen_qcoreapplication.cpp

@@ -282,7 +282,7 @@ void QCoreApplication_OrganizationNameChanged(QCoreApplication* self) {
 	self->organizationNameChanged();
 }
 
-void QCoreApplication_connect_OrganizationNameChanged(QCoreApplication* self, void* slot) {
+void QCoreApplication_connect_OrganizationNameChanged(QCoreApplication* self, intptr_t slot) {
 	QCoreApplication::connect(self, static_cast<void (QCoreApplication::*)()>(&QCoreApplication::organizationNameChanged), self, [=]() {
 		miqt_exec_callback_QCoreApplication_OrganizationNameChanged(slot);
 	});
@@ -292,7 +292,7 @@ void QCoreApplication_OrganizationDomainChanged(QCoreApplication* self) {
 	self->organizationDomainChanged();
 }
 
-void QCoreApplication_connect_OrganizationDomainChanged(QCoreApplication* self, void* slot) {
+void QCoreApplication_connect_OrganizationDomainChanged(QCoreApplication* self, intptr_t slot) {
 	QCoreApplication::connect(self, static_cast<void (QCoreApplication::*)()>(&QCoreApplication::organizationDomainChanged), self, [=]() {
 		miqt_exec_callback_QCoreApplication_OrganizationDomainChanged(slot);
 	});
@@ -302,7 +302,7 @@ void QCoreApplication_ApplicationNameChanged(QCoreApplication* self) {
 	self->applicationNameChanged();
 }
 
-void QCoreApplication_connect_ApplicationNameChanged(QCoreApplication* self, void* slot) {
+void QCoreApplication_connect_ApplicationNameChanged(QCoreApplication* self, intptr_t slot) {
 	QCoreApplication::connect(self, static_cast<void (QCoreApplication::*)()>(&QCoreApplication::applicationNameChanged), self, [=]() {
 		miqt_exec_callback_QCoreApplication_ApplicationNameChanged(slot);
 	});
@@ -312,7 +312,7 @@ void QCoreApplication_ApplicationVersionChanged(QCoreApplication* self) {
 	self->applicationVersionChanged();
 }
 
-void QCoreApplication_connect_ApplicationVersionChanged(QCoreApplication* self, void* slot) {
+void QCoreApplication_connect_ApplicationVersionChanged(QCoreApplication* self, intptr_t slot) {
 	QCoreApplication::connect(self, static_cast<void (QCoreApplication::*)()>(&QCoreApplication::applicationVersionChanged), self, [=]() {
 		miqt_exec_callback_QCoreApplication_ApplicationVersionChanged(slot);
 	});

qt/gen_qcoreapplication.go

@@ -344,12 +344,12 @@ func (this *QCoreApplication) OrganizationNameChanged() {
 	C.QCoreApplication_OrganizationNameChanged(this.h)
 }
 func (this *QCoreApplication) OnOrganizationNameChanged(slot func()) {
-	C.QCoreApplication_connect_OrganizationNameChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QCoreApplication_connect_OrganizationNameChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QCoreApplication_OrganizationNameChanged
-func miqt_exec_callback_QCoreApplication_OrganizationNameChanged(cb *C.void) {
+func miqt_exec_callback_QCoreApplication_OrganizationNameChanged(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -361,12 +361,12 @@ func (this *QCoreApplication) OrganizationDomainChanged() {
 	C.QCoreApplication_OrganizationDomainChanged(this.h)
 }
 func (this *QCoreApplication) OnOrganizationDomainChanged(slot func()) {
-	C.QCoreApplication_connect_OrganizationDomainChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QCoreApplication_connect_OrganizationDomainChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QCoreApplication_OrganizationDomainChanged
-func miqt_exec_callback_QCoreApplication_OrganizationDomainChanged(cb *C.void) {
+func miqt_exec_callback_QCoreApplication_OrganizationDomainChanged(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -378,12 +378,12 @@ func (this *QCoreApplication) ApplicationNameChanged() {
 	C.QCoreApplication_ApplicationNameChanged(this.h)
 }
 func (this *QCoreApplication) OnApplicationNameChanged(slot func()) {
-	C.QCoreApplication_connect_ApplicationNameChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QCoreApplication_connect_ApplicationNameChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QCoreApplication_ApplicationNameChanged
-func miqt_exec_callback_QCoreApplication_ApplicationNameChanged(cb *C.void) {
+func miqt_exec_callback_QCoreApplication_ApplicationNameChanged(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -395,12 +395,12 @@ func (this *QCoreApplication) ApplicationVersionChanged() {
 	C.QCoreApplication_ApplicationVersionChanged(this.h)
 }
 func (this *QCoreApplication) OnApplicationVersionChanged(slot func()) {
-	C.QCoreApplication_connect_ApplicationVersionChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QCoreApplication_connect_ApplicationVersionChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QCoreApplication_ApplicationVersionChanged
-func miqt_exec_callback_QCoreApplication_ApplicationVersionChanged(cb *C.void) {
+func miqt_exec_callback_QCoreApplication_ApplicationVersionChanged(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qcoreapplication.h

@@ -82,13 +82,13 @@ bool QCoreApplication_IsQuitLockEnabled();
 void QCoreApplication_SetQuitLockEnabled(bool enabled);
 void QCoreApplication_Quit();
 void QCoreApplication_OrganizationNameChanged(QCoreApplication* self);
-void QCoreApplication_connect_OrganizationNameChanged(QCoreApplication* self, void* slot);
+void QCoreApplication_connect_OrganizationNameChanged(QCoreApplication* self, intptr_t slot);
 void QCoreApplication_OrganizationDomainChanged(QCoreApplication* self);
-void QCoreApplication_connect_OrganizationDomainChanged(QCoreApplication* self, void* slot);
+void QCoreApplication_connect_OrganizationDomainChanged(QCoreApplication* self, intptr_t slot);
 void QCoreApplication_ApplicationNameChanged(QCoreApplication* self);
-void QCoreApplication_connect_ApplicationNameChanged(QCoreApplication* self, void* slot);
+void QCoreApplication_connect_ApplicationNameChanged(QCoreApplication* self, intptr_t slot);
 void QCoreApplication_ApplicationVersionChanged(QCoreApplication* self);
-void QCoreApplication_connect_ApplicationVersionChanged(QCoreApplication* self, void* slot);
+void QCoreApplication_connect_ApplicationVersionChanged(QCoreApplication* self, intptr_t slot);
 struct miqt_string* QCoreApplication_Tr2(const char* s, const char* c);
 struct miqt_string* QCoreApplication_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QCoreApplication_TrUtf82(const char* s, const char* c);

qt/gen_qdatawidgetmapper.cpp

@@ -153,7 +153,7 @@ void QDataWidgetMapper_CurrentIndexChanged(QDataWidgetMapper* self, int index) {
 	self->currentIndexChanged(static_cast<int>(index));
 }
 
-void QDataWidgetMapper_connect_CurrentIndexChanged(QDataWidgetMapper* self, void* slot) {
+void QDataWidgetMapper_connect_CurrentIndexChanged(QDataWidgetMapper* self, intptr_t slot) {
 	QDataWidgetMapper::connect(self, static_cast<void (QDataWidgetMapper::*)(int)>(&QDataWidgetMapper::currentIndexChanged), self, [=](int index) {
 		int sigval1 = index;
 		miqt_exec_callback_QDataWidgetMapper_CurrentIndexChanged(slot, sigval1);

qt/gen_qdatawidgetmapper.go

@@ -198,12 +198,12 @@ func (this *QDataWidgetMapper) CurrentIndexChanged(index int) {
 	C.QDataWidgetMapper_CurrentIndexChanged(this.h, (C.int)(index))
 }
 func (this *QDataWidgetMapper) OnCurrentIndexChanged(slot func(index int)) {
-	C.QDataWidgetMapper_connect_CurrentIndexChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QDataWidgetMapper_connect_CurrentIndexChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QDataWidgetMapper_CurrentIndexChanged
-func miqt_exec_callback_QDataWidgetMapper_CurrentIndexChanged(cb *C.void, index C.int) {
+func miqt_exec_callback_QDataWidgetMapper_CurrentIndexChanged(cb C.intptr_t, index C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(index int))
+	gofunc, ok := cgo.Handle(cb).Value().(func(index int))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qdatawidgetmapper.h

@@ -66,7 +66,7 @@ void QDataWidgetMapper_ToPrevious(QDataWidgetMapper* self);
 void QDataWidgetMapper_SetCurrentIndex(QDataWidgetMapper* self, int index);
 void QDataWidgetMapper_SetCurrentModelIndex(QDataWidgetMapper* self, QModelIndex* index);
 void QDataWidgetMapper_CurrentIndexChanged(QDataWidgetMapper* self, int index);
-void QDataWidgetMapper_connect_CurrentIndexChanged(QDataWidgetMapper* self, void* slot);
+void QDataWidgetMapper_connect_CurrentIndexChanged(QDataWidgetMapper* self, intptr_t slot);
 struct miqt_string* QDataWidgetMapper_Tr2(const char* s, const char* c);
 struct miqt_string* QDataWidgetMapper_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QDataWidgetMapper_TrUtf82(const char* s, const char* c);

qt/gen_qdatetimeedit.cpp

@@ -274,7 +274,7 @@ void QDateTimeEdit_DateTimeChanged(QDateTimeEdit* self, QDateTime* dateTime) {
 	self->dateTimeChanged(*dateTime);
 }
 
-void QDateTimeEdit_connect_DateTimeChanged(QDateTimeEdit* self, void* slot) {
+void QDateTimeEdit_connect_DateTimeChanged(QDateTimeEdit* self, intptr_t slot) {
 	QDateTimeEdit::connect(self, static_cast<void (QDateTimeEdit::*)(const QDateTime&)>(&QDateTimeEdit::dateTimeChanged), self, [=](const QDateTime& dateTime) {
 		const QDateTime& dateTime_ret = dateTime;
 		// Cast returned reference into pointer
@@ -287,7 +287,7 @@ void QDateTimeEdit_TimeChanged(QDateTimeEdit* self, QTime* time) {
 	self->timeChanged(*time);
 }
 
-void QDateTimeEdit_connect_TimeChanged(QDateTimeEdit* self, void* slot) {
+void QDateTimeEdit_connect_TimeChanged(QDateTimeEdit* self, intptr_t slot) {
 	QDateTimeEdit::connect(self, static_cast<void (QDateTimeEdit::*)(const QTime&)>(&QDateTimeEdit::timeChanged), self, [=](const QTime& time) {
 		const QTime& time_ret = time;
 		// Cast returned reference into pointer
@@ -300,7 +300,7 @@ void QDateTimeEdit_DateChanged(QDateTimeEdit* self, QDate* date) {
 	self->dateChanged(*date);
 }
 
-void QDateTimeEdit_connect_DateChanged(QDateTimeEdit* self, void* slot) {
+void QDateTimeEdit_connect_DateChanged(QDateTimeEdit* self, intptr_t slot) {
 	QDateTimeEdit::connect(self, static_cast<void (QDateTimeEdit::*)(const QDate&)>(&QDateTimeEdit::dateChanged), self, [=](const QDate& date) {
 		const QDate& date_ret = date;
 		// Cast returned reference into pointer
@@ -395,7 +395,7 @@ void QTimeEdit_UserTimeChanged(QTimeEdit* self, QTime* time) {
 	self->userTimeChanged(*time);
 }
 
-void QTimeEdit_connect_UserTimeChanged(QTimeEdit* self, void* slot) {
+void QTimeEdit_connect_UserTimeChanged(QTimeEdit* self, intptr_t slot) {
 	QTimeEdit::connect(self, static_cast<void (QTimeEdit::*)(const QTime&)>(&QTimeEdit::userTimeChanged), self, [=](const QTime& time) {
 		const QTime& time_ret = time;
 		// Cast returned reference into pointer
@@ -478,7 +478,7 @@ void QDateEdit_UserDateChanged(QDateEdit* self, QDate* date) {
 	self->userDateChanged(*date);
 }
 
-void QDateEdit_connect_UserDateChanged(QDateEdit* self, void* slot) {
+void QDateEdit_connect_UserDateChanged(QDateEdit* self, intptr_t slot) {
 	QDateEdit::connect(self, static_cast<void (QDateEdit::*)(const QDate&)>(&QDateEdit::userDateChanged), self, [=](const QDate& date) {
 		const QDate& date_ret = date;
 		// Cast returned reference into pointer

qt/gen_qdatetimeedit.go

@@ -362,12 +362,12 @@ func (this *QDateTimeEdit) DateTimeChanged(dateTime *QDateTime) {
 	C.QDateTimeEdit_DateTimeChanged(this.h, dateTime.cPointer())
 }
 func (this *QDateTimeEdit) OnDateTimeChanged(slot func(dateTime *QDateTime)) {
-	C.QDateTimeEdit_connect_DateTimeChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QDateTimeEdit_connect_DateTimeChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QDateTimeEdit_DateTimeChanged
-func miqt_exec_callback_QDateTimeEdit_DateTimeChanged(cb *C.void, dateTime *C.QDateTime) {
+func miqt_exec_callback_QDateTimeEdit_DateTimeChanged(cb C.intptr_t, dateTime *C.QDateTime) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(dateTime *QDateTime))
+	gofunc, ok := cgo.Handle(cb).Value().(func(dateTime *QDateTime))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -382,12 +382,12 @@ func (this *QDateTimeEdit) TimeChanged(time *QTime) {
 	C.QDateTimeEdit_TimeChanged(this.h, time.cPointer())
 }
 func (this *QDateTimeEdit) OnTimeChanged(slot func(time *QTime)) {
-	C.QDateTimeEdit_connect_TimeChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QDateTimeEdit_connect_TimeChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QDateTimeEdit_TimeChanged
-func miqt_exec_callback_QDateTimeEdit_TimeChanged(cb *C.void, time *C.QTime) {
+func miqt_exec_callback_QDateTimeEdit_TimeChanged(cb C.intptr_t, time *C.QTime) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(time *QTime))
+	gofunc, ok := cgo.Handle(cb).Value().(func(time *QTime))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -402,12 +402,12 @@ func (this *QDateTimeEdit) DateChanged(date *QDate) {
 	C.QDateTimeEdit_DateChanged(this.h, date.cPointer())
 }
 func (this *QDateTimeEdit) OnDateChanged(slot func(date *QDate)) {
-	C.QDateTimeEdit_connect_DateChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QDateTimeEdit_connect_DateChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QDateTimeEdit_DateChanged
-func miqt_exec_callback_QDateTimeEdit_DateChanged(cb *C.void, date *C.QDate) {
+func miqt_exec_callback_QDateTimeEdit_DateChanged(cb C.intptr_t, date *C.QDate) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(date *QDate))
+	gofunc, ok := cgo.Handle(cb).Value().(func(date *QDate))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -567,12 +567,12 @@ func (this *QTimeEdit) UserTimeChanged(time *QTime) {
 	C.QTimeEdit_UserTimeChanged(this.h, time.cPointer())
 }
 func (this *QTimeEdit) OnUserTimeChanged(slot func(time *QTime)) {
-	C.QTimeEdit_connect_UserTimeChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QTimeEdit_connect_UserTimeChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QTimeEdit_UserTimeChanged
-func miqt_exec_callback_QTimeEdit_UserTimeChanged(cb *C.void, time *C.QTime) {
+func miqt_exec_callback_QTimeEdit_UserTimeChanged(cb C.intptr_t, time *C.QTime) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(time *QTime))
+	gofunc, ok := cgo.Handle(cb).Value().(func(time *QTime))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -720,12 +720,12 @@ func (this *QDateEdit) UserDateChanged(date *QDate) {
 	C.QDateEdit_UserDateChanged(this.h, date.cPointer())
 }
 func (this *QDateEdit) OnUserDateChanged(slot func(date *QDate)) {
-	C.QDateEdit_connect_UserDateChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QDateEdit_connect_UserDateChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QDateEdit_UserDateChanged
-func miqt_exec_callback_QDateEdit_UserDateChanged(cb *C.void, date *C.QDate) {
+func miqt_exec_callback_QDateEdit_UserDateChanged(cb C.intptr_t, date *C.QDate) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(date *QDate))
+	gofunc, ok := cgo.Handle(cb).Value().(func(date *QDate))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qdatetimeedit.h

@@ -101,11 +101,11 @@ void QDateTimeEdit_Clear(QDateTimeEdit* self);
 void QDateTimeEdit_StepBy(QDateTimeEdit* self, int steps);
 bool QDateTimeEdit_Event(QDateTimeEdit* self, QEvent* event);
 void QDateTimeEdit_DateTimeChanged(QDateTimeEdit* self, QDateTime* dateTime);
-void QDateTimeEdit_connect_DateTimeChanged(QDateTimeEdit* self, void* slot);
+void QDateTimeEdit_connect_DateTimeChanged(QDateTimeEdit* self, intptr_t slot);
 void QDateTimeEdit_TimeChanged(QDateTimeEdit* self, QTime* time);
-void QDateTimeEdit_connect_TimeChanged(QDateTimeEdit* self, void* slot);
+void QDateTimeEdit_connect_TimeChanged(QDateTimeEdit* self, intptr_t slot);
 void QDateTimeEdit_DateChanged(QDateTimeEdit* self, QDate* date);
-void QDateTimeEdit_connect_DateChanged(QDateTimeEdit* self, void* slot);
+void QDateTimeEdit_connect_DateChanged(QDateTimeEdit* self, intptr_t slot);
 void QDateTimeEdit_SetDateTime(QDateTimeEdit* self, QDateTime* dateTime);
 void QDateTimeEdit_SetDate(QDateTimeEdit* self, QDate* date);
 void QDateTimeEdit_SetTime(QDateTimeEdit* self, QTime* time);
@@ -124,7 +124,7 @@ void* QTimeEdit_Metacast(QTimeEdit* self, const char* param1);
 struct miqt_string* QTimeEdit_Tr(const char* s);
 struct miqt_string* QTimeEdit_TrUtf8(const char* s);
 void QTimeEdit_UserTimeChanged(QTimeEdit* self, QTime* time);
-void QTimeEdit_connect_UserTimeChanged(QTimeEdit* self, void* slot);
+void QTimeEdit_connect_UserTimeChanged(QTimeEdit* self, intptr_t slot);
 struct miqt_string* QTimeEdit_Tr2(const char* s, const char* c);
 struct miqt_string* QTimeEdit_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QTimeEdit_TrUtf82(const char* s, const char* c);
@@ -140,7 +140,7 @@ void* QDateEdit_Metacast(QDateEdit* self, const char* param1);
 struct miqt_string* QDateEdit_Tr(const char* s);
 struct miqt_string* QDateEdit_TrUtf8(const char* s);
 void QDateEdit_UserDateChanged(QDateEdit* self, QDate* date);
-void QDateEdit_connect_UserDateChanged(QDateEdit* self, void* slot);
+void QDateEdit_connect_UserDateChanged(QDateEdit* self, intptr_t slot);
 struct miqt_string* QDateEdit_Tr2(const char* s, const char* c);
 struct miqt_string* QDateEdit_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QDateEdit_TrUtf82(const char* s, const char* c);

qt/gen_qdesktopwidget.cpp

@@ -92,7 +92,7 @@ void QDesktopWidget_Resized(QDesktopWidget* self, int param1) {
 	self->resized(static_cast<int>(param1));
 }
 
-void QDesktopWidget_connect_Resized(QDesktopWidget* self, void* slot) {
+void QDesktopWidget_connect_Resized(QDesktopWidget* self, intptr_t slot) {
 	QDesktopWidget::connect(self, static_cast<void (QDesktopWidget::*)(int)>(&QDesktopWidget::resized), self, [=](int param1) {
 		int sigval1 = param1;
 		miqt_exec_callback_QDesktopWidget_Resized(slot, sigval1);
@@ -103,7 +103,7 @@ void QDesktopWidget_WorkAreaResized(QDesktopWidget* self, int param1) {
 	self->workAreaResized(static_cast<int>(param1));
 }
 
-void QDesktopWidget_connect_WorkAreaResized(QDesktopWidget* self, void* slot) {
+void QDesktopWidget_connect_WorkAreaResized(QDesktopWidget* self, intptr_t slot) {
 	QDesktopWidget::connect(self, static_cast<void (QDesktopWidget::*)(int)>(&QDesktopWidget::workAreaResized), self, [=](int param1) {
 		int sigval1 = param1;
 		miqt_exec_callback_QDesktopWidget_WorkAreaResized(slot, sigval1);
@@ -114,7 +114,7 @@ void QDesktopWidget_ScreenCountChanged(QDesktopWidget* self, int param1) {
 	self->screenCountChanged(static_cast<int>(param1));
 }
 
-void QDesktopWidget_connect_ScreenCountChanged(QDesktopWidget* self, void* slot) {
+void QDesktopWidget_connect_ScreenCountChanged(QDesktopWidget* self, intptr_t slot) {
 	QDesktopWidget::connect(self, static_cast<void (QDesktopWidget::*)(int)>(&QDesktopWidget::screenCountChanged), self, [=](int param1) {
 		int sigval1 = param1;
 		miqt_exec_callback_QDesktopWidget_ScreenCountChanged(slot, sigval1);
@@ -125,7 +125,7 @@ void QDesktopWidget_PrimaryScreenChanged(QDesktopWidget* self) {
 	self->primaryScreenChanged();
 }
 
-void QDesktopWidget_connect_PrimaryScreenChanged(QDesktopWidget* self, void* slot) {
+void QDesktopWidget_connect_PrimaryScreenChanged(QDesktopWidget* self, intptr_t slot) {
 	QDesktopWidget::connect(self, static_cast<void (QDesktopWidget::*)()>(&QDesktopWidget::primaryScreenChanged), self, [=]() {
 		miqt_exec_callback_QDesktopWidget_PrimaryScreenChanged(slot);
 	});

qt/gen_qdesktopwidget.go

@@ -145,12 +145,12 @@ func (this *QDesktopWidget) Resized(param1 int) {
 	C.QDesktopWidget_Resized(this.h, (C.int)(param1))
 }
 func (this *QDesktopWidget) OnResized(slot func(param1 int)) {
-	C.QDesktopWidget_connect_Resized(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QDesktopWidget_connect_Resized(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QDesktopWidget_Resized
-func miqt_exec_callback_QDesktopWidget_Resized(cb *C.void, param1 C.int) {
+func miqt_exec_callback_QDesktopWidget_Resized(cb C.intptr_t, param1 C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 int))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 int))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -165,12 +165,12 @@ func (this *QDesktopWidget) WorkAreaResized(param1 int) {
 	C.QDesktopWidget_WorkAreaResized(this.h, (C.int)(param1))
 }
 func (this *QDesktopWidget) OnWorkAreaResized(slot func(param1 int)) {
-	C.QDesktopWidget_connect_WorkAreaResized(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QDesktopWidget_connect_WorkAreaResized(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QDesktopWidget_WorkAreaResized
-func miqt_exec_callback_QDesktopWidget_WorkAreaResized(cb *C.void, param1 C.int) {
+func miqt_exec_callback_QDesktopWidget_WorkAreaResized(cb C.intptr_t, param1 C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 int))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 int))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -185,12 +185,12 @@ func (this *QDesktopWidget) ScreenCountChanged(param1 int) {
 	C.QDesktopWidget_ScreenCountChanged(this.h, (C.int)(param1))
 }
 func (this *QDesktopWidget) OnScreenCountChanged(slot func(param1 int)) {
-	C.QDesktopWidget_connect_ScreenCountChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QDesktopWidget_connect_ScreenCountChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QDesktopWidget_ScreenCountChanged
-func miqt_exec_callback_QDesktopWidget_ScreenCountChanged(cb *C.void, param1 C.int) {
+func miqt_exec_callback_QDesktopWidget_ScreenCountChanged(cb C.intptr_t, param1 C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 int))
+	gofunc, ok := cgo.Handle(cb).Value().(func(param1 int))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -205,12 +205,12 @@ func (this *QDesktopWidget) PrimaryScreenChanged() {
 	C.QDesktopWidget_PrimaryScreenChanged(this.h)
 }
 func (this *QDesktopWidget) OnPrimaryScreenChanged(slot func()) {
-	C.QDesktopWidget_connect_PrimaryScreenChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QDesktopWidget_connect_PrimaryScreenChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QDesktopWidget_PrimaryScreenChanged
-func miqt_exec_callback_QDesktopWidget_PrimaryScreenChanged(cb *C.void) {
+func miqt_exec_callback_QDesktopWidget_PrimaryScreenChanged(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qdesktopwidget.h

@@ -46,13 +46,13 @@ QRect* QDesktopWidget_ScreenGeometryWithPoint(const QDesktopWidget* self, QPoint
 QRect* QDesktopWidget_AvailableGeometry2(const QDesktopWidget* self);
 QRect* QDesktopWidget_AvailableGeometryWithPoint(const QDesktopWidget* self, QPoint* point);
 void QDesktopWidget_Resized(QDesktopWidget* self, int param1);
-void QDesktopWidget_connect_Resized(QDesktopWidget* self, void* slot);
+void QDesktopWidget_connect_Resized(QDesktopWidget* self, intptr_t slot);
 void QDesktopWidget_WorkAreaResized(QDesktopWidget* self, int param1);
-void QDesktopWidget_connect_WorkAreaResized(QDesktopWidget* self, void* slot);
+void QDesktopWidget_connect_WorkAreaResized(QDesktopWidget* self, intptr_t slot);
 void QDesktopWidget_ScreenCountChanged(QDesktopWidget* self, int param1);
-void QDesktopWidget_connect_ScreenCountChanged(QDesktopWidget* self, void* slot);
+void QDesktopWidget_connect_ScreenCountChanged(QDesktopWidget* self, intptr_t slot);
 void QDesktopWidget_PrimaryScreenChanged(QDesktopWidget* self);
-void QDesktopWidget_connect_PrimaryScreenChanged(QDesktopWidget* self, void* slot);
+void QDesktopWidget_connect_PrimaryScreenChanged(QDesktopWidget* self, intptr_t slot);
 struct miqt_string* QDesktopWidget_Tr2(const char* s, const char* c);
 struct miqt_string* QDesktopWidget_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QDesktopWidget_TrUtf82(const char* s, const char* c);

qt/gen_qdialog.cpp

@@ -96,7 +96,7 @@ void QDialog_Finished(QDialog* self, int result) {
 	self->finished(static_cast<int>(result));
 }
 
-void QDialog_connect_Finished(QDialog* self, void* slot) {
+void QDialog_connect_Finished(QDialog* self, intptr_t slot) {
 	QDialog::connect(self, static_cast<void (QDialog::*)(int)>(&QDialog::finished), self, [=](int result) {
 		int sigval1 = result;
 		miqt_exec_callback_QDialog_Finished(slot, sigval1);
@@ -107,7 +107,7 @@ void QDialog_Accepted(QDialog* self) {
 	self->accepted();
 }
 
-void QDialog_connect_Accepted(QDialog* self, void* slot) {
+void QDialog_connect_Accepted(QDialog* self, intptr_t slot) {
 	QDialog::connect(self, static_cast<void (QDialog::*)()>(&QDialog::accepted), self, [=]() {
 		miqt_exec_callback_QDialog_Accepted(slot);
 	});
@@ -117,7 +117,7 @@ void QDialog_Rejected(QDialog* self) {
 	self->rejected();
 }
 
-void QDialog_connect_Rejected(QDialog* self, void* slot) {
+void QDialog_connect_Rejected(QDialog* self, intptr_t slot) {
 	QDialog::connect(self, static_cast<void (QDialog::*)()>(&QDialog::rejected), self, [=]() {
 		miqt_exec_callback_QDialog_Rejected(slot);
 	});

qt/gen_qdialog.go

@@ -148,12 +148,12 @@ func (this *QDialog) Finished(result int) {
 	C.QDialog_Finished(this.h, (C.int)(result))
 }
 func (this *QDialog) OnFinished(slot func(result int)) {
-	C.QDialog_connect_Finished(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QDialog_connect_Finished(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QDialog_Finished
-func miqt_exec_callback_QDialog_Finished(cb *C.void, result C.int) {
+func miqt_exec_callback_QDialog_Finished(cb C.intptr_t, result C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(result int))
+	gofunc, ok := cgo.Handle(cb).Value().(func(result int))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -168,12 +168,12 @@ func (this *QDialog) Accepted() {
 	C.QDialog_Accepted(this.h)
 }
 func (this *QDialog) OnAccepted(slot func()) {
-	C.QDialog_connect_Accepted(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QDialog_connect_Accepted(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QDialog_Accepted
-func miqt_exec_callback_QDialog_Accepted(cb *C.void) {
+func miqt_exec_callback_QDialog_Accepted(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -185,12 +185,12 @@ func (this *QDialog) Rejected() {
 	C.QDialog_Rejected(this.h)
 }
 func (this *QDialog) OnRejected(slot func()) {
-	C.QDialog_connect_Rejected(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QDialog_connect_Rejected(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QDialog_Rejected
-func miqt_exec_callback_QDialog_Rejected(cb *C.void) {
+func miqt_exec_callback_QDialog_Rejected(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qdialog.h

@@ -45,11 +45,11 @@ bool QDialog_IsSizeGripEnabled(const QDialog* self);
 void QDialog_SetModal(QDialog* self, bool modal);
 void QDialog_SetResult(QDialog* self, int r);
 void QDialog_Finished(QDialog* self, int result);
-void QDialog_connect_Finished(QDialog* self, void* slot);
+void QDialog_connect_Finished(QDialog* self, intptr_t slot);
 void QDialog_Accepted(QDialog* self);
-void QDialog_connect_Accepted(QDialog* self, void* slot);
+void QDialog_connect_Accepted(QDialog* self, intptr_t slot);
 void QDialog_Rejected(QDialog* self);
-void QDialog_connect_Rejected(QDialog* self, void* slot);
+void QDialog_connect_Rejected(QDialog* self, intptr_t slot);
 void QDialog_Open(QDialog* self);
 int QDialog_Exec(QDialog* self);
 void QDialog_Done(QDialog* self, int param1);

qt/gen_qdialogbuttonbox.cpp

@@ -143,7 +143,7 @@ void QDialogButtonBox_Clicked(QDialogButtonBox* self, QAbstractButton* button) {
 	self->clicked(button);
 }
 
-void QDialogButtonBox_connect_Clicked(QDialogButtonBox* self, void* slot) {
+void QDialogButtonBox_connect_Clicked(QDialogButtonBox* self, intptr_t slot) {
 	QDialogButtonBox::connect(self, static_cast<void (QDialogButtonBox::*)(QAbstractButton*)>(&QDialogButtonBox::clicked), self, [=](QAbstractButton* button) {
 		QAbstractButton* sigval1 = button;
 		miqt_exec_callback_QDialogButtonBox_Clicked(slot, sigval1);
@@ -154,7 +154,7 @@ void QDialogButtonBox_Accepted(QDialogButtonBox* self) {
 	self->accepted();
 }
 
-void QDialogButtonBox_connect_Accepted(QDialogButtonBox* self, void* slot) {
+void QDialogButtonBox_connect_Accepted(QDialogButtonBox* self, intptr_t slot) {
 	QDialogButtonBox::connect(self, static_cast<void (QDialogButtonBox::*)()>(&QDialogButtonBox::accepted), self, [=]() {
 		miqt_exec_callback_QDialogButtonBox_Accepted(slot);
 	});
@@ -164,7 +164,7 @@ void QDialogButtonBox_HelpRequested(QDialogButtonBox* self) {
 	self->helpRequested();
 }
 
-void QDialogButtonBox_connect_HelpRequested(QDialogButtonBox* self, void* slot) {
+void QDialogButtonBox_connect_HelpRequested(QDialogButtonBox* self, intptr_t slot) {
 	QDialogButtonBox::connect(self, static_cast<void (QDialogButtonBox::*)()>(&QDialogButtonBox::helpRequested), self, [=]() {
 		miqt_exec_callback_QDialogButtonBox_HelpRequested(slot);
 	});
@@ -174,7 +174,7 @@ void QDialogButtonBox_Rejected(QDialogButtonBox* self) {
 	self->rejected();
 }
 
-void QDialogButtonBox_connect_Rejected(QDialogButtonBox* self, void* slot) {
+void QDialogButtonBox_connect_Rejected(QDialogButtonBox* self, intptr_t slot) {
 	QDialogButtonBox::connect(self, static_cast<void (QDialogButtonBox::*)()>(&QDialogButtonBox::rejected), self, [=]() {
 		miqt_exec_callback_QDialogButtonBox_Rejected(slot);
 	});

qt/gen_qdialogbuttonbox.go

@@ -238,12 +238,12 @@ func (this *QDialogButtonBox) Clicked(button *QAbstractButton) {
 	C.QDialogButtonBox_Clicked(this.h, button.cPointer())
 }
 func (this *QDialogButtonBox) OnClicked(slot func(button *QAbstractButton)) {
-	C.QDialogButtonBox_connect_Clicked(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QDialogButtonBox_connect_Clicked(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QDialogButtonBox_Clicked
-func miqt_exec_callback_QDialogButtonBox_Clicked(cb *C.void, button *C.QAbstractButton) {
+func miqt_exec_callback_QDialogButtonBox_Clicked(cb C.intptr_t, button *C.QAbstractButton) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(button *QAbstractButton))
+	gofunc, ok := cgo.Handle(cb).Value().(func(button *QAbstractButton))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -258,12 +258,12 @@ func (this *QDialogButtonBox) Accepted() {
 	C.QDialogButtonBox_Accepted(this.h)
 }
 func (this *QDialogButtonBox) OnAccepted(slot func()) {
-	C.QDialogButtonBox_connect_Accepted(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QDialogButtonBox_connect_Accepted(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QDialogButtonBox_Accepted
-func miqt_exec_callback_QDialogButtonBox_Accepted(cb *C.void) {
+func miqt_exec_callback_QDialogButtonBox_Accepted(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -275,12 +275,12 @@ func (this *QDialogButtonBox) HelpRequested() {
 	C.QDialogButtonBox_HelpRequested(this.h)
 }
 func (this *QDialogButtonBox) OnHelpRequested(slot func()) {
-	C.QDialogButtonBox_connect_HelpRequested(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QDialogButtonBox_connect_HelpRequested(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QDialogButtonBox_HelpRequested
-func miqt_exec_callback_QDialogButtonBox_HelpRequested(cb *C.void) {
+func miqt_exec_callback_QDialogButtonBox_HelpRequested(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -292,12 +292,12 @@ func (this *QDialogButtonBox) Rejected() {
 	C.QDialogButtonBox_Rejected(this.h)
 }
 func (this *QDialogButtonBox) OnRejected(slot func()) {
-	C.QDialogButtonBox_connect_Rejected(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QDialogButtonBox_connect_Rejected(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QDialogButtonBox_Rejected
-func miqt_exec_callback_QDialogButtonBox_Rejected(cb *C.void) {
+func miqt_exec_callback_QDialogButtonBox_Rejected(cb C.intptr_t) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func())
+	gofunc, ok := cgo.Handle(cb).Value().(func())
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qdialogbuttonbox.h

@@ -55,13 +55,13 @@ QPushButton* QDialogButtonBox_Button(const QDialogButtonBox* self, int which);
 void QDialogButtonBox_SetCenterButtons(QDialogButtonBox* self, bool center);
 bool QDialogButtonBox_CenterButtons(const QDialogButtonBox* self);
 void QDialogButtonBox_Clicked(QDialogButtonBox* self, QAbstractButton* button);
-void QDialogButtonBox_connect_Clicked(QDialogButtonBox* self, void* slot);
+void QDialogButtonBox_connect_Clicked(QDialogButtonBox* self, intptr_t slot);
 void QDialogButtonBox_Accepted(QDialogButtonBox* self);
-void QDialogButtonBox_connect_Accepted(QDialogButtonBox* self, void* slot);
+void QDialogButtonBox_connect_Accepted(QDialogButtonBox* self, intptr_t slot);
 void QDialogButtonBox_HelpRequested(QDialogButtonBox* self);
-void QDialogButtonBox_connect_HelpRequested(QDialogButtonBox* self, void* slot);
+void QDialogButtonBox_connect_HelpRequested(QDialogButtonBox* self, intptr_t slot);
 void QDialogButtonBox_Rejected(QDialogButtonBox* self);
-void QDialogButtonBox_connect_Rejected(QDialogButtonBox* self, void* slot);
+void QDialogButtonBox_connect_Rejected(QDialogButtonBox* self, intptr_t slot);
 struct miqt_string* QDialogButtonBox_Tr2(const char* s, const char* c);
 struct miqt_string* QDialogButtonBox_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QDialogButtonBox_TrUtf82(const char* s, const char* c);

qt/gen_qdockwidget.cpp

@@ -112,7 +112,7 @@ void QDockWidget_FeaturesChanged(QDockWidget* self, int features) {
 	self->featuresChanged(static_cast<QDockWidget::DockWidgetFeatures>(features));
 }
 
-void QDockWidget_connect_FeaturesChanged(QDockWidget* self, void* slot) {
+void QDockWidget_connect_FeaturesChanged(QDockWidget* self, intptr_t slot) {
 	QDockWidget::connect(self, static_cast<void (QDockWidget::*)(QDockWidget::DockWidgetFeatures)>(&QDockWidget::featuresChanged), self, [=](QDockWidget::DockWidgetFeatures features) {
 		QDockWidget::DockWidgetFeatures features_ret = features;
 		int sigval1 = static_cast<int>(features_ret);
@@ -124,7 +124,7 @@ void QDockWidget_TopLevelChanged(QDockWidget* self, bool topLevel) {
 	self->topLevelChanged(topLevel);
 }
 
-void QDockWidget_connect_TopLevelChanged(QDockWidget* self, void* slot) {
+void QDockWidget_connect_TopLevelChanged(QDockWidget* self, intptr_t slot) {
 	QDockWidget::connect(self, static_cast<void (QDockWidget::*)(bool)>(&QDockWidget::topLevelChanged), self, [=](bool topLevel) {
 		bool sigval1 = topLevel;
 		miqt_exec_callback_QDockWidget_TopLevelChanged(slot, sigval1);
@@ -135,7 +135,7 @@ void QDockWidget_AllowedAreasChanged(QDockWidget* self, int allowedAreas) {
 	self->allowedAreasChanged(static_cast<Qt::DockWidgetAreas>(allowedAreas));
 }
 
-void QDockWidget_connect_AllowedAreasChanged(QDockWidget* self, void* slot) {
+void QDockWidget_connect_AllowedAreasChanged(QDockWidget* self, intptr_t slot) {
 	QDockWidget::connect(self, static_cast<void (QDockWidget::*)(Qt::DockWidgetAreas)>(&QDockWidget::allowedAreasChanged), self, [=](Qt::DockWidgetAreas allowedAreas) {
 		Qt::DockWidgetAreas allowedAreas_ret = allowedAreas;
 		int sigval1 = static_cast<int>(allowedAreas_ret);
@@ -147,7 +147,7 @@ void QDockWidget_VisibilityChanged(QDockWidget* self, bool visible) {
 	self->visibilityChanged(visible);
 }
 
-void QDockWidget_connect_VisibilityChanged(QDockWidget* self, void* slot) {
+void QDockWidget_connect_VisibilityChanged(QDockWidget* self, intptr_t slot) {
 	QDockWidget::connect(self, static_cast<void (QDockWidget::*)(bool)>(&QDockWidget::visibilityChanged), self, [=](bool visible) {
 		bool sigval1 = visible;
 		miqt_exec_callback_QDockWidget_VisibilityChanged(slot, sigval1);
@@ -158,7 +158,7 @@ void QDockWidget_DockLocationChanged(QDockWidget* self, int area) {
 	self->dockLocationChanged(static_cast<Qt::DockWidgetArea>(area));
 }
 
-void QDockWidget_connect_DockLocationChanged(QDockWidget* self, void* slot) {
+void QDockWidget_connect_DockLocationChanged(QDockWidget* self, intptr_t slot) {
 	QDockWidget::connect(self, static_cast<void (QDockWidget::*)(Qt::DockWidgetArea)>(&QDockWidget::dockLocationChanged), self, [=](Qt::DockWidgetArea area) {
 		Qt::DockWidgetArea area_ret = area;
 		int sigval1 = static_cast<int>(area_ret);

qt/gen_qdockwidget.go

@@ -172,12 +172,12 @@ func (this *QDockWidget) FeaturesChanged(features QDockWidget__DockWidgetFeature
 	C.QDockWidget_FeaturesChanged(this.h, (C.int)(features))
 }
 func (this *QDockWidget) OnFeaturesChanged(slot func(features QDockWidget__DockWidgetFeature)) {
-	C.QDockWidget_connect_FeaturesChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QDockWidget_connect_FeaturesChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QDockWidget_FeaturesChanged
-func miqt_exec_callback_QDockWidget_FeaturesChanged(cb *C.void, features C.int) {
+func miqt_exec_callback_QDockWidget_FeaturesChanged(cb C.intptr_t, features C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(features QDockWidget__DockWidgetFeature))
+	gofunc, ok := cgo.Handle(cb).Value().(func(features QDockWidget__DockWidgetFeature))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -192,12 +192,12 @@ func (this *QDockWidget) TopLevelChanged(topLevel bool) {
 	C.QDockWidget_TopLevelChanged(this.h, (C.bool)(topLevel))
 }
 func (this *QDockWidget) OnTopLevelChanged(slot func(topLevel bool)) {
-	C.QDockWidget_connect_TopLevelChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QDockWidget_connect_TopLevelChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QDockWidget_TopLevelChanged
-func miqt_exec_callback_QDockWidget_TopLevelChanged(cb *C.void, topLevel C.bool) {
+func miqt_exec_callback_QDockWidget_TopLevelChanged(cb C.intptr_t, topLevel C.bool) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(topLevel bool))
+	gofunc, ok := cgo.Handle(cb).Value().(func(topLevel bool))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -212,12 +212,12 @@ func (this *QDockWidget) AllowedAreasChanged(allowedAreas DockWidgetArea) {
 	C.QDockWidget_AllowedAreasChanged(this.h, (C.int)(allowedAreas))
 }
 func (this *QDockWidget) OnAllowedAreasChanged(slot func(allowedAreas DockWidgetArea)) {
-	C.QDockWidget_connect_AllowedAreasChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QDockWidget_connect_AllowedAreasChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QDockWidget_AllowedAreasChanged
-func miqt_exec_callback_QDockWidget_AllowedAreasChanged(cb *C.void, allowedAreas C.int) {
+func miqt_exec_callback_QDockWidget_AllowedAreasChanged(cb C.intptr_t, allowedAreas C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(allowedAreas DockWidgetArea))
+	gofunc, ok := cgo.Handle(cb).Value().(func(allowedAreas DockWidgetArea))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -232,12 +232,12 @@ func (this *QDockWidget) VisibilityChanged(visible bool) {
 	C.QDockWidget_VisibilityChanged(this.h, (C.bool)(visible))
 }
 func (this *QDockWidget) OnVisibilityChanged(slot func(visible bool)) {
-	C.QDockWidget_connect_VisibilityChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QDockWidget_connect_VisibilityChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QDockWidget_VisibilityChanged
-func miqt_exec_callback_QDockWidget_VisibilityChanged(cb *C.void, visible C.bool) {
+func miqt_exec_callback_QDockWidget_VisibilityChanged(cb C.intptr_t, visible C.bool) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(visible bool))
+	gofunc, ok := cgo.Handle(cb).Value().(func(visible bool))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -252,12 +252,12 @@ func (this *QDockWidget) DockLocationChanged(area DockWidgetArea) {
 	C.QDockWidget_DockLocationChanged(this.h, (C.int)(area))
 }
 func (this *QDockWidget) OnDockLocationChanged(slot func(area DockWidgetArea)) {
-	C.QDockWidget_connect_DockLocationChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QDockWidget_connect_DockLocationChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QDockWidget_DockLocationChanged
-func miqt_exec_callback_QDockWidget_DockLocationChanged(cb *C.void, area C.int) {
+func miqt_exec_callback_QDockWidget_DockLocationChanged(cb C.intptr_t, area C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(area DockWidgetArea))
+	gofunc, ok := cgo.Handle(cb).Value().(func(area DockWidgetArea))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qdockwidget.h

@@ -48,15 +48,15 @@ QWidget* QDockWidget_TitleBarWidget(const QDockWidget* self);
 bool QDockWidget_IsAreaAllowed(const QDockWidget* self, int area);
 QAction* QDockWidget_ToggleViewAction(const QDockWidget* self);
 void QDockWidget_FeaturesChanged(QDockWidget* self, int features);
-void QDockWidget_connect_FeaturesChanged(QDockWidget* self, void* slot);
+void QDockWidget_connect_FeaturesChanged(QDockWidget* self, intptr_t slot);
 void QDockWidget_TopLevelChanged(QDockWidget* self, bool topLevel);
-void QDockWidget_connect_TopLevelChanged(QDockWidget* self, void* slot);
+void QDockWidget_connect_TopLevelChanged(QDockWidget* self, intptr_t slot);
 void QDockWidget_AllowedAreasChanged(QDockWidget* self, int allowedAreas);
-void QDockWidget_connect_AllowedAreasChanged(QDockWidget* self, void* slot);
+void QDockWidget_connect_AllowedAreasChanged(QDockWidget* self, intptr_t slot);
 void QDockWidget_VisibilityChanged(QDockWidget* self, bool visible);
-void QDockWidget_connect_VisibilityChanged(QDockWidget* self, void* slot);
+void QDockWidget_connect_VisibilityChanged(QDockWidget* self, intptr_t slot);
 void QDockWidget_DockLocationChanged(QDockWidget* self, int area);
-void QDockWidget_connect_DockLocationChanged(QDockWidget* self, void* slot);
+void QDockWidget_connect_DockLocationChanged(QDockWidget* self, intptr_t slot);
 struct miqt_string* QDockWidget_Tr2(const char* s, const char* c);
 struct miqt_string* QDockWidget_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QDockWidget_TrUtf82(const char* s, const char* c);

qt/gen_qdrag.cpp

@@ -110,7 +110,7 @@ void QDrag_ActionChanged(QDrag* self, int action) {
 	self->actionChanged(static_cast<Qt::DropAction>(action));
 }
 
-void QDrag_connect_ActionChanged(QDrag* self, void* slot) {
+void QDrag_connect_ActionChanged(QDrag* self, intptr_t slot) {
 	QDrag::connect(self, static_cast<void (QDrag::*)(Qt::DropAction)>(&QDrag::actionChanged), self, [=](Qt::DropAction action) {
 		Qt::DropAction action_ret = action;
 		int sigval1 = static_cast<int>(action_ret);
@@ -122,7 +122,7 @@ void QDrag_TargetChanged(QDrag* self, QObject* newTarget) {
 	self->targetChanged(newTarget);
 }
 
-void QDrag_connect_TargetChanged(QDrag* self, void* slot) {
+void QDrag_connect_TargetChanged(QDrag* self, intptr_t slot) {
 	QDrag::connect(self, static_cast<void (QDrag::*)(QObject*)>(&QDrag::targetChanged), self, [=](QObject* newTarget) {
 		QObject* sigval1 = newTarget;
 		miqt_exec_callback_QDrag_TargetChanged(slot, sigval1);

qt/gen_qdrag.go

@@ -148,12 +148,12 @@ func (this *QDrag) ActionChanged(action DropAction) {
 	C.QDrag_ActionChanged(this.h, (C.int)(action))
 }
 func (this *QDrag) OnActionChanged(slot func(action DropAction)) {
-	C.QDrag_connect_ActionChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QDrag_connect_ActionChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QDrag_ActionChanged
-func miqt_exec_callback_QDrag_ActionChanged(cb *C.void, action C.int) {
+func miqt_exec_callback_QDrag_ActionChanged(cb C.intptr_t, action C.int) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(action DropAction))
+	gofunc, ok := cgo.Handle(cb).Value().(func(action DropAction))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -168,12 +168,12 @@ func (this *QDrag) TargetChanged(newTarget *QObject) {
 	C.QDrag_TargetChanged(this.h, newTarget.cPointer())
 }
 func (this *QDrag) OnTargetChanged(slot func(newTarget *QObject)) {
-	C.QDrag_connect_TargetChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QDrag_connect_TargetChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QDrag_TargetChanged
-func miqt_exec_callback_QDrag_TargetChanged(cb *C.void, newTarget *C.QObject) {
+func miqt_exec_callback_QDrag_TargetChanged(cb C.intptr_t, newTarget *C.QObject) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(newTarget *QObject))
+	gofunc, ok := cgo.Handle(cb).Value().(func(newTarget *QObject))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qdrag.h

@@ -51,9 +51,9 @@ int QDrag_SupportedActions(const QDrag* self);
 int QDrag_DefaultAction(const QDrag* self);
 void QDrag_Cancel();
 void QDrag_ActionChanged(QDrag* self, int action);
-void QDrag_connect_ActionChanged(QDrag* self, void* slot);
+void QDrag_connect_ActionChanged(QDrag* self, intptr_t slot);
 void QDrag_TargetChanged(QDrag* self, QObject* newTarget);
-void QDrag_connect_TargetChanged(QDrag* self, void* slot);
+void QDrag_connect_TargetChanged(QDrag* self, intptr_t slot);
 struct miqt_string* QDrag_Tr2(const char* s, const char* c);
 struct miqt_string* QDrag_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QDrag_TrUtf82(const char* s, const char* c);

qt/gen_qfiledialog.cpp

@@ -436,7 +436,7 @@ void QFileDialog_FileSelected(QFileDialog* self, struct miqt_string* file) {
 	self->fileSelected(file_QString);
 }
 
-void QFileDialog_connect_FileSelected(QFileDialog* self, void* slot) {
+void QFileDialog_connect_FileSelected(QFileDialog* self, intptr_t slot) {
 	QFileDialog::connect(self, static_cast<void (QFileDialog::*)(const QString&)>(&QFileDialog::fileSelected), self, [=](const QString& file) {
 		const QString file_ret = file;
 		// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
@@ -457,7 +457,7 @@ void QFileDialog_FilesSelected(QFileDialog* self, struct miqt_array* /* of struc
 	self->filesSelected(files_QList);
 }
 
-void QFileDialog_connect_FilesSelected(QFileDialog* self, void* slot) {
+void QFileDialog_connect_FilesSelected(QFileDialog* self, intptr_t slot) {
 	QFileDialog::connect(self, static_cast<void (QFileDialog::*)(const QStringList&)>(&QFileDialog::filesSelected), self, [=](const QStringList& files) {
 		const QStringList& files_ret = files;
 		// Convert QList<> from C++ memory to manually-managed C memory
@@ -481,7 +481,7 @@ void QFileDialog_CurrentChanged(QFileDialog* self, struct miqt_string* path) {
 	self->currentChanged(path_QString);
 }
 
-void QFileDialog_connect_CurrentChanged(QFileDialog* self, void* slot) {
+void QFileDialog_connect_CurrentChanged(QFileDialog* self, intptr_t slot) {
 	QFileDialog::connect(self, static_cast<void (QFileDialog::*)(const QString&)>(&QFileDialog::currentChanged), self, [=](const QString& path) {
 		const QString path_ret = path;
 		// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
@@ -496,7 +496,7 @@ void QFileDialog_DirectoryEntered(QFileDialog* self, struct miqt_string* directo
 	self->directoryEntered(directory_QString);
 }
 
-void QFileDialog_connect_DirectoryEntered(QFileDialog* self, void* slot) {
+void QFileDialog_connect_DirectoryEntered(QFileDialog* self, intptr_t slot) {
 	QFileDialog::connect(self, static_cast<void (QFileDialog::*)(const QString&)>(&QFileDialog::directoryEntered), self, [=](const QString& directory) {
 		const QString directory_ret = directory;
 		// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
@@ -510,7 +510,7 @@ void QFileDialog_UrlSelected(QFileDialog* self, QUrl* url) {
 	self->urlSelected(*url);
 }
 
-void QFileDialog_connect_UrlSelected(QFileDialog* self, void* slot) {
+void QFileDialog_connect_UrlSelected(QFileDialog* self, intptr_t slot) {
 	QFileDialog::connect(self, static_cast<void (QFileDialog::*)(const QUrl&)>(&QFileDialog::urlSelected), self, [=](const QUrl& url) {
 		const QUrl& url_ret = url;
 		// Cast returned reference into pointer
@@ -529,7 +529,7 @@ void QFileDialog_UrlsSelected(QFileDialog* self, struct miqt_array* /* of QUrl*
 	self->urlsSelected(urls_QList);
 }
 
-void QFileDialog_connect_UrlsSelected(QFileDialog* self, void* slot) {
+void QFileDialog_connect_UrlsSelected(QFileDialog* self, intptr_t slot) {
 	QFileDialog::connect(self, static_cast<void (QFileDialog::*)(const QList<QUrl>&)>(&QFileDialog::urlsSelected), self, [=](const QList<QUrl>& urls) {
 		const QList<QUrl>& urls_ret = urls;
 		// Convert QList<> from C++ memory to manually-managed C memory
@@ -549,7 +549,7 @@ void QFileDialog_CurrentUrlChanged(QFileDialog* self, QUrl* url) {
 	self->currentUrlChanged(*url);
 }
 
-void QFileDialog_connect_CurrentUrlChanged(QFileDialog* self, void* slot) {
+void QFileDialog_connect_CurrentUrlChanged(QFileDialog* self, intptr_t slot) {
 	QFileDialog::connect(self, static_cast<void (QFileDialog::*)(const QUrl&)>(&QFileDialog::currentUrlChanged), self, [=](const QUrl& url) {
 		const QUrl& url_ret = url;
 		// Cast returned reference into pointer
@@ -562,7 +562,7 @@ void QFileDialog_DirectoryUrlEntered(QFileDialog* self, QUrl* directory) {
 	self->directoryUrlEntered(*directory);
 }
 
-void QFileDialog_connect_DirectoryUrlEntered(QFileDialog* self, void* slot) {
+void QFileDialog_connect_DirectoryUrlEntered(QFileDialog* self, intptr_t slot) {
 	QFileDialog::connect(self, static_cast<void (QFileDialog::*)(const QUrl&)>(&QFileDialog::directoryUrlEntered), self, [=](const QUrl& directory) {
 		const QUrl& directory_ret = directory;
 		// Cast returned reference into pointer
@@ -576,7 +576,7 @@ void QFileDialog_FilterSelected(QFileDialog* self, struct miqt_string* filter) {
 	self->filterSelected(filter_QString);
 }
 
-void QFileDialog_connect_FilterSelected(QFileDialog* self, void* slot) {
+void QFileDialog_connect_FilterSelected(QFileDialog* self, intptr_t slot) {
 	QFileDialog::connect(self, static_cast<void (QFileDialog::*)(const QString&)>(&QFileDialog::filterSelected), self, [=](const QString& filter) {
 		const QString filter_ret = filter;
 		// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory

qt/gen_qfiledialog.go

@@ -547,12 +547,12 @@ func (this *QFileDialog) FileSelected(file string) {
 	C.QFileDialog_FileSelected(this.h, (*C.struct_miqt_string)(file_ms))
 }
 func (this *QFileDialog) OnFileSelected(slot func(file string)) {
-	C.QFileDialog_connect_FileSelected(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QFileDialog_connect_FileSelected(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QFileDialog_FileSelected
-func miqt_exec_callback_QFileDialog_FileSelected(cb *C.void, file *C.struct_miqt_string) {
+func miqt_exec_callback_QFileDialog_FileSelected(cb C.intptr_t, file *C.struct_miqt_string) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(file string))
+	gofunc, ok := cgo.Handle(cb).Value().(func(file string))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -580,12 +580,12 @@ func (this *QFileDialog) FilesSelected(files []string) {
 	C.QFileDialog_FilesSelected(this.h, files_ma)
 }
 func (this *QFileDialog) OnFilesSelected(slot func(files []string)) {
-	C.QFileDialog_connect_FilesSelected(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QFileDialog_connect_FilesSelected(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QFileDialog_FilesSelected
-func miqt_exec_callback_QFileDialog_FilesSelected(cb *C.void, files *C.struct_miqt_array) {
+func miqt_exec_callback_QFileDialog_FilesSelected(cb C.intptr_t, files *C.struct_miqt_array) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(files []string))
+	gofunc, ok := cgo.Handle(cb).Value().(func(files []string))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -612,12 +612,12 @@ func (this *QFileDialog) CurrentChanged(path string) {
 	C.QFileDialog_CurrentChanged(this.h, (*C.struct_miqt_string)(path_ms))
 }
 func (this *QFileDialog) OnCurrentChanged(slot func(path string)) {
-	C.QFileDialog_connect_CurrentChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QFileDialog_connect_CurrentChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QFileDialog_CurrentChanged
-func miqt_exec_callback_QFileDialog_CurrentChanged(cb *C.void, path *C.struct_miqt_string) {
+func miqt_exec_callback_QFileDialog_CurrentChanged(cb C.intptr_t, path *C.struct_miqt_string) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(path string))
+	gofunc, ok := cgo.Handle(cb).Value().(func(path string))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -637,12 +637,12 @@ func (this *QFileDialog) DirectoryEntered(directory string) {
 	C.QFileDialog_DirectoryEntered(this.h, (*C.struct_miqt_string)(directory_ms))
 }
 func (this *QFileDialog) OnDirectoryEntered(slot func(directory string)) {
-	C.QFileDialog_connect_DirectoryEntered(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QFileDialog_connect_DirectoryEntered(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QFileDialog_DirectoryEntered
-func miqt_exec_callback_QFileDialog_DirectoryEntered(cb *C.void, directory *C.struct_miqt_string) {
+func miqt_exec_callback_QFileDialog_DirectoryEntered(cb C.intptr_t, directory *C.struct_miqt_string) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(directory string))
+	gofunc, ok := cgo.Handle(cb).Value().(func(directory string))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -660,12 +660,12 @@ func (this *QFileDialog) UrlSelected(url *QUrl) {
 	C.QFileDialog_UrlSelected(this.h, url.cPointer())
 }
 func (this *QFileDialog) OnUrlSelected(slot func(url *QUrl)) {
-	C.QFileDialog_connect_UrlSelected(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QFileDialog_connect_UrlSelected(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QFileDialog_UrlSelected
-func miqt_exec_callback_QFileDialog_UrlSelected(cb *C.void, url *C.QUrl) {
+func miqt_exec_callback_QFileDialog_UrlSelected(cb C.intptr_t, url *C.QUrl) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(url *QUrl))
+	gofunc, ok := cgo.Handle(cb).Value().(func(url *QUrl))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -688,12 +688,12 @@ func (this *QFileDialog) UrlsSelected(urls []QUrl) {
 	C.QFileDialog_UrlsSelected(this.h, urls_ma)
 }
 func (this *QFileDialog) OnUrlsSelected(slot func(urls []QUrl)) {
-	C.QFileDialog_connect_UrlsSelected(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QFileDialog_connect_UrlsSelected(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QFileDialog_UrlsSelected
-func miqt_exec_callback_QFileDialog_UrlsSelected(cb *C.void, urls *C.struct_miqt_array) {
+func miqt_exec_callback_QFileDialog_UrlsSelected(cb C.intptr_t, urls *C.struct_miqt_array) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(urls []QUrl))
+	gofunc, ok := cgo.Handle(cb).Value().(func(urls []QUrl))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -718,12 +718,12 @@ func (this *QFileDialog) CurrentUrlChanged(url *QUrl) {
 	C.QFileDialog_CurrentUrlChanged(this.h, url.cPointer())
 }
 func (this *QFileDialog) OnCurrentUrlChanged(slot func(url *QUrl)) {
-	C.QFileDialog_connect_CurrentUrlChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QFileDialog_connect_CurrentUrlChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QFileDialog_CurrentUrlChanged
-func miqt_exec_callback_QFileDialog_CurrentUrlChanged(cb *C.void, url *C.QUrl) {
+func miqt_exec_callback_QFileDialog_CurrentUrlChanged(cb C.intptr_t, url *C.QUrl) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(url *QUrl))
+	gofunc, ok := cgo.Handle(cb).Value().(func(url *QUrl))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -738,12 +738,12 @@ func (this *QFileDialog) DirectoryUrlEntered(directory *QUrl) {
 	C.QFileDialog_DirectoryUrlEntered(this.h, directory.cPointer())
 }
 func (this *QFileDialog) OnDirectoryUrlEntered(slot func(directory *QUrl)) {
-	C.QFileDialog_connect_DirectoryUrlEntered(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QFileDialog_connect_DirectoryUrlEntered(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QFileDialog_DirectoryUrlEntered
-func miqt_exec_callback_QFileDialog_DirectoryUrlEntered(cb *C.void, directory *C.QUrl) {
+func miqt_exec_callback_QFileDialog_DirectoryUrlEntered(cb C.intptr_t, directory *C.QUrl) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(directory *QUrl))
+	gofunc, ok := cgo.Handle(cb).Value().(func(directory *QUrl))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -760,12 +760,12 @@ func (this *QFileDialog) FilterSelected(filter string) {
 	C.QFileDialog_FilterSelected(this.h, (*C.struct_miqt_string)(filter_ms))
 }
 func (this *QFileDialog) OnFilterSelected(slot func(filter string)) {
-	C.QFileDialog_connect_FilterSelected(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QFileDialog_connect_FilterSelected(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QFileDialog_FilterSelected
-func miqt_exec_callback_QFileDialog_FilterSelected(cb *C.void, filter *C.struct_miqt_string) {
+func miqt_exec_callback_QFileDialog_FilterSelected(cb C.intptr_t, filter *C.struct_miqt_string) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(filter string))
+	gofunc, ok := cgo.Handle(cb).Value().(func(filter string))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qfiledialog.h

@@ -103,23 +103,23 @@ void QFileDialog_SetOptions(QFileDialog* self, int options);
 int QFileDialog_Options(const QFileDialog* self);
 void QFileDialog_SetVisible(QFileDialog* self, bool visible);
 void QFileDialog_FileSelected(QFileDialog* self, struct miqt_string* file);
-void QFileDialog_connect_FileSelected(QFileDialog* self, void* slot);
+void QFileDialog_connect_FileSelected(QFileDialog* self, intptr_t slot);
 void QFileDialog_FilesSelected(QFileDialog* self, struct miqt_array* /* of struct miqt_string* */ files);
-void QFileDialog_connect_FilesSelected(QFileDialog* self, void* slot);
+void QFileDialog_connect_FilesSelected(QFileDialog* self, intptr_t slot);
 void QFileDialog_CurrentChanged(QFileDialog* self, struct miqt_string* path);
-void QFileDialog_connect_CurrentChanged(QFileDialog* self, void* slot);
+void QFileDialog_connect_CurrentChanged(QFileDialog* self, intptr_t slot);
 void QFileDialog_DirectoryEntered(QFileDialog* self, struct miqt_string* directory);
-void QFileDialog_connect_DirectoryEntered(QFileDialog* self, void* slot);
+void QFileDialog_connect_DirectoryEntered(QFileDialog* self, intptr_t slot);
 void QFileDialog_UrlSelected(QFileDialog* self, QUrl* url);
-void QFileDialog_connect_UrlSelected(QFileDialog* self, void* slot);
+void QFileDialog_connect_UrlSelected(QFileDialog* self, intptr_t slot);
 void QFileDialog_UrlsSelected(QFileDialog* self, struct miqt_array* /* of QUrl* */ urls);
-void QFileDialog_connect_UrlsSelected(QFileDialog* self, void* slot);
+void QFileDialog_connect_UrlsSelected(QFileDialog* self, intptr_t slot);
 void QFileDialog_CurrentUrlChanged(QFileDialog* self, QUrl* url);
-void QFileDialog_connect_CurrentUrlChanged(QFileDialog* self, void* slot);
+void QFileDialog_connect_CurrentUrlChanged(QFileDialog* self, intptr_t slot);
 void QFileDialog_DirectoryUrlEntered(QFileDialog* self, QUrl* directory);
-void QFileDialog_connect_DirectoryUrlEntered(QFileDialog* self, void* slot);
+void QFileDialog_connect_DirectoryUrlEntered(QFileDialog* self, intptr_t slot);
 void QFileDialog_FilterSelected(QFileDialog* self, struct miqt_string* filter);
-void QFileDialog_connect_FilterSelected(QFileDialog* self, void* slot);
+void QFileDialog_connect_FilterSelected(QFileDialog* self, intptr_t slot);
 struct miqt_string* QFileDialog_GetOpenFileName();
 QUrl* QFileDialog_GetOpenFileUrl();
 struct miqt_string* QFileDialog_GetSaveFileName();

qt/gen_qfilesystemmodel.cpp

@@ -52,7 +52,7 @@ void QFileSystemModel_RootPathChanged(QFileSystemModel* self, struct miqt_string
 	self->rootPathChanged(newPath_QString);
 }
 
-void QFileSystemModel_connect_RootPathChanged(QFileSystemModel* self, void* slot) {
+void QFileSystemModel_connect_RootPathChanged(QFileSystemModel* self, intptr_t slot) {
 	QFileSystemModel::connect(self, static_cast<void (QFileSystemModel::*)(const QString&)>(&QFileSystemModel::rootPathChanged), self, [=](const QString& newPath) {
 		const QString newPath_ret = newPath;
 		// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
@@ -69,7 +69,7 @@ void QFileSystemModel_FileRenamed(QFileSystemModel* self, struct miqt_string* pa
 	self->fileRenamed(path_QString, oldName_QString, newName_QString);
 }
 
-void QFileSystemModel_connect_FileRenamed(QFileSystemModel* self, void* slot) {
+void QFileSystemModel_connect_FileRenamed(QFileSystemModel* self, intptr_t slot) {
 	QFileSystemModel::connect(self, static_cast<void (QFileSystemModel::*)(const QString&, const QString&, const QString&)>(&QFileSystemModel::fileRenamed), self, [=](const QString& path, const QString& oldName, const QString& newName) {
 		const QString path_ret = path;
 		// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
@@ -92,7 +92,7 @@ void QFileSystemModel_DirectoryLoaded(QFileSystemModel* self, struct miqt_string
 	self->directoryLoaded(path_QString);
 }
 
-void QFileSystemModel_connect_DirectoryLoaded(QFileSystemModel* self, void* slot) {
+void QFileSystemModel_connect_DirectoryLoaded(QFileSystemModel* self, intptr_t slot) {
 	QFileSystemModel::connect(self, static_cast<void (QFileSystemModel::*)(const QString&)>(&QFileSystemModel::directoryLoaded), self, [=](const QString& path) {
 		const QString path_ret = path;
 		// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory

qt/gen_qfilesystemmodel.go

@@ -100,12 +100,12 @@ func (this *QFileSystemModel) RootPathChanged(newPath string) {
 	C.QFileSystemModel_RootPathChanged(this.h, (*C.struct_miqt_string)(newPath_ms))
 }
 func (this *QFileSystemModel) OnRootPathChanged(slot func(newPath string)) {
-	C.QFileSystemModel_connect_RootPathChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QFileSystemModel_connect_RootPathChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QFileSystemModel_RootPathChanged
-func miqt_exec_callback_QFileSystemModel_RootPathChanged(cb *C.void, newPath *C.struct_miqt_string) {
+func miqt_exec_callback_QFileSystemModel_RootPathChanged(cb C.intptr_t, newPath *C.struct_miqt_string) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(newPath string))
+	gofunc, ok := cgo.Handle(cb).Value().(func(newPath string))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -129,12 +129,12 @@ func (this *QFileSystemModel) FileRenamed(path string, oldName string, newName s
 	C.QFileSystemModel_FileRenamed(this.h, (*C.struct_miqt_string)(path_ms), (*C.struct_miqt_string)(oldName_ms), (*C.struct_miqt_string)(newName_ms))
 }
 func (this *QFileSystemModel) OnFileRenamed(slot func(path string, oldName string, newName string)) {
-	C.QFileSystemModel_connect_FileRenamed(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QFileSystemModel_connect_FileRenamed(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QFileSystemModel_FileRenamed
-func miqt_exec_callback_QFileSystemModel_FileRenamed(cb *C.void, path *C.struct_miqt_string, oldName *C.struct_miqt_string, newName *C.struct_miqt_string) {
+func miqt_exec_callback_QFileSystemModel_FileRenamed(cb C.intptr_t, path *C.struct_miqt_string, oldName *C.struct_miqt_string, newName *C.struct_miqt_string) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(path string, oldName string, newName string))
+	gofunc, ok := cgo.Handle(cb).Value().(func(path string, oldName string, newName string))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -162,12 +162,12 @@ func (this *QFileSystemModel) DirectoryLoaded(path string) {
 	C.QFileSystemModel_DirectoryLoaded(this.h, (*C.struct_miqt_string)(path_ms))
 }
 func (this *QFileSystemModel) OnDirectoryLoaded(slot func(path string)) {
-	C.QFileSystemModel_connect_DirectoryLoaded(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QFileSystemModel_connect_DirectoryLoaded(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QFileSystemModel_DirectoryLoaded
-func miqt_exec_callback_QFileSystemModel_DirectoryLoaded(cb *C.void, path *C.struct_miqt_string) {
+func miqt_exec_callback_QFileSystemModel_DirectoryLoaded(cb C.intptr_t, path *C.struct_miqt_string) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(path string))
+	gofunc, ok := cgo.Handle(cb).Value().(func(path string))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qfilesystemmodel.h

@@ -46,11 +46,11 @@ void* QFileSystemModel_Metacast(QFileSystemModel* self, const char* param1);
 struct miqt_string* QFileSystemModel_Tr(const char* s);
 struct miqt_string* QFileSystemModel_TrUtf8(const char* s);
 void QFileSystemModel_RootPathChanged(QFileSystemModel* self, struct miqt_string* newPath);
-void QFileSystemModel_connect_RootPathChanged(QFileSystemModel* self, void* slot);
+void QFileSystemModel_connect_RootPathChanged(QFileSystemModel* self, intptr_t slot);
 void QFileSystemModel_FileRenamed(QFileSystemModel* self, struct miqt_string* path, struct miqt_string* oldName, struct miqt_string* newName);
-void QFileSystemModel_connect_FileRenamed(QFileSystemModel* self, void* slot);
+void QFileSystemModel_connect_FileRenamed(QFileSystemModel* self, intptr_t slot);
 void QFileSystemModel_DirectoryLoaded(QFileSystemModel* self, struct miqt_string* path);
-void QFileSystemModel_connect_DirectoryLoaded(QFileSystemModel* self, void* slot);
+void QFileSystemModel_connect_DirectoryLoaded(QFileSystemModel* self, intptr_t slot);
 QModelIndex* QFileSystemModel_Index(const QFileSystemModel* self, int row, int column);
 QModelIndex* QFileSystemModel_IndexWithPath(const QFileSystemModel* self, struct miqt_string* path);
 QModelIndex* QFileSystemModel_Parent(const QFileSystemModel* self, QModelIndex* child);

qt/gen_qfontcombobox.cpp

@@ -74,7 +74,7 @@ void QFontComboBox_CurrentFontChanged(QFontComboBox* self, QFont* f) {
 	self->currentFontChanged(*f);
 }
 
-void QFontComboBox_connect_CurrentFontChanged(QFontComboBox* self, void* slot) {
+void QFontComboBox_connect_CurrentFontChanged(QFontComboBox* self, intptr_t slot) {
 	QFontComboBox::connect(self, static_cast<void (QFontComboBox::*)(const QFont&)>(&QFontComboBox::currentFontChanged), self, [=](const QFont& f) {
 		const QFont& f_ret = f;
 		// Cast returned reference into pointer

qt/gen_qfontcombobox.go

@@ -125,12 +125,12 @@ func (this *QFontComboBox) CurrentFontChanged(f *QFont) {
 	C.QFontComboBox_CurrentFontChanged(this.h, f.cPointer())
 }
 func (this *QFontComboBox) OnCurrentFontChanged(slot func(f *QFont)) {
-	C.QFontComboBox_connect_CurrentFontChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QFontComboBox_connect_CurrentFontChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QFontComboBox_CurrentFontChanged
-func miqt_exec_callback_QFontComboBox_CurrentFontChanged(cb *C.void, f *C.QFont) {
+func miqt_exec_callback_QFontComboBox_CurrentFontChanged(cb C.intptr_t, f *C.QFont) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(f *QFont))
+	gofunc, ok := cgo.Handle(cb).Value().(func(f *QFont))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qfontcombobox.h

@@ -41,7 +41,7 @@ QFont* QFontComboBox_CurrentFont(const QFontComboBox* self);
 QSize* QFontComboBox_SizeHint(const QFontComboBox* self);
 void QFontComboBox_SetCurrentFont(QFontComboBox* self, QFont* f);
 void QFontComboBox_CurrentFontChanged(QFontComboBox* self, QFont* f);
-void QFontComboBox_connect_CurrentFontChanged(QFontComboBox* self, void* slot);
+void QFontComboBox_connect_CurrentFontChanged(QFontComboBox* self, intptr_t slot);
 struct miqt_string* QFontComboBox_Tr2(const char* s, const char* c);
 struct miqt_string* QFontComboBox_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QFontComboBox_TrUtf82(const char* s, const char* c);

qt/gen_qfontdialog.cpp

@@ -92,7 +92,7 @@ void QFontDialog_CurrentFontChanged(QFontDialog* self, QFont* font) {
 	self->currentFontChanged(*font);
 }
 
-void QFontDialog_connect_CurrentFontChanged(QFontDialog* self, void* slot) {
+void QFontDialog_connect_CurrentFontChanged(QFontDialog* self, intptr_t slot) {
 	QFontDialog::connect(self, static_cast<void (QFontDialog::*)(const QFont&)>(&QFontDialog::currentFontChanged), self, [=](const QFont& font) {
 		const QFont& font_ret = font;
 		// Cast returned reference into pointer
@@ -105,7 +105,7 @@ void QFontDialog_FontSelected(QFontDialog* self, QFont* font) {
 	self->fontSelected(*font);
 }
 
-void QFontDialog_connect_FontSelected(QFontDialog* self, void* slot) {
+void QFontDialog_connect_FontSelected(QFontDialog* self, intptr_t slot) {
 	QFontDialog::connect(self, static_cast<void (QFontDialog::*)(const QFont&)>(&QFontDialog::fontSelected), self, [=](const QFont& font) {
 		const QFont& font_ret = font;
 		// Cast returned reference into pointer

qt/gen_qfontdialog.go

@@ -156,12 +156,12 @@ func (this *QFontDialog) CurrentFontChanged(font *QFont) {
 	C.QFontDialog_CurrentFontChanged(this.h, font.cPointer())
 }
 func (this *QFontDialog) OnCurrentFontChanged(slot func(font *QFont)) {
-	C.QFontDialog_connect_CurrentFontChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QFontDialog_connect_CurrentFontChanged(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QFontDialog_CurrentFontChanged
-func miqt_exec_callback_QFontDialog_CurrentFontChanged(cb *C.void, font *C.QFont) {
+func miqt_exec_callback_QFontDialog_CurrentFontChanged(cb C.intptr_t, font *C.QFont) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(font *QFont))
+	gofunc, ok := cgo.Handle(cb).Value().(func(font *QFont))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}
@@ -176,12 +176,12 @@ func (this *QFontDialog) FontSelected(font *QFont) {
 	C.QFontDialog_FontSelected(this.h, font.cPointer())
 }
 func (this *QFontDialog) OnFontSelected(slot func(font *QFont)) {
-	C.QFontDialog_connect_FontSelected(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slot))))
+	C.QFontDialog_connect_FontSelected(this.h, C.intptr_t(cgo.NewHandle(slot)))
 }
 
 //export miqt_exec_callback_QFontDialog_FontSelected
-func miqt_exec_callback_QFontDialog_FontSelected(cb *C.void, font *C.QFont) {
+func miqt_exec_callback_QFontDialog_FontSelected(cb C.intptr_t, font *C.QFont) {
-	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(font *QFont))
+	gofunc, ok := cgo.Handle(cb).Value().(func(font *QFont))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
 	}

qt/gen_qfontdialog.h

@@ -44,9 +44,9 @@ void QFontDialog_SetVisible(QFontDialog* self, bool visible);
 QFont* QFontDialog_GetFont(bool* ok);
 QFont* QFontDialog_GetFont2(bool* ok, QFont* initial);
 void QFontDialog_CurrentFontChanged(QFontDialog* self, QFont* font);
-void QFontDialog_connect_CurrentFontChanged(QFontDialog* self, void* slot);
+void QFontDialog_connect_CurrentFontChanged(QFontDialog* self, intptr_t slot);
 void QFontDialog_FontSelected(QFontDialog* self, QFont* font);
-void QFontDialog_connect_FontSelected(QFontDialog* self, void* slot);
+void QFontDialog_connect_FontSelected(QFontDialog* self, intptr_t slot);
 struct miqt_string* QFontDialog_Tr2(const char* s, const char* c);
 struct miqt_string* QFontDialog_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QFontDialog_TrUtf82(const char* s, const char* c);

qt/gen_qfuturewatcher.cpp

@@ -85,7 +85,7 @@ void QFutureWatcherBase_Started(QFutureWatcherBase* self) {
 	self->started();
 }
 
-void QFutureWatcherBase_connect_Started(QFutureWatcherBase* self, void* slot) {
+void QFutureWatcherBase_connect_Started(QFutureWatcherBase* self, intptr_t slot) {
 	QFutureWatcherBase::connect(self, static_cast<void (QFutureWatcherBase::*)()>(&QFutureWatcherBase::started), self, [=]() {
 		miqt_exec_callback_QFutureWatcherBase_Started(slot);
 	});
@@ -95,7 +95,7 @@ void QFutureWatcherBase_Finished(QFutureWatcherBase* self) {
 	self->finished();
 }
 
-void QFutureWatcherBase_connect_Finished(QFutureWatcherBase* self, void* slot) {
+void QFutureWatcherBase_connect_Finished(QFutureWatcherBase* self, intptr_t slot) {
 	QFutureWatcherBase::connect(self, static_cast<void (QFutureWatcherBase::*)()>(&QFutureWatcherBase::finished), self, [=]() {
 		miqt_exec_callback_QFutureWatcherBase_Finished(slot);
 	});
@@ -105,7 +105,7 @@ void QFutureWatcherBase_Canceled(QFutureWatcherBase* self) {
 	self->canceled();
 }
 
-void QFutureWatcherBase_connect_Canceled(QFutureWatcherBase* self, void* slot) {
+void QFutureWatcherBase_connect_Canceled(QFutureWatcherBase* self, intptr_t slot) {
 	QFutureWatcherBase::connect(self, static_cast<void (QFutureWatcherBase::*)()>(&QFutureWatcherBase::canceled), self, [=]() {
 		miqt_exec_callback_QFutureWatcherBase_Canceled(slot);
 	});
@@ -115,7 +115,7 @@ void QFutureWatcherBase_Paused(QFutureWatcherBase* self) {
 	self->paused();
 }
 
-void QFutureWatcherBase_connect_Paused(QFutureWatcherBase* self, void* slot) {
+void QFutureWatcherBase_connect_Paused(QFutureWatcherBase* self, intptr_t slot) {
 	QFutureWatcherBase::connect(self, static_cast<void (QFutureWatcherBase::*)()>(&QFutureWatcherBase::paused), self, [=]() {
 		miqt_exec_callback_QFutureWatcherBase_Paused(slot);
 	});
@@ -125,7 +125,7 @@ void QFutureWatcherBase_Resumed(QFutureWatcherBase* self) {
 	self->resumed();
 }
 
-void QFutureWatcherBase_connect_Resumed(QFutureWatcherBase* self, void* slot) {
+void QFutureWatcherBase_connect_Resumed(QFutureWatcherBase* self, intptr_t slot) {
 	QFutureWatcherBase::connect(self, static_cast<void (QFutureWatcherBase::*)()>(&QFutureWatcherBase::resumed), self, [=]() {
 		miqt_exec_callback_QFutureWatcherBase_Resumed(slot);
 	});
@@ -135,7 +135,7 @@ void QFutureWatcherBase_ResultReadyAt(QFutureWatcherBase* self, int resultIndex)
 	self->resultReadyAt(static_cast<int>(resultIndex));
 }
 
-void QFutureWatcherBase_connect_ResultReadyAt(QFutureWatcherBase* self, void* slot) {
+void QFutureWatcherBase_connect_ResultReadyAt(QFutureWatcherBase* self, intptr_t slot) {
 	QFutureWatcherBase::connect(self, static_cast<void (QFutureWatcherBase::*)(int)>(&QFutureWatcherBase::resultReadyAt), self, [=](int resultIndex) {
 		int sigval1 = resultIndex;
 		miqt_exec_callback_QFutureWatcherBase_ResultReadyAt(slot, sigval1);
@@ -146,7 +146,7 @@ void QFutureWatcherBase_ResultsReadyAt(QFutureWatcherBase* self, int beginIndex,
 	self->resultsReadyAt(static_cast<int>(beginIndex), static_cast<int>(endIndex));
 }
 
-void QFutureWatcherBase_connect_ResultsReadyAt(QFutureWatcherBase* self, void* slot) {
+void QFutureWatcherBase_connect_ResultsReadyAt(QFutureWatcherBase* self, intptr_t slot) {
 	QFutureWatcherBase::connect(self, static_cast<void (QFutureWatcherBase::*)(int, int)>(&QFutureWatcherBase::resultsReadyAt), self, [=](int beginIndex, int endIndex) {
 		int sigval1 = beginIndex;
 		int sigval2 = endIndex;
@@ -158,7 +158,7 @@ void QFutureWatcherBase_ProgressRangeChanged(QFutureWatcherBase* self, int minim
 	self->progressRangeChanged(static_cast<int>(minimum), static_cast<int>(maximum));
 }
 
-void QFutureWatcherBase_connect_ProgressRangeChanged(QFutureWatcherBase* self, void* slot) {
+void QFutureWatcherBase_connect_ProgressRangeChanged(QFutureWatcherBase* self, intptr_t slot) {
 	QFutureWatcherBase::connect(self, static_cast<void (QFutureWatcherBase::*)(int, int)>(&QFutureWatcherBase::progressRangeChanged), self, [=](int minimum, int maximum) {
 		int sigval1 = minimum;
 		int sigval2 = maximum;
@@ -170,7 +170,7 @@ void QFutureWatcherBase_ProgressValueChanged(QFutureWatcherBase* self, int progr
 	self->progressValueChanged(static_cast<int>(progressValue));
 }
 
-void QFutureWatcherBase_connect_ProgressValueChanged(QFutureWatcherBase* self, void* slot) {
+void QFutureWatcherBase_connect_ProgressValueChanged(QFutureWatcherBase* self, intptr_t slot) {
 	QFutureWatcherBase::connect(self, static_cast<void (QFutureWatcherBase::*)(int)>(&QFutureWatcherBase::progressValueChanged), self, [=](int progressValue) {
 		int sigval1 = progressValue;
 		miqt_exec_callback_QFutureWatcherBase_ProgressValueChanged(slot, sigval1);
@@ -182,7 +182,7 @@ void QFutureWatcherBase_ProgressTextChanged(QFutureWatcherBase* self, struct miq
 	self->progressTextChanged(progressText_QString);
 }
 
-void QFutureWatcherBase_connect_ProgressTextChanged(QFutureWatcherBase* self, void* slot) {
+void QFutureWatcherBase_connect_ProgressTextChanged(QFutureWatcherBase* self, intptr_t slot) {
 	QFutureWatcherBase::connect(self, static_cast<void (QFutureWatcherBase::*)(const QString&)>(&QFutureWatcherBase::progressTextChanged), self, [=](const QString& progressText) {
 		const QString progressText_ret = progressText;
 		// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory