qt: rebuild (more accurate enum/typedef handling)

qt/gen_qabstractanimation.cpp

@@ -28,21 +28,21 @@ struct miqt_string* QAbstractAnimation_TrUtf8(const char* s) {
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-uintptr_t QAbstractAnimation_State(const QAbstractAnimation* self) {
+int QAbstractAnimation_State(const QAbstractAnimation* self) {
 	QAbstractAnimation::State _ret = self->state();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 QAnimationGroup* QAbstractAnimation_Group(const QAbstractAnimation* self) {
 	return self->group();
 }
 
-uintptr_t QAbstractAnimation_Direction(const QAbstractAnimation* self) {
+int QAbstractAnimation_Direction(const QAbstractAnimation* self) {
 	QAbstractAnimation::Direction _ret = self->direction();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-void QAbstractAnimation_SetDirection(QAbstractAnimation* self, uintptr_t direction) {
+void QAbstractAnimation_SetDirection(QAbstractAnimation* self, int direction) {
 	self->setDirection(static_cast<QAbstractAnimation::Direction>(direction));
 }
 
@@ -84,16 +84,16 @@ void QAbstractAnimation_connect_Finished(QAbstractAnimation* self, void* slot) {
 	});
 }
 
-void QAbstractAnimation_StateChanged(QAbstractAnimation* self, uintptr_t newState, uintptr_t oldState) {
+void QAbstractAnimation_StateChanged(QAbstractAnimation* self, int newState, int oldState) {
 	self->stateChanged(static_cast<QAbstractAnimation::State>(newState), static_cast<QAbstractAnimation::State>(oldState));
 }
 
 void QAbstractAnimation_connect_StateChanged(QAbstractAnimation* self, void* 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;
-		uintptr_t sigval1 = static_cast<uintptr_t>(newState_ret);
+		int sigval1 = static_cast<int>(newState_ret);
 		QAbstractAnimation::State oldState_ret = oldState;
-		uintptr_t sigval2 = static_cast<uintptr_t>(oldState_ret);
+		int sigval2 = static_cast<int>(oldState_ret);
 		miqt_exec_callback_QAbstractAnimation_StateChanged(slot, sigval1, sigval2);
 	});
 }
@@ -109,14 +109,14 @@ void QAbstractAnimation_connect_CurrentLoopChanged(QAbstractAnimation* self, voi
 	});
 }
 
-void QAbstractAnimation_DirectionChanged(QAbstractAnimation* self, uintptr_t param1) {
+void QAbstractAnimation_DirectionChanged(QAbstractAnimation* self, int param1) {
 	self->directionChanged(static_cast<QAbstractAnimation::Direction>(param1));
 }
 
 void QAbstractAnimation_connect_DirectionChanged(QAbstractAnimation* self, void* slot) {
 	QAbstractAnimation::connect(self, static_cast<void (QAbstractAnimation::*)(QAbstractAnimation::Direction)>(&QAbstractAnimation::directionChanged), self, [=](QAbstractAnimation::Direction param1) {
 		QAbstractAnimation::Direction param1_ret = param1;
-		uintptr_t sigval1 = static_cast<uintptr_t>(param1_ret);
+		int sigval1 = static_cast<int>(param1_ret);
 		miqt_exec_callback_QAbstractAnimation_DirectionChanged(slot, sigval1);
 	});
 }
@@ -173,7 +173,7 @@ struct miqt_string* QAbstractAnimation_TrUtf83(const char* s, const char* c, int
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-void QAbstractAnimation_Start1(QAbstractAnimation* self, uintptr_t policy) {
+void QAbstractAnimation_Start1(QAbstractAnimation* self, int policy) {
 	self->start(static_cast<QAbstractAnimation::DeletionPolicy>(policy));
 }
 
@@ -224,7 +224,8 @@ bool QAnimationDriver_IsRunning(const QAnimationDriver* self) {
 }
 
 long long QAnimationDriver_Elapsed(const QAnimationDriver* self) {
-	return self->elapsed();
+	qint64 _ret = self->elapsed();
+	return static_cast<long long>(_ret);
 }
 
 void QAnimationDriver_SetStartTime(QAnimationDriver* self, long long startTime) {
@@ -232,7 +233,8 @@ void QAnimationDriver_SetStartTime(QAnimationDriver* self, long long startTime)
 }
 
 long long QAnimationDriver_StartTime(const QAnimationDriver* self) {
-	return self->startTime();
+	qint64 _ret = self->startTime();
+	return static_cast<long long>(_ret);
 }
 
 void QAnimationDriver_Started(QAnimationDriver* self) {

qt/gen_qabstractanimation.go

@@ -94,7 +94,7 @@ func (this *QAbstractAnimation) Direction() QAbstractAnimation__Direction {
 }
 
 func (this *QAbstractAnimation) SetDirection(direction QAbstractAnimation__Direction) {
-	C.QAbstractAnimation_SetDirection(this.h, (C.uintptr_t)(direction))
+	C.QAbstractAnimation_SetDirection(this.h, (C.int)(direction))
 }
 
 func (this *QAbstractAnimation) CurrentTime() int {
@@ -143,14 +143,14 @@ func miqt_exec_callback_QAbstractAnimation_Finished(cb *C.void) {
 }
 
 func (this *QAbstractAnimation) StateChanged(newState QAbstractAnimation__State, oldState QAbstractAnimation__State) {
-	C.QAbstractAnimation_StateChanged(this.h, (C.uintptr_t)(newState), (C.uintptr_t)(oldState))
+	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))))
 }
 
 //export miqt_exec_callback_QAbstractAnimation_StateChanged
-func miqt_exec_callback_QAbstractAnimation_StateChanged(cb *C.void, newState C.uintptr_t, oldState C.uintptr_t) {
+func miqt_exec_callback_QAbstractAnimation_StateChanged(cb *C.void, newState C.int, oldState C.int) {
 	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(newState QAbstractAnimation__State, oldState QAbstractAnimation__State))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
@@ -185,14 +185,14 @@ func miqt_exec_callback_QAbstractAnimation_CurrentLoopChanged(cb *C.void, curren
 }
 
 func (this *QAbstractAnimation) DirectionChanged(param1 QAbstractAnimation__Direction) {
-	C.QAbstractAnimation_DirectionChanged(this.h, (C.uintptr_t)(param1))
+	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))))
 }
 
 //export miqt_exec_callback_QAbstractAnimation_DirectionChanged
-func miqt_exec_callback_QAbstractAnimation_DirectionChanged(cb *C.void, param1 C.uintptr_t) {
+func miqt_exec_callback_QAbstractAnimation_DirectionChanged(cb *C.void, param1 C.int) {
 	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(param1 QAbstractAnimation__Direction))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
@@ -273,7 +273,7 @@ func QAbstractAnimation_TrUtf83(s string, c string, n int) string {
 }
 
 func (this *QAbstractAnimation) Start1(policy QAbstractAnimation__DeletionPolicy) {
-	C.QAbstractAnimation_Start1(this.h, (C.uintptr_t)(policy))
+	C.QAbstractAnimation_Start1(this.h, (C.int)(policy))
 }
 
 // Delete this object from C++ memory.

qt/gen_qabstractanimation.h

@@ -30,10 +30,10 @@ typedef struct QObject QObject;
 QMetaObject* QAbstractAnimation_MetaObject(const QAbstractAnimation* self);
 struct miqt_string* QAbstractAnimation_Tr(const char* s);
 struct miqt_string* QAbstractAnimation_TrUtf8(const char* s);
-uintptr_t QAbstractAnimation_State(const QAbstractAnimation* self);
+int QAbstractAnimation_State(const QAbstractAnimation* self);
 QAnimationGroup* QAbstractAnimation_Group(const QAbstractAnimation* self);
-uintptr_t QAbstractAnimation_Direction(const QAbstractAnimation* self);
-void QAbstractAnimation_SetDirection(QAbstractAnimation* self, uintptr_t direction);
+int QAbstractAnimation_Direction(const QAbstractAnimation* self);
+void QAbstractAnimation_SetDirection(QAbstractAnimation* self, int direction);
 int QAbstractAnimation_CurrentTime(const QAbstractAnimation* self);
 int QAbstractAnimation_CurrentLoopTime(const QAbstractAnimation* self);
 int QAbstractAnimation_LoopCount(const QAbstractAnimation* self);
@@ -43,11 +43,11 @@ 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_StateChanged(QAbstractAnimation* self, uintptr_t newState, uintptr_t oldState);
+void QAbstractAnimation_StateChanged(QAbstractAnimation* self, int newState, int oldState);
 void QAbstractAnimation_connect_StateChanged(QAbstractAnimation* self, void* slot);
 void QAbstractAnimation_CurrentLoopChanged(QAbstractAnimation* self, int currentLoop);
 void QAbstractAnimation_connect_CurrentLoopChanged(QAbstractAnimation* self, void* slot);
-void QAbstractAnimation_DirectionChanged(QAbstractAnimation* self, uintptr_t param1);
+void QAbstractAnimation_DirectionChanged(QAbstractAnimation* self, int param1);
 void QAbstractAnimation_connect_DirectionChanged(QAbstractAnimation* self, void* slot);
 void QAbstractAnimation_Start(QAbstractAnimation* self);
 void QAbstractAnimation_Pause(QAbstractAnimation* self);
@@ -59,7 +59,7 @@ struct miqt_string* QAbstractAnimation_Tr2(const char* s, const char* c);
 struct miqt_string* QAbstractAnimation_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QAbstractAnimation_TrUtf82(const char* s, const char* c);
 struct miqt_string* QAbstractAnimation_TrUtf83(const char* s, const char* c, int n);
-void QAbstractAnimation_Start1(QAbstractAnimation* self, uintptr_t policy);
+void QAbstractAnimation_Start1(QAbstractAnimation* self, int policy);
 void QAbstractAnimation_Delete(QAbstractAnimation* self);
 
 QAnimationDriver* QAnimationDriver_new();

qt/gen_qabstracteventdispatcher.cpp

@@ -51,11 +51,11 @@ void QAbstractEventDispatcher_UnregisterSocketNotifier(QAbstractEventDispatcher*
 	self->unregisterSocketNotifier(notifier);
 }
 
-int QAbstractEventDispatcher_RegisterTimer(QAbstractEventDispatcher* self, int interval, uintptr_t timerType, QObject* object) {
+int QAbstractEventDispatcher_RegisterTimer(QAbstractEventDispatcher* self, int interval, int timerType, QObject* object) {
 	return self->registerTimer(static_cast<int>(interval), static_cast<Qt::TimerType>(timerType), object);
 }
 
-void QAbstractEventDispatcher_RegisterTimer2(QAbstractEventDispatcher* self, int timerId, int interval, uintptr_t timerType, QObject* object) {
+void QAbstractEventDispatcher_RegisterTimer2(QAbstractEventDispatcher* self, int timerId, int interval, int timerType, QObject* object) {
 	self->registerTimer(static_cast<int>(timerId), static_cast<int>(interval), static_cast<Qt::TimerType>(timerType), object);
 }
 
@@ -168,7 +168,7 @@ void QAbstractEventDispatcher_Delete(QAbstractEventDispatcher* self) {
 	delete self;
 }
 
-QAbstractEventDispatcher__TimerInfo* QAbstractEventDispatcher__TimerInfo_new(int id, int i, uintptr_t t) {
+QAbstractEventDispatcher__TimerInfo* QAbstractEventDispatcher__TimerInfo_new(int id, int i, int t) {
 	return new QAbstractEventDispatcher::TimerInfo(static_cast<int>(id), static_cast<int>(i), static_cast<Qt::TimerType>(t));
 }
 

qt/gen_qabstracteventdispatcher.go

@@ -64,7 +64,7 @@ func QAbstractEventDispatcher_Instance() *QAbstractEventDispatcher {
 }
 
 func (this *QAbstractEventDispatcher) ProcessEvents(flags int) bool {
-	return (bool)(C.QAbstractEventDispatcher_ProcessEvents(this.h, (C.int)(flags)))
+	return (bool)(C.QAbstractEventDispatcher_ProcessEvents(this.h, flags))
 }
 
 func (this *QAbstractEventDispatcher) HasPendingEvents() bool {
@@ -80,11 +80,11 @@ func (this *QAbstractEventDispatcher) UnregisterSocketNotifier(notifier *QSocket
 }
 
 func (this *QAbstractEventDispatcher) RegisterTimer(interval int, timerType TimerType, object *QObject) int {
-	return (int)(C.QAbstractEventDispatcher_RegisterTimer(this.h, (C.int)(interval), (C.uintptr_t)(timerType), object.cPointer()))
+	return (int)(C.QAbstractEventDispatcher_RegisterTimer(this.h, (C.int)(interval), (C.int)(timerType), object.cPointer()))
 }
 
 func (this *QAbstractEventDispatcher) RegisterTimer2(timerId int, interval int, timerType TimerType, object *QObject) {
-	C.QAbstractEventDispatcher_RegisterTimer2(this.h, (C.int)(timerId), (C.int)(interval), (C.uintptr_t)(timerType), object.cPointer())
+	C.QAbstractEventDispatcher_RegisterTimer2(this.h, (C.int)(timerId), (C.int)(interval), (C.int)(timerType), object.cPointer())
 }
 
 func (this *QAbstractEventDispatcher) UnregisterTimer(timerId int) bool {
@@ -261,7 +261,7 @@ func newQAbstractEventDispatcher__TimerInfo_U(h unsafe.Pointer) *QAbstractEventD
 
 // NewQAbstractEventDispatcher__TimerInfo constructs a new QAbstractEventDispatcher::TimerInfo object.
 func NewQAbstractEventDispatcher__TimerInfo(id int, i int, t TimerType) *QAbstractEventDispatcher__TimerInfo {
-	ret := C.QAbstractEventDispatcher__TimerInfo_new((C.int)(id), (C.int)(i), (C.uintptr_t)(t))
+	ret := C.QAbstractEventDispatcher__TimerInfo_new((C.int)(id), (C.int)(i), (C.int)(t))
 	return newQAbstractEventDispatcher__TimerInfo(ret)
 }
 

qt/gen_qabstracteventdispatcher.h

@@ -43,8 +43,8 @@ bool QAbstractEventDispatcher_ProcessEvents(QAbstractEventDispatcher* self, int
 bool QAbstractEventDispatcher_HasPendingEvents(QAbstractEventDispatcher* self);
 void QAbstractEventDispatcher_RegisterSocketNotifier(QAbstractEventDispatcher* self, QSocketNotifier* notifier);
 void QAbstractEventDispatcher_UnregisterSocketNotifier(QAbstractEventDispatcher* self, QSocketNotifier* notifier);
-int QAbstractEventDispatcher_RegisterTimer(QAbstractEventDispatcher* self, int interval, uintptr_t timerType, QObject* object);
-void QAbstractEventDispatcher_RegisterTimer2(QAbstractEventDispatcher* self, int timerId, int interval, uintptr_t timerType, QObject* object);
+int QAbstractEventDispatcher_RegisterTimer(QAbstractEventDispatcher* self, int interval, int timerType, QObject* object);
+void QAbstractEventDispatcher_RegisterTimer2(QAbstractEventDispatcher* self, int timerId, int interval, int timerType, QObject* object);
 bool QAbstractEventDispatcher_UnregisterTimer(QAbstractEventDispatcher* self, int timerId);
 bool QAbstractEventDispatcher_UnregisterTimers(QAbstractEventDispatcher* self, QObject* object);
 struct miqt_array* QAbstractEventDispatcher_RegisteredTimers(const QAbstractEventDispatcher* self, QObject* object);
@@ -67,7 +67,7 @@ struct miqt_string* QAbstractEventDispatcher_TrUtf83(const char* s, const char*
 QAbstractEventDispatcher* QAbstractEventDispatcher_Instance1(QThread* thread);
 void QAbstractEventDispatcher_Delete(QAbstractEventDispatcher* self);
 
-QAbstractEventDispatcher__TimerInfo* QAbstractEventDispatcher__TimerInfo_new(int id, int i, uintptr_t t);
+QAbstractEventDispatcher__TimerInfo* QAbstractEventDispatcher__TimerInfo_new(int id, int i, int t);
 void QAbstractEventDispatcher__TimerInfo_Delete(QAbstractEventDispatcher__TimerInfo* self);
 
 #ifdef __cplusplus

qt/gen_qabstractitemdelegate.cpp

@@ -68,7 +68,7 @@ bool QAbstractItemDelegate_EditorEvent(QAbstractItemDelegate* self, QEvent* even
 	return self->editorEvent(event, model, *option, *index);
 }
 
-struct miqt_string* QAbstractItemDelegate_ElidedText(QFontMetrics* fontMetrics, int width, uintptr_t mode, struct miqt_string* text) {
+struct miqt_string* QAbstractItemDelegate_ElidedText(QFontMetrics* fontMetrics, int width, int mode, struct miqt_string* text) {
 	QString text_QString = QString::fromUtf8(&text->data, text->len);
 	QString _ret = QAbstractItemDelegate::elidedText(*fontMetrics, static_cast<int>(width), static_cast<Qt::TextElideMode>(mode), text_QString);
 	// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
@@ -156,7 +156,7 @@ struct miqt_string* QAbstractItemDelegate_TrUtf83(const char* s, const char* c,
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-void QAbstractItemDelegate_CloseEditor2(QAbstractItemDelegate* self, QWidget* editor, uintptr_t hint) {
+void QAbstractItemDelegate_CloseEditor2(QAbstractItemDelegate* self, QWidget* editor, int hint) {
 	self->closeEditor(editor, static_cast<QAbstractItemDelegate::EndEditHint>(hint));
 }
 
@@ -164,7 +164,7 @@ void QAbstractItemDelegate_connect_CloseEditor2(QAbstractItemDelegate* self, voi
 	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;
-		uintptr_t sigval2 = static_cast<uintptr_t>(hint_ret);
+		int sigval2 = static_cast<int>(hint_ret);
 		miqt_exec_callback_QAbstractItemDelegate_CloseEditor2(slot, sigval1, sigval2);
 	});
 }

qt/gen_qabstractitemdelegate.go

@@ -107,7 +107,7 @@ func (this *QAbstractItemDelegate) EditorEvent(event *QEvent, model *QAbstractIt
 func QAbstractItemDelegate_ElidedText(fontMetrics *QFontMetrics, width int, mode TextElideMode, text string) string {
 	text_ms := miqt_strdupg(text)
 	defer C.free(text_ms)
-	var _ms *C.struct_miqt_string = C.QAbstractItemDelegate_ElidedText(fontMetrics.cPointer(), (C.int)(width), (C.uintptr_t)(mode), (*C.struct_miqt_string)(text_ms))
+	var _ms *C.struct_miqt_string = C.QAbstractItemDelegate_ElidedText(fontMetrics.cPointer(), (C.int)(width), (C.int)(mode), (*C.struct_miqt_string)(text_ms))
 	_ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len)))
 	C.free(unsafe.Pointer(_ms))
 	return _ret
@@ -233,14 +233,14 @@ func QAbstractItemDelegate_TrUtf83(s string, c string, n int) string {
 }
 
 func (this *QAbstractItemDelegate) CloseEditor2(editor *QWidget, hint QAbstractItemDelegate__EndEditHint) {
-	C.QAbstractItemDelegate_CloseEditor2(this.h, editor.cPointer(), (C.uintptr_t)(hint))
+	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))))
 }
 
 //export miqt_exec_callback_QAbstractItemDelegate_CloseEditor2
-func miqt_exec_callback_QAbstractItemDelegate_CloseEditor2(cb *C.void, editor *C.QWidget, hint C.uintptr_t) {
+func miqt_exec_callback_QAbstractItemDelegate_CloseEditor2(cb *C.void, editor *C.QWidget, hint C.int) {
 	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(editor *QWidget, hint QAbstractItemDelegate__EndEditHint))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")

qt/gen_qabstractitemdelegate.h

@@ -52,7 +52,7 @@ void QAbstractItemDelegate_SetEditorData(const QAbstractItemDelegate* self, QWid
 void QAbstractItemDelegate_SetModelData(const QAbstractItemDelegate* self, QWidget* editor, QAbstractItemModel* model, QModelIndex* index);
 void QAbstractItemDelegate_UpdateEditorGeometry(const QAbstractItemDelegate* self, QWidget* editor, QStyleOptionViewItem* option, QModelIndex* index);
 bool QAbstractItemDelegate_EditorEvent(QAbstractItemDelegate* self, QEvent* event, QAbstractItemModel* model, QStyleOptionViewItem* option, QModelIndex* index);
-struct miqt_string* QAbstractItemDelegate_ElidedText(QFontMetrics* fontMetrics, int width, uintptr_t mode, struct miqt_string* text);
+struct miqt_string* QAbstractItemDelegate_ElidedText(QFontMetrics* fontMetrics, int width, int mode, struct miqt_string* text);
 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);
@@ -65,7 +65,7 @@ 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, uintptr_t hint);
+void QAbstractItemDelegate_CloseEditor2(QAbstractItemDelegate* self, QWidget* editor, int hint);
 void QAbstractItemDelegate_connect_CloseEditor2(QAbstractItemDelegate* self, void* slot);
 void QAbstractItemDelegate_Delete(QAbstractItemDelegate* self);
 

qt/gen_qabstractitemmodel.cpp

@@ -241,11 +241,11 @@ bool QAbstractItemModel_SetData(QAbstractItemModel* self, QModelIndex* index, QV
 	return self->setData(*index, *value);
 }
 
-QVariant* QAbstractItemModel_HeaderData(const QAbstractItemModel* self, int section, uintptr_t orientation) {
+QVariant* QAbstractItemModel_HeaderData(const QAbstractItemModel* self, int section, int orientation) {
 	return new QVariant(self->headerData(static_cast<int>(section), static_cast<Qt::Orientation>(orientation)));
 }
 
-bool QAbstractItemModel_SetHeaderData(QAbstractItemModel* self, int section, uintptr_t orientation, QVariant* value) {
+bool QAbstractItemModel_SetHeaderData(QAbstractItemModel* self, int section, int orientation, QVariant* value) {
 	return self->setHeaderData(static_cast<int>(section), static_cast<Qt::Orientation>(orientation), *value);
 }
 
@@ -275,11 +275,11 @@ QMimeData* QAbstractItemModel_MimeData(const QAbstractItemModel* self, struct mi
 	return self->mimeData(indexes_QList);
 }
 
-bool QAbstractItemModel_CanDropMimeData(const QAbstractItemModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent) {
+bool QAbstractItemModel_CanDropMimeData(const QAbstractItemModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent) {
 	return self->canDropMimeData(data, static_cast<Qt::DropAction>(action), static_cast<int>(row), static_cast<int>(column), *parent);
 }
 
-bool QAbstractItemModel_DropMimeData(QAbstractItemModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent) {
+bool QAbstractItemModel_DropMimeData(QAbstractItemModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent) {
 	return self->dropMimeData(data, static_cast<Qt::DropAction>(action), static_cast<int>(row), static_cast<int>(column), *parent);
 }
 
@@ -399,14 +399,14 @@ void QAbstractItemModel_connect_DataChanged(QAbstractItemModel* self, void* slot
 	});
 }
 
-void QAbstractItemModel_HeaderDataChanged(QAbstractItemModel* self, uintptr_t orientation, int first, int last) {
+void QAbstractItemModel_HeaderDataChanged(QAbstractItemModel* self, int orientation, int first, int last) {
 	self->headerDataChanged(static_cast<Qt::Orientation>(orientation), static_cast<int>(first), static_cast<int>(last));
 }
 
 void QAbstractItemModel_connect_HeaderDataChanged(QAbstractItemModel* self, void* 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;
-		uintptr_t sigval1 = static_cast<uintptr_t>(orientation_ret);
+		int sigval1 = static_cast<int>(orientation_ret);
 		int sigval2 = first;
 		int sigval3 = last;
 		miqt_exec_callback_QAbstractItemModel_HeaderDataChanged(slot, sigval1, sigval2, sigval3);
@@ -497,11 +497,11 @@ bool QAbstractItemModel_SetData3(QAbstractItemModel* self, QModelIndex* index, Q
 	return self->setData(*index, *value, static_cast<int>(role));
 }
 
-QVariant* QAbstractItemModel_HeaderData3(const QAbstractItemModel* self, int section, uintptr_t orientation, int role) {
+QVariant* QAbstractItemModel_HeaderData3(const QAbstractItemModel* self, int section, int orientation, int role) {
 	return new QVariant(self->headerData(static_cast<int>(section), static_cast<Qt::Orientation>(orientation), static_cast<int>(role)));
 }
 
-bool QAbstractItemModel_SetHeaderData4(QAbstractItemModel* self, int section, uintptr_t orientation, QVariant* value, int role) {
+bool QAbstractItemModel_SetHeaderData4(QAbstractItemModel* self, int section, int orientation, QVariant* value, int role) {
 	return self->setHeaderData(static_cast<int>(section), static_cast<Qt::Orientation>(orientation), *value, static_cast<int>(role));
 }
 
@@ -537,7 +537,7 @@ bool QAbstractItemModel_RemoveColumn2(QAbstractItemModel* self, int column, QMod
 	return self->removeColumn(static_cast<int>(column), *parent);
 }
 
-void QAbstractItemModel_Sort2(QAbstractItemModel* self, int column, uintptr_t order) {
+void QAbstractItemModel_Sort2(QAbstractItemModel* self, int column, int order) {
 	self->sort(static_cast<int>(column), static_cast<Qt::SortOrder>(order));
 }
 
@@ -629,7 +629,7 @@ void QAbstractItemModel_connect_LayoutChanged1(QAbstractItemModel* self, void* s
 	});
 }
 
-void QAbstractItemModel_LayoutChanged2(QAbstractItemModel* self, struct miqt_array* /* of QPersistentModelIndex* */ parents, uintptr_t hint) {
+void QAbstractItemModel_LayoutChanged2(QAbstractItemModel* self, struct miqt_array* /* of QPersistentModelIndex* */ parents, int hint) {
 	QList<QPersistentModelIndex> parents_QList;
 	parents_QList.reserve(parents->len);
 	QPersistentModelIndex** parents_arr = static_cast<QPersistentModelIndex**>(parents->data);
@@ -652,7 +652,7 @@ void QAbstractItemModel_connect_LayoutChanged2(QAbstractItemModel* self, void* s
 		parents_out->data = static_cast<void*>(parents_arr);
 		struct miqt_array* sigval1 = parents_out;
 		QAbstractItemModel::LayoutChangeHint hint_ret = hint;
-		uintptr_t sigval2 = static_cast<uintptr_t>(hint_ret);
+		int sigval2 = static_cast<int>(hint_ret);
 		miqt_exec_callback_QAbstractItemModel_LayoutChanged2(slot, sigval1, sigval2);
 	});
 }
@@ -683,7 +683,7 @@ void QAbstractItemModel_connect_LayoutAboutToBeChanged1(QAbstractItemModel* self
 	});
 }
 
-void QAbstractItemModel_LayoutAboutToBeChanged2(QAbstractItemModel* self, struct miqt_array* /* of QPersistentModelIndex* */ parents, uintptr_t hint) {
+void QAbstractItemModel_LayoutAboutToBeChanged2(QAbstractItemModel* self, struct miqt_array* /* of QPersistentModelIndex* */ parents, int hint) {
 	QList<QPersistentModelIndex> parents_QList;
 	parents_QList.reserve(parents->len);
 	QPersistentModelIndex** parents_arr = static_cast<QPersistentModelIndex**>(parents->data);
@@ -706,7 +706,7 @@ void QAbstractItemModel_connect_LayoutAboutToBeChanged2(QAbstractItemModel* self
 		parents_out->data = static_cast<void*>(parents_arr);
 		struct miqt_array* sigval1 = parents_out;
 		QAbstractItemModel::LayoutChangeHint hint_ret = hint;
-		uintptr_t sigval2 = static_cast<uintptr_t>(hint_ret);
+		int sigval2 = static_cast<int>(hint_ret);
 		miqt_exec_callback_QAbstractItemModel_LayoutAboutToBeChanged2(slot, sigval1, sigval2);
 	});
 }
@@ -741,7 +741,7 @@ QModelIndex* QAbstractTableModel_Sibling(const QAbstractTableModel* self, int ro
 	return new QModelIndex(self->sibling(static_cast<int>(row), static_cast<int>(column), *idx));
 }
 
-bool QAbstractTableModel_DropMimeData(QAbstractTableModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent) {
+bool QAbstractTableModel_DropMimeData(QAbstractTableModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent) {
 	return self->dropMimeData(data, static_cast<Qt::DropAction>(action), static_cast<int>(row), static_cast<int>(column), *parent);
 }
 
@@ -812,7 +812,7 @@ QModelIndex* QAbstractListModel_Sibling(const QAbstractListModel* self, int row,
 	return new QModelIndex(self->sibling(static_cast<int>(row), static_cast<int>(column), *idx));
 }
 
-bool QAbstractListModel_DropMimeData(QAbstractListModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent) {
+bool QAbstractListModel_DropMimeData(QAbstractListModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent) {
 	return self->dropMimeData(data, static_cast<Qt::DropAction>(action), static_cast<int>(row), static_cast<int>(column), *parent);
 }
 

qt/gen_qabstractitemmodel.go

@@ -403,14 +403,14 @@ func (this *QAbstractItemModel) SetData(index *QModelIndex, value *QVariant) boo
 }
 
 func (this *QAbstractItemModel) HeaderData(section int, orientation Orientation) *QVariant {
-	_ret := C.QAbstractItemModel_HeaderData(this.h, (C.int)(section), (C.uintptr_t)(orientation))
+	_ret := C.QAbstractItemModel_HeaderData(this.h, (C.int)(section), (C.int)(orientation))
 	_goptr := newQVariant(_ret)
 	_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	return _goptr
 }
 
 func (this *QAbstractItemModel) SetHeaderData(section int, orientation Orientation, value *QVariant) bool {
-	return (bool)(C.QAbstractItemModel_SetHeaderData(this.h, (C.int)(section), (C.uintptr_t)(orientation), value.cPointer()))
+	return (bool)(C.QAbstractItemModel_SetHeaderData(this.h, (C.int)(section), (C.int)(orientation), value.cPointer()))
 }
 
 func (this *QAbstractItemModel) MimeTypes() []string {
@@ -440,11 +440,11 @@ func (this *QAbstractItemModel) MimeData(indexes []QModelIndex) *QMimeData {
 }
 
 func (this *QAbstractItemModel) CanDropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool {
-	return (bool)(C.QAbstractItemModel_CanDropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer()))
+	return (bool)(C.QAbstractItemModel_CanDropMimeData(this.h, data.cPointer(), (C.int)(action), (C.int)(row), (C.int)(column), parent.cPointer()))
 }
 
 func (this *QAbstractItemModel) DropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool {
-	return (bool)(C.QAbstractItemModel_DropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer()))
+	return (bool)(C.QAbstractItemModel_DropMimeData(this.h, data.cPointer(), (C.int)(action), (C.int)(row), (C.int)(column), parent.cPointer()))
 }
 
 func (this *QAbstractItemModel) SupportedDropActions() int {
@@ -573,14 +573,14 @@ func miqt_exec_callback_QAbstractItemModel_DataChanged(cb *C.void, topLeft *C.QM
 }
 
 func (this *QAbstractItemModel) HeaderDataChanged(orientation Orientation, first int, last int) {
-	C.QAbstractItemModel_HeaderDataChanged(this.h, (C.uintptr_t)(orientation), (C.int)(first), (C.int)(last))
+	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))))
 }
 
 //export miqt_exec_callback_QAbstractItemModel_HeaderDataChanged
-func miqt_exec_callback_QAbstractItemModel_HeaderDataChanged(cb *C.void, orientation C.uintptr_t, first C.int, last C.int) {
+func miqt_exec_callback_QAbstractItemModel_HeaderDataChanged(cb *C.void, 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))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
@@ -717,14 +717,14 @@ func (this *QAbstractItemModel) SetData3(index *QModelIndex, value *QVariant, ro
 }
 
 func (this *QAbstractItemModel) HeaderData3(section int, orientation Orientation, role int) *QVariant {
-	_ret := C.QAbstractItemModel_HeaderData3(this.h, (C.int)(section), (C.uintptr_t)(orientation), (C.int)(role))
+	_ret := C.QAbstractItemModel_HeaderData3(this.h, (C.int)(section), (C.int)(orientation), (C.int)(role))
 	_goptr := newQVariant(_ret)
 	_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	return _goptr
 }
 
 func (this *QAbstractItemModel) SetHeaderData4(section int, orientation Orientation, value *QVariant, role int) bool {
-	return (bool)(C.QAbstractItemModel_SetHeaderData4(this.h, (C.int)(section), (C.uintptr_t)(orientation), value.cPointer(), (C.int)(role)))
+	return (bool)(C.QAbstractItemModel_SetHeaderData4(this.h, (C.int)(section), (C.int)(orientation), value.cPointer(), (C.int)(role)))
 }
 
 func (this *QAbstractItemModel) InsertRows3(row int, count int, parent *QModelIndex) bool {
@@ -760,7 +760,7 @@ func (this *QAbstractItemModel) RemoveColumn2(column int, parent *QModelIndex) b
 }
 
 func (this *QAbstractItemModel) Sort2(column int, order SortOrder) {
-	C.QAbstractItemModel_Sort2(this.h, (C.int)(column), (C.uintptr_t)(order))
+	C.QAbstractItemModel_Sort2(this.h, (C.int)(column), (C.int)(order))
 }
 
 func (this *QAbstractItemModel) Match4(start *QModelIndex, role int, value *QVariant, hits int) []QModelIndex {
@@ -778,7 +778,7 @@ func (this *QAbstractItemModel) Match4(start *QModelIndex, role int, value *QVar
 }
 
 func (this *QAbstractItemModel) Match5(start *QModelIndex, role int, value *QVariant, hits int, flags int) []QModelIndex {
-	var _ma *C.struct_miqt_array = C.QAbstractItemModel_Match5(this.h, start.cPointer(), (C.int)(role), value.cPointer(), (C.int)(hits), (C.int)(flags))
+	var _ma *C.struct_miqt_array = C.QAbstractItemModel_Match5(this.h, start.cPointer(), (C.int)(role), value.cPointer(), (C.int)(hits), flags)
 	_ret := make([]QModelIndex, int(_ma.len))
 	_outCast := (*[0xffff]*C.QModelIndex)(unsafe.Pointer(_ma.data)) // hey ya
 	for i := 0; i < int(_ma.len); i++ {
@@ -792,7 +792,7 @@ func (this *QAbstractItemModel) Match5(start *QModelIndex, role int, value *QVar
 }
 
 func (this *QAbstractItemModel) CheckIndex2(index *QModelIndex, options int) bool {
-	return (bool)(C.QAbstractItemModel_CheckIndex2(this.h, index.cPointer(), (C.int)(options)))
+	return (bool)(C.QAbstractItemModel_CheckIndex2(this.h, index.cPointer(), options))
 }
 
 func (this *QAbstractItemModel) DataChanged3(topLeft *QModelIndex, bottomRight *QModelIndex, roles []int) {
@@ -879,14 +879,14 @@ func (this *QAbstractItemModel) LayoutChanged2(parents []QPersistentModelIndex,
 	}
 	parents_ma := &C.struct_miqt_array{len: C.size_t(len(parents)), data: unsafe.Pointer(parents_CArray)}
 	defer runtime.KeepAlive(unsafe.Pointer(parents_ma))
-	C.QAbstractItemModel_LayoutChanged2(this.h, parents_ma, (C.uintptr_t)(hint))
+	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))))
 }
 
 //export miqt_exec_callback_QAbstractItemModel_LayoutChanged2
-func miqt_exec_callback_QAbstractItemModel_LayoutChanged2(cb *C.void, parents *C.struct_miqt_array, hint C.uintptr_t) {
+func miqt_exec_callback_QAbstractItemModel_LayoutChanged2(cb *C.void, parents *C.struct_miqt_array, hint C.int) {
 	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(parents []QPersistentModelIndex, hint QAbstractItemModel__LayoutChangeHint))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
@@ -957,14 +957,14 @@ func (this *QAbstractItemModel) LayoutAboutToBeChanged2(parents []QPersistentMod
 	}
 	parents_ma := &C.struct_miqt_array{len: C.size_t(len(parents)), data: unsafe.Pointer(parents_CArray)}
 	defer runtime.KeepAlive(unsafe.Pointer(parents_ma))
-	C.QAbstractItemModel_LayoutAboutToBeChanged2(this.h, parents_ma, (C.uintptr_t)(hint))
+	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))))
 }
 
 //export miqt_exec_callback_QAbstractItemModel_LayoutAboutToBeChanged2
-func miqt_exec_callback_QAbstractItemModel_LayoutAboutToBeChanged2(cb *C.void, parents *C.struct_miqt_array, hint C.uintptr_t) {
+func miqt_exec_callback_QAbstractItemModel_LayoutAboutToBeChanged2(cb *C.void, parents *C.struct_miqt_array, hint C.int) {
 	gofunc, ok := (cgo.Handle(uintptr(unsafe.Pointer(cb))).Value()).(func(parents []QPersistentModelIndex, hint QAbstractItemModel__LayoutChangeHint))
 	if !ok {
 		panic("miqt: callback of non-callback type (heap corruption?)")
@@ -1062,7 +1062,7 @@ func (this *QAbstractTableModel) Sibling(row int, column int, idx *QModelIndex)
 }
 
 func (this *QAbstractTableModel) DropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool {
-	return (bool)(C.QAbstractTableModel_DropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer()))
+	return (bool)(C.QAbstractTableModel_DropMimeData(this.h, data.cPointer(), (C.int)(action), (C.int)(row), (C.int)(column), parent.cPointer()))
 }
 
 func (this *QAbstractTableModel) Flags(index *QModelIndex) int {
@@ -1194,7 +1194,7 @@ func (this *QAbstractListModel) Sibling(row int, column int, idx *QModelIndex) *
 }
 
 func (this *QAbstractListModel) DropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool {
-	return (bool)(C.QAbstractListModel_DropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer()))
+	return (bool)(C.QAbstractListModel_DropMimeData(this.h, data.cPointer(), (C.int)(action), (C.int)(row), (C.int)(column), parent.cPointer()))
 }
 
 func (this *QAbstractListModel) Flags(index *QModelIndex) int {

qt/gen_qabstractitemmodel.h

@@ -91,12 +91,12 @@ int QAbstractItemModel_ColumnCount(const QAbstractItemModel* self);
 bool QAbstractItemModel_HasChildren(const QAbstractItemModel* self);
 QVariant* QAbstractItemModel_Data(const QAbstractItemModel* self, QModelIndex* index);
 bool QAbstractItemModel_SetData(QAbstractItemModel* self, QModelIndex* index, QVariant* value);
-QVariant* QAbstractItemModel_HeaderData(const QAbstractItemModel* self, int section, uintptr_t orientation);
-bool QAbstractItemModel_SetHeaderData(QAbstractItemModel* self, int section, uintptr_t orientation, QVariant* value);
+QVariant* QAbstractItemModel_HeaderData(const QAbstractItemModel* self, int section, int orientation);
+bool QAbstractItemModel_SetHeaderData(QAbstractItemModel* self, int section, int orientation, QVariant* value);
 struct miqt_array* QAbstractItemModel_MimeTypes(const QAbstractItemModel* self);
 QMimeData* QAbstractItemModel_MimeData(const QAbstractItemModel* self, struct miqt_array* /* of QModelIndex* */ indexes);
-bool QAbstractItemModel_CanDropMimeData(const QAbstractItemModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent);
-bool QAbstractItemModel_DropMimeData(QAbstractItemModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent);
+bool QAbstractItemModel_CanDropMimeData(const QAbstractItemModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent);
+bool QAbstractItemModel_DropMimeData(QAbstractItemModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent);
 int QAbstractItemModel_SupportedDropActions(const QAbstractItemModel* self);
 int QAbstractItemModel_SupportedDragActions(const QAbstractItemModel* self);
 bool QAbstractItemModel_InsertRows(QAbstractItemModel* self, int row, int count);
@@ -121,7 +121,7 @@ QSize* QAbstractItemModel_Span(const QAbstractItemModel* self, QModelIndex* inde
 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_HeaderDataChanged(QAbstractItemModel* self, uintptr_t orientation, int first, int last);
+void QAbstractItemModel_HeaderDataChanged(QAbstractItemModel* self, int orientation, int first, int last);
 void QAbstractItemModel_connect_HeaderDataChanged(QAbstractItemModel* self, void* slot);
 void QAbstractItemModel_LayoutChanged(QAbstractItemModel* self);
 void QAbstractItemModel_connect_LayoutChanged(QAbstractItemModel* self, void* slot);
@@ -140,8 +140,8 @@ int QAbstractItemModel_ColumnCount1(const QAbstractItemModel* self, QModelIndex*
 bool QAbstractItemModel_HasChildren1(const QAbstractItemModel* self, QModelIndex* parent);
 QVariant* QAbstractItemModel_Data2(const QAbstractItemModel* self, QModelIndex* index, int role);
 bool QAbstractItemModel_SetData3(QAbstractItemModel* self, QModelIndex* index, QVariant* value, int role);
-QVariant* QAbstractItemModel_HeaderData3(const QAbstractItemModel* self, int section, uintptr_t orientation, int role);
-bool QAbstractItemModel_SetHeaderData4(QAbstractItemModel* self, int section, uintptr_t orientation, QVariant* value, int role);
+QVariant* QAbstractItemModel_HeaderData3(const QAbstractItemModel* self, int section, int orientation, int role);
+bool QAbstractItemModel_SetHeaderData4(QAbstractItemModel* self, int section, int orientation, QVariant* value, int role);
 bool QAbstractItemModel_InsertRows3(QAbstractItemModel* self, int row, int count, QModelIndex* parent);
 bool QAbstractItemModel_InsertColumns3(QAbstractItemModel* self, int column, int count, QModelIndex* parent);
 bool QAbstractItemModel_RemoveRows3(QAbstractItemModel* self, int row, int count, QModelIndex* parent);
@@ -150,7 +150,7 @@ bool QAbstractItemModel_InsertRow2(QAbstractItemModel* self, int row, QModelInde
 bool QAbstractItemModel_InsertColumn2(QAbstractItemModel* self, int column, QModelIndex* parent);
 bool QAbstractItemModel_RemoveRow2(QAbstractItemModel* self, int row, QModelIndex* parent);
 bool QAbstractItemModel_RemoveColumn2(QAbstractItemModel* self, int column, QModelIndex* parent);
-void QAbstractItemModel_Sort2(QAbstractItemModel* self, int column, uintptr_t order);
+void QAbstractItemModel_Sort2(QAbstractItemModel* self, int column, int order);
 struct miqt_array* QAbstractItemModel_Match4(const QAbstractItemModel* self, QModelIndex* start, int role, QVariant* value, int hits);
 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);
@@ -158,11 +158,11 @@ void QAbstractItemModel_DataChanged3(QAbstractItemModel* self, QModelIndex* topL
 void QAbstractItemModel_connect_DataChanged3(QAbstractItemModel* self, void* slot);
 void QAbstractItemModel_LayoutChanged1(QAbstractItemModel* self, struct miqt_array* /* of QPersistentModelIndex* */ parents);
 void QAbstractItemModel_connect_LayoutChanged1(QAbstractItemModel* self, void* slot);
-void QAbstractItemModel_LayoutChanged2(QAbstractItemModel* self, struct miqt_array* /* of QPersistentModelIndex* */ parents, uintptr_t hint);
+void QAbstractItemModel_LayoutChanged2(QAbstractItemModel* self, struct miqt_array* /* of QPersistentModelIndex* */ parents, int hint);
 void QAbstractItemModel_connect_LayoutChanged2(QAbstractItemModel* self, void* slot);
 void QAbstractItemModel_LayoutAboutToBeChanged1(QAbstractItemModel* self, struct miqt_array* /* of QPersistentModelIndex* */ parents);
 void QAbstractItemModel_connect_LayoutAboutToBeChanged1(QAbstractItemModel* self, void* slot);
-void QAbstractItemModel_LayoutAboutToBeChanged2(QAbstractItemModel* self, struct miqt_array* /* of QPersistentModelIndex* */ parents, uintptr_t hint);
+void QAbstractItemModel_LayoutAboutToBeChanged2(QAbstractItemModel* self, struct miqt_array* /* of QPersistentModelIndex* */ parents, int hint);
 void QAbstractItemModel_connect_LayoutAboutToBeChanged2(QAbstractItemModel* self, void* slot);
 void QAbstractItemModel_Delete(QAbstractItemModel* self);
 
@@ -171,7 +171,7 @@ struct miqt_string* QAbstractTableModel_Tr(const char* s);
 struct miqt_string* QAbstractTableModel_TrUtf8(const char* s);
 QModelIndex* QAbstractTableModel_Index(const QAbstractTableModel* self, int row, int column);
 QModelIndex* QAbstractTableModel_Sibling(const QAbstractTableModel* self, int row, int column, QModelIndex* idx);
-bool QAbstractTableModel_DropMimeData(QAbstractTableModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent);
+bool QAbstractTableModel_DropMimeData(QAbstractTableModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent);
 int QAbstractTableModel_Flags(const QAbstractTableModel* self, QModelIndex* index);
 struct miqt_string* QAbstractTableModel_Tr2(const char* s, const char* c);
 struct miqt_string* QAbstractTableModel_Tr3(const char* s, const char* c, int n);
@@ -185,7 +185,7 @@ struct miqt_string* QAbstractListModel_Tr(const char* s);
 struct miqt_string* QAbstractListModel_TrUtf8(const char* s);
 QModelIndex* QAbstractListModel_Index(const QAbstractListModel* self, int row);
 QModelIndex* QAbstractListModel_Sibling(const QAbstractListModel* self, int row, int column, QModelIndex* idx);
-bool QAbstractListModel_DropMimeData(QAbstractListModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent);
+bool QAbstractListModel_DropMimeData(QAbstractListModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent);
 int QAbstractListModel_Flags(const QAbstractListModel* self, QModelIndex* index);
 struct miqt_string* QAbstractListModel_Tr2(const char* s, const char* c);
 struct miqt_string* QAbstractListModel_Tr3(const char* s, const char* c, int n);

qt/gen_qabstractitemview.cpp

@@ -58,22 +58,22 @@ QAbstractItemDelegate* QAbstractItemView_ItemDelegate(const QAbstractItemView* s
 	return self->itemDelegate();
 }
 
-void QAbstractItemView_SetSelectionMode(QAbstractItemView* self, uintptr_t mode) {
+void QAbstractItemView_SetSelectionMode(QAbstractItemView* self, int mode) {
 	self->setSelectionMode(static_cast<QAbstractItemView::SelectionMode>(mode));
 }
 
-uintptr_t QAbstractItemView_SelectionMode(const QAbstractItemView* self) {
+int QAbstractItemView_SelectionMode(const QAbstractItemView* self) {
 	QAbstractItemView::SelectionMode _ret = self->selectionMode();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-void QAbstractItemView_SetSelectionBehavior(QAbstractItemView* self, uintptr_t behavior) {
+void QAbstractItemView_SetSelectionBehavior(QAbstractItemView* self, int behavior) {
 	self->setSelectionBehavior(static_cast<QAbstractItemView::SelectionBehavior>(behavior));
 }
 
-uintptr_t QAbstractItemView_SelectionBehavior(const QAbstractItemView* self) {
+int QAbstractItemView_SelectionBehavior(const QAbstractItemView* self) {
 	QAbstractItemView::SelectionBehavior _ret = self->selectionBehavior();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 QModelIndex* QAbstractItemView_CurrentIndex(const QAbstractItemView* self) {
@@ -93,26 +93,26 @@ int QAbstractItemView_EditTriggers(const QAbstractItemView* self) {
 	return static_cast<int>(_ret);
 }
 
-void QAbstractItemView_SetVerticalScrollMode(QAbstractItemView* self, uintptr_t mode) {
+void QAbstractItemView_SetVerticalScrollMode(QAbstractItemView* self, int mode) {
 	self->setVerticalScrollMode(static_cast<QAbstractItemView::ScrollMode>(mode));
 }
 
-uintptr_t QAbstractItemView_VerticalScrollMode(const QAbstractItemView* self) {
+int QAbstractItemView_VerticalScrollMode(const QAbstractItemView* self) {
 	QAbstractItemView::ScrollMode _ret = self->verticalScrollMode();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 void QAbstractItemView_ResetVerticalScrollMode(QAbstractItemView* self) {
 	self->resetVerticalScrollMode();
 }
 
-void QAbstractItemView_SetHorizontalScrollMode(QAbstractItemView* self, uintptr_t mode) {
+void QAbstractItemView_SetHorizontalScrollMode(QAbstractItemView* self, int mode) {
 	self->setHorizontalScrollMode(static_cast<QAbstractItemView::ScrollMode>(mode));
 }
 
-uintptr_t QAbstractItemView_HorizontalScrollMode(const QAbstractItemView* self) {
+int QAbstractItemView_HorizontalScrollMode(const QAbstractItemView* self) {
 	QAbstractItemView::ScrollMode _ret = self->horizontalScrollMode();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 void QAbstractItemView_ResetHorizontalScrollMode(QAbstractItemView* self) {
@@ -167,22 +167,22 @@ bool QAbstractItemView_DragDropOverwriteMode(const QAbstractItemView* self) {
 	return self->dragDropOverwriteMode();
 }
 
-void QAbstractItemView_SetDragDropMode(QAbstractItemView* self, uintptr_t behavior) {
+void QAbstractItemView_SetDragDropMode(QAbstractItemView* self, int behavior) {
 	self->setDragDropMode(static_cast<QAbstractItemView::DragDropMode>(behavior));
 }
 
-uintptr_t QAbstractItemView_DragDropMode(const QAbstractItemView* self) {
+int QAbstractItemView_DragDropMode(const QAbstractItemView* self) {
 	QAbstractItemView::DragDropMode _ret = self->dragDropMode();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-void QAbstractItemView_SetDefaultDropAction(QAbstractItemView* self, uintptr_t dropAction) {
+void QAbstractItemView_SetDefaultDropAction(QAbstractItemView* self, int dropAction) {
 	self->setDefaultDropAction(static_cast<Qt::DropAction>(dropAction));
 }
 
-uintptr_t QAbstractItemView_DefaultDropAction(const QAbstractItemView* self) {
+int QAbstractItemView_DefaultDropAction(const QAbstractItemView* self) {
 	Qt::DropAction _ret = self->defaultDropAction();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 void QAbstractItemView_SetAlternatingRowColors(QAbstractItemView* self, bool enable) {
@@ -201,13 +201,13 @@ QSize* QAbstractItemView_IconSize(const QAbstractItemView* self) {
 	return new QSize(self->iconSize());
 }
 
-void QAbstractItemView_SetTextElideMode(QAbstractItemView* self, uintptr_t mode) {
+void QAbstractItemView_SetTextElideMode(QAbstractItemView* self, int mode) {
 	self->setTextElideMode(static_cast<Qt::TextElideMode>(mode));
 }
 
-uintptr_t QAbstractItemView_TextElideMode(const QAbstractItemView* self) {
+int QAbstractItemView_TextElideMode(const QAbstractItemView* self) {
 	Qt::TextElideMode _ret = self->textElideMode();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 void QAbstractItemView_KeyboardSearch(QAbstractItemView* self, struct miqt_string* search) {
@@ -279,7 +279,7 @@ QAbstractItemDelegate* QAbstractItemView_ItemDelegateWithIndex(const QAbstractIt
 	return self->itemDelegate(*index);
 }
 
-QVariant* QAbstractItemView_InputMethodQuery(const QAbstractItemView* self, uintptr_t query) {
+QVariant* QAbstractItemView_InputMethodQuery(const QAbstractItemView* self, int query) {
 	return new QVariant(self->inputMethodQuery(static_cast<Qt::InputMethodQuery>(query)));
 }
 
@@ -439,7 +439,7 @@ struct miqt_string* QAbstractItemView_TrUtf83(const char* s, const char* c, int
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-void QAbstractItemView_ScrollTo2(QAbstractItemView* self, QModelIndex* index, uintptr_t hint) {
+void QAbstractItemView_ScrollTo2(QAbstractItemView* self, QModelIndex* index, int hint) {
 	self->scrollTo(*index, static_cast<QAbstractItemView::ScrollHint>(hint));
 }
 

qt/gen_qabstractitemview.go

@@ -140,7 +140,7 @@ func (this *QAbstractItemView) ItemDelegate() *QAbstractItemDelegate {
 }
 
 func (this *QAbstractItemView) SetSelectionMode(mode QAbstractItemView__SelectionMode) {
-	C.QAbstractItemView_SetSelectionMode(this.h, (C.uintptr_t)(mode))
+	C.QAbstractItemView_SetSelectionMode(this.h, (C.int)(mode))
 }
 
 func (this *QAbstractItemView) SelectionMode() QAbstractItemView__SelectionMode {
@@ -148,7 +148,7 @@ func (this *QAbstractItemView) SelectionMode() QAbstractItemView__SelectionMode
 }
 
 func (this *QAbstractItemView) SetSelectionBehavior(behavior QAbstractItemView__SelectionBehavior) {
-	C.QAbstractItemView_SetSelectionBehavior(this.h, (C.uintptr_t)(behavior))
+	C.QAbstractItemView_SetSelectionBehavior(this.h, (C.int)(behavior))
 }
 
 func (this *QAbstractItemView) SelectionBehavior() QAbstractItemView__SelectionBehavior {
@@ -170,7 +170,7 @@ func (this *QAbstractItemView) RootIndex() *QModelIndex {
 }
 
 func (this *QAbstractItemView) SetEditTriggers(triggers int) {
-	C.QAbstractItemView_SetEditTriggers(this.h, (C.int)(triggers))
+	C.QAbstractItemView_SetEditTriggers(this.h, triggers)
 }
 
 func (this *QAbstractItemView) EditTriggers() int {
@@ -178,7 +178,7 @@ func (this *QAbstractItemView) EditTriggers() int {
 }
 
 func (this *QAbstractItemView) SetVerticalScrollMode(mode QAbstractItemView__ScrollMode) {
-	C.QAbstractItemView_SetVerticalScrollMode(this.h, (C.uintptr_t)(mode))
+	C.QAbstractItemView_SetVerticalScrollMode(this.h, (C.int)(mode))
 }
 
 func (this *QAbstractItemView) VerticalScrollMode() QAbstractItemView__ScrollMode {
@@ -190,7 +190,7 @@ func (this *QAbstractItemView) ResetVerticalScrollMode() {
 }
 
 func (this *QAbstractItemView) SetHorizontalScrollMode(mode QAbstractItemView__ScrollMode) {
-	C.QAbstractItemView_SetHorizontalScrollMode(this.h, (C.uintptr_t)(mode))
+	C.QAbstractItemView_SetHorizontalScrollMode(this.h, (C.int)(mode))
 }
 
 func (this *QAbstractItemView) HorizontalScrollMode() QAbstractItemView__ScrollMode {
@@ -250,7 +250,7 @@ func (this *QAbstractItemView) DragDropOverwriteMode() bool {
 }
 
 func (this *QAbstractItemView) SetDragDropMode(behavior QAbstractItemView__DragDropMode) {
-	C.QAbstractItemView_SetDragDropMode(this.h, (C.uintptr_t)(behavior))
+	C.QAbstractItemView_SetDragDropMode(this.h, (C.int)(behavior))
 }
 
 func (this *QAbstractItemView) DragDropMode() QAbstractItemView__DragDropMode {
@@ -258,7 +258,7 @@ func (this *QAbstractItemView) DragDropMode() QAbstractItemView__DragDropMode {
 }
 
 func (this *QAbstractItemView) SetDefaultDropAction(dropAction DropAction) {
-	C.QAbstractItemView_SetDefaultDropAction(this.h, (C.uintptr_t)(dropAction))
+	C.QAbstractItemView_SetDefaultDropAction(this.h, (C.int)(dropAction))
 }
 
 func (this *QAbstractItemView) DefaultDropAction() DropAction {
@@ -285,7 +285,7 @@ func (this *QAbstractItemView) IconSize() *QSize {
 }
 
 func (this *QAbstractItemView) SetTextElideMode(mode TextElideMode) {
-	C.QAbstractItemView_SetTextElideMode(this.h, (C.uintptr_t)(mode))
+	C.QAbstractItemView_SetTextElideMode(this.h, (C.int)(mode))
 }
 
 func (this *QAbstractItemView) TextElideMode() TextElideMode {
@@ -372,7 +372,7 @@ func (this *QAbstractItemView) ItemDelegateWithIndex(index *QModelIndex) *QAbstr
 }
 
 func (this *QAbstractItemView) InputMethodQuery(query InputMethodQuery) *QVariant {
-	_ret := C.QAbstractItemView_InputMethodQuery(this.h, (C.uintptr_t)(query))
+	_ret := C.QAbstractItemView_InputMethodQuery(this.h, (C.int)(query))
 	_goptr := newQVariant(_ret)
 	_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	return _goptr
@@ -600,7 +600,7 @@ func QAbstractItemView_TrUtf83(s string, c string, n int) string {
 }
 
 func (this *QAbstractItemView) ScrollTo2(index *QModelIndex, hint QAbstractItemView__ScrollHint) {
-	C.QAbstractItemView_ScrollTo2(this.h, index.cPointer(), (C.uintptr_t)(hint))
+	C.QAbstractItemView_ScrollTo2(this.h, index.cPointer(), (C.int)(hint))
 }
 
 // Delete this object from C++ memory.

qt/gen_qabstractitemview.h

@@ -48,19 +48,19 @@ void QAbstractItemView_SetSelectionModel(QAbstractItemView* self, QItemSelection
 QItemSelectionModel* QAbstractItemView_SelectionModel(const QAbstractItemView* self);
 void QAbstractItemView_SetItemDelegate(QAbstractItemView* self, QAbstractItemDelegate* delegate);
 QAbstractItemDelegate* QAbstractItemView_ItemDelegate(const QAbstractItemView* self);
-void QAbstractItemView_SetSelectionMode(QAbstractItemView* self, uintptr_t mode);
-uintptr_t QAbstractItemView_SelectionMode(const QAbstractItemView* self);
-void QAbstractItemView_SetSelectionBehavior(QAbstractItemView* self, uintptr_t behavior);
-uintptr_t QAbstractItemView_SelectionBehavior(const QAbstractItemView* self);
+void QAbstractItemView_SetSelectionMode(QAbstractItemView* self, int mode);
+int QAbstractItemView_SelectionMode(const QAbstractItemView* self);
+void QAbstractItemView_SetSelectionBehavior(QAbstractItemView* self, int behavior);
+int QAbstractItemView_SelectionBehavior(const QAbstractItemView* self);
 QModelIndex* QAbstractItemView_CurrentIndex(const QAbstractItemView* self);
 QModelIndex* QAbstractItemView_RootIndex(const QAbstractItemView* self);
 void QAbstractItemView_SetEditTriggers(QAbstractItemView* self, int triggers);
 int QAbstractItemView_EditTriggers(const QAbstractItemView* self);
-void QAbstractItemView_SetVerticalScrollMode(QAbstractItemView* self, uintptr_t mode);
-uintptr_t QAbstractItemView_VerticalScrollMode(const QAbstractItemView* self);
+void QAbstractItemView_SetVerticalScrollMode(QAbstractItemView* self, int mode);
+int QAbstractItemView_VerticalScrollMode(const QAbstractItemView* self);
 void QAbstractItemView_ResetVerticalScrollMode(QAbstractItemView* self);
-void QAbstractItemView_SetHorizontalScrollMode(QAbstractItemView* self, uintptr_t mode);
-uintptr_t QAbstractItemView_HorizontalScrollMode(const QAbstractItemView* self);
+void QAbstractItemView_SetHorizontalScrollMode(QAbstractItemView* self, int mode);
+int QAbstractItemView_HorizontalScrollMode(const QAbstractItemView* self);
 void QAbstractItemView_ResetHorizontalScrollMode(QAbstractItemView* self);
 void QAbstractItemView_SetAutoScroll(QAbstractItemView* self, bool enable);
 bool QAbstractItemView_HasAutoScroll(const QAbstractItemView* self);
@@ -74,16 +74,16 @@ void QAbstractItemView_SetDragEnabled(QAbstractItemView* self, bool enable);
 bool QAbstractItemView_DragEnabled(const QAbstractItemView* self);
 void QAbstractItemView_SetDragDropOverwriteMode(QAbstractItemView* self, bool overwrite);
 bool QAbstractItemView_DragDropOverwriteMode(const QAbstractItemView* self);
-void QAbstractItemView_SetDragDropMode(QAbstractItemView* self, uintptr_t behavior);
-uintptr_t QAbstractItemView_DragDropMode(const QAbstractItemView* self);
-void QAbstractItemView_SetDefaultDropAction(QAbstractItemView* self, uintptr_t dropAction);
-uintptr_t QAbstractItemView_DefaultDropAction(const QAbstractItemView* self);
+void QAbstractItemView_SetDragDropMode(QAbstractItemView* self, int behavior);
+int QAbstractItemView_DragDropMode(const QAbstractItemView* self);
+void QAbstractItemView_SetDefaultDropAction(QAbstractItemView* self, int dropAction);
+int QAbstractItemView_DefaultDropAction(const QAbstractItemView* self);
 void QAbstractItemView_SetAlternatingRowColors(QAbstractItemView* self, bool enable);
 bool QAbstractItemView_AlternatingRowColors(const QAbstractItemView* self);
 void QAbstractItemView_SetIconSize(QAbstractItemView* self, QSize* size);
 QSize* QAbstractItemView_IconSize(const QAbstractItemView* self);
-void QAbstractItemView_SetTextElideMode(QAbstractItemView* self, uintptr_t mode);
-uintptr_t QAbstractItemView_TextElideMode(const QAbstractItemView* self);
+void QAbstractItemView_SetTextElideMode(QAbstractItemView* self, int mode);
+int QAbstractItemView_TextElideMode(const QAbstractItemView* self);
 void QAbstractItemView_KeyboardSearch(QAbstractItemView* self, struct miqt_string* search);
 QRect* QAbstractItemView_VisualRect(const QAbstractItemView* self, QModelIndex* index);
 void QAbstractItemView_ScrollTo(QAbstractItemView* self, QModelIndex* index);
@@ -101,7 +101,7 @@ QAbstractItemDelegate* QAbstractItemView_ItemDelegateForRow(const QAbstractItemV
 void QAbstractItemView_SetItemDelegateForColumn(QAbstractItemView* self, int column, QAbstractItemDelegate* delegate);
 QAbstractItemDelegate* QAbstractItemView_ItemDelegateForColumn(const QAbstractItemView* self, int column);
 QAbstractItemDelegate* QAbstractItemView_ItemDelegateWithIndex(const QAbstractItemView* self, QModelIndex* index);
-QVariant* QAbstractItemView_InputMethodQuery(const QAbstractItemView* self, uintptr_t query);
+QVariant* QAbstractItemView_InputMethodQuery(const QAbstractItemView* self, int query);
 void QAbstractItemView_Reset(QAbstractItemView* self);
 void QAbstractItemView_SetRootIndex(QAbstractItemView* self, QModelIndex* index);
 void QAbstractItemView_DoItemsLayout(QAbstractItemView* self);
@@ -130,7 +130,7 @@ 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);
 struct miqt_string* QAbstractItemView_TrUtf83(const char* s, const char* c, int n);
-void QAbstractItemView_ScrollTo2(QAbstractItemView* self, QModelIndex* index, uintptr_t hint);
+void QAbstractItemView_ScrollTo2(QAbstractItemView* self, QModelIndex* index, int hint);
 void QAbstractItemView_Delete(QAbstractItemView* self);
 
 #ifdef __cplusplus

qt/gen_qabstractproxymodel.cpp

@@ -59,7 +59,7 @@ QVariant* QAbstractProxyModel_Data(const QAbstractProxyModel* self, QModelIndex*
 	return new QVariant(self->data(*proxyIndex));
 }
 
-QVariant* QAbstractProxyModel_HeaderData(const QAbstractProxyModel* self, int section, uintptr_t orientation) {
+QVariant* QAbstractProxyModel_HeaderData(const QAbstractProxyModel* self, int section, int orientation) {
 	return new QVariant(self->headerData(static_cast<int>(section), static_cast<Qt::Orientation>(orientation)));
 }
 
@@ -72,7 +72,7 @@ bool QAbstractProxyModel_SetData(QAbstractProxyModel* self, QModelIndex* index,
 	return self->setData(*index, *value);
 }
 
-bool QAbstractProxyModel_SetHeaderData(QAbstractProxyModel* self, int section, uintptr_t orientation, QVariant* value) {
+bool QAbstractProxyModel_SetHeaderData(QAbstractProxyModel* self, int section, int orientation, QVariant* value) {
 	return self->setHeaderData(static_cast<int>(section), static_cast<Qt::Orientation>(orientation), *value);
 }
 
@@ -114,11 +114,11 @@ QMimeData* QAbstractProxyModel_MimeData(const QAbstractProxyModel* self, struct
 	return self->mimeData(indexes_QList);
 }
 
-bool QAbstractProxyModel_CanDropMimeData(const QAbstractProxyModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent) {
+bool QAbstractProxyModel_CanDropMimeData(const QAbstractProxyModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent) {
 	return self->canDropMimeData(data, static_cast<Qt::DropAction>(action), static_cast<int>(row), static_cast<int>(column), *parent);
 }
 
-bool QAbstractProxyModel_DropMimeData(QAbstractProxyModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent) {
+bool QAbstractProxyModel_DropMimeData(QAbstractProxyModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent) {
 	return self->dropMimeData(data, static_cast<Qt::DropAction>(action), static_cast<int>(row), static_cast<int>(column), *parent);
 }
 
@@ -180,7 +180,7 @@ QVariant* QAbstractProxyModel_Data2(const QAbstractProxyModel* self, QModelIndex
 	return new QVariant(self->data(*proxyIndex, static_cast<int>(role)));
 }
 
-QVariant* QAbstractProxyModel_HeaderData3(const QAbstractProxyModel* self, int section, uintptr_t orientation, int role) {
+QVariant* QAbstractProxyModel_HeaderData3(const QAbstractProxyModel* self, int section, int orientation, int role) {
 	return new QVariant(self->headerData(static_cast<int>(section), static_cast<Qt::Orientation>(orientation), static_cast<int>(role)));
 }
 
@@ -188,11 +188,11 @@ bool QAbstractProxyModel_SetData3(QAbstractProxyModel* self, QModelIndex* index,
 	return self->setData(*index, *value, static_cast<int>(role));
 }
 
-bool QAbstractProxyModel_SetHeaderData4(QAbstractProxyModel* self, int section, uintptr_t orientation, QVariant* value, int role) {
+bool QAbstractProxyModel_SetHeaderData4(QAbstractProxyModel* self, int section, int orientation, QVariant* value, int role) {
 	return self->setHeaderData(static_cast<int>(section), static_cast<Qt::Orientation>(orientation), *value, static_cast<int>(role));
 }
 
-void QAbstractProxyModel_Sort2(QAbstractProxyModel* self, int column, uintptr_t order) {
+void QAbstractProxyModel_Sort2(QAbstractProxyModel* self, int column, int order) {
 	self->sort(static_cast<int>(column), static_cast<Qt::SortOrder>(order));
 }
 

qt/gen_qabstractproxymodel.go

@@ -96,7 +96,7 @@ func (this *QAbstractProxyModel) Data(proxyIndex *QModelIndex) *QVariant {
 }
 
 func (this *QAbstractProxyModel) HeaderData(section int, orientation Orientation) *QVariant {
-	_ret := C.QAbstractProxyModel_HeaderData(this.h, (C.int)(section), (C.uintptr_t)(orientation))
+	_ret := C.QAbstractProxyModel_HeaderData(this.h, (C.int)(section), (C.int)(orientation))
 	_goptr := newQVariant(_ret)
 	_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	return _goptr
@@ -111,7 +111,7 @@ func (this *QAbstractProxyModel) SetData(index *QModelIndex, value *QVariant) bo
 }
 
 func (this *QAbstractProxyModel) SetHeaderData(section int, orientation Orientation, value *QVariant) bool {
-	return (bool)(C.QAbstractProxyModel_SetHeaderData(this.h, (C.int)(section), (C.uintptr_t)(orientation), value.cPointer()))
+	return (bool)(C.QAbstractProxyModel_SetHeaderData(this.h, (C.int)(section), (C.int)(orientation), value.cPointer()))
 }
 
 func (this *QAbstractProxyModel) Buddy(index *QModelIndex) *QModelIndex {
@@ -164,11 +164,11 @@ func (this *QAbstractProxyModel) MimeData(indexes []QModelIndex) *QMimeData {
 }
 
 func (this *QAbstractProxyModel) CanDropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool {
-	return (bool)(C.QAbstractProxyModel_CanDropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer()))
+	return (bool)(C.QAbstractProxyModel_CanDropMimeData(this.h, data.cPointer(), (C.int)(action), (C.int)(row), (C.int)(column), parent.cPointer()))
 }
 
 func (this *QAbstractProxyModel) DropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool {
-	return (bool)(C.QAbstractProxyModel_DropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer()))
+	return (bool)(C.QAbstractProxyModel_DropMimeData(this.h, data.cPointer(), (C.int)(action), (C.int)(row), (C.int)(column), parent.cPointer()))
 }
 
 func (this *QAbstractProxyModel) MimeTypes() []string {
@@ -245,7 +245,7 @@ func (this *QAbstractProxyModel) Data2(proxyIndex *QModelIndex, role int) *QVari
 }
 
 func (this *QAbstractProxyModel) HeaderData3(section int, orientation Orientation, role int) *QVariant {
-	_ret := C.QAbstractProxyModel_HeaderData3(this.h, (C.int)(section), (C.uintptr_t)(orientation), (C.int)(role))
+	_ret := C.QAbstractProxyModel_HeaderData3(this.h, (C.int)(section), (C.int)(orientation), (C.int)(role))
 	_goptr := newQVariant(_ret)
 	_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	return _goptr
@@ -256,11 +256,11 @@ func (this *QAbstractProxyModel) SetData3(index *QModelIndex, value *QVariant, r
 }
 
 func (this *QAbstractProxyModel) SetHeaderData4(section int, orientation Orientation, value *QVariant, role int) bool {
-	return (bool)(C.QAbstractProxyModel_SetHeaderData4(this.h, (C.int)(section), (C.uintptr_t)(orientation), value.cPointer(), (C.int)(role)))
+	return (bool)(C.QAbstractProxyModel_SetHeaderData4(this.h, (C.int)(section), (C.int)(orientation), value.cPointer(), (C.int)(role)))
 }
 
 func (this *QAbstractProxyModel) Sort2(column int, order SortOrder) {
-	C.QAbstractProxyModel_Sort2(this.h, (C.int)(column), (C.uintptr_t)(order))
+	C.QAbstractProxyModel_Sort2(this.h, (C.int)(column), (C.int)(order))
 }
 
 func (this *QAbstractProxyModel) HasChildren1(parent *QModelIndex) bool {

qt/gen_qabstractproxymodel.h

@@ -41,10 +41,10 @@ QModelIndex* QAbstractProxyModel_MapFromSource(const QAbstractProxyModel* self,
 bool QAbstractProxyModel_Submit(QAbstractProxyModel* self);
 void QAbstractProxyModel_Revert(QAbstractProxyModel* self);
 QVariant* QAbstractProxyModel_Data(const QAbstractProxyModel* self, QModelIndex* proxyIndex);
-QVariant* QAbstractProxyModel_HeaderData(const QAbstractProxyModel* self, int section, uintptr_t orientation);
+QVariant* QAbstractProxyModel_HeaderData(const QAbstractProxyModel* self, int section, int orientation);
 int QAbstractProxyModel_Flags(const QAbstractProxyModel* self, QModelIndex* index);
 bool QAbstractProxyModel_SetData(QAbstractProxyModel* self, QModelIndex* index, QVariant* value);
-bool QAbstractProxyModel_SetHeaderData(QAbstractProxyModel* self, int section, uintptr_t orientation, QVariant* value);
+bool QAbstractProxyModel_SetHeaderData(QAbstractProxyModel* self, int section, int orientation, QVariant* value);
 QModelIndex* QAbstractProxyModel_Buddy(const QAbstractProxyModel* self, QModelIndex* index);
 bool QAbstractProxyModel_CanFetchMore(const QAbstractProxyModel* self, QModelIndex* parent);
 void QAbstractProxyModel_FetchMore(QAbstractProxyModel* self, QModelIndex* parent);
@@ -53,8 +53,8 @@ QSize* QAbstractProxyModel_Span(const QAbstractProxyModel* self, QModelIndex* in
 bool QAbstractProxyModel_HasChildren(const QAbstractProxyModel* self);
 QModelIndex* QAbstractProxyModel_Sibling(const QAbstractProxyModel* self, int row, int column, QModelIndex* idx);
 QMimeData* QAbstractProxyModel_MimeData(const QAbstractProxyModel* self, struct miqt_array* /* of QModelIndex* */ indexes);
-bool QAbstractProxyModel_CanDropMimeData(const QAbstractProxyModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent);
-bool QAbstractProxyModel_DropMimeData(QAbstractProxyModel* self, QMimeData* data, uintptr_t action, int row, int column, QModelIndex* parent);
+bool QAbstractProxyModel_CanDropMimeData(const QAbstractProxyModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent);
+bool QAbstractProxyModel_DropMimeData(QAbstractProxyModel* self, QMimeData* data, int action, int row, int column, QModelIndex* parent);
 struct miqt_array* QAbstractProxyModel_MimeTypes(const QAbstractProxyModel* self);
 int QAbstractProxyModel_SupportedDragActions(const QAbstractProxyModel* self);
 int QAbstractProxyModel_SupportedDropActions(const QAbstractProxyModel* self);
@@ -63,10 +63,10 @@ struct miqt_string* QAbstractProxyModel_Tr3(const char* s, const char* c, int n)
 struct miqt_string* QAbstractProxyModel_TrUtf82(const char* s, const char* c);
 struct miqt_string* QAbstractProxyModel_TrUtf83(const char* s, const char* c, int n);
 QVariant* QAbstractProxyModel_Data2(const QAbstractProxyModel* self, QModelIndex* proxyIndex, int role);
-QVariant* QAbstractProxyModel_HeaderData3(const QAbstractProxyModel* self, int section, uintptr_t orientation, int role);
+QVariant* QAbstractProxyModel_HeaderData3(const QAbstractProxyModel* self, int section, int orientation, int role);
 bool QAbstractProxyModel_SetData3(QAbstractProxyModel* self, QModelIndex* index, QVariant* value, int role);
-bool QAbstractProxyModel_SetHeaderData4(QAbstractProxyModel* self, int section, uintptr_t orientation, QVariant* value, int role);
-void QAbstractProxyModel_Sort2(QAbstractProxyModel* self, int column, uintptr_t order);
+bool QAbstractProxyModel_SetHeaderData4(QAbstractProxyModel* self, int section, int orientation, QVariant* value, int role);
+void QAbstractProxyModel_Sort2(QAbstractProxyModel* self, int column, int order);
 bool QAbstractProxyModel_HasChildren1(const QAbstractProxyModel* self, QModelIndex* parent);
 void QAbstractProxyModel_Delete(QAbstractProxyModel* self);
 

qt/gen_qabstractscrollarea.cpp

@@ -37,12 +37,12 @@ struct miqt_string* QAbstractScrollArea_TrUtf8(const char* s) {
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-uintptr_t QAbstractScrollArea_VerticalScrollBarPolicy(const QAbstractScrollArea* self) {
+int QAbstractScrollArea_VerticalScrollBarPolicy(const QAbstractScrollArea* self) {
 	Qt::ScrollBarPolicy _ret = self->verticalScrollBarPolicy();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-void QAbstractScrollArea_SetVerticalScrollBarPolicy(QAbstractScrollArea* self, uintptr_t verticalScrollBarPolicy) {
+void QAbstractScrollArea_SetVerticalScrollBarPolicy(QAbstractScrollArea* self, int verticalScrollBarPolicy) {
 	self->setVerticalScrollBarPolicy(static_cast<Qt::ScrollBarPolicy>(verticalScrollBarPolicy));
 }
 
@@ -54,12 +54,12 @@ void QAbstractScrollArea_SetVerticalScrollBar(QAbstractScrollArea* self, QScroll
 	self->setVerticalScrollBar(scrollbar);
 }
 
-uintptr_t QAbstractScrollArea_HorizontalScrollBarPolicy(const QAbstractScrollArea* self) {
+int QAbstractScrollArea_HorizontalScrollBarPolicy(const QAbstractScrollArea* self) {
 	Qt::ScrollBarPolicy _ret = self->horizontalScrollBarPolicy();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-void QAbstractScrollArea_SetHorizontalScrollBarPolicy(QAbstractScrollArea* self, uintptr_t horizontalScrollBarPolicy) {
+void QAbstractScrollArea_SetHorizontalScrollBarPolicy(QAbstractScrollArea* self, int horizontalScrollBarPolicy) {
 	self->setHorizontalScrollBarPolicy(static_cast<Qt::ScrollBarPolicy>(horizontalScrollBarPolicy));
 }
 
@@ -120,12 +120,12 @@ void QAbstractScrollArea_SetupViewport(QAbstractScrollArea* self, QWidget* viewp
 	self->setupViewport(viewport);
 }
 
-uintptr_t QAbstractScrollArea_SizeAdjustPolicy(const QAbstractScrollArea* self) {
+int QAbstractScrollArea_SizeAdjustPolicy(const QAbstractScrollArea* self) {
 	QAbstractScrollArea::SizeAdjustPolicy _ret = self->sizeAdjustPolicy();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-void QAbstractScrollArea_SetSizeAdjustPolicy(QAbstractScrollArea* self, uintptr_t policy) {
+void QAbstractScrollArea_SetSizeAdjustPolicy(QAbstractScrollArea* self, int policy) {
 	self->setSizeAdjustPolicy(static_cast<QAbstractScrollArea::SizeAdjustPolicy>(policy));
 }
 

qt/gen_qabstractscrollarea.go

@@ -83,7 +83,7 @@ func (this *QAbstractScrollArea) VerticalScrollBarPolicy() ScrollBarPolicy {
 }
 
 func (this *QAbstractScrollArea) SetVerticalScrollBarPolicy(verticalScrollBarPolicy ScrollBarPolicy) {
-	C.QAbstractScrollArea_SetVerticalScrollBarPolicy(this.h, (C.uintptr_t)(verticalScrollBarPolicy))
+	C.QAbstractScrollArea_SetVerticalScrollBarPolicy(this.h, (C.int)(verticalScrollBarPolicy))
 }
 
 func (this *QAbstractScrollArea) VerticalScrollBar() *QScrollBar {
@@ -99,7 +99,7 @@ func (this *QAbstractScrollArea) HorizontalScrollBarPolicy() ScrollBarPolicy {
 }
 
 func (this *QAbstractScrollArea) SetHorizontalScrollBarPolicy(horizontalScrollBarPolicy ScrollBarPolicy) {
-	C.QAbstractScrollArea_SetHorizontalScrollBarPolicy(this.h, (C.uintptr_t)(horizontalScrollBarPolicy))
+	C.QAbstractScrollArea_SetHorizontalScrollBarPolicy(this.h, (C.int)(horizontalScrollBarPolicy))
 }
 
 func (this *QAbstractScrollArea) HorizontalScrollBar() *QScrollBar {
@@ -119,11 +119,11 @@ func (this *QAbstractScrollArea) SetCornerWidget(widget *QWidget) {
 }
 
 func (this *QAbstractScrollArea) AddScrollBarWidget(widget *QWidget, alignment int) {
-	C.QAbstractScrollArea_AddScrollBarWidget(this.h, widget.cPointer(), (C.int)(alignment))
+	C.QAbstractScrollArea_AddScrollBarWidget(this.h, widget.cPointer(), alignment)
 }
 
 func (this *QAbstractScrollArea) ScrollBarWidgets(alignment int) []*QWidget {
-	var _ma *C.struct_miqt_array = C.QAbstractScrollArea_ScrollBarWidgets(this.h, (C.int)(alignment))
+	var _ma *C.struct_miqt_array = C.QAbstractScrollArea_ScrollBarWidgets(this.h, alignment)
 	_ret := make([]*QWidget, int(_ma.len))
 	_outCast := (*[0xffff]*C.QWidget)(unsafe.Pointer(_ma.data)) // hey ya
 	for i := 0; i < int(_ma.len); i++ {
@@ -171,7 +171,7 @@ func (this *QAbstractScrollArea) SizeAdjustPolicy() QAbstractScrollArea__SizeAdj
 }
 
 func (this *QAbstractScrollArea) SetSizeAdjustPolicy(policy QAbstractScrollArea__SizeAdjustPolicy) {
-	C.QAbstractScrollArea_SetSizeAdjustPolicy(this.h, (C.uintptr_t)(policy))
+	C.QAbstractScrollArea_SetSizeAdjustPolicy(this.h, (C.int)(policy))
 }
 
 func QAbstractScrollArea_Tr2(s string, c string) string {

qt/gen_qabstractscrollarea.h

@@ -32,12 +32,12 @@ QAbstractScrollArea* QAbstractScrollArea_new2(QWidget* parent);
 QMetaObject* QAbstractScrollArea_MetaObject(const QAbstractScrollArea* self);
 struct miqt_string* QAbstractScrollArea_Tr(const char* s);
 struct miqt_string* QAbstractScrollArea_TrUtf8(const char* s);
-uintptr_t QAbstractScrollArea_VerticalScrollBarPolicy(const QAbstractScrollArea* self);
-void QAbstractScrollArea_SetVerticalScrollBarPolicy(QAbstractScrollArea* self, uintptr_t verticalScrollBarPolicy);
+int QAbstractScrollArea_VerticalScrollBarPolicy(const QAbstractScrollArea* self);
+void QAbstractScrollArea_SetVerticalScrollBarPolicy(QAbstractScrollArea* self, int verticalScrollBarPolicy);
 QScrollBar* QAbstractScrollArea_VerticalScrollBar(const QAbstractScrollArea* self);
 void QAbstractScrollArea_SetVerticalScrollBar(QAbstractScrollArea* self, QScrollBar* scrollbar);
-uintptr_t QAbstractScrollArea_HorizontalScrollBarPolicy(const QAbstractScrollArea* self);
-void QAbstractScrollArea_SetHorizontalScrollBarPolicy(QAbstractScrollArea* self, uintptr_t horizontalScrollBarPolicy);
+int QAbstractScrollArea_HorizontalScrollBarPolicy(const QAbstractScrollArea* self);
+void QAbstractScrollArea_SetHorizontalScrollBarPolicy(QAbstractScrollArea* self, int horizontalScrollBarPolicy);
 QScrollBar* QAbstractScrollArea_HorizontalScrollBar(const QAbstractScrollArea* self);
 void QAbstractScrollArea_SetHorizontalScrollBar(QAbstractScrollArea* self, QScrollBar* scrollbar);
 QWidget* QAbstractScrollArea_CornerWidget(const QAbstractScrollArea* self);
@@ -50,8 +50,8 @@ QSize* QAbstractScrollArea_MaximumViewportSize(const QAbstractScrollArea* self);
 QSize* QAbstractScrollArea_MinimumSizeHint(const QAbstractScrollArea* self);
 QSize* QAbstractScrollArea_SizeHint(const QAbstractScrollArea* self);
 void QAbstractScrollArea_SetupViewport(QAbstractScrollArea* self, QWidget* viewport);
-uintptr_t QAbstractScrollArea_SizeAdjustPolicy(const QAbstractScrollArea* self);
-void QAbstractScrollArea_SetSizeAdjustPolicy(QAbstractScrollArea* self, uintptr_t policy);
+int QAbstractScrollArea_SizeAdjustPolicy(const QAbstractScrollArea* self);
+void QAbstractScrollArea_SetSizeAdjustPolicy(QAbstractScrollArea* self, int policy);
 struct miqt_string* QAbstractScrollArea_Tr2(const char* s, const char* c);
 struct miqt_string* QAbstractScrollArea_Tr3(const char* s, const char* c, int n);
 struct miqt_string* QAbstractScrollArea_TrUtf82(const char* s, const char* c);

qt/gen_qabstractslider.cpp

@@ -34,9 +34,9 @@ struct miqt_string* QAbstractSlider_TrUtf8(const char* s) {
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-uintptr_t QAbstractSlider_Orientation(const QAbstractSlider* self) {
+int QAbstractSlider_Orientation(const QAbstractSlider* self) {
 	Qt::Orientation _ret = self->orientation();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 void QAbstractSlider_SetMinimum(QAbstractSlider* self, int minimum) {
@@ -115,7 +115,7 @@ int QAbstractSlider_Value(const QAbstractSlider* self) {
 	return self->value();
 }
 
-void QAbstractSlider_TriggerAction(QAbstractSlider* self, uintptr_t action) {
+void QAbstractSlider_TriggerAction(QAbstractSlider* self, int action) {
 	self->triggerAction(static_cast<QAbstractSlider::SliderAction>(action));
 }
 
@@ -123,7 +123,7 @@ void QAbstractSlider_SetValue(QAbstractSlider* self, int value) {
 	self->setValue(static_cast<int>(value));
 }
 
-void QAbstractSlider_SetOrientation(QAbstractSlider* self, uintptr_t orientation) {
+void QAbstractSlider_SetOrientation(QAbstractSlider* self, int orientation) {
 	self->setOrientation(static_cast<Qt::Orientation>(orientation));
 }
 

qt/gen_qabstractslider.go

@@ -165,7 +165,7 @@ func (this *QAbstractSlider) Value() int {
 }
 
 func (this *QAbstractSlider) TriggerAction(action QAbstractSlider__SliderAction) {
-	C.QAbstractSlider_TriggerAction(this.h, (C.uintptr_t)(action))
+	C.QAbstractSlider_TriggerAction(this.h, (C.int)(action))
 }
 
 func (this *QAbstractSlider) SetValue(value int) {
@@ -173,7 +173,7 @@ func (this *QAbstractSlider) SetValue(value int) {
 }
 
 func (this *QAbstractSlider) SetOrientation(orientation Orientation) {
-	C.QAbstractSlider_SetOrientation(this.h, (C.uintptr_t)(orientation))
+	C.QAbstractSlider_SetOrientation(this.h, (C.int)(orientation))
 }
 
 func (this *QAbstractSlider) SetRange(min int, max int) {

qt/gen_qabstractslider.h

@@ -28,7 +28,7 @@ QAbstractSlider* QAbstractSlider_new2(QWidget* parent);
 QMetaObject* QAbstractSlider_MetaObject(const QAbstractSlider* self);
 struct miqt_string* QAbstractSlider_Tr(const char* s);
 struct miqt_string* QAbstractSlider_TrUtf8(const char* s);
-uintptr_t QAbstractSlider_Orientation(const QAbstractSlider* self);
+int QAbstractSlider_Orientation(const QAbstractSlider* self);
 void QAbstractSlider_SetMinimum(QAbstractSlider* self, int minimum);
 int QAbstractSlider_Minimum(const QAbstractSlider* self);
 void QAbstractSlider_SetMaximum(QAbstractSlider* self, int maximum);
@@ -48,9 +48,9 @@ bool QAbstractSlider_InvertedAppearance(const QAbstractSlider* self);
 void QAbstractSlider_SetInvertedControls(QAbstractSlider* self, bool invertedControls);
 bool QAbstractSlider_InvertedControls(const QAbstractSlider* self);
 int QAbstractSlider_Value(const QAbstractSlider* self);
-void QAbstractSlider_TriggerAction(QAbstractSlider* self, uintptr_t action);
+void QAbstractSlider_TriggerAction(QAbstractSlider* self, int action);
 void QAbstractSlider_SetValue(QAbstractSlider* self, int value);
-void QAbstractSlider_SetOrientation(QAbstractSlider* self, uintptr_t orientation);
+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);

qt/gen_qabstractspinbox.cpp

@@ -37,22 +37,22 @@ struct miqt_string* QAbstractSpinBox_TrUtf8(const char* s) {
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-uintptr_t QAbstractSpinBox_ButtonSymbols(const QAbstractSpinBox* self) {
+int QAbstractSpinBox_ButtonSymbols(const QAbstractSpinBox* self) {
 	QAbstractSpinBox::ButtonSymbols _ret = self->buttonSymbols();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-void QAbstractSpinBox_SetButtonSymbols(QAbstractSpinBox* self, uintptr_t bs) {
+void QAbstractSpinBox_SetButtonSymbols(QAbstractSpinBox* self, int bs) {
 	self->setButtonSymbols(static_cast<QAbstractSpinBox::ButtonSymbols>(bs));
 }
 
-void QAbstractSpinBox_SetCorrectionMode(QAbstractSpinBox* self, uintptr_t cm) {
+void QAbstractSpinBox_SetCorrectionMode(QAbstractSpinBox* self, int cm) {
 	self->setCorrectionMode(static_cast<QAbstractSpinBox::CorrectionMode>(cm));
 }
 
-uintptr_t QAbstractSpinBox_CorrectionMode(const QAbstractSpinBox* self) {
+int QAbstractSpinBox_CorrectionMode(const QAbstractSpinBox* self) {
 	QAbstractSpinBox::CorrectionMode _ret = self->correctionMode();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 bool QAbstractSpinBox_HasAcceptableInput(const QAbstractSpinBox* self) {
@@ -151,14 +151,14 @@ bool QAbstractSpinBox_Event(QAbstractSpinBox* self, QEvent* event) {
 	return self->event(event);
 }
 
-QVariant* QAbstractSpinBox_InputMethodQuery(const QAbstractSpinBox* self, uintptr_t param1) {
+QVariant* QAbstractSpinBox_InputMethodQuery(const QAbstractSpinBox* self, int param1) {
 	return new QVariant(self->inputMethodQuery(static_cast<Qt::InputMethodQuery>(param1)));
 }
 
-uintptr_t QAbstractSpinBox_Validate(const QAbstractSpinBox* self, struct miqt_string* input, int* pos) {
+int QAbstractSpinBox_Validate(const QAbstractSpinBox* self, struct miqt_string* input, int* pos) {
 	QString input_QString = QString::fromUtf8(&input->data, input->len);
 	QValidator::State _ret = self->validate(input_QString, static_cast<int&>(*pos));
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 void QAbstractSpinBox_Fixup(const QAbstractSpinBox* self, struct miqt_string* input) {

qt/gen_qabstractspinbox.go

@@ -106,11 +106,11 @@ func (this *QAbstractSpinBox) ButtonSymbols() QAbstractSpinBox__ButtonSymbols {
 }
 
 func (this *QAbstractSpinBox) SetButtonSymbols(bs QAbstractSpinBox__ButtonSymbols) {
-	C.QAbstractSpinBox_SetButtonSymbols(this.h, (C.uintptr_t)(bs))
+	C.QAbstractSpinBox_SetButtonSymbols(this.h, (C.int)(bs))
 }
 
 func (this *QAbstractSpinBox) SetCorrectionMode(cm QAbstractSpinBox__CorrectionMode) {
-	C.QAbstractSpinBox_SetCorrectionMode(this.h, (C.uintptr_t)(cm))
+	C.QAbstractSpinBox_SetCorrectionMode(this.h, (C.int)(cm))
 }
 
 func (this *QAbstractSpinBox) CorrectionMode() QAbstractSpinBox__CorrectionMode {
@@ -166,7 +166,7 @@ func (this *QAbstractSpinBox) KeyboardTracking() bool {
 }
 
 func (this *QAbstractSpinBox) SetAlignment(flag int) {
-	C.QAbstractSpinBox_SetAlignment(this.h, (C.int)(flag))
+	C.QAbstractSpinBox_SetAlignment(this.h, flag)
 }
 
 func (this *QAbstractSpinBox) Alignment() int {
@@ -220,7 +220,7 @@ func (this *QAbstractSpinBox) Event(event *QEvent) bool {
 }
 
 func (this *QAbstractSpinBox) InputMethodQuery(param1 InputMethodQuery) *QVariant {
-	_ret := C.QAbstractSpinBox_InputMethodQuery(this.h, (C.uintptr_t)(param1))
+	_ret := C.QAbstractSpinBox_InputMethodQuery(this.h, (C.int)(param1))
 	_goptr := newQVariant(_ret)
 	_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	return _goptr

qt/gen_qabstractspinbox.h

@@ -34,10 +34,10 @@ QAbstractSpinBox* QAbstractSpinBox_new2(QWidget* parent);
 QMetaObject* QAbstractSpinBox_MetaObject(const QAbstractSpinBox* self);
 struct miqt_string* QAbstractSpinBox_Tr(const char* s);
 struct miqt_string* QAbstractSpinBox_TrUtf8(const char* s);
-uintptr_t QAbstractSpinBox_ButtonSymbols(const QAbstractSpinBox* self);
-void QAbstractSpinBox_SetButtonSymbols(QAbstractSpinBox* self, uintptr_t bs);
-void QAbstractSpinBox_SetCorrectionMode(QAbstractSpinBox* self, uintptr_t cm);
-uintptr_t QAbstractSpinBox_CorrectionMode(const QAbstractSpinBox* self);
+int QAbstractSpinBox_ButtonSymbols(const QAbstractSpinBox* self);
+void QAbstractSpinBox_SetButtonSymbols(QAbstractSpinBox* self, int bs);
+void QAbstractSpinBox_SetCorrectionMode(QAbstractSpinBox* self, int cm);
+int QAbstractSpinBox_CorrectionMode(const QAbstractSpinBox* self);
 bool QAbstractSpinBox_HasAcceptableInput(const QAbstractSpinBox* self);
 struct miqt_string* QAbstractSpinBox_Text(const QAbstractSpinBox* self);
 struct miqt_string* QAbstractSpinBox_SpecialValueText(const QAbstractSpinBox* self);
@@ -60,8 +60,8 @@ QSize* QAbstractSpinBox_SizeHint(const QAbstractSpinBox* self);
 QSize* QAbstractSpinBox_MinimumSizeHint(const QAbstractSpinBox* self);
 void QAbstractSpinBox_InterpretText(QAbstractSpinBox* self);
 bool QAbstractSpinBox_Event(QAbstractSpinBox* self, QEvent* event);
-QVariant* QAbstractSpinBox_InputMethodQuery(const QAbstractSpinBox* self, uintptr_t param1);
-uintptr_t QAbstractSpinBox_Validate(const QAbstractSpinBox* self, struct miqt_string* input, int* pos);
+QVariant* QAbstractSpinBox_InputMethodQuery(const QAbstractSpinBox* self, int param1);
+int QAbstractSpinBox_Validate(const QAbstractSpinBox* self, struct miqt_string* input, int* pos);
 void QAbstractSpinBox_Fixup(const QAbstractSpinBox* self, struct miqt_string* input);
 void QAbstractSpinBox_StepBy(QAbstractSpinBox* self, int steps);
 void QAbstractSpinBox_StepUp(QAbstractSpinBox* self);

qt/gen_qabstracttextdocumentlayout.cpp

@@ -42,7 +42,7 @@ void QAbstractTextDocumentLayout_Draw(QAbstractTextDocumentLayout* self, QPainte
 	self->draw(painter, *context);
 }
 
-int QAbstractTextDocumentLayout_HitTest(const QAbstractTextDocumentLayout* self, QPointF* point, uintptr_t accuracy) {
+int QAbstractTextDocumentLayout_HitTest(const QAbstractTextDocumentLayout* self, QPointF* point, int accuracy) {
 	return self->hitTest(*point, static_cast<Qt::HitTestAccuracy>(accuracy));
 }
 
@@ -224,6 +224,10 @@ QAbstractTextDocumentLayout__Selection* QAbstractTextDocumentLayout__Selection_n
 	return new QAbstractTextDocumentLayout::Selection(*param1);
 }
 
+void QAbstractTextDocumentLayout__Selection_OperatorAssign(QAbstractTextDocumentLayout__Selection* self, QAbstractTextDocumentLayout__Selection* param1) {
+	self->operator=(*param1);
+}
+
 void QAbstractTextDocumentLayout__Selection_Delete(QAbstractTextDocumentLayout__Selection* self) {
 	delete self;
 }
@@ -236,6 +240,10 @@ QAbstractTextDocumentLayout__PaintContext* QAbstractTextDocumentLayout__PaintCon
 	return new QAbstractTextDocumentLayout::PaintContext(*param1);
 }
 
+void QAbstractTextDocumentLayout__PaintContext_OperatorAssign(QAbstractTextDocumentLayout__PaintContext* self, QAbstractTextDocumentLayout__PaintContext* param1) {
+	self->operator=(*param1);
+}
+
 void QAbstractTextDocumentLayout__PaintContext_Delete(QAbstractTextDocumentLayout__PaintContext* self) {
 	delete self;
 }

qt/gen_qabstracttextdocumentlayout.go

@@ -64,7 +64,7 @@ func (this *QAbstractTextDocumentLayout) Draw(painter *QPainter, context *QAbstr
 }
 
 func (this *QAbstractTextDocumentLayout) HitTest(point *QPointF, accuracy HitTestAccuracy) int {
-	return (int)(C.QAbstractTextDocumentLayout_HitTest(this.h, point.cPointer(), (C.uintptr_t)(accuracy)))
+	return (int)(C.QAbstractTextDocumentLayout_HitTest(this.h, point.cPointer(), (C.int)(accuracy)))
 }
 
 func (this *QAbstractTextDocumentLayout) AnchorAt(pos *QPointF) string {
@@ -382,6 +382,10 @@ func NewQAbstractTextDocumentLayout__Selection(param1 *QAbstractTextDocumentLayo
 	return newQAbstractTextDocumentLayout__Selection(ret)
 }
 
+func (this *QAbstractTextDocumentLayout__Selection) OperatorAssign(param1 *QAbstractTextDocumentLayout__Selection) {
+	C.QAbstractTextDocumentLayout__Selection_OperatorAssign(this.h, param1.cPointer())
+}
+
 // Delete this object from C++ memory.
 func (this *QAbstractTextDocumentLayout__Selection) Delete() {
 	C.QAbstractTextDocumentLayout__Selection_Delete(this.h)
@@ -430,6 +434,10 @@ func NewQAbstractTextDocumentLayout__PaintContext2(param1 *QAbstractTextDocument
 	return newQAbstractTextDocumentLayout__PaintContext(ret)
 }
 
+func (this *QAbstractTextDocumentLayout__PaintContext) OperatorAssign(param1 *QAbstractTextDocumentLayout__PaintContext) {
+	C.QAbstractTextDocumentLayout__PaintContext_OperatorAssign(this.h, param1.cPointer())
+}
+
 // Delete this object from C++ memory.
 func (this *QAbstractTextDocumentLayout__PaintContext) Delete() {
 	C.QAbstractTextDocumentLayout__PaintContext_Delete(this.h)

qt/gen_qabstracttextdocumentlayout.h

@@ -59,7 +59,7 @@ QMetaObject* QAbstractTextDocumentLayout_MetaObject(const QAbstractTextDocumentL
 struct miqt_string* QAbstractTextDocumentLayout_Tr(const char* s);
 struct miqt_string* QAbstractTextDocumentLayout_TrUtf8(const char* s);
 void QAbstractTextDocumentLayout_Draw(QAbstractTextDocumentLayout* self, QPainter* painter, QAbstractTextDocumentLayout__PaintContext* context);
-int QAbstractTextDocumentLayout_HitTest(const QAbstractTextDocumentLayout* self, QPointF* point, uintptr_t accuracy);
+int QAbstractTextDocumentLayout_HitTest(const QAbstractTextDocumentLayout* self, QPointF* point, int accuracy);
 struct miqt_string* QAbstractTextDocumentLayout_AnchorAt(const QAbstractTextDocumentLayout* self, QPointF* pos);
 struct miqt_string* QAbstractTextDocumentLayout_ImageAt(const QAbstractTextDocumentLayout* self, QPointF* pos);
 QTextFormat* QAbstractTextDocumentLayout_FormatAt(const QAbstractTextDocumentLayout* self, QPointF* pos);
@@ -97,10 +97,12 @@ void QTextObjectInterface_OperatorAssign(QTextObjectInterface* self, QTextObject
 void QTextObjectInterface_Delete(QTextObjectInterface* self);
 
 QAbstractTextDocumentLayout__Selection* QAbstractTextDocumentLayout__Selection_new(QAbstractTextDocumentLayout__Selection* param1);
+void QAbstractTextDocumentLayout__Selection_OperatorAssign(QAbstractTextDocumentLayout__Selection* self, QAbstractTextDocumentLayout__Selection* param1);
 void QAbstractTextDocumentLayout__Selection_Delete(QAbstractTextDocumentLayout__Selection* self);
 
 QAbstractTextDocumentLayout__PaintContext* QAbstractTextDocumentLayout__PaintContext_new();
 QAbstractTextDocumentLayout__PaintContext* QAbstractTextDocumentLayout__PaintContext_new2(QAbstractTextDocumentLayout__PaintContext* param1);
+void QAbstractTextDocumentLayout__PaintContext_OperatorAssign(QAbstractTextDocumentLayout__PaintContext* self, QAbstractTextDocumentLayout__PaintContext* param1);
 void QAbstractTextDocumentLayout__PaintContext_Delete(QAbstractTextDocumentLayout__PaintContext* self);
 
 #ifdef __cplusplus

qt/gen_qabstracttransition.cpp

@@ -43,7 +43,7 @@ void QAbstractTransition_SetTargetState(QAbstractTransition* self, QAbstractStat
 }
 
 struct miqt_array* QAbstractTransition_TargetStates(const QAbstractTransition* self) {
-	QList<QAbstractState*> _ret = self->targetStates();
+	QList<QAbstractState *> _ret = self->targetStates();
 	// Convert QList<> from C++ memory to manually-managed C memory
 	QAbstractState** _arr = static_cast<QAbstractState**>(malloc(sizeof(QAbstractState*) * _ret.length()));
 	for (size_t i = 0, e = _ret.length(); i < e; ++i) {
@@ -65,12 +65,12 @@ void QAbstractTransition_SetTargetStates(QAbstractTransition* self, struct miqt_
 	self->setTargetStates(targets_QList);
 }
 
-uintptr_t QAbstractTransition_TransitionType(const QAbstractTransition* self) {
+int QAbstractTransition_TransitionType(const QAbstractTransition* self) {
 	QAbstractTransition::TransitionType _ret = self->transitionType();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-void QAbstractTransition_SetTransitionType(QAbstractTransition* self, uintptr_t typeVal) {
+void QAbstractTransition_SetTransitionType(QAbstractTransition* self, int typeVal) {
 	self->setTransitionType(static_cast<QAbstractTransition::TransitionType>(typeVal));
 }
 
@@ -87,7 +87,7 @@ void QAbstractTransition_RemoveAnimation(QAbstractTransition* self, QAbstractAni
 }
 
 struct miqt_array* QAbstractTransition_Animations(const QAbstractTransition* self) {
-	QList<QAbstractAnimation*> _ret = self->animations();
+	QList<QAbstractAnimation *> _ret = self->animations();
 	// Convert QList<> from C++ memory to manually-managed C memory
 	QAbstractAnimation** _arr = static_cast<QAbstractAnimation**>(malloc(sizeof(QAbstractAnimation*) * _ret.length()));
 	for (size_t i = 0, e = _ret.length(); i < e; ++i) {

qt/gen_qabstracttransition.go

@@ -105,7 +105,7 @@ func (this *QAbstractTransition) TransitionType() QAbstractTransition__Transitio
 }
 
 func (this *QAbstractTransition) SetTransitionType(typeVal QAbstractTransition__TransitionType) {
-	C.QAbstractTransition_SetTransitionType(this.h, (C.uintptr_t)(typeVal))
+	C.QAbstractTransition_SetTransitionType(this.h, (C.int)(typeVal))
 }
 
 func (this *QAbstractTransition) Machine() *QStateMachine {

qt/gen_qabstracttransition.h

@@ -37,8 +37,8 @@ QAbstractState* QAbstractTransition_TargetState(const QAbstractTransition* self)
 void QAbstractTransition_SetTargetState(QAbstractTransition* self, QAbstractState* target);
 struct miqt_array* QAbstractTransition_TargetStates(const QAbstractTransition* self);
 void QAbstractTransition_SetTargetStates(QAbstractTransition* self, struct miqt_array* /* of QAbstractState* */ targets);
-uintptr_t QAbstractTransition_TransitionType(const QAbstractTransition* self);
-void QAbstractTransition_SetTransitionType(QAbstractTransition* self, uintptr_t typeVal);
+int QAbstractTransition_TransitionType(const QAbstractTransition* self);
+void QAbstractTransition_SetTransitionType(QAbstractTransition* self, int typeVal);
 QStateMachine* QAbstractTransition_Machine(const QAbstractTransition* self);
 void QAbstractTransition_AddAnimation(QAbstractTransition* self, QAbstractAnimation* animation);
 void QAbstractTransition_RemoveAnimation(QAbstractTransition* self, QAbstractAnimation* animation);

qt/gen_qaccessible.cpp

@@ -46,7 +46,8 @@ QAccessibleInterface* QAccessible_QueryAccessibleInterface(QObject* param1) {
 }
 
 unsigned int QAccessible_UniqueId(QAccessibleInterface* iface) {
-	return QAccessible::uniqueId(iface);
+	QAccessible::Id _ret = QAccessible::uniqueId(iface);
+	return static_cast<unsigned int>(_ret);
 }
 
 QAccessibleInterface* QAccessible_AccessibleInterface(unsigned int uniqueId) {
@@ -54,7 +55,8 @@ QAccessibleInterface* QAccessible_AccessibleInterface(unsigned int uniqueId) {
 }
 
 unsigned int QAccessible_RegisterAccessibleInterface(QAccessibleInterface* iface) {
-	return QAccessible::registerAccessibleInterface(iface);
+	QAccessible::Id _ret = QAccessible::registerAccessibleInterface(iface);
+	return static_cast<unsigned int>(_ret);
 }
 
 void QAccessible_DeleteAccessibleInterface(unsigned int uniqueId) {
@@ -121,14 +123,14 @@ int QAccessibleInterface_IndexOfChild(const QAccessibleInterface* self, QAccessi
 	return self->indexOfChild(param1);
 }
 
-struct miqt_string* QAccessibleInterface_Text(const QAccessibleInterface* self, uintptr_t t) {
+struct miqt_string* QAccessibleInterface_Text(const QAccessibleInterface* self, int t) {
 	QString _ret = self->text(static_cast<QAccessible::Text>(t));
 	// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
 	QByteArray _b = _ret.toUtf8();
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-void QAccessibleInterface_SetText(QAccessibleInterface* self, uintptr_t t, struct miqt_string* text) {
+void QAccessibleInterface_SetText(QAccessibleInterface* self, int t, struct miqt_string* text) {
 	QString text_QString = QString::fromUtf8(&text->data, text->len);
 	self->setText(static_cast<QAccessible::Text>(t), text_QString);
 }
@@ -137,9 +139,9 @@ QRect* QAccessibleInterface_Rect(const QAccessibleInterface* self) {
 	return new QRect(self->rect());
 }
 
-uintptr_t QAccessibleInterface_Role(const QAccessibleInterface* self) {
+int QAccessibleInterface_Role(const QAccessibleInterface* self) {
 	QAccessible::Role _ret = self->role();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 QAccessible__State* QAccessibleInterface_State(const QAccessibleInterface* self) {
@@ -217,21 +219,21 @@ struct miqt_string* QAccessibleTextInterface_Text(const QAccessibleTextInterface
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-struct miqt_string* QAccessibleTextInterface_TextBeforeOffset(const QAccessibleTextInterface* self, int offset, uintptr_t boundaryType, int* startOffset, int* endOffset) {
+struct miqt_string* QAccessibleTextInterface_TextBeforeOffset(const QAccessibleTextInterface* self, int offset, int boundaryType, int* startOffset, int* endOffset) {
 	QString _ret = self->textBeforeOffset(static_cast<int>(offset), static_cast<QAccessible::TextBoundaryType>(boundaryType), static_cast<int*>(startOffset), static_cast<int*>(endOffset));
 	// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
 	QByteArray _b = _ret.toUtf8();
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-struct miqt_string* QAccessibleTextInterface_TextAfterOffset(const QAccessibleTextInterface* self, int offset, uintptr_t boundaryType, int* startOffset, int* endOffset) {
+struct miqt_string* QAccessibleTextInterface_TextAfterOffset(const QAccessibleTextInterface* self, int offset, int boundaryType, int* startOffset, int* endOffset) {
 	QString _ret = self->textAfterOffset(static_cast<int>(offset), static_cast<QAccessible::TextBoundaryType>(boundaryType), static_cast<int*>(startOffset), static_cast<int*>(endOffset));
 	// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
 	QByteArray _b = _ret.toUtf8();
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-struct miqt_string* QAccessibleTextInterface_TextAtOffset(const QAccessibleTextInterface* self, int offset, uintptr_t boundaryType, int* startOffset, int* endOffset) {
+struct miqt_string* QAccessibleTextInterface_TextAtOffset(const QAccessibleTextInterface* self, int offset, int boundaryType, int* startOffset, int* endOffset) {
 	QString _ret = self->textAtOffset(static_cast<int>(offset), static_cast<QAccessible::TextBoundaryType>(boundaryType), static_cast<int*>(startOffset), static_cast<int*>(endOffset));
 	// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
 	QByteArray _b = _ret.toUtf8();
@@ -324,7 +326,7 @@ bool QAccessibleTableCellInterface_IsSelected(const QAccessibleTableCellInterfac
 }
 
 struct miqt_array* QAccessibleTableCellInterface_ColumnHeaderCells(const QAccessibleTableCellInterface* self) {
-	QList<QAccessibleInterface*> _ret = self->columnHeaderCells();
+	QList<QAccessibleInterface *> _ret = self->columnHeaderCells();
 	// Convert QList<> from C++ memory to manually-managed C memory
 	QAccessibleInterface** _arr = static_cast<QAccessibleInterface**>(malloc(sizeof(QAccessibleInterface*) * _ret.length()));
 	for (size_t i = 0, e = _ret.length(); i < e; ++i) {
@@ -337,7 +339,7 @@ struct miqt_array* QAccessibleTableCellInterface_ColumnHeaderCells(const QAccess
 }
 
 struct miqt_array* QAccessibleTableCellInterface_RowHeaderCells(const QAccessibleTableCellInterface* self) {
-	QList<QAccessibleInterface*> _ret = self->rowHeaderCells();
+	QList<QAccessibleInterface *> _ret = self->rowHeaderCells();
 	// Convert QList<> from C++ memory to manually-managed C memory
 	QAccessibleInterface** _arr = static_cast<QAccessibleInterface**>(malloc(sizeof(QAccessibleInterface*) * _ret.length()));
 	for (size_t i = 0, e = _ret.length(); i < e; ++i) {
@@ -394,7 +396,7 @@ int QAccessibleTableInterface_SelectedCellCount(const QAccessibleTableInterface*
 }
 
 struct miqt_array* QAccessibleTableInterface_SelectedCells(const QAccessibleTableInterface* self) {
-	QList<QAccessibleInterface*> _ret = self->selectedCells();
+	QList<QAccessibleInterface *> _ret = self->selectedCells();
 	// Convert QList<> from C++ memory to manually-managed C memory
 	QAccessibleInterface** _arr = static_cast<QAccessibleInterface**>(malloc(sizeof(QAccessibleInterface*) * _ret.length()));
 	for (size_t i = 0, e = _ret.length(); i < e; ++i) {
@@ -705,17 +707,17 @@ void QAccessibleImageInterface_Delete(QAccessibleImageInterface* self) {
 	delete self;
 }
 
-QAccessibleEvent* QAccessibleEvent_new(QObject* obj, uintptr_t typ) {
+QAccessibleEvent* QAccessibleEvent_new(QObject* obj, int typ) {
 	return new QAccessibleEvent(obj, static_cast<QAccessible::Event>(typ));
 }
 
-QAccessibleEvent* QAccessibleEvent_new2(QAccessibleInterface* iface, uintptr_t typ) {
+QAccessibleEvent* QAccessibleEvent_new2(QAccessibleInterface* iface, int typ) {
 	return new QAccessibleEvent(iface, static_cast<QAccessible::Event>(typ));
 }
 
-uintptr_t QAccessibleEvent_Type(const QAccessibleEvent* self) {
+int QAccessibleEvent_Type(const QAccessibleEvent* self) {
 	QAccessible::Event _ret = self->type();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 QObject* QAccessibleEvent_Object(const QAccessibleEvent* self) {
@@ -723,7 +725,8 @@ QObject* QAccessibleEvent_Object(const QAccessibleEvent* self) {
 }
 
 unsigned int QAccessibleEvent_UniqueId(const QAccessibleEvent* self) {
-	return self->uniqueId();
+	QAccessible::Id _ret = self->uniqueId();
+	return static_cast<unsigned int>(_ret);
 }
 
 void QAccessibleEvent_SetChild(QAccessibleEvent* self, int chld) {
@@ -906,21 +909,21 @@ void QAccessibleValueChangeEvent_Delete(QAccessibleValueChangeEvent* self) {
 	delete self;
 }
 
-QAccessibleTableModelChangeEvent* QAccessibleTableModelChangeEvent_new(QObject* obj, uintptr_t changeType) {
+QAccessibleTableModelChangeEvent* QAccessibleTableModelChangeEvent_new(QObject* obj, int changeType) {
 	return new QAccessibleTableModelChangeEvent(obj, static_cast<QAccessibleTableModelChangeEvent::ModelChangeType>(changeType));
 }
 
-QAccessibleTableModelChangeEvent* QAccessibleTableModelChangeEvent_new2(QAccessibleInterface* iface, uintptr_t changeType) {
+QAccessibleTableModelChangeEvent* QAccessibleTableModelChangeEvent_new2(QAccessibleInterface* iface, int changeType) {
 	return new QAccessibleTableModelChangeEvent(iface, static_cast<QAccessibleTableModelChangeEvent::ModelChangeType>(changeType));
 }
 
-void QAccessibleTableModelChangeEvent_SetModelChangeType(QAccessibleTableModelChangeEvent* self, uintptr_t changeType) {
+void QAccessibleTableModelChangeEvent_SetModelChangeType(QAccessibleTableModelChangeEvent* self, int changeType) {
 	self->setModelChangeType(static_cast<QAccessibleTableModelChangeEvent::ModelChangeType>(changeType));
 }
 
-uintptr_t QAccessibleTableModelChangeEvent_ModelChangeType(const QAccessibleTableModelChangeEvent* self) {
+int QAccessibleTableModelChangeEvent_ModelChangeType(const QAccessibleTableModelChangeEvent* self) {
 	QAccessibleTableModelChangeEvent::ModelChangeType _ret = self->modelChangeType();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 void QAccessibleTableModelChangeEvent_SetFirstRow(QAccessibleTableModelChangeEvent* self, int row) {
@@ -975,6 +978,10 @@ void QAccessible__ActivationObserver_AccessibilityActiveChanged(QAccessible__Act
 	self->accessibilityActiveChanged(active);
 }
 
+void QAccessible__ActivationObserver_OperatorAssign(QAccessible__ActivationObserver* self, QAccessible__ActivationObserver* param1) {
+	self->operator=(*param1);
+}
+
 void QAccessible__ActivationObserver_Delete(QAccessible__ActivationObserver* self) {
 	delete self;
 }

qt/gen_qaccessible.go

@@ -368,7 +368,7 @@ func (this *QAccessibleInterface) IndexOfChild(param1 *QAccessibleInterface) int
 }
 
 func (this *QAccessibleInterface) Text(t QAccessible__Text) string {
-	var _ms *C.struct_miqt_string = C.QAccessibleInterface_Text(this.h, (C.uintptr_t)(t))
+	var _ms *C.struct_miqt_string = C.QAccessibleInterface_Text(this.h, (C.int)(t))
 	_ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len)))
 	C.free(unsafe.Pointer(_ms))
 	return _ret
@@ -377,7 +377,7 @@ func (this *QAccessibleInterface) Text(t QAccessible__Text) string {
 func (this *QAccessibleInterface) SetText(t QAccessible__Text, text string) {
 	text_ms := miqt_strdupg(text)
 	defer C.free(text_ms)
-	C.QAccessibleInterface_SetText(this.h, (C.uintptr_t)(t), (*C.struct_miqt_string)(text_ms))
+	C.QAccessibleInterface_SetText(this.h, (C.int)(t), (*C.struct_miqt_string)(text_ms))
 }
 
 func (this *QAccessibleInterface) Rect() *QRect {
@@ -498,21 +498,21 @@ func (this *QAccessibleTextInterface) Text(startOffset int, endOffset int) strin
 }
 
 func (this *QAccessibleTextInterface) TextBeforeOffset(offset int, boundaryType QAccessible__TextBoundaryType, startOffset *int, endOffset *int) string {
-	var _ms *C.struct_miqt_string = C.QAccessibleTextInterface_TextBeforeOffset(this.h, (C.int)(offset), (C.uintptr_t)(boundaryType), (*C.int)(unsafe.Pointer(startOffset)), (*C.int)(unsafe.Pointer(endOffset)))
+	var _ms *C.struct_miqt_string = C.QAccessibleTextInterface_TextBeforeOffset(this.h, (C.int)(offset), (C.int)(boundaryType), (*C.int)(unsafe.Pointer(startOffset)), (*C.int)(unsafe.Pointer(endOffset)))
 	_ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len)))
 	C.free(unsafe.Pointer(_ms))
 	return _ret
 }
 
 func (this *QAccessibleTextInterface) TextAfterOffset(offset int, boundaryType QAccessible__TextBoundaryType, startOffset *int, endOffset *int) string {
-	var _ms *C.struct_miqt_string = C.QAccessibleTextInterface_TextAfterOffset(this.h, (C.int)(offset), (C.uintptr_t)(boundaryType), (*C.int)(unsafe.Pointer(startOffset)), (*C.int)(unsafe.Pointer(endOffset)))
+	var _ms *C.struct_miqt_string = C.QAccessibleTextInterface_TextAfterOffset(this.h, (C.int)(offset), (C.int)(boundaryType), (*C.int)(unsafe.Pointer(startOffset)), (*C.int)(unsafe.Pointer(endOffset)))
 	_ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len)))
 	C.free(unsafe.Pointer(_ms))
 	return _ret
 }
 
 func (this *QAccessibleTextInterface) TextAtOffset(offset int, boundaryType QAccessible__TextBoundaryType, startOffset *int, endOffset *int) string {
-	var _ms *C.struct_miqt_string = C.QAccessibleTextInterface_TextAtOffset(this.h, (C.int)(offset), (C.uintptr_t)(boundaryType), (*C.int)(unsafe.Pointer(startOffset)), (*C.int)(unsafe.Pointer(endOffset)))
+	var _ms *C.struct_miqt_string = C.QAccessibleTextInterface_TextAtOffset(this.h, (C.int)(offset), (C.int)(boundaryType), (*C.int)(unsafe.Pointer(startOffset)), (*C.int)(unsafe.Pointer(endOffset)))
 	_ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len)))
 	C.free(unsafe.Pointer(_ms))
 	return _ret
@@ -1244,13 +1244,13 @@ func newQAccessibleEvent_U(h unsafe.Pointer) *QAccessibleEvent {
 
 // NewQAccessibleEvent constructs a new QAccessibleEvent object.
 func NewQAccessibleEvent(obj *QObject, typ QAccessible__Event) *QAccessibleEvent {
-	ret := C.QAccessibleEvent_new(obj.cPointer(), (C.uintptr_t)(typ))
+	ret := C.QAccessibleEvent_new(obj.cPointer(), (C.int)(typ))
 	return newQAccessibleEvent(ret)
 }
 
 // NewQAccessibleEvent2 constructs a new QAccessibleEvent object.
 func NewQAccessibleEvent2(iface *QAccessibleInterface, typ QAccessible__Event) *QAccessibleEvent {
-	ret := C.QAccessibleEvent_new2(iface.cPointer(), (C.uintptr_t)(typ))
+	ret := C.QAccessibleEvent_new2(iface.cPointer(), (C.int)(typ))
 	return newQAccessibleEvent(ret)
 }
 
@@ -1754,18 +1754,18 @@ func newQAccessibleTableModelChangeEvent_U(h unsafe.Pointer) *QAccessibleTableMo
 
 // NewQAccessibleTableModelChangeEvent constructs a new QAccessibleTableModelChangeEvent object.
 func NewQAccessibleTableModelChangeEvent(obj *QObject, changeType QAccessibleTableModelChangeEvent__ModelChangeType) *QAccessibleTableModelChangeEvent {
-	ret := C.QAccessibleTableModelChangeEvent_new(obj.cPointer(), (C.uintptr_t)(changeType))
+	ret := C.QAccessibleTableModelChangeEvent_new(obj.cPointer(), (C.int)(changeType))
 	return newQAccessibleTableModelChangeEvent(ret)
 }
 
 // NewQAccessibleTableModelChangeEvent2 constructs a new QAccessibleTableModelChangeEvent object.
 func NewQAccessibleTableModelChangeEvent2(iface *QAccessibleInterface, changeType QAccessibleTableModelChangeEvent__ModelChangeType) *QAccessibleTableModelChangeEvent {
-	ret := C.QAccessibleTableModelChangeEvent_new2(iface.cPointer(), (C.uintptr_t)(changeType))
+	ret := C.QAccessibleTableModelChangeEvent_new2(iface.cPointer(), (C.int)(changeType))
 	return newQAccessibleTableModelChangeEvent(ret)
 }
 
 func (this *QAccessibleTableModelChangeEvent) SetModelChangeType(changeType QAccessibleTableModelChangeEvent__ModelChangeType) {
-	C.QAccessibleTableModelChangeEvent_SetModelChangeType(this.h, (C.uintptr_t)(changeType))
+	C.QAccessibleTableModelChangeEvent_SetModelChangeType(this.h, (C.int)(changeType))
 }
 
 func (this *QAccessibleTableModelChangeEvent) ModelChangeType() QAccessibleTableModelChangeEvent__ModelChangeType {
@@ -1892,6 +1892,10 @@ func (this *QAccessible__ActivationObserver) AccessibilityActiveChanged(active b
 	C.QAccessible__ActivationObserver_AccessibilityActiveChanged(this.h, (C.bool)(active))
 }
 
+func (this *QAccessible__ActivationObserver) OperatorAssign(param1 *QAccessible__ActivationObserver) {
+	C.QAccessible__ActivationObserver_OperatorAssign(this.h, param1.cPointer())
+}
+
 // Delete this object from C++ memory.
 func (this *QAccessible__ActivationObserver) Delete() {
 	C.QAccessible__ActivationObserver_Delete(this.h)

qt/gen_qaccessible.h

@@ -102,10 +102,10 @@ QAccessibleInterface* QAccessibleInterface_Parent(const QAccessibleInterface* se
 QAccessibleInterface* QAccessibleInterface_Child(const QAccessibleInterface* self, int index);
 int QAccessibleInterface_ChildCount(const QAccessibleInterface* self);
 int QAccessibleInterface_IndexOfChild(const QAccessibleInterface* self, QAccessibleInterface* param1);
-struct miqt_string* QAccessibleInterface_Text(const QAccessibleInterface* self, uintptr_t t);
-void QAccessibleInterface_SetText(QAccessibleInterface* self, uintptr_t t, struct miqt_string* text);
+struct miqt_string* QAccessibleInterface_Text(const QAccessibleInterface* self, int t);
+void QAccessibleInterface_SetText(QAccessibleInterface* self, int t, struct miqt_string* text);
 QRect* QAccessibleInterface_Rect(const QAccessibleInterface* self);
-uintptr_t QAccessibleInterface_Role(const QAccessibleInterface* self);
+int QAccessibleInterface_Role(const QAccessibleInterface* self);
 QAccessible__State* QAccessibleInterface_State(const QAccessibleInterface* self);
 QColor* QAccessibleInterface_ForegroundColor(const QAccessibleInterface* self);
 QColor* QAccessibleInterface_BackgroundColor(const QAccessibleInterface* self);
@@ -125,9 +125,9 @@ void QAccessibleTextInterface_SetSelection(QAccessibleTextInterface* self, int s
 int QAccessibleTextInterface_CursorPosition(const QAccessibleTextInterface* self);
 void QAccessibleTextInterface_SetCursorPosition(QAccessibleTextInterface* self, int position);
 struct miqt_string* QAccessibleTextInterface_Text(const QAccessibleTextInterface* self, int startOffset, int endOffset);
-struct miqt_string* QAccessibleTextInterface_TextBeforeOffset(const QAccessibleTextInterface* self, int offset, uintptr_t boundaryType, int* startOffset, int* endOffset);
-struct miqt_string* QAccessibleTextInterface_TextAfterOffset(const QAccessibleTextInterface* self, int offset, uintptr_t boundaryType, int* startOffset, int* endOffset);
-struct miqt_string* QAccessibleTextInterface_TextAtOffset(const QAccessibleTextInterface* self, int offset, uintptr_t boundaryType, int* startOffset, int* endOffset);
+struct miqt_string* QAccessibleTextInterface_TextBeforeOffset(const QAccessibleTextInterface* self, int offset, int boundaryType, int* startOffset, int* endOffset);
+struct miqt_string* QAccessibleTextInterface_TextAfterOffset(const QAccessibleTextInterface* self, int offset, int boundaryType, int* startOffset, int* endOffset);
+struct miqt_string* QAccessibleTextInterface_TextAtOffset(const QAccessibleTextInterface* self, int offset, int boundaryType, int* startOffset, int* endOffset);
 int QAccessibleTextInterface_CharacterCount(const QAccessibleTextInterface* self);
 QRect* QAccessibleTextInterface_CharacterRect(const QAccessibleTextInterface* self, int offset);
 int QAccessibleTextInterface_OffsetAtPoint(const QAccessibleTextInterface* self, QPoint* point);
@@ -215,9 +215,9 @@ QPoint* QAccessibleImageInterface_ImagePosition(const QAccessibleImageInterface*
 void QAccessibleImageInterface_OperatorAssign(QAccessibleImageInterface* self, QAccessibleImageInterface* param1);
 void QAccessibleImageInterface_Delete(QAccessibleImageInterface* self);
 
-QAccessibleEvent* QAccessibleEvent_new(QObject* obj, uintptr_t typ);
-QAccessibleEvent* QAccessibleEvent_new2(QAccessibleInterface* iface, uintptr_t typ);
-uintptr_t QAccessibleEvent_Type(const QAccessibleEvent* self);
+QAccessibleEvent* QAccessibleEvent_new(QObject* obj, int typ);
+QAccessibleEvent* QAccessibleEvent_new2(QAccessibleInterface* iface, int typ);
+int QAccessibleEvent_Type(const QAccessibleEvent* self);
 QObject* QAccessibleEvent_Object(const QAccessibleEvent* self);
 unsigned int QAccessibleEvent_UniqueId(const QAccessibleEvent* self);
 void QAccessibleEvent_SetChild(QAccessibleEvent* self, int chld);
@@ -268,10 +268,10 @@ void QAccessibleValueChangeEvent_SetValue(QAccessibleValueChangeEvent* self, QVa
 QVariant* QAccessibleValueChangeEvent_Value(const QAccessibleValueChangeEvent* self);
 void QAccessibleValueChangeEvent_Delete(QAccessibleValueChangeEvent* self);
 
-QAccessibleTableModelChangeEvent* QAccessibleTableModelChangeEvent_new(QObject* obj, uintptr_t changeType);
-QAccessibleTableModelChangeEvent* QAccessibleTableModelChangeEvent_new2(QAccessibleInterface* iface, uintptr_t changeType);
-void QAccessibleTableModelChangeEvent_SetModelChangeType(QAccessibleTableModelChangeEvent* self, uintptr_t changeType);
-uintptr_t QAccessibleTableModelChangeEvent_ModelChangeType(const QAccessibleTableModelChangeEvent* self);
+QAccessibleTableModelChangeEvent* QAccessibleTableModelChangeEvent_new(QObject* obj, int changeType);
+QAccessibleTableModelChangeEvent* QAccessibleTableModelChangeEvent_new2(QAccessibleInterface* iface, int changeType);
+void QAccessibleTableModelChangeEvent_SetModelChangeType(QAccessibleTableModelChangeEvent* self, int changeType);
+int QAccessibleTableModelChangeEvent_ModelChangeType(const QAccessibleTableModelChangeEvent* self);
 void QAccessibleTableModelChangeEvent_SetFirstRow(QAccessibleTableModelChangeEvent* self, int row);
 void QAccessibleTableModelChangeEvent_SetFirstColumn(QAccessibleTableModelChangeEvent* self, int col);
 void QAccessibleTableModelChangeEvent_SetLastRow(QAccessibleTableModelChangeEvent* self, int row);
@@ -287,6 +287,7 @@ QAccessible__State* QAccessible__State_new2(QAccessible__State* param1);
 void QAccessible__State_Delete(QAccessible__State* self);
 
 void QAccessible__ActivationObserver_AccessibilityActiveChanged(QAccessible__ActivationObserver* self, bool active);
+void QAccessible__ActivationObserver_OperatorAssign(QAccessible__ActivationObserver* self, QAccessible__ActivationObserver* param1);
 void QAccessible__ActivationObserver_Delete(QAccessible__ActivationObserver* self);
 
 #ifdef __cplusplus

qt/gen_qaccessibleobject.cpp

@@ -24,7 +24,7 @@ QRect* QAccessibleObject_Rect(const QAccessibleObject* self) {
 	return new QRect(self->rect());
 }
 
-void QAccessibleObject_SetText(QAccessibleObject* self, uintptr_t t, struct miqt_string* text) {
+void QAccessibleObject_SetText(QAccessibleObject* self, int t, struct miqt_string* text) {
 	QString text_QString = QString::fromUtf8(&text->data, text->len);
 	self->setText(static_cast<QAccessible::Text>(t), text_QString);
 }
@@ -61,16 +61,16 @@ QAccessibleInterface* QAccessibleApplication_Child(const QAccessibleApplication*
 	return self->child(static_cast<int>(index));
 }
 
-struct miqt_string* QAccessibleApplication_Text(const QAccessibleApplication* self, uintptr_t t) {
+struct miqt_string* QAccessibleApplication_Text(const QAccessibleApplication* self, int t) {
 	QString _ret = self->text(static_cast<QAccessible::Text>(t));
 	// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
 	QByteArray _b = _ret.toUtf8();
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-uintptr_t QAccessibleApplication_Role(const QAccessibleApplication* self) {
+int QAccessibleApplication_Role(const QAccessibleApplication* self) {
 	QAccessible::Role _ret = self->role();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 QAccessible__State* QAccessibleApplication_State(const QAccessibleApplication* self) {

qt/gen_qaccessibleobject.go

@@ -54,7 +54,7 @@ func (this *QAccessibleObject) Rect() *QRect {
 func (this *QAccessibleObject) SetText(t QAccessible__Text, text string) {
 	text_ms := miqt_strdupg(text)
 	defer C.free(text_ms)
-	C.QAccessibleObject_SetText(this.h, (C.uintptr_t)(t), (*C.struct_miqt_string)(text_ms))
+	C.QAccessibleObject_SetText(this.h, (C.int)(t), (*C.struct_miqt_string)(text_ms))
 }
 
 func (this *QAccessibleObject) ChildAt(x int, y int) *QAccessibleInterface {
@@ -115,7 +115,7 @@ func (this *QAccessibleApplication) Child(index int) *QAccessibleInterface {
 }
 
 func (this *QAccessibleApplication) Text(t QAccessible__Text) string {
-	var _ms *C.struct_miqt_string = C.QAccessibleApplication_Text(this.h, (C.uintptr_t)(t))
+	var _ms *C.struct_miqt_string = C.QAccessibleApplication_Text(this.h, (C.int)(t))
 	_ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len)))
 	C.free(unsafe.Pointer(_ms))
 	return _ret

qt/gen_qaccessibleobject.h

@@ -38,7 +38,7 @@ typedef struct QWindow QWindow;
 bool QAccessibleObject_IsValid(const QAccessibleObject* self);
 QObject* QAccessibleObject_Object(const QAccessibleObject* self);
 QRect* QAccessibleObject_Rect(const QAccessibleObject* self);
-void QAccessibleObject_SetText(QAccessibleObject* self, uintptr_t t, struct miqt_string* text);
+void QAccessibleObject_SetText(QAccessibleObject* self, int t, struct miqt_string* text);
 QAccessibleInterface* QAccessibleObject_ChildAt(const QAccessibleObject* self, int x, int y);
 
 QAccessibleApplication* QAccessibleApplication_new();
@@ -48,8 +48,8 @@ int QAccessibleApplication_IndexOfChild(const QAccessibleApplication* self, QAcc
 QAccessibleInterface* QAccessibleApplication_FocusChild(const QAccessibleApplication* self);
 QAccessibleInterface* QAccessibleApplication_Parent(const QAccessibleApplication* self);
 QAccessibleInterface* QAccessibleApplication_Child(const QAccessibleApplication* self, int index);
-struct miqt_string* QAccessibleApplication_Text(const QAccessibleApplication* self, uintptr_t t);
-uintptr_t QAccessibleApplication_Role(const QAccessibleApplication* self);
+struct miqt_string* QAccessibleApplication_Text(const QAccessibleApplication* self, int t);
+int QAccessibleApplication_Role(const QAccessibleApplication* self);
 QAccessible__State* QAccessibleApplication_State(const QAccessibleApplication* self);
 void QAccessibleApplication_Delete(QAccessibleApplication* self);
 

qt/gen_qaccessiblewidget.cpp

@@ -17,11 +17,11 @@ QAccessibleWidget* QAccessibleWidget_new(QWidget* o) {
 	return new QAccessibleWidget(o);
 }
 
-QAccessibleWidget* QAccessibleWidget_new2(QWidget* o, uintptr_t r) {
+QAccessibleWidget* QAccessibleWidget_new2(QWidget* o, int r) {
 	return new QAccessibleWidget(o, static_cast<QAccessible::Role>(r));
 }
 
-QAccessibleWidget* QAccessibleWidget_new3(QWidget* o, uintptr_t r, struct miqt_string* name) {
+QAccessibleWidget* QAccessibleWidget_new3(QWidget* o, int r, struct miqt_string* name) {
 	QString name_QString = QString::fromUtf8(&name->data, name->len);
 	return new QAccessibleWidget(o, static_cast<QAccessible::Role>(r), name_QString);
 }
@@ -58,16 +58,16 @@ QAccessibleInterface* QAccessibleWidget_Child(const QAccessibleWidget* self, int
 	return self->child(static_cast<int>(index));
 }
 
-struct miqt_string* QAccessibleWidget_Text(const QAccessibleWidget* self, uintptr_t t) {
+struct miqt_string* QAccessibleWidget_Text(const QAccessibleWidget* self, int t) {
 	QString _ret = self->text(static_cast<QAccessible::Text>(t));
 	// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
 	QByteArray _b = _ret.toUtf8();
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-uintptr_t QAccessibleWidget_Role(const QAccessibleWidget* self) {
+int QAccessibleWidget_Role(const QAccessibleWidget* self) {
 	QAccessible::Role _ret = self->role();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 QAccessible__State* QAccessibleWidget_State(const QAccessibleWidget* self) {

qt/gen_qaccessiblewidget.go

@@ -44,7 +44,7 @@ func NewQAccessibleWidget(o *QWidget) *QAccessibleWidget {
 
 // NewQAccessibleWidget2 constructs a new QAccessibleWidget object.
 func NewQAccessibleWidget2(o *QWidget, r QAccessible__Role) *QAccessibleWidget {
-	ret := C.QAccessibleWidget_new2(o.cPointer(), (C.uintptr_t)(r))
+	ret := C.QAccessibleWidget_new2(o.cPointer(), (C.int)(r))
 	return newQAccessibleWidget(ret)
 }
 
@@ -52,7 +52,7 @@ func NewQAccessibleWidget2(o *QWidget, r QAccessible__Role) *QAccessibleWidget {
 func NewQAccessibleWidget3(o *QWidget, r QAccessible__Role, name string) *QAccessibleWidget {
 	name_ms := miqt_strdupg(name)
 	defer C.free(name_ms)
-	ret := C.QAccessibleWidget_new3(o.cPointer(), (C.uintptr_t)(r), (*C.struct_miqt_string)(name_ms))
+	ret := C.QAccessibleWidget_new3(o.cPointer(), (C.int)(r), (*C.struct_miqt_string)(name_ms))
 	return newQAccessibleWidget(ret)
 }
 
@@ -92,7 +92,7 @@ func (this *QAccessibleWidget) Child(index int) *QAccessibleInterface {
 }
 
 func (this *QAccessibleWidget) Text(t QAccessible__Text) string {
-	var _ms *C.struct_miqt_string = C.QAccessibleWidget_Text(this.h, (C.uintptr_t)(t))
+	var _ms *C.struct_miqt_string = C.QAccessibleWidget_Text(this.h, (C.int)(t))
 	_ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len)))
 	C.free(unsafe.Pointer(_ms))
 	return _ret

qt/gen_qaccessiblewidget.h

@@ -36,8 +36,8 @@ typedef struct QWindow QWindow;
 #endif
 
 QAccessibleWidget* QAccessibleWidget_new(QWidget* o);
-QAccessibleWidget* QAccessibleWidget_new2(QWidget* o, uintptr_t r);
-QAccessibleWidget* QAccessibleWidget_new3(QWidget* o, uintptr_t r, struct miqt_string* name);
+QAccessibleWidget* QAccessibleWidget_new2(QWidget* o, int r);
+QAccessibleWidget* QAccessibleWidget_new3(QWidget* o, int r, struct miqt_string* name);
 bool QAccessibleWidget_IsValid(const QAccessibleWidget* self);
 QWindow* QAccessibleWidget_Window(const QAccessibleWidget* self);
 int QAccessibleWidget_ChildCount(const QAccessibleWidget* self);
@@ -46,8 +46,8 @@ QAccessibleInterface* QAccessibleWidget_FocusChild(const QAccessibleWidget* self
 QRect* QAccessibleWidget_Rect(const QAccessibleWidget* self);
 QAccessibleInterface* QAccessibleWidget_Parent(const QAccessibleWidget* self);
 QAccessibleInterface* QAccessibleWidget_Child(const QAccessibleWidget* self, int index);
-struct miqt_string* QAccessibleWidget_Text(const QAccessibleWidget* self, uintptr_t t);
-uintptr_t QAccessibleWidget_Role(const QAccessibleWidget* self);
+struct miqt_string* QAccessibleWidget_Text(const QAccessibleWidget* self, int t);
+int QAccessibleWidget_Role(const QAccessibleWidget* self);
 QAccessible__State* QAccessibleWidget_State(const QAccessibleWidget* self);
 QColor* QAccessibleWidget_ForegroundColor(const QAccessibleWidget* self);
 QColor* QAccessibleWidget_BackgroundColor(const QAccessibleWidget* self);

qt/gen_qaction.cpp

@@ -139,13 +139,13 @@ struct miqt_string* QAction_WhatsThis(const QAction* self) {
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-void QAction_SetPriority(QAction* self, uintptr_t priority) {
+void QAction_SetPriority(QAction* self, int priority) {
 	self->setPriority(static_cast<QAction::Priority>(priority));
 }
 
-uintptr_t QAction_Priority(const QAction* self) {
+int QAction_Priority(const QAction* self) {
 	QAction::Priority _ret = self->priority();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 QMenu* QAction_Menu(const QAction* self) {
@@ -182,7 +182,7 @@ void QAction_SetShortcuts(QAction* self, struct miqt_array* /* of QKeySequence*
 	self->setShortcuts(shortcuts_QList);
 }
 
-void QAction_SetShortcutsWithShortcuts(QAction* self, uintptr_t shortcuts) {
+void QAction_SetShortcutsWithShortcuts(QAction* self, int shortcuts) {
 	self->setShortcuts(static_cast<QKeySequence::StandardKey>(shortcuts));
 }
 
@@ -199,13 +199,13 @@ struct miqt_array* QAction_Shortcuts(const QAction* self) {
 	return _out;
 }
 
-void QAction_SetShortcutContext(QAction* self, uintptr_t context) {
+void QAction_SetShortcutContext(QAction* self, int context) {
 	self->setShortcutContext(static_cast<Qt::ShortcutContext>(context));
 }
 
-uintptr_t QAction_ShortcutContext(const QAction* self) {
+int QAction_ShortcutContext(const QAction* self) {
 	Qt::ShortcutContext _ret = self->shortcutContext();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 void QAction_SetAutoRepeat(QAction* self, bool autoRepeat) {
@@ -252,7 +252,7 @@ bool QAction_IsVisible(const QAction* self) {
 	return self->isVisible();
 }
 
-void QAction_Activate(QAction* self, uintptr_t event) {
+void QAction_Activate(QAction* self, int event) {
 	self->activate(static_cast<QAction::ActionEvent>(event));
 }
 
@@ -260,13 +260,13 @@ bool QAction_ShowStatusText(QAction* self) {
 	return self->showStatusText();
 }
 
-void QAction_SetMenuRole(QAction* self, uintptr_t menuRole) {
+void QAction_SetMenuRole(QAction* self, int menuRole) {
 	self->setMenuRole(static_cast<QAction::MenuRole>(menuRole));
 }
 
-uintptr_t QAction_MenuRole(const QAction* self) {
+int QAction_MenuRole(const QAction* self) {
 	QAction::MenuRole _ret = self->menuRole();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 void QAction_SetIconVisibleInMenu(QAction* self, bool visible) {
@@ -290,7 +290,7 @@ QWidget* QAction_ParentWidget(const QAction* self) {
 }
 
 struct miqt_array* QAction_AssociatedWidgets(const QAction* self) {
-	QList<QWidget*> _ret = self->associatedWidgets();
+	QList<QWidget *> _ret = self->associatedWidgets();
 	// Convert QList<> from C++ memory to manually-managed C memory
 	QWidget** _arr = static_cast<QWidget**>(malloc(sizeof(QWidget*) * _ret.length()));
 	for (size_t i = 0, e = _ret.length(); i < e; ++i) {
@@ -303,7 +303,7 @@ struct miqt_array* QAction_AssociatedWidgets(const QAction* self) {
 }
 
 struct miqt_array* QAction_AssociatedGraphicsWidgets(const QAction* self) {
-	QList<QGraphicsWidget*> _ret = self->associatedGraphicsWidgets();
+	QList<QGraphicsWidget *> _ret = self->associatedGraphicsWidgets();
 	// Convert QList<> from C++ memory to manually-managed C memory
 	QGraphicsWidget** _arr = static_cast<QGraphicsWidget**>(malloc(sizeof(QGraphicsWidget*) * _ret.length()));
 	for (size_t i = 0, e = _ret.length(); i < e; ++i) {

qt/gen_qaction.go

@@ -215,7 +215,7 @@ func (this *QAction) WhatsThis() string {
 }
 
 func (this *QAction) SetPriority(priority QAction__Priority) {
-	C.QAction_SetPriority(this.h, (C.uintptr_t)(priority))
+	C.QAction_SetPriority(this.h, (C.int)(priority))
 }
 
 func (this *QAction) Priority() QAction__Priority {
@@ -262,7 +262,7 @@ func (this *QAction) SetShortcuts(shortcuts []QKeySequence) {
 }
 
 func (this *QAction) SetShortcutsWithShortcuts(shortcuts QKeySequence__StandardKey) {
-	C.QAction_SetShortcutsWithShortcuts(this.h, (C.uintptr_t)(shortcuts))
+	C.QAction_SetShortcutsWithShortcuts(this.h, (C.int)(shortcuts))
 }
 
 func (this *QAction) Shortcuts() []QKeySequence {
@@ -280,7 +280,7 @@ func (this *QAction) Shortcuts() []QKeySequence {
 }
 
 func (this *QAction) SetShortcutContext(context ShortcutContext) {
-	C.QAction_SetShortcutContext(this.h, (C.uintptr_t)(context))
+	C.QAction_SetShortcutContext(this.h, (C.int)(context))
 }
 
 func (this *QAction) ShortcutContext() ShortcutContext {
@@ -338,7 +338,7 @@ func (this *QAction) IsVisible() bool {
 }
 
 func (this *QAction) Activate(event QAction__ActionEvent) {
-	C.QAction_Activate(this.h, (C.uintptr_t)(event))
+	C.QAction_Activate(this.h, (C.int)(event))
 }
 
 func (this *QAction) ShowStatusText() bool {
@@ -346,7 +346,7 @@ func (this *QAction) ShowStatusText() bool {
 }
 
 func (this *QAction) SetMenuRole(menuRole QAction__MenuRole) {
-	C.QAction_SetMenuRole(this.h, (C.uintptr_t)(menuRole))
+	C.QAction_SetMenuRole(this.h, (C.int)(menuRole))
 }
 
 func (this *QAction) MenuRole() QAction__MenuRole {

qt/gen_qaction.h

@@ -62,8 +62,8 @@ void QAction_SetStatusTip(QAction* self, struct miqt_string* statusTip);
 struct miqt_string* QAction_StatusTip(const QAction* self);
 void QAction_SetWhatsThis(QAction* self, struct miqt_string* what);
 struct miqt_string* QAction_WhatsThis(const QAction* self);
-void QAction_SetPriority(QAction* self, uintptr_t priority);
-uintptr_t QAction_Priority(const QAction* self);
+void QAction_SetPriority(QAction* self, int priority);
+int QAction_Priority(const QAction* self);
 QMenu* QAction_Menu(const QAction* self);
 void QAction_SetMenu(QAction* self, QMenu* menu);
 void QAction_SetSeparator(QAction* self, bool b);
@@ -71,10 +71,10 @@ bool QAction_IsSeparator(const QAction* self);
 void QAction_SetShortcut(QAction* self, QKeySequence* shortcut);
 QKeySequence* QAction_Shortcut(const QAction* self);
 void QAction_SetShortcuts(QAction* self, struct miqt_array* /* of QKeySequence* */ shortcuts);
-void QAction_SetShortcutsWithShortcuts(QAction* self, uintptr_t shortcuts);
+void QAction_SetShortcutsWithShortcuts(QAction* self, int shortcuts);
 struct miqt_array* QAction_Shortcuts(const QAction* self);
-void QAction_SetShortcutContext(QAction* self, uintptr_t context);
-uintptr_t QAction_ShortcutContext(const QAction* self);
+void QAction_SetShortcutContext(QAction* self, int context);
+int QAction_ShortcutContext(const QAction* self);
 void QAction_SetAutoRepeat(QAction* self, bool autoRepeat);
 bool QAction_AutoRepeat(const QAction* self);
 void QAction_SetFont(QAction* self, QFont* font);
@@ -86,10 +86,10 @@ void QAction_SetData(QAction* self, QVariant* varVal);
 bool QAction_IsChecked(const QAction* self);
 bool QAction_IsEnabled(const QAction* self);
 bool QAction_IsVisible(const QAction* self);
-void QAction_Activate(QAction* self, uintptr_t event);
+void QAction_Activate(QAction* self, int event);
 bool QAction_ShowStatusText(QAction* self);
-void QAction_SetMenuRole(QAction* self, uintptr_t menuRole);
-uintptr_t QAction_MenuRole(const QAction* self);
+void QAction_SetMenuRole(QAction* self, int menuRole);
+int QAction_MenuRole(const QAction* self);
 void QAction_SetIconVisibleInMenu(QAction* self, bool visible);
 bool QAction_IsIconVisibleInMenu(const QAction* self);
 void QAction_SetShortcutVisibleInContextMenu(QAction* self, bool show);

qt/gen_qactiongroup.cpp

@@ -52,7 +52,7 @@ void QActionGroup_RemoveAction(QActionGroup* self, QAction* a) {
 }
 
 struct miqt_array* QActionGroup_Actions(const QActionGroup* self) {
-	QList<QAction*> _ret = self->actions();
+	QList<QAction *> _ret = self->actions();
 	// Convert QList<> from C++ memory to manually-managed C memory
 	QAction** _arr = static_cast<QAction**>(malloc(sizeof(QAction*) * _ret.length()));
 	for (size_t i = 0, e = _ret.length(); i < e; ++i) {
@@ -80,9 +80,9 @@ bool QActionGroup_IsVisible(const QActionGroup* self) {
 	return self->isVisible();
 }
 
-uintptr_t QActionGroup_ExclusionPolicy(const QActionGroup* self) {
+int QActionGroup_ExclusionPolicy(const QActionGroup* self) {
 	QActionGroup::ExclusionPolicy _ret = self->exclusionPolicy();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 void QActionGroup_SetEnabled(QActionGroup* self, bool enabled) {
@@ -101,7 +101,7 @@ void QActionGroup_SetExclusive(QActionGroup* self, bool exclusive) {
 	self->setExclusive(exclusive);
 }
 
-void QActionGroup_SetExclusionPolicy(QActionGroup* self, uintptr_t policy) {
+void QActionGroup_SetExclusionPolicy(QActionGroup* self, int policy) {
 	self->setExclusionPolicy(static_cast<QActionGroup::ExclusionPolicy>(policy));
 }
 

qt/gen_qactiongroup.go

@@ -141,7 +141,7 @@ func (this *QActionGroup) SetExclusive(exclusive bool) {
 }
 
 func (this *QActionGroup) SetExclusionPolicy(policy QActionGroup__ExclusionPolicy) {
-	C.QActionGroup_SetExclusionPolicy(this.h, (C.uintptr_t)(policy))
+	C.QActionGroup_SetExclusionPolicy(this.h, (C.int)(policy))
 }
 
 func (this *QActionGroup) Triggered(param1 *QAction) {

qt/gen_qactiongroup.h

@@ -40,12 +40,12 @@ QAction* QActionGroup_CheckedAction(const QActionGroup* self);
 bool QActionGroup_IsExclusive(const QActionGroup* self);
 bool QActionGroup_IsEnabled(const QActionGroup* self);
 bool QActionGroup_IsVisible(const QActionGroup* self);
-uintptr_t QActionGroup_ExclusionPolicy(const QActionGroup* self);
+int QActionGroup_ExclusionPolicy(const QActionGroup* self);
 void QActionGroup_SetEnabled(QActionGroup* self, bool enabled);
 void QActionGroup_SetDisabled(QActionGroup* self, bool b);
 void QActionGroup_SetVisible(QActionGroup* self, bool visible);
 void QActionGroup_SetExclusive(QActionGroup* self, bool exclusive);
-void QActionGroup_SetExclusionPolicy(QActionGroup* self, uintptr_t policy);
+void QActionGroup_SetExclusionPolicy(QActionGroup* self, int policy);
 void QActionGroup_Triggered(QActionGroup* self, QAction* param1);
 void QActionGroup_connect_Triggered(QActionGroup* self, void* slot);
 void QActionGroup_Hovered(QActionGroup* self, QAction* param1);

qt/gen_qapplication.cpp

@@ -236,11 +236,11 @@ int QApplication_StartDragDistance() {
 	return QApplication::startDragDistance();
 }
 
-bool QApplication_IsEffectEnabled(uintptr_t param1) {
+bool QApplication_IsEffectEnabled(int param1) {
 	return QApplication::isEffectEnabled(static_cast<Qt::UIEffect>(param1));
 }
 
-void QApplication_SetEffectEnabled(uintptr_t param1) {
+void QApplication_SetEffectEnabled(int param1) {
 	QApplication::setEffectEnabled(static_cast<Qt::UIEffect>(param1));
 }
 
@@ -332,7 +332,7 @@ void QApplication_Alert2(QWidget* widget, int duration) {
 	QApplication::alert(widget, static_cast<int>(duration));
 }
 
-void QApplication_SetEffectEnabled2(uintptr_t param1, bool enable) {
+void QApplication_SetEffectEnabled2(int param1, bool enable) {
 	QApplication::setEffectEnabled(static_cast<Qt::UIEffect>(param1), enable);
 }
 

qt/gen_qapplication.go

@@ -310,11 +310,11 @@ func QApplication_StartDragDistance() int {
 }
 
 func QApplication_IsEffectEnabled(param1 UIEffect) bool {
-	return (bool)(C.QApplication_IsEffectEnabled((C.uintptr_t)(param1)))
+	return (bool)(C.QApplication_IsEffectEnabled((C.int)(param1)))
 }
 
 func QApplication_SetEffectEnabled(param1 UIEffect) {
-	C.QApplication_SetEffectEnabled((C.uintptr_t)(param1))
+	C.QApplication_SetEffectEnabled((C.int)(param1))
 }
 
 func QApplication_Exec() int {
@@ -436,7 +436,7 @@ func QApplication_Alert2(widget *QWidget, duration int) {
 }
 
 func QApplication_SetEffectEnabled2(param1 UIEffect, enable bool) {
-	C.QApplication_SetEffectEnabled2((C.uintptr_t)(param1), (C.bool)(enable))
+	C.QApplication_SetEffectEnabled2((C.int)(param1), (C.bool)(enable))
 }
 
 // Delete this object from C++ memory.

qt/gen_qapplication.h

@@ -91,8 +91,8 @@ void QApplication_SetStartDragTime(int ms);
 int QApplication_StartDragTime();
 void QApplication_SetStartDragDistance(int l);
 int QApplication_StartDragDistance();
-bool QApplication_IsEffectEnabled(uintptr_t param1);
-void QApplication_SetEffectEnabled(uintptr_t param1);
+bool QApplication_IsEffectEnabled(int param1);
+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);
@@ -110,7 +110,7 @@ struct miqt_string* QApplication_TrUtf83(const char* s, const char* c, int n);
 void QApplication_SetPalette2(QPalette* param1, const char* className);
 void QApplication_SetFont2(QFont* param1, const char* className);
 void QApplication_Alert2(QWidget* widget, int duration);
-void QApplication_SetEffectEnabled2(uintptr_t param1, bool enable);
+void QApplication_SetEffectEnabled2(int param1, bool enable);
 void QApplication_Delete(QApplication* self);
 
 #ifdef __cplusplus

qt/gen_qarraydata.cpp

@@ -50,9 +50,9 @@ void QArrayData_Delete(QArrayData* self) {
 	delete self;
 }
 
-uintptr_t QtPrivate__QContainerImplHelper_Mid(int originalLength, int* position, int* length) {
+int QtPrivate__QContainerImplHelper_Mid(int originalLength, int* position, int* length) {
 	QtPrivate::QContainerImplHelper::CutResult _ret = QtPrivate::QContainerImplHelper::mid(static_cast<int>(originalLength), static_cast<int*>(position), static_cast<int*>(length));
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 void QtPrivate__QContainerImplHelper_Delete(QtPrivate__QContainerImplHelper* self) {

qt/gen_qarraydata.go

@@ -87,11 +87,11 @@ func QArrayData_SharedNull() *QArrayData {
 }
 
 func QArrayData_Allocate4(objectSize uint64, alignment uint64, capacity uint64, options int) *QArrayData {
-	return newQArrayData_U(unsafe.Pointer(C.QArrayData_Allocate4((C.size_t)(objectSize), (C.size_t)(alignment), (C.size_t)(capacity), (C.int)(options))))
+	return newQArrayData_U(unsafe.Pointer(C.QArrayData_Allocate4((C.size_t)(objectSize), (C.size_t)(alignment), (C.size_t)(capacity), options)))
 }
 
 func QArrayData_ReallocateUnaligned4(data *QArrayData, objectSize uint64, newCapacity uint64, newOptions int) *QArrayData {
-	return newQArrayData_U(unsafe.Pointer(C.QArrayData_ReallocateUnaligned4(data.cPointer(), (C.size_t)(objectSize), (C.size_t)(newCapacity), (C.int)(newOptions))))
+	return newQArrayData_U(unsafe.Pointer(C.QArrayData_ReallocateUnaligned4(data.cPointer(), (C.size_t)(objectSize), (C.size_t)(newCapacity), newOptions)))
 }
 
 // Delete this object from C++ memory.

qt/gen_qarraydata.h

@@ -37,7 +37,7 @@ QArrayData* QArrayData_Allocate4(size_t objectSize, size_t alignment, size_t cap
 QArrayData* QArrayData_ReallocateUnaligned4(QArrayData* data, size_t objectSize, size_t newCapacity, int newOptions);
 void QArrayData_Delete(QArrayData* self);
 
-uintptr_t QtPrivate__QContainerImplHelper_Mid(int originalLength, int* position, int* length);
+int QtPrivate__QContainerImplHelper_Mid(int originalLength, int* position, int* length);
 void QtPrivate__QContainerImplHelper_Delete(QtPrivate__QContainerImplHelper* self);
 
 #ifdef __cplusplus

qt/gen_qbasictimer.cpp

@@ -32,7 +32,7 @@ void QBasicTimer_Start(QBasicTimer* self, int msec, QObject* obj) {
 	self->start(static_cast<int>(msec), obj);
 }
 
-void QBasicTimer_Start2(QBasicTimer* self, int msec, uintptr_t timerType, QObject* obj) {
+void QBasicTimer_Start2(QBasicTimer* self, int msec, int timerType, QObject* obj) {
 	self->start(static_cast<int>(msec), static_cast<Qt::TimerType>(timerType), obj);
 }
 

qt/gen_qbasictimer.go

@@ -68,7 +68,7 @@ func (this *QBasicTimer) Start(msec int, obj *QObject) {
 }
 
 func (this *QBasicTimer) Start2(msec int, timerType TimerType, obj *QObject) {
-	C.QBasicTimer_Start2(this.h, (C.int)(msec), (C.uintptr_t)(timerType), obj.cPointer())
+	C.QBasicTimer_Start2(this.h, (C.int)(msec), (C.int)(timerType), obj.cPointer())
 }
 
 func (this *QBasicTimer) Stop() {

qt/gen_qbasictimer.h

@@ -28,7 +28,7 @@ void QBasicTimer_Swap(QBasicTimer* self, QBasicTimer* other);
 bool QBasicTimer_IsActive(const QBasicTimer* self);
 int QBasicTimer_TimerId(const QBasicTimer* self);
 void QBasicTimer_Start(QBasicTimer* self, int msec, QObject* obj);
-void QBasicTimer_Start2(QBasicTimer* self, int msec, uintptr_t timerType, QObject* obj);
+void QBasicTimer_Start2(QBasicTimer* self, int msec, int timerType, QObject* obj);
 void QBasicTimer_Stop(QBasicTimer* self);
 void QBasicTimer_Delete(QBasicTimer* self);
 

qt/gen_qbitmap.cpp

@@ -77,7 +77,7 @@ QBitmap* QBitmap_FromImage2(QImage* image, int flags) {
 	return new QBitmap(QBitmap::fromImage(*image, static_cast<Qt::ImageConversionFlags>(flags)));
 }
 
-QBitmap* QBitmap_FromData3(QSize* size, const unsigned char* bits, uintptr_t monoFormat) {
+QBitmap* QBitmap_FromData3(QSize* size, const unsigned char* bits, int monoFormat) {
 	return new QBitmap(QBitmap::fromData(*size, static_cast<const uchar*>(bits), static_cast<QImage::Format>(monoFormat)));
 }
 

qt/gen_qbitmap.go

@@ -129,14 +129,14 @@ func (this *QBitmap) TransformedWithMatrix(matrix *QTransform) *QBitmap {
 }
 
 func QBitmap_FromImage2(image *QImage, flags int) *QBitmap {
-	_ret := C.QBitmap_FromImage2(image.cPointer(), (C.int)(flags))
+	_ret := C.QBitmap_FromImage2(image.cPointer(), flags)
 	_goptr := newQBitmap(_ret)
 	_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	return _goptr
 }
 
 func QBitmap_FromData3(size *QSize, bits *byte, monoFormat QImage__Format) *QBitmap {
-	_ret := C.QBitmap_FromData3(size.cPointer(), (*C.uchar)(unsafe.Pointer(bits)), (C.uintptr_t)(monoFormat))
+	_ret := C.QBitmap_FromData3(size.cPointer(), (*C.uchar)(unsafe.Pointer(bits)), (C.int)(monoFormat))
 	_goptr := newQBitmap(_ret)
 	_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	return _goptr

qt/gen_qbitmap.h

@@ -45,7 +45,7 @@ QBitmap* QBitmap_FromData(QSize* size, const unsigned char* bits);
 QBitmap* QBitmap_Transformed(const QBitmap* self, QMatrix* param1);
 QBitmap* QBitmap_TransformedWithMatrix(const QBitmap* self, QTransform* matrix);
 QBitmap* QBitmap_FromImage2(QImage* image, int flags);
-QBitmap* QBitmap_FromData3(QSize* size, const unsigned char* bits, uintptr_t monoFormat);
+QBitmap* QBitmap_FromData3(QSize* size, const unsigned char* bits, int monoFormat);
 void QBitmap_Delete(QBitmap* self);
 
 #ifdef __cplusplus

qt/gen_qboxlayout.cpp

@@ -15,11 +15,11 @@
 #include "gen_qboxlayout.h"
 #include "_cgo_export.h"
 
-QBoxLayout* QBoxLayout_new(uintptr_t param1) {
+QBoxLayout* QBoxLayout_new(int param1) {
 	return new QBoxLayout(static_cast<QBoxLayout::Direction>(param1));
 }
 
-QBoxLayout* QBoxLayout_new2(uintptr_t param1, QWidget* parent) {
+QBoxLayout* QBoxLayout_new2(int param1, QWidget* parent) {
 	return new QBoxLayout(static_cast<QBoxLayout::Direction>(param1), parent);
 }
 
@@ -41,12 +41,12 @@ struct miqt_string* QBoxLayout_TrUtf8(const char* s) {
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-uintptr_t QBoxLayout_Direction(const QBoxLayout* self) {
+int QBoxLayout_Direction(const QBoxLayout* self) {
 	QBoxLayout::Direction _ret = self->direction();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-void QBoxLayout_SetDirection(QBoxLayout* self, uintptr_t direction) {
+void QBoxLayout_SetDirection(QBoxLayout* self, int direction) {
 	self->setDirection(static_cast<QBoxLayout::Direction>(direction));
 }
 

qt/gen_qboxlayout.go

@@ -49,13 +49,13 @@ func newQBoxLayout_U(h unsafe.Pointer) *QBoxLayout {
 
 // NewQBoxLayout constructs a new QBoxLayout object.
 func NewQBoxLayout(param1 QBoxLayout__Direction) *QBoxLayout {
-	ret := C.QBoxLayout_new((C.uintptr_t)(param1))
+	ret := C.QBoxLayout_new((C.int)(param1))
 	return newQBoxLayout(ret)
 }
 
 // NewQBoxLayout2 constructs a new QBoxLayout object.
 func NewQBoxLayout2(param1 QBoxLayout__Direction, parent *QWidget) *QBoxLayout {
-	ret := C.QBoxLayout_new2((C.uintptr_t)(param1), parent.cPointer())
+	ret := C.QBoxLayout_new2((C.int)(param1), parent.cPointer())
 	return newQBoxLayout(ret)
 }
 
@@ -86,7 +86,7 @@ func (this *QBoxLayout) Direction() QBoxLayout__Direction {
 }
 
 func (this *QBoxLayout) SetDirection(direction QBoxLayout__Direction) {
-	C.QBoxLayout_SetDirection(this.h, (C.uintptr_t)(direction))
+	C.QBoxLayout_SetDirection(this.h, (C.int)(direction))
 }
 
 func (this *QBoxLayout) AddSpacing(size int) {
@@ -275,7 +275,7 @@ func (this *QBoxLayout) AddWidget2(param1 *QWidget, stretch int) {
 }
 
 func (this *QBoxLayout) AddWidget3(param1 *QWidget, stretch int, alignment int) {
-	C.QBoxLayout_AddWidget3(this.h, param1.cPointer(), (C.int)(stretch), (C.int)(alignment))
+	C.QBoxLayout_AddWidget3(this.h, param1.cPointer(), (C.int)(stretch), alignment)
 }
 
 func (this *QBoxLayout) AddLayout2(layout *QLayout, stretch int) {
@@ -291,7 +291,7 @@ func (this *QBoxLayout) InsertWidget3(index int, widget *QWidget, stretch int) {
 }
 
 func (this *QBoxLayout) InsertWidget4(index int, widget *QWidget, stretch int, alignment int) {
-	C.QBoxLayout_InsertWidget4(this.h, (C.int)(index), widget.cPointer(), (C.int)(stretch), (C.int)(alignment))
+	C.QBoxLayout_InsertWidget4(this.h, (C.int)(index), widget.cPointer(), (C.int)(stretch), alignment)
 }
 
 func (this *QBoxLayout) InsertLayout3(index int, layout *QLayout, stretch int) {

qt/gen_qboxlayout.h

@@ -37,13 +37,13 @@ typedef struct QVBoxLayout QVBoxLayout;
 typedef struct QWidget QWidget;
 #endif
 
-QBoxLayout* QBoxLayout_new(uintptr_t param1);
-QBoxLayout* QBoxLayout_new2(uintptr_t param1, QWidget* parent);
+QBoxLayout* QBoxLayout_new(int param1);
+QBoxLayout* QBoxLayout_new2(int param1, QWidget* parent);
 QMetaObject* QBoxLayout_MetaObject(const QBoxLayout* self);
 struct miqt_string* QBoxLayout_Tr(const char* s);
 struct miqt_string* QBoxLayout_TrUtf8(const char* s);
-uintptr_t QBoxLayout_Direction(const QBoxLayout* self);
-void QBoxLayout_SetDirection(QBoxLayout* self, uintptr_t direction);
+int QBoxLayout_Direction(const QBoxLayout* self);
+void QBoxLayout_SetDirection(QBoxLayout* self, int direction);
 void QBoxLayout_AddSpacing(QBoxLayout* self, int size);
 void QBoxLayout_AddStretch(QBoxLayout* self);
 void QBoxLayout_AddSpacerItem(QBoxLayout* self, QSpacerItem* spacerItem);

qt/gen_qbrush.cpp

@@ -19,7 +19,7 @@ QBrush* QBrush_new() {
 	return new QBrush();
 }
 
-QBrush* QBrush_new2(uintptr_t bs) {
+QBrush* QBrush_new2(int bs) {
 	return new QBrush(static_cast<Qt::BrushStyle>(bs));
 }
 
@@ -27,7 +27,7 @@ QBrush* QBrush_new3(QColor* color) {
 	return new QBrush(*color);
 }
 
-QBrush* QBrush_new4(uintptr_t color) {
+QBrush* QBrush_new4(int color) {
 	return new QBrush(static_cast<Qt::GlobalColor>(color));
 }
 
@@ -35,7 +35,7 @@ QBrush* QBrush_new5(QColor* color, QPixmap* pixmap) {
 	return new QBrush(*color, *pixmap);
 }
 
-QBrush* QBrush_new6(uintptr_t color, QPixmap* pixmap) {
+QBrush* QBrush_new6(int color, QPixmap* pixmap) {
 	return new QBrush(static_cast<Qt::GlobalColor>(color), *pixmap);
 }
 
@@ -55,11 +55,11 @@ QBrush* QBrush_new10(QGradient* gradient) {
 	return new QBrush(*gradient);
 }
 
-QBrush* QBrush_new11(QColor* color, uintptr_t bs) {
+QBrush* QBrush_new11(QColor* color, int bs) {
 	return new QBrush(*color, static_cast<Qt::BrushStyle>(bs));
 }
 
-QBrush* QBrush_new12(uintptr_t color, uintptr_t bs) {
+QBrush* QBrush_new12(int color, int bs) {
 	return new QBrush(static_cast<Qt::GlobalColor>(color), static_cast<Qt::BrushStyle>(bs));
 }
 
@@ -71,12 +71,12 @@ void QBrush_Swap(QBrush* self, QBrush* other) {
 	self->swap(*other);
 }
 
-uintptr_t QBrush_Style(const QBrush* self) {
+int QBrush_Style(const QBrush* self) {
 	Qt::BrushStyle _ret = self->style();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-void QBrush_SetStyle(QBrush* self, uintptr_t style) {
+void QBrush_SetStyle(QBrush* self, int style) {
 	self->setStyle(static_cast<Qt::BrushStyle>(style));
 }
 
@@ -124,7 +124,7 @@ void QBrush_SetColor(QBrush* self, QColor* color) {
 	self->setColor(*color);
 }
 
-void QBrush_SetColorWithColor(QBrush* self, uintptr_t color) {
+void QBrush_SetColorWithColor(QBrush* self, int color) {
 	self->setColor(static_cast<Qt::GlobalColor>(color));
 }
 
@@ -168,7 +168,7 @@ QGradient* QGradient_new() {
 	return new QGradient();
 }
 
-QGradient* QGradient_new2(uintptr_t param1) {
+QGradient* QGradient_new2(int param1) {
 	return new QGradient(static_cast<QGradient::Preset>(param1));
 }
 
@@ -176,39 +176,39 @@ QGradient* QGradient_new3(QGradient* param1) {
 	return new QGradient(*param1);
 }
 
-uintptr_t QGradient_Type(const QGradient* self) {
+int QGradient_Type(const QGradient* self) {
 	QGradient::Type _ret = self->type();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-void QGradient_SetSpread(QGradient* self, uintptr_t spread) {
+void QGradient_SetSpread(QGradient* self, int spread) {
 	self->setSpread(static_cast<QGradient::Spread>(spread));
 }
 
-uintptr_t QGradient_Spread(const QGradient* self) {
+int QGradient_Spread(const QGradient* self) {
 	QGradient::Spread _ret = self->spread();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 void QGradient_SetColorAt(QGradient* self, double pos, QColor* color) {
 	self->setColorAt(static_cast<qreal>(pos), *color);
 }
 
-uintptr_t QGradient_CoordinateMode(const QGradient* self) {
+int QGradient_CoordinateMode(const QGradient* self) {
 	QGradient::CoordinateMode _ret = self->coordinateMode();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-void QGradient_SetCoordinateMode(QGradient* self, uintptr_t mode) {
+void QGradient_SetCoordinateMode(QGradient* self, int mode) {
 	self->setCoordinateMode(static_cast<QGradient::CoordinateMode>(mode));
 }
 
-uintptr_t QGradient_InterpolationMode(const QGradient* self) {
+int QGradient_InterpolationMode(const QGradient* self) {
 	QGradient::InterpolationMode _ret = self->interpolationMode();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-void QGradient_SetInterpolationMode(QGradient* self, uintptr_t mode) {
+void QGradient_SetInterpolationMode(QGradient* self, int mode) {
 	self->setInterpolationMode(static_cast<QGradient::InterpolationMode>(mode));
 }
 
@@ -325,7 +325,8 @@ void QRadialGradient_SetFocalPoint2(QRadialGradient* self, double x, double y) {
 }
 
 double QRadialGradient_Radius(const QRadialGradient* self) {
-	return self->radius();
+	qreal _ret = self->radius();
+	return static_cast<double>(_ret);
 }
 
 void QRadialGradient_SetRadius(QRadialGradient* self, double radius) {
@@ -333,7 +334,8 @@ void QRadialGradient_SetRadius(QRadialGradient* self, double radius) {
 }
 
 double QRadialGradient_CenterRadius(const QRadialGradient* self) {
-	return self->centerRadius();
+	qreal _ret = self->centerRadius();
+	return static_cast<double>(_ret);
 }
 
 void QRadialGradient_SetCenterRadius(QRadialGradient* self, double radius) {
@@ -341,7 +343,8 @@ void QRadialGradient_SetCenterRadius(QRadialGradient* self, double radius) {
 }
 
 double QRadialGradient_FocalRadius(const QRadialGradient* self) {
-	return self->focalRadius();
+	qreal _ret = self->focalRadius();
+	return static_cast<double>(_ret);
 }
 
 void QRadialGradient_SetFocalRadius(QRadialGradient* self, double radius) {
@@ -381,7 +384,8 @@ void QConicalGradient_SetCenter2(QConicalGradient* self, double x, double y) {
 }
 
 double QConicalGradient_Angle(const QConicalGradient* self) {
-	return self->angle();
+	qreal _ret = self->angle();
+	return static_cast<double>(_ret);
 }
 
 void QConicalGradient_SetAngle(QConicalGradient* self, double angle) {
@@ -396,6 +400,10 @@ QGradient__QGradientData* QGradient__QGradientData_new(QGradient__QGradientData*
 	return new QGradient::QGradientData(*param1);
 }
 
+void QGradient__QGradientData_OperatorAssign(QGradient__QGradientData* self, QGradient__QGradientData* param1) {
+	self->operator=(*param1);
+}
+
 void QGradient__QGradientData_Delete(QGradient__QGradientData* self) {
 	delete self;
 }

qt/gen_qbrush.go

@@ -250,7 +250,7 @@ func NewQBrush() *QBrush {
 
 // NewQBrush2 constructs a new QBrush object.
 func NewQBrush2(bs BrushStyle) *QBrush {
-	ret := C.QBrush_new2((C.uintptr_t)(bs))
+	ret := C.QBrush_new2((C.int)(bs))
 	return newQBrush(ret)
 }
 
@@ -262,7 +262,7 @@ func NewQBrush3(color *QColor) *QBrush {
 
 // NewQBrush4 constructs a new QBrush object.
 func NewQBrush4(color GlobalColor) *QBrush {
-	ret := C.QBrush_new4((C.uintptr_t)(color))
+	ret := C.QBrush_new4((C.int)(color))
 	return newQBrush(ret)
 }
 
@@ -274,7 +274,7 @@ func NewQBrush5(color *QColor, pixmap *QPixmap) *QBrush {
 
 // NewQBrush6 constructs a new QBrush object.
 func NewQBrush6(color GlobalColor, pixmap *QPixmap) *QBrush {
-	ret := C.QBrush_new6((C.uintptr_t)(color), pixmap.cPointer())
+	ret := C.QBrush_new6((C.int)(color), pixmap.cPointer())
 	return newQBrush(ret)
 }
 
@@ -304,13 +304,13 @@ func NewQBrush10(gradient *QGradient) *QBrush {
 
 // NewQBrush11 constructs a new QBrush object.
 func NewQBrush11(color *QColor, bs BrushStyle) *QBrush {
-	ret := C.QBrush_new11(color.cPointer(), (C.uintptr_t)(bs))
+	ret := C.QBrush_new11(color.cPointer(), (C.int)(bs))
 	return newQBrush(ret)
 }
 
 // NewQBrush12 constructs a new QBrush object.
 func NewQBrush12(color GlobalColor, bs BrushStyle) *QBrush {
-	ret := C.QBrush_new12((C.uintptr_t)(color), (C.uintptr_t)(bs))
+	ret := C.QBrush_new12((C.int)(color), (C.int)(bs))
 	return newQBrush(ret)
 }
 
@@ -327,7 +327,7 @@ func (this *QBrush) Style() BrushStyle {
 }
 
 func (this *QBrush) SetStyle(style BrushStyle) {
-	C.QBrush_SetStyle(this.h, (C.uintptr_t)(style))
+	C.QBrush_SetStyle(this.h, (C.int)(style))
 }
 
 func (this *QBrush) Matrix() *QMatrix {
@@ -380,7 +380,7 @@ func (this *QBrush) SetColor(color *QColor) {
 }
 
 func (this *QBrush) SetColorWithColor(color GlobalColor) {
-	C.QBrush_SetColorWithColor(this.h, (C.uintptr_t)(color))
+	C.QBrush_SetColorWithColor(this.h, (C.int)(color))
 }
 
 func (this *QBrush) Gradient() *QGradient {
@@ -493,7 +493,7 @@ func NewQGradient() *QGradient {
 
 // NewQGradient2 constructs a new QGradient object.
 func NewQGradient2(param1 QGradient__Preset) *QGradient {
-	ret := C.QGradient_new2((C.uintptr_t)(param1))
+	ret := C.QGradient_new2((C.int)(param1))
 	return newQGradient(ret)
 }
 
@@ -508,7 +508,7 @@ func (this *QGradient) Type() QGradient__Type {
 }
 
 func (this *QGradient) SetSpread(spread QGradient__Spread) {
-	C.QGradient_SetSpread(this.h, (C.uintptr_t)(spread))
+	C.QGradient_SetSpread(this.h, (C.int)(spread))
 }
 
 func (this *QGradient) Spread() QGradient__Spread {
@@ -524,7 +524,7 @@ func (this *QGradient) CoordinateMode() QGradient__CoordinateMode {
 }
 
 func (this *QGradient) SetCoordinateMode(mode QGradient__CoordinateMode) {
-	C.QGradient_SetCoordinateMode(this.h, (C.uintptr_t)(mode))
+	C.QGradient_SetCoordinateMode(this.h, (C.int)(mode))
 }
 
 func (this *QGradient) InterpolationMode() QGradient__InterpolationMode {
@@ -532,7 +532,7 @@ func (this *QGradient) InterpolationMode() QGradient__InterpolationMode {
 }
 
 func (this *QGradient) SetInterpolationMode(mode QGradient__InterpolationMode) {
-	C.QGradient_SetInterpolationMode(this.h, (C.uintptr_t)(mode))
+	C.QGradient_SetInterpolationMode(this.h, (C.int)(mode))
 }
 
 func (this *QGradient) OperatorEqual(gradient *QGradient) bool {
@@ -899,6 +899,10 @@ func NewQGradient__QGradientData(param1 *QGradient__QGradientData) *QGradient__Q
 	return newQGradient__QGradientData(ret)
 }
 
+func (this *QGradient__QGradientData) OperatorAssign(param1 *QGradient__QGradientData) {
+	C.QGradient__QGradientData_OperatorAssign(this.h, param1.cPointer())
+}
+
 // Delete this object from C++ memory.
 func (this *QGradient__QGradientData) Delete() {
 	C.QGradient__QGradientData_Delete(this.h)

qt/gen_qbrush.h

@@ -48,21 +48,21 @@ typedef struct QTransform QTransform;
 #endif
 
 QBrush* QBrush_new();
-QBrush* QBrush_new2(uintptr_t bs);
+QBrush* QBrush_new2(int bs);
 QBrush* QBrush_new3(QColor* color);
-QBrush* QBrush_new4(uintptr_t color);
+QBrush* QBrush_new4(int color);
 QBrush* QBrush_new5(QColor* color, QPixmap* pixmap);
-QBrush* QBrush_new6(uintptr_t color, QPixmap* pixmap);
+QBrush* QBrush_new6(int color, QPixmap* pixmap);
 QBrush* QBrush_new7(QPixmap* pixmap);
 QBrush* QBrush_new8(QImage* image);
 QBrush* QBrush_new9(QBrush* brush);
 QBrush* QBrush_new10(QGradient* gradient);
-QBrush* QBrush_new11(QColor* color, uintptr_t bs);
-QBrush* QBrush_new12(uintptr_t color, uintptr_t bs);
+QBrush* QBrush_new11(QColor* color, int bs);
+QBrush* QBrush_new12(int color, int bs);
 void QBrush_OperatorAssign(QBrush* self, QBrush* brush);
 void QBrush_Swap(QBrush* self, QBrush* other);
-uintptr_t QBrush_Style(const QBrush* self);
-void QBrush_SetStyle(QBrush* self, uintptr_t style);
+int QBrush_Style(const QBrush* self);
+void QBrush_SetStyle(QBrush* self, int style);
 QMatrix* QBrush_Matrix(const QBrush* self);
 void QBrush_SetMatrix(QBrush* self, QMatrix* mat);
 QTransform* QBrush_Transform(const QBrush* self);
@@ -73,7 +73,7 @@ QImage* QBrush_TextureImage(const QBrush* self);
 void QBrush_SetTextureImage(QBrush* self, QImage* image);
 QColor* QBrush_Color(const QBrush* self);
 void QBrush_SetColor(QBrush* self, QColor* color);
-void QBrush_SetColorWithColor(QBrush* self, uintptr_t color);
+void QBrush_SetColorWithColor(QBrush* self, int color);
 QGradient* QBrush_Gradient(const QBrush* self);
 bool QBrush_IsOpaque(const QBrush* self);
 bool QBrush_OperatorEqual(const QBrush* self, QBrush* b);
@@ -86,16 +86,16 @@ void QBrushData_OperatorAssign(QBrushData* self, QBrushData* param1);
 void QBrushData_Delete(QBrushData* self);
 
 QGradient* QGradient_new();
-QGradient* QGradient_new2(uintptr_t param1);
+QGradient* QGradient_new2(int param1);
 QGradient* QGradient_new3(QGradient* param1);
-uintptr_t QGradient_Type(const QGradient* self);
-void QGradient_SetSpread(QGradient* self, uintptr_t spread);
-uintptr_t QGradient_Spread(const QGradient* self);
+int QGradient_Type(const QGradient* self);
+void QGradient_SetSpread(QGradient* self, int spread);
+int QGradient_Spread(const QGradient* self);
 void QGradient_SetColorAt(QGradient* self, double pos, QColor* color);
-uintptr_t QGradient_CoordinateMode(const QGradient* self);
-void QGradient_SetCoordinateMode(QGradient* self, uintptr_t mode);
-uintptr_t QGradient_InterpolationMode(const QGradient* self);
-void QGradient_SetInterpolationMode(QGradient* self, uintptr_t mode);
+int QGradient_CoordinateMode(const QGradient* self);
+void QGradient_SetCoordinateMode(QGradient* self, int mode);
+int QGradient_InterpolationMode(const QGradient* self);
+void QGradient_SetInterpolationMode(QGradient* self, int mode);
 bool QGradient_OperatorEqual(const QGradient* self, QGradient* gradient);
 bool QGradient_OperatorNotEqual(const QGradient* self, QGradient* other);
 void QGradient_Delete(QGradient* self);
@@ -146,6 +146,7 @@ void QConicalGradient_SetAngle(QConicalGradient* self, double angle);
 void QConicalGradient_Delete(QConicalGradient* self);
 
 QGradient__QGradientData* QGradient__QGradientData_new(QGradient__QGradientData* param1);
+void QGradient__QGradientData_OperatorAssign(QGradient__QGradientData* self, QGradient__QGradientData* param1);
 void QGradient__QGradientData_Delete(QGradient__QGradientData* self);
 
 #ifdef __cplusplus

qt/gen_qbuffer.cpp

@@ -82,11 +82,13 @@ void QBuffer_Close(QBuffer* self) {
 }
 
 long long QBuffer_Size(const QBuffer* self) {
-	return self->size();
+	qint64 _ret = self->size();
+	return static_cast<long long>(_ret);
 }
 
 long long QBuffer_Pos(const QBuffer* self) {
-	return self->pos();
+	qint64 _ret = self->pos();
+	return static_cast<long long>(_ret);
 }
 
 bool QBuffer_Seek(QBuffer* self, long long off) {

qt/gen_qbuffer.go

@@ -109,7 +109,7 @@ func (this *QBuffer) Data() *QByteArray {
 }
 
 func (this *QBuffer) Open(openMode int) bool {
-	return (bool)(C.QBuffer_Open(this.h, (C.int)(openMode)))
+	return (bool)(C.QBuffer_Open(this.h, openMode))
 }
 
 func (this *QBuffer) Close() {

qt/gen_qbuttongroup.cpp

@@ -53,7 +53,7 @@ void QButtonGroup_RemoveButton(QButtonGroup* self, QAbstractButton* param1) {
 }
 
 struct miqt_array* QButtonGroup_Buttons(const QButtonGroup* self) {
-	QList<QAbstractButton*> _ret = self->buttons();
+	QList<QAbstractButton *> _ret = self->buttons();
 	// Convert QList<> from C++ memory to manually-managed C memory
 	QAbstractButton** _arr = static_cast<QAbstractButton**>(malloc(sizeof(QAbstractButton*) * _ret.length()));
 	for (size_t i = 0, e = _ret.length(); i < e; ++i) {

qt/gen_qbytearray.cpp

@@ -34,7 +34,7 @@ QByteArray* QByteArray_new3(int size, char c) {
 	return new QByteArray(static_cast<int>(size), static_cast<char>(c));
 }
 
-QByteArray* QByteArray_new4(int size, uintptr_t param2) {
+QByteArray* QByteArray_new4(int size, int param2) {
 	return new QByteArray(static_cast<int>(size), static_cast<Qt::Initialization>(param2));
 }
 
@@ -576,7 +576,8 @@ int16_t QByteArray_ToShort(const QByteArray* self) {
 }
 
 uint16_t QByteArray_ToUShort(const QByteArray* self) {
-	return self->toUShort();
+	ushort _ret = self->toUShort();
+	return static_cast<uint16_t>(_ret);
 }
 
 int QByteArray_ToInt(const QByteArray* self) {
@@ -584,7 +585,8 @@ int QByteArray_ToInt(const QByteArray* self) {
 }
 
 unsigned int QByteArray_ToUInt(const QByteArray* self) {
-	return self->toUInt();
+	uint _ret = self->toUInt();
+	return static_cast<unsigned int>(_ret);
 }
 
 long QByteArray_ToLong(const QByteArray* self) {
@@ -592,15 +594,18 @@ long QByteArray_ToLong(const QByteArray* self) {
 }
 
 unsigned long QByteArray_ToULong(const QByteArray* self) {
-	return self->toULong();
+	ulong _ret = self->toULong();
+	return static_cast<unsigned long>(_ret);
 }
 
-int64_t QByteArray_ToLongLong(const QByteArray* self) {
-	return self->toLongLong();
+long long QByteArray_ToLongLong(const QByteArray* self) {
+	qlonglong _ret = self->toLongLong();
+	return static_cast<long long>(_ret);
 }
 
-uint64_t QByteArray_ToULongLong(const QByteArray* self) {
-	return self->toULongLong();
+unsigned long long QByteArray_ToULongLong(const QByteArray* self) {
+	qulonglong _ret = self->toULongLong();
+	return static_cast<unsigned long long>(_ret);
 }
 
 float QByteArray_ToFloat(const QByteArray* self) {
@@ -656,13 +661,13 @@ QByteArray* QByteArray_SetNumWithUint(QByteArray* self, unsigned int param1) {
 }
 
 QByteArray* QByteArray_SetNumWithQlonglong(QByteArray* self, long long param1) {
-	QByteArray& _ret = self->setNum(static_cast<qint64>(param1));
+	QByteArray& _ret = self->setNum(static_cast<qlonglong>(param1));
 	// Cast returned reference into pointer
 	return &_ret;
 }
 
 QByteArray* QByteArray_SetNumWithQulonglong(QByteArray* self, unsigned long long param1) {
-	QByteArray& _ret = self->setNum(static_cast<quint64>(param1));
+	QByteArray& _ret = self->setNum(static_cast<qulonglong>(param1));
 	// Cast returned reference into pointer
 	return &_ret;
 }
@@ -694,11 +699,11 @@ QByteArray* QByteArray_NumberWithUint(unsigned int param1) {
 }
 
 QByteArray* QByteArray_NumberWithQlonglong(long long param1) {
-	return new QByteArray(QByteArray::number(static_cast<qint64>(param1)));
+	return new QByteArray(QByteArray::number(static_cast<qlonglong>(param1)));
 }
 
 QByteArray* QByteArray_NumberWithQulonglong(unsigned long long param1) {
-	return new QByteArray(QByteArray::number(static_cast<quint64>(param1)));
+	return new QByteArray(QByteArray::number(static_cast<qulonglong>(param1)));
 }
 
 QByteArray* QByteArray_NumberWithDouble(double param1) {
@@ -730,35 +735,43 @@ QByteArray* QByteArray_FromPercentEncoding(QByteArray* pctEncoded) {
 }
 
 char* QByteArray_Begin(QByteArray* self) {
-	return self->begin();
+	QByteArray::iterator* _ret = self->begin();
+	return static_cast<char*>(_ret);
 }
 
 const char* QByteArray_Begin2(const QByteArray* self) {
-	return (const char*) self->begin();
+	const QByteArray::const_iterator* _ret = self->begin();
+	return static_cast<const char*>(_ret);
 }
 
 const char* QByteArray_Cbegin(const QByteArray* self) {
-	return (const char*) self->cbegin();
+	const QByteArray::const_iterator* _ret = self->cbegin();
+	return static_cast<const char*>(_ret);
 }
 
 const char* QByteArray_ConstBegin(const QByteArray* self) {
-	return (const char*) self->constBegin();
+	const QByteArray::const_iterator* _ret = self->constBegin();
+	return static_cast<const char*>(_ret);
 }
 
 char* QByteArray_End(QByteArray* self) {
-	return self->end();
+	QByteArray::iterator* _ret = self->end();
+	return static_cast<char*>(_ret);
 }
 
 const char* QByteArray_End2(const QByteArray* self) {
-	return (const char*) self->end();
+	const QByteArray::const_iterator* _ret = self->end();
+	return static_cast<const char*>(_ret);
 }
 
 const char* QByteArray_Cend(const QByteArray* self) {
-	return (const char*) self->cend();
+	const QByteArray::const_iterator* _ret = self->cend();
+	return static_cast<const char*>(_ret);
 }
 
 const char* QByteArray_ConstEnd(const QByteArray* self) {
-	return (const char*) self->constEnd();
+	const QByteArray::const_iterator* _ret = self->constEnd();
+	return static_cast<const char*>(_ret);
 }
 
 void QByteArray_PushBack(QByteArray* self, char c) {
@@ -831,11 +844,11 @@ int QByteArray_LastIndexOf23(const QByteArray* self, QByteArray* a, int from) {
 	return self->lastIndexOf(*a, static_cast<int>(from));
 }
 
-int QByteArray_Compare2(const QByteArray* self, const char* c, uintptr_t cs) {
+int QByteArray_Compare2(const QByteArray* self, const char* c, int cs) {
 	return self->compare(c, static_cast<Qt::CaseSensitivity>(cs));
 }
 
-int QByteArray_Compare22(const QByteArray* self, QByteArray* a, uintptr_t cs) {
+int QByteArray_Compare22(const QByteArray* self, QByteArray* a, int cs) {
 	return self->compare(*a, static_cast<Qt::CaseSensitivity>(cs));
 }
 
@@ -878,11 +891,13 @@ int16_t QByteArray_ToShort2(const QByteArray* self, bool* ok, int base) {
 }
 
 uint16_t QByteArray_ToUShort1(const QByteArray* self, bool* ok) {
-	return self->toUShort(ok);
+	ushort _ret = self->toUShort(ok);
+	return static_cast<uint16_t>(_ret);
 }
 
 uint16_t QByteArray_ToUShort2(const QByteArray* self, bool* ok, int base) {
-	return self->toUShort(ok, static_cast<int>(base));
+	ushort _ret = self->toUShort(ok, static_cast<int>(base));
+	return static_cast<uint16_t>(_ret);
 }
 
 int QByteArray_ToInt1(const QByteArray* self, bool* ok) {
@@ -894,11 +909,13 @@ int QByteArray_ToInt2(const QByteArray* self, bool* ok, int base) {
 }
 
 unsigned int QByteArray_ToUInt1(const QByteArray* self, bool* ok) {
-	return self->toUInt(ok);
+	uint _ret = self->toUInt(ok);
+	return static_cast<unsigned int>(_ret);
 }
 
 unsigned int QByteArray_ToUInt2(const QByteArray* self, bool* ok, int base) {
-	return self->toUInt(ok, static_cast<int>(base));
+	uint _ret = self->toUInt(ok, static_cast<int>(base));
+	return static_cast<unsigned int>(_ret);
 }
 
 long QByteArray_ToLong1(const QByteArray* self, bool* ok) {
@@ -910,27 +927,33 @@ long QByteArray_ToLong2(const QByteArray* self, bool* ok, int base) {
 }
 
 unsigned long QByteArray_ToULong1(const QByteArray* self, bool* ok) {
-	return self->toULong(ok);
+	ulong _ret = self->toULong(ok);
+	return static_cast<unsigned long>(_ret);
 }
 
 unsigned long QByteArray_ToULong2(const QByteArray* self, bool* ok, int base) {
-	return self->toULong(ok, static_cast<int>(base));
+	ulong _ret = self->toULong(ok, static_cast<int>(base));
+	return static_cast<unsigned long>(_ret);
 }
 
-int64_t QByteArray_ToLongLong1(const QByteArray* self, bool* ok) {
-	return self->toLongLong(ok);
+long long QByteArray_ToLongLong1(const QByteArray* self, bool* ok) {
+	qlonglong _ret = self->toLongLong(ok);
+	return static_cast<long long>(_ret);
 }
 
-int64_t QByteArray_ToLongLong2(const QByteArray* self, bool* ok, int base) {
-	return self->toLongLong(ok, static_cast<int>(base));
+long long QByteArray_ToLongLong2(const QByteArray* self, bool* ok, int base) {
+	qlonglong _ret = self->toLongLong(ok, static_cast<int>(base));
+	return static_cast<long long>(_ret);
 }
 
-uint64_t QByteArray_ToULongLong1(const QByteArray* self, bool* ok) {
-	return self->toULongLong(ok);
+unsigned long long QByteArray_ToULongLong1(const QByteArray* self, bool* ok) {
+	qulonglong _ret = self->toULongLong(ok);
+	return static_cast<unsigned long long>(_ret);
 }
 
-uint64_t QByteArray_ToULongLong2(const QByteArray* self, bool* ok, int base) {
-	return self->toULongLong(ok, static_cast<int>(base));
+unsigned long long QByteArray_ToULongLong2(const QByteArray* self, bool* ok, int base) {
+	qulonglong _ret = self->toULongLong(ok, static_cast<int>(base));
+	return static_cast<unsigned long long>(_ret);
 }
 
 float QByteArray_ToFloat1(const QByteArray* self, bool* ok) {
@@ -978,13 +1001,13 @@ QByteArray* QByteArray_SetNum24(QByteArray* self, unsigned int param1, int base)
 }
 
 QByteArray* QByteArray_SetNum25(QByteArray* self, long long param1, int base) {
-	QByteArray& _ret = self->setNum(static_cast<qint64>(param1), static_cast<int>(base));
+	QByteArray& _ret = self->setNum(static_cast<qlonglong>(param1), static_cast<int>(base));
 	// Cast returned reference into pointer
 	return &_ret;
 }
 
 QByteArray* QByteArray_SetNum26(QByteArray* self, unsigned long long param1, int base) {
-	QByteArray& _ret = self->setNum(static_cast<quint64>(param1), static_cast<int>(base));
+	QByteArray& _ret = self->setNum(static_cast<qulonglong>(param1), static_cast<int>(base));
 	// Cast returned reference into pointer
 	return &_ret;
 }
@@ -1022,11 +1045,11 @@ QByteArray* QByteArray_Number22(unsigned int param1, int base) {
 }
 
 QByteArray* QByteArray_Number23(long long param1, int base) {
-	return new QByteArray(QByteArray::number(static_cast<qint64>(param1), static_cast<int>(base)));
+	return new QByteArray(QByteArray::number(static_cast<qlonglong>(param1), static_cast<int>(base)));
 }
 
 QByteArray* QByteArray_Number24(unsigned long long param1, int base) {
-	return new QByteArray(QByteArray::number(static_cast<quint64>(param1), static_cast<int>(base)));
+	return new QByteArray(QByteArray::number(static_cast<qulonglong>(param1), static_cast<int>(base)));
 }
 
 QByteArray* QByteArray_Number25(double param1, char f) {
@@ -1109,6 +1132,10 @@ QByteArray* QByteArray__FromBase64Result_OperatorMultiply2(const QByteArray__Fro
 	return const_cast<QByteArray*>(&_ret);
 }
 
+void QByteArray__FromBase64Result_OperatorAssign(QByteArray__FromBase64Result* self, QByteArray__FromBase64Result* param1) {
+	self->operator=(*param1);
+}
+
 void QByteArray__FromBase64Result_Delete(QByteArray__FromBase64Result* self) {
 	delete self;
 }

qt/gen_qbytearray.go

@@ -139,7 +139,7 @@ func NewQByteArray3(size int, c byte) *QByteArray {
 
 // NewQByteArray4 constructs a new QByteArray object.
 func NewQByteArray4(size int, param2 Initialization) *QByteArray {
-	ret := C.QByteArray_new4((C.int)(size), (C.uintptr_t)(param2))
+	ret := C.QByteArray_new4((C.int)(size), (C.int)(param2))
 	return newQByteArray(ret)
 }
 
@@ -764,7 +764,7 @@ func (this *QByteArray) ToDouble() float64 {
 }
 
 func (this *QByteArray) ToBase64(options int) *QByteArray {
-	_ret := C.QByteArray_ToBase64(this.h, (C.int)(options))
+	_ret := C.QByteArray_ToBase64(this.h, options)
 	_goptr := newQByteArray(_ret)
 	_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	return _goptr
@@ -888,7 +888,7 @@ func QByteArray_FromBase64Encoding(base64 *QByteArray) *QByteArray__FromBase64Re
 }
 
 func QByteArray_FromBase64(base64 *QByteArray, options int) *QByteArray {
-	_ret := C.QByteArray_FromBase64(base64.cPointer(), (C.int)(options))
+	_ret := C.QByteArray_FromBase64(base64.cPointer(), options)
 	_goptr := newQByteArray(_ret)
 	_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	return _goptr
@@ -1034,11 +1034,11 @@ func (this *QByteArray) LastIndexOf23(a *QByteArray, from int) int {
 func (this *QByteArray) Compare2(c string, cs CaseSensitivity) int {
 	c_Cstring := C.CString(c)
 	defer C.free(unsafe.Pointer(c_Cstring))
-	return (int)(C.QByteArray_Compare2(this.h, c_Cstring, (C.uintptr_t)(cs)))
+	return (int)(C.QByteArray_Compare2(this.h, c_Cstring, (C.int)(cs)))
 }
 
 func (this *QByteArray) Compare22(a *QByteArray, cs CaseSensitivity) int {
-	return (int)(C.QByteArray_Compare22(this.h, a.cPointer(), (C.uintptr_t)(cs)))
+	return (int)(C.QByteArray_Compare22(this.h, a.cPointer(), (C.int)(cs)))
 }
 
 func (this *QByteArray) Mid2(index int, lenVal int) *QByteArray {
@@ -1264,7 +1264,7 @@ func QByteArray_Number3(param1 float64, f byte, prec int) *QByteArray {
 }
 
 func QByteArray_FromBase64Encoding2(base64 *QByteArray, options int) *QByteArray__FromBase64Result {
-	_ret := C.QByteArray_FromBase64Encoding2(base64.cPointer(), (C.int)(options))
+	_ret := C.QByteArray_FromBase64Encoding2(base64.cPointer(), options)
 	_goptr := newQByteArray__FromBase64Result(_ret)
 	_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	return _goptr
@@ -1405,6 +1405,10 @@ func (this *QByteArray__FromBase64Result) OperatorMultiply2() *QByteArray {
 	return newQByteArray_U(unsafe.Pointer(C.QByteArray__FromBase64Result_OperatorMultiply2(this.h)))
 }
 
+func (this *QByteArray__FromBase64Result) OperatorAssign(param1 *QByteArray__FromBase64Result) {
+	C.QByteArray__FromBase64Result_OperatorAssign(this.h, param1.cPointer())
+}
+
 // Delete this object from C++ memory.
 func (this *QByteArray__FromBase64Result) Delete() {
 	C.QByteArray__FromBase64Result_Delete(this.h)

qt/gen_qbytearray.h

@@ -36,7 +36,7 @@ void QByteArrayDataPtr_Delete(QByteArrayDataPtr* self);
 QByteArray* QByteArray_new();
 QByteArray* QByteArray_new2(const char* param1);
 QByteArray* QByteArray_new3(int size, char c);
-QByteArray* QByteArray_new4(int size, uintptr_t param2);
+QByteArray* QByteArray_new4(int size, int param2);
 QByteArray* QByteArray_new5(QByteArray* param1);
 QByteArray* QByteArray_new6(QByteArrayDataPtr* dd);
 QByteArray* QByteArray_new7(const char* param1, int size);
@@ -152,8 +152,8 @@ int QByteArray_ToInt(const QByteArray* self);
 unsigned int QByteArray_ToUInt(const QByteArray* self);
 long QByteArray_ToLong(const QByteArray* self);
 unsigned long QByteArray_ToULong(const QByteArray* self);
-int64_t QByteArray_ToLongLong(const QByteArray* self);
-uint64_t QByteArray_ToULongLong(const QByteArray* self);
+long long QByteArray_ToLongLong(const QByteArray* self);
+unsigned long long QByteArray_ToULongLong(const QByteArray* self);
 float QByteArray_ToFloat(const QByteArray* self);
 double QByteArray_ToDouble(const QByteArray* self);
 QByteArray* QByteArray_ToBase64(const QByteArray* self, int options);
@@ -206,8 +206,8 @@ int QByteArray_IndexOf23(const QByteArray* self, QByteArray* a, int from);
 int QByteArray_LastIndexOf2(const QByteArray* self, char c, int from);
 int QByteArray_LastIndexOf22(const QByteArray* self, const char* c, int from);
 int QByteArray_LastIndexOf23(const QByteArray* self, QByteArray* a, int from);
-int QByteArray_Compare2(const QByteArray* self, const char* c, uintptr_t cs);
-int QByteArray_Compare22(const QByteArray* self, QByteArray* a, uintptr_t cs);
+int QByteArray_Compare2(const QByteArray* self, const char* c, int cs);
+int QByteArray_Compare22(const QByteArray* self, QByteArray* a, int cs);
 QByteArray* QByteArray_Mid2(const QByteArray* self, int index, int lenVal);
 QByteArray* QByteArray_LeftJustified2(const QByteArray* self, int width, char fill);
 QByteArray* QByteArray_LeftJustified3(const QByteArray* self, int width, char fill, bool truncate);
@@ -227,10 +227,10 @@ long QByteArray_ToLong1(const QByteArray* self, bool* ok);
 long QByteArray_ToLong2(const QByteArray* self, bool* ok, int base);
 unsigned long QByteArray_ToULong1(const QByteArray* self, bool* ok);
 unsigned long QByteArray_ToULong2(const QByteArray* self, bool* ok, int base);
-int64_t QByteArray_ToLongLong1(const QByteArray* self, bool* ok);
-int64_t QByteArray_ToLongLong2(const QByteArray* self, bool* ok, int base);
-uint64_t QByteArray_ToULongLong1(const QByteArray* self, bool* ok);
-uint64_t QByteArray_ToULongLong2(const QByteArray* self, bool* ok, int base);
+long long QByteArray_ToLongLong1(const QByteArray* self, bool* ok);
+long long QByteArray_ToLongLong2(const QByteArray* self, bool* ok, int base);
+unsigned long long QByteArray_ToULongLong1(const QByteArray* self, bool* ok);
+unsigned long long QByteArray_ToULongLong2(const QByteArray* self, bool* ok, int base);
 float QByteArray_ToFloat1(const QByteArray* self, bool* ok);
 double QByteArray_ToDouble1(const QByteArray* self, bool* ok);
 QByteArray* QByteArray_ToPercentEncoding1(const QByteArray* self, QByteArray* exclude);
@@ -271,6 +271,7 @@ QByteArray__FromBase64Result* QByteArray__FromBase64Result_new(QByteArray__FromB
 void QByteArray__FromBase64Result_Swap(QByteArray__FromBase64Result* self, QByteArray__FromBase64Result* other);
 QByteArray* QByteArray__FromBase64Result_OperatorMultiply(QByteArray__FromBase64Result* self);
 QByteArray* QByteArray__FromBase64Result_OperatorMultiply2(const QByteArray__FromBase64Result* self);
+void QByteArray__FromBase64Result_OperatorAssign(QByteArray__FromBase64Result* self, QByteArray__FromBase64Result* param1);
 void QByteArray__FromBase64Result_Delete(QByteArray__FromBase64Result* self);
 
 #ifdef __cplusplus

qt/gen_qcalendar.cpp

@@ -14,7 +14,7 @@ QCalendar* QCalendar_new() {
 	return new QCalendar();
 }
 
-QCalendar* QCalendar_new2(uintptr_t system) {
+QCalendar* QCalendar_new2(int system) {
 	return new QCalendar(static_cast<QCalendar::System>(system));
 }
 
@@ -156,7 +156,7 @@ struct miqt_string* QCalendar_MonthName3(const QCalendar* self, QLocale* locale,
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-struct miqt_string* QCalendar_MonthName4(const QCalendar* self, QLocale* locale, int month, int year, uintptr_t format) {
+struct miqt_string* QCalendar_MonthName4(const QCalendar* self, QLocale* locale, int month, int year, int format) {
 	QString _ret = self->monthName(*locale, static_cast<int>(month), static_cast<int>(year), static_cast<QLocale::FormatType>(format));
 	// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
 	QByteArray _b = _ret.toUtf8();
@@ -170,21 +170,21 @@ struct miqt_string* QCalendar_StandaloneMonthName3(const QCalendar* self, QLocal
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-struct miqt_string* QCalendar_StandaloneMonthName4(const QCalendar* self, QLocale* locale, int month, int year, uintptr_t format) {
+struct miqt_string* QCalendar_StandaloneMonthName4(const QCalendar* self, QLocale* locale, int month, int year, int format) {
 	QString _ret = self->standaloneMonthName(*locale, static_cast<int>(month), static_cast<int>(year), static_cast<QLocale::FormatType>(format));
 	// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
 	QByteArray _b = _ret.toUtf8();
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-struct miqt_string* QCalendar_WeekDayName3(const QCalendar* self, QLocale* locale, int day, uintptr_t format) {
+struct miqt_string* QCalendar_WeekDayName3(const QCalendar* self, QLocale* locale, int day, int format) {
 	QString _ret = self->weekDayName(*locale, static_cast<int>(day), static_cast<QLocale::FormatType>(format));
 	// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
 	QByteArray _b = _ret.toUtf8();
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-struct miqt_string* QCalendar_StandaloneWeekDayName3(const QCalendar* self, QLocale* locale, int day, uintptr_t format) {
+struct miqt_string* QCalendar_StandaloneWeekDayName3(const QCalendar* self, QLocale* locale, int day, int format) {
 	QString _ret = self->standaloneWeekDayName(*locale, static_cast<int>(day), static_cast<QLocale::FormatType>(format));
 	// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
 	QByteArray _b = _ret.toUtf8();

qt/gen_qcalendar.go

@@ -61,7 +61,7 @@ func NewQCalendar() *QCalendar {
 
 // NewQCalendar2 constructs a new QCalendar object.
 func NewQCalendar2(system QCalendar__System) *QCalendar {
-	ret := C.QCalendar_new2((C.uintptr_t)(system))
+	ret := C.QCalendar_new2((C.int)(system))
 	return newQCalendar(ret)
 }
 
@@ -211,7 +211,7 @@ func (this *QCalendar) MonthName3(locale *QLocale, month int, year int) string {
 }
 
 func (this *QCalendar) MonthName4(locale *QLocale, month int, year int, format QLocale__FormatType) string {
-	var _ms *C.struct_miqt_string = C.QCalendar_MonthName4(this.h, locale.cPointer(), (C.int)(month), (C.int)(year), (C.uintptr_t)(format))
+	var _ms *C.struct_miqt_string = C.QCalendar_MonthName4(this.h, locale.cPointer(), (C.int)(month), (C.int)(year), (C.int)(format))
 	_ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len)))
 	C.free(unsafe.Pointer(_ms))
 	return _ret
@@ -225,21 +225,21 @@ func (this *QCalendar) StandaloneMonthName3(locale *QLocale, month int, year int
 }
 
 func (this *QCalendar) StandaloneMonthName4(locale *QLocale, month int, year int, format QLocale__FormatType) string {
-	var _ms *C.struct_miqt_string = C.QCalendar_StandaloneMonthName4(this.h, locale.cPointer(), (C.int)(month), (C.int)(year), (C.uintptr_t)(format))
+	var _ms *C.struct_miqt_string = C.QCalendar_StandaloneMonthName4(this.h, locale.cPointer(), (C.int)(month), (C.int)(year), (C.int)(format))
 	_ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len)))
 	C.free(unsafe.Pointer(_ms))
 	return _ret
 }
 
 func (this *QCalendar) WeekDayName3(locale *QLocale, day int, format QLocale__FormatType) string {
-	var _ms *C.struct_miqt_string = C.QCalendar_WeekDayName3(this.h, locale.cPointer(), (C.int)(day), (C.uintptr_t)(format))
+	var _ms *C.struct_miqt_string = C.QCalendar_WeekDayName3(this.h, locale.cPointer(), (C.int)(day), (C.int)(format))
 	_ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len)))
 	C.free(unsafe.Pointer(_ms))
 	return _ret
 }
 
 func (this *QCalendar) StandaloneWeekDayName3(locale *QLocale, day int, format QLocale__FormatType) string {
-	var _ms *C.struct_miqt_string = C.QCalendar_StandaloneWeekDayName3(this.h, locale.cPointer(), (C.int)(day), (C.uintptr_t)(format))
+	var _ms *C.struct_miqt_string = C.QCalendar_StandaloneWeekDayName3(this.h, locale.cPointer(), (C.int)(day), (C.int)(format))
 	_ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len)))
 	C.free(unsafe.Pointer(_ms))
 	return _ret

qt/gen_qcalendar.h

@@ -30,7 +30,7 @@ typedef struct QLocale QLocale;
 #endif
 
 QCalendar* QCalendar_new();
-QCalendar* QCalendar_new2(uintptr_t system);
+QCalendar* QCalendar_new2(int system);
 bool QCalendar_IsValid(const QCalendar* self);
 int QCalendar_DaysInMonth(const QCalendar* self, int month);
 int QCalendar_DaysInYear(const QCalendar* self, int year);
@@ -58,11 +58,11 @@ struct miqt_string* QCalendar_StandaloneWeekDayName(const QCalendar* self, QLoca
 struct miqt_array* QCalendar_AvailableCalendars();
 int QCalendar_DaysInMonth2(const QCalendar* self, int month, int year);
 struct miqt_string* QCalendar_MonthName3(const QCalendar* self, QLocale* locale, int month, int year);
-struct miqt_string* QCalendar_MonthName4(const QCalendar* self, QLocale* locale, int month, int year, uintptr_t format);
+struct miqt_string* QCalendar_MonthName4(const QCalendar* self, QLocale* locale, int month, int year, int format);
 struct miqt_string* QCalendar_StandaloneMonthName3(const QCalendar* self, QLocale* locale, int month, int year);
-struct miqt_string* QCalendar_StandaloneMonthName4(const QCalendar* self, QLocale* locale, int month, int year, uintptr_t format);
-struct miqt_string* QCalendar_WeekDayName3(const QCalendar* self, QLocale* locale, int day, uintptr_t format);
-struct miqt_string* QCalendar_StandaloneWeekDayName3(const QCalendar* self, QLocale* locale, int day, uintptr_t format);
+struct miqt_string* QCalendar_StandaloneMonthName4(const QCalendar* self, QLocale* locale, int month, int year, int format);
+struct miqt_string* QCalendar_WeekDayName3(const QCalendar* self, QLocale* locale, int day, int format);
+struct miqt_string* QCalendar_StandaloneWeekDayName3(const QCalendar* self, QLocale* locale, int day, int format);
 void QCalendar_Delete(QCalendar* self);
 
 QCalendar__YearMonthDay* QCalendar__YearMonthDay_new();

qt/gen_qcalendarwidget.cpp

@@ -74,12 +74,12 @@ void QCalendarWidget_SetMaximumDate(QCalendarWidget* self, QDate* date) {
 	self->setMaximumDate(*date);
 }
 
-uintptr_t QCalendarWidget_FirstDayOfWeek(const QCalendarWidget* self) {
+int QCalendarWidget_FirstDayOfWeek(const QCalendarWidget* self) {
 	Qt::DayOfWeek _ret = self->firstDayOfWeek();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-void QCalendarWidget_SetFirstDayOfWeek(QCalendarWidget* self, uintptr_t dayOfWeek) {
+void QCalendarWidget_SetFirstDayOfWeek(QCalendarWidget* self, int dayOfWeek) {
 	self->setFirstDayOfWeek(static_cast<Qt::DayOfWeek>(dayOfWeek));
 }
 
@@ -99,30 +99,30 @@ void QCalendarWidget_SetCalendar(QCalendarWidget* self, QCalendar* calendar) {
 	self->setCalendar(*calendar);
 }
 
-uintptr_t QCalendarWidget_SelectionMode(const QCalendarWidget* self) {
+int QCalendarWidget_SelectionMode(const QCalendarWidget* self) {
 	QCalendarWidget::SelectionMode _ret = self->selectionMode();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-void QCalendarWidget_SetSelectionMode(QCalendarWidget* self, uintptr_t mode) {
+void QCalendarWidget_SetSelectionMode(QCalendarWidget* self, int mode) {
 	self->setSelectionMode(static_cast<QCalendarWidget::SelectionMode>(mode));
 }
 
-uintptr_t QCalendarWidget_HorizontalHeaderFormat(const QCalendarWidget* self) {
+int QCalendarWidget_HorizontalHeaderFormat(const QCalendarWidget* self) {
 	QCalendarWidget::HorizontalHeaderFormat _ret = self->horizontalHeaderFormat();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-void QCalendarWidget_SetHorizontalHeaderFormat(QCalendarWidget* self, uintptr_t format) {
+void QCalendarWidget_SetHorizontalHeaderFormat(QCalendarWidget* self, int format) {
 	self->setHorizontalHeaderFormat(static_cast<QCalendarWidget::HorizontalHeaderFormat>(format));
 }
 
-uintptr_t QCalendarWidget_VerticalHeaderFormat(const QCalendarWidget* self) {
+int QCalendarWidget_VerticalHeaderFormat(const QCalendarWidget* self) {
 	QCalendarWidget::VerticalHeaderFormat _ret = self->verticalHeaderFormat();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-void QCalendarWidget_SetVerticalHeaderFormat(QCalendarWidget* self, uintptr_t format) {
+void QCalendarWidget_SetVerticalHeaderFormat(QCalendarWidget* self, int format) {
 	self->setVerticalHeaderFormat(static_cast<QCalendarWidget::VerticalHeaderFormat>(format));
 }
 
@@ -134,11 +134,11 @@ void QCalendarWidget_SetHeaderTextFormat(QCalendarWidget* self, QTextCharFormat*
 	self->setHeaderTextFormat(*format);
 }
 
-QTextCharFormat* QCalendarWidget_WeekdayTextFormat(const QCalendarWidget* self, uintptr_t dayOfWeek) {
+QTextCharFormat* QCalendarWidget_WeekdayTextFormat(const QCalendarWidget* self, int dayOfWeek) {
 	return new QTextCharFormat(self->weekdayTextFormat(static_cast<Qt::DayOfWeek>(dayOfWeek)));
 }
 
-void QCalendarWidget_SetWeekdayTextFormat(QCalendarWidget* self, uintptr_t dayOfWeek, QTextCharFormat* format) {
+void QCalendarWidget_SetWeekdayTextFormat(QCalendarWidget* self, int dayOfWeek, QTextCharFormat* format) {
 	self->setWeekdayTextFormat(static_cast<Qt::DayOfWeek>(dayOfWeek), *format);
 }
 

qt/gen_qcalendarwidget.go

@@ -150,7 +150,7 @@ func (this *QCalendarWidget) FirstDayOfWeek() DayOfWeek {
 }
 
 func (this *QCalendarWidget) SetFirstDayOfWeek(dayOfWeek DayOfWeek) {
-	C.QCalendarWidget_SetFirstDayOfWeek(this.h, (C.uintptr_t)(dayOfWeek))
+	C.QCalendarWidget_SetFirstDayOfWeek(this.h, (C.int)(dayOfWeek))
 }
 
 func (this *QCalendarWidget) IsNavigationBarVisible() bool {
@@ -177,7 +177,7 @@ func (this *QCalendarWidget) SelectionMode() QCalendarWidget__SelectionMode {
 }
 
 func (this *QCalendarWidget) SetSelectionMode(mode QCalendarWidget__SelectionMode) {
-	C.QCalendarWidget_SetSelectionMode(this.h, (C.uintptr_t)(mode))
+	C.QCalendarWidget_SetSelectionMode(this.h, (C.int)(mode))
 }
 
 func (this *QCalendarWidget) HorizontalHeaderFormat() QCalendarWidget__HorizontalHeaderFormat {
@@ -185,7 +185,7 @@ func (this *QCalendarWidget) HorizontalHeaderFormat() QCalendarWidget__Horizonta
 }
 
 func (this *QCalendarWidget) SetHorizontalHeaderFormat(format QCalendarWidget__HorizontalHeaderFormat) {
-	C.QCalendarWidget_SetHorizontalHeaderFormat(this.h, (C.uintptr_t)(format))
+	C.QCalendarWidget_SetHorizontalHeaderFormat(this.h, (C.int)(format))
 }
 
 func (this *QCalendarWidget) VerticalHeaderFormat() QCalendarWidget__VerticalHeaderFormat {
@@ -193,7 +193,7 @@ func (this *QCalendarWidget) VerticalHeaderFormat() QCalendarWidget__VerticalHea
 }
 
 func (this *QCalendarWidget) SetVerticalHeaderFormat(format QCalendarWidget__VerticalHeaderFormat) {
-	C.QCalendarWidget_SetVerticalHeaderFormat(this.h, (C.uintptr_t)(format))
+	C.QCalendarWidget_SetVerticalHeaderFormat(this.h, (C.int)(format))
 }
 
 func (this *QCalendarWidget) HeaderTextFormat() *QTextCharFormat {
@@ -208,14 +208,14 @@ func (this *QCalendarWidget) SetHeaderTextFormat(format *QTextCharFormat) {
 }
 
 func (this *QCalendarWidget) WeekdayTextFormat(dayOfWeek DayOfWeek) *QTextCharFormat {
-	_ret := C.QCalendarWidget_WeekdayTextFormat(this.h, (C.uintptr_t)(dayOfWeek))
+	_ret := C.QCalendarWidget_WeekdayTextFormat(this.h, (C.int)(dayOfWeek))
 	_goptr := newQTextCharFormat(_ret)
 	_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	return _goptr
 }
 
 func (this *QCalendarWidget) SetWeekdayTextFormat(dayOfWeek DayOfWeek, format *QTextCharFormat) {
-	C.QCalendarWidget_SetWeekdayTextFormat(this.h, (C.uintptr_t)(dayOfWeek), format.cPointer())
+	C.QCalendarWidget_SetWeekdayTextFormat(this.h, (C.int)(dayOfWeek), format.cPointer())
 }
 
 func (this *QCalendarWidget) DateTextFormatWithDate(date *QDate) *QTextCharFormat {

qt/gen_qcalendarwidget.h

@@ -45,22 +45,22 @@ QDate* QCalendarWidget_MinimumDate(const QCalendarWidget* self);
 void QCalendarWidget_SetMinimumDate(QCalendarWidget* self, QDate* date);
 QDate* QCalendarWidget_MaximumDate(const QCalendarWidget* self);
 void QCalendarWidget_SetMaximumDate(QCalendarWidget* self, QDate* date);
-uintptr_t QCalendarWidget_FirstDayOfWeek(const QCalendarWidget* self);
-void QCalendarWidget_SetFirstDayOfWeek(QCalendarWidget* self, uintptr_t dayOfWeek);
+int QCalendarWidget_FirstDayOfWeek(const QCalendarWidget* self);
+void QCalendarWidget_SetFirstDayOfWeek(QCalendarWidget* self, int dayOfWeek);
 bool QCalendarWidget_IsNavigationBarVisible(const QCalendarWidget* self);
 bool QCalendarWidget_IsGridVisible(const QCalendarWidget* self);
 QCalendar* QCalendarWidget_Calendar(const QCalendarWidget* self);
 void QCalendarWidget_SetCalendar(QCalendarWidget* self, QCalendar* calendar);
-uintptr_t QCalendarWidget_SelectionMode(const QCalendarWidget* self);
-void QCalendarWidget_SetSelectionMode(QCalendarWidget* self, uintptr_t mode);
-uintptr_t QCalendarWidget_HorizontalHeaderFormat(const QCalendarWidget* self);
-void QCalendarWidget_SetHorizontalHeaderFormat(QCalendarWidget* self, uintptr_t format);
-uintptr_t QCalendarWidget_VerticalHeaderFormat(const QCalendarWidget* self);
-void QCalendarWidget_SetVerticalHeaderFormat(QCalendarWidget* self, uintptr_t format);
+int QCalendarWidget_SelectionMode(const QCalendarWidget* self);
+void QCalendarWidget_SetSelectionMode(QCalendarWidget* self, int mode);
+int QCalendarWidget_HorizontalHeaderFormat(const QCalendarWidget* self);
+void QCalendarWidget_SetHorizontalHeaderFormat(QCalendarWidget* self, int format);
+int QCalendarWidget_VerticalHeaderFormat(const QCalendarWidget* self);
+void QCalendarWidget_SetVerticalHeaderFormat(QCalendarWidget* self, int format);
 QTextCharFormat* QCalendarWidget_HeaderTextFormat(const QCalendarWidget* self);
 void QCalendarWidget_SetHeaderTextFormat(QCalendarWidget* self, QTextCharFormat* format);
-QTextCharFormat* QCalendarWidget_WeekdayTextFormat(const QCalendarWidget* self, uintptr_t dayOfWeek);
-void QCalendarWidget_SetWeekdayTextFormat(QCalendarWidget* self, uintptr_t dayOfWeek, QTextCharFormat* format);
+QTextCharFormat* QCalendarWidget_WeekdayTextFormat(const QCalendarWidget* self, int dayOfWeek);
+void QCalendarWidget_SetWeekdayTextFormat(QCalendarWidget* self, int dayOfWeek, QTextCharFormat* format);
 QTextCharFormat* QCalendarWidget_DateTextFormatWithDate(const QCalendarWidget* self, QDate* date);
 void QCalendarWidget_SetDateTextFormat(QCalendarWidget* self, QDate* date, QTextCharFormat* format);
 bool QCalendarWidget_IsDateEditEnabled(const QCalendarWidget* self);

qt/gen_qcborarray.cpp

@@ -251,6 +251,10 @@ QCborArray__Iterator* QCborArray__Iterator_new2(QCborArray__Iterator* param1) {
 	return new QCborArray::Iterator(*param1);
 }
 
+void QCborArray__Iterator_OperatorAssign(QCborArray__Iterator* self, QCborArray__Iterator* other) {
+	self->operator=(*other);
+}
+
 QCborValueRef* QCborArray__Iterator_OperatorMultiply(const QCborArray__Iterator* self) {
 	return new QCborValueRef(self->operator*());
 }
@@ -311,14 +315,38 @@ bool QCborArray__Iterator_OperatorGreaterOrEqualWithOther(const QCborArray__Iter
 	return self->operator>=(*other);
 }
 
-QCborArray__Iterator* QCborArray__Iterator_OperatorPlusPlus(QCborArray__Iterator* self, int param1) {
+QCborArray__Iterator* QCborArray__Iterator_OperatorPlusPlus(QCborArray__Iterator* self) {
+	QCborArray::Iterator& _ret = self->operator++();
+	// Cast returned reference into pointer
+	return &_ret;
+}
+
+QCborArray__Iterator* QCborArray__Iterator_OperatorPlusPlusWithInt(QCborArray__Iterator* self, int param1) {
 	return new QCborArray::Iterator(self->operator++(static_cast<int>(param1)));
 }
 
-QCborArray__Iterator* QCborArray__Iterator_OperatorMinusMinus(QCborArray__Iterator* self, int param1) {
+QCborArray__Iterator* QCborArray__Iterator_OperatorMinusMinus(QCborArray__Iterator* self) {
+	QCborArray::Iterator& _ret = self->operator--();
+	// Cast returned reference into pointer
+	return &_ret;
+}
+
+QCborArray__Iterator* QCborArray__Iterator_OperatorMinusMinusWithInt(QCborArray__Iterator* self, int param1) {
 	return new QCborArray::Iterator(self->operator--(static_cast<int>(param1)));
 }
 
+QCborArray__Iterator* QCborArray__Iterator_OperatorPlusAssign(QCborArray__Iterator* self, size_t j) {
+	QCborArray::Iterator& _ret = self->operator+=(static_cast<qsizetype>(j));
+	// Cast returned reference into pointer
+	return &_ret;
+}
+
+QCborArray__Iterator* QCborArray__Iterator_OperatorMinusAssign(QCborArray__Iterator* self, size_t j) {
+	QCborArray::Iterator& _ret = self->operator-=(static_cast<qsizetype>(j));
+	// Cast returned reference into pointer
+	return &_ret;
+}
+
 QCborArray__Iterator* QCborArray__Iterator_OperatorPlus(const QCborArray__Iterator* self, size_t j) {
 	return new QCborArray::Iterator(self->operator+(static_cast<qsizetype>(j)));
 }
@@ -343,6 +371,10 @@ QCborArray__ConstIterator* QCborArray__ConstIterator_new2(QCborArray__ConstItera
 	return new QCborArray::ConstIterator(*param1);
 }
 
+void QCborArray__ConstIterator_OperatorAssign(QCborArray__ConstIterator* self, QCborArray__ConstIterator* other) {
+	self->operator=(*other);
+}
+
 QCborValueRef* QCborArray__ConstIterator_OperatorMultiply(const QCborArray__ConstIterator* self) {
 	return new QCborValueRef(self->operator*());
 }
@@ -403,14 +435,38 @@ bool QCborArray__ConstIterator_OperatorGreaterOrEqualWithOther(const QCborArray_
 	return self->operator>=(*other);
 }
 
-QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorPlusPlus(QCborArray__ConstIterator* self, int param1) {
+QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorPlusPlus(QCborArray__ConstIterator* self) {
+	QCborArray::ConstIterator& _ret = self->operator++();
+	// Cast returned reference into pointer
+	return &_ret;
+}
+
+QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorPlusPlusWithInt(QCborArray__ConstIterator* self, int param1) {
 	return new QCborArray::ConstIterator(self->operator++(static_cast<int>(param1)));
 }
 
-QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorMinusMinus(QCborArray__ConstIterator* self, int param1) {
+QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorMinusMinus(QCborArray__ConstIterator* self) {
+	QCborArray::ConstIterator& _ret = self->operator--();
+	// Cast returned reference into pointer
+	return &_ret;
+}
+
+QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorMinusMinusWithInt(QCborArray__ConstIterator* self, int param1) {
 	return new QCborArray::ConstIterator(self->operator--(static_cast<int>(param1)));
 }
 
+QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorPlusAssign(QCborArray__ConstIterator* self, size_t j) {
+	QCborArray::ConstIterator& _ret = self->operator+=(static_cast<qsizetype>(j));
+	// Cast returned reference into pointer
+	return &_ret;
+}
+
+QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorMinusAssign(QCborArray__ConstIterator* self, size_t j) {
+	QCborArray::ConstIterator& _ret = self->operator-=(static_cast<qsizetype>(j));
+	// Cast returned reference into pointer
+	return &_ret;
+}
+
 QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorPlus(const QCborArray__ConstIterator* self, size_t j) {
 	return new QCborArray::ConstIterator(self->operator+(static_cast<qsizetype>(j)));
 }

qt/gen_qcborarray.go

@@ -400,6 +400,10 @@ func NewQCborArray__Iterator2(param1 *QCborArray__Iterator) *QCborArray__Iterato
 	return newQCborArray__Iterator(ret)
 }
 
+func (this *QCborArray__Iterator) OperatorAssign(other *QCborArray__Iterator) {
+	C.QCborArray__Iterator_OperatorAssign(this.h, other.cPointer())
+}
+
 func (this *QCborArray__Iterator) OperatorMultiply() *QCborValueRef {
 	_ret := C.QCborArray__Iterator_OperatorMultiply(this.h)
 	_goptr := newQCborValueRef(_ret)
@@ -466,20 +470,36 @@ func (this *QCborArray__Iterator) OperatorGreaterOrEqualWithOther(other *QCborAr
 	return (bool)(C.QCborArray__Iterator_OperatorGreaterOrEqualWithOther(this.h, other.cPointer()))
 }
 
-func (this *QCborArray__Iterator) OperatorPlusPlus(param1 int) *QCborArray__Iterator {
-	_ret := C.QCborArray__Iterator_OperatorPlusPlus(this.h, (C.int)(param1))
+func (this *QCborArray__Iterator) OperatorPlusPlus() *QCborArray__Iterator {
+	return newQCborArray__Iterator_U(unsafe.Pointer(C.QCborArray__Iterator_OperatorPlusPlus(this.h)))
+}
+
+func (this *QCborArray__Iterator) OperatorPlusPlusWithInt(param1 int) *QCborArray__Iterator {
+	_ret := C.QCborArray__Iterator_OperatorPlusPlusWithInt(this.h, (C.int)(param1))
 	_goptr := newQCborArray__Iterator(_ret)
 	_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	return _goptr
 }
 
-func (this *QCborArray__Iterator) OperatorMinusMinus(param1 int) *QCborArray__Iterator {
-	_ret := C.QCborArray__Iterator_OperatorMinusMinus(this.h, (C.int)(param1))
+func (this *QCborArray__Iterator) OperatorMinusMinus() *QCborArray__Iterator {
+	return newQCborArray__Iterator_U(unsafe.Pointer(C.QCborArray__Iterator_OperatorMinusMinus(this.h)))
+}
+
+func (this *QCborArray__Iterator) OperatorMinusMinusWithInt(param1 int) *QCborArray__Iterator {
+	_ret := C.QCborArray__Iterator_OperatorMinusMinusWithInt(this.h, (C.int)(param1))
 	_goptr := newQCborArray__Iterator(_ret)
 	_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	return _goptr
 }
 
+func (this *QCborArray__Iterator) OperatorPlusAssign(j uint64) *QCborArray__Iterator {
+	return newQCborArray__Iterator_U(unsafe.Pointer(C.QCborArray__Iterator_OperatorPlusAssign(this.h, (C.size_t)(j))))
+}
+
+func (this *QCborArray__Iterator) OperatorMinusAssign(j uint64) *QCborArray__Iterator {
+	return newQCborArray__Iterator_U(unsafe.Pointer(C.QCborArray__Iterator_OperatorMinusAssign(this.h, (C.size_t)(j))))
+}
+
 func (this *QCborArray__Iterator) OperatorPlus(j uint64) *QCborArray__Iterator {
 	_ret := C.QCborArray__Iterator_OperatorPlus(this.h, (C.size_t)(j))
 	_goptr := newQCborArray__Iterator(_ret)
@@ -546,6 +566,10 @@ func NewQCborArray__ConstIterator2(param1 *QCborArray__ConstIterator) *QCborArra
 	return newQCborArray__ConstIterator(ret)
 }
 
+func (this *QCborArray__ConstIterator) OperatorAssign(other *QCborArray__ConstIterator) {
+	C.QCborArray__ConstIterator_OperatorAssign(this.h, other.cPointer())
+}
+
 func (this *QCborArray__ConstIterator) OperatorMultiply() *QCborValueRef {
 	_ret := C.QCborArray__ConstIterator_OperatorMultiply(this.h)
 	_goptr := newQCborValueRef(_ret)
@@ -612,20 +636,36 @@ func (this *QCborArray__ConstIterator) OperatorGreaterOrEqualWithOther(other *QC
 	return (bool)(C.QCborArray__ConstIterator_OperatorGreaterOrEqualWithOther(this.h, other.cPointer()))
 }
 
-func (this *QCborArray__ConstIterator) OperatorPlusPlus(param1 int) *QCborArray__ConstIterator {
-	_ret := C.QCborArray__ConstIterator_OperatorPlusPlus(this.h, (C.int)(param1))
+func (this *QCborArray__ConstIterator) OperatorPlusPlus() *QCborArray__ConstIterator {
+	return newQCborArray__ConstIterator_U(unsafe.Pointer(C.QCborArray__ConstIterator_OperatorPlusPlus(this.h)))
+}
+
+func (this *QCborArray__ConstIterator) OperatorPlusPlusWithInt(param1 int) *QCborArray__ConstIterator {
+	_ret := C.QCborArray__ConstIterator_OperatorPlusPlusWithInt(this.h, (C.int)(param1))
 	_goptr := newQCborArray__ConstIterator(_ret)
 	_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	return _goptr
 }
 
-func (this *QCborArray__ConstIterator) OperatorMinusMinus(param1 int) *QCborArray__ConstIterator {
-	_ret := C.QCborArray__ConstIterator_OperatorMinusMinus(this.h, (C.int)(param1))
+func (this *QCborArray__ConstIterator) OperatorMinusMinus() *QCborArray__ConstIterator {
+	return newQCborArray__ConstIterator_U(unsafe.Pointer(C.QCborArray__ConstIterator_OperatorMinusMinus(this.h)))
+}
+
+func (this *QCborArray__ConstIterator) OperatorMinusMinusWithInt(param1 int) *QCborArray__ConstIterator {
+	_ret := C.QCborArray__ConstIterator_OperatorMinusMinusWithInt(this.h, (C.int)(param1))
 	_goptr := newQCborArray__ConstIterator(_ret)
 	_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	return _goptr
 }
 
+func (this *QCborArray__ConstIterator) OperatorPlusAssign(j uint64) *QCborArray__ConstIterator {
+	return newQCborArray__ConstIterator_U(unsafe.Pointer(C.QCborArray__ConstIterator_OperatorPlusAssign(this.h, (C.size_t)(j))))
+}
+
+func (this *QCborArray__ConstIterator) OperatorMinusAssign(j uint64) *QCborArray__ConstIterator {
+	return newQCborArray__ConstIterator_U(unsafe.Pointer(C.QCborArray__ConstIterator_OperatorMinusAssign(this.h, (C.size_t)(j))))
+}
+
 func (this *QCborArray__ConstIterator) OperatorPlus(j uint64) *QCborArray__ConstIterator {
 	_ret := C.QCborArray__ConstIterator_OperatorPlus(this.h, (C.size_t)(j))
 	_goptr := newQCborArray__ConstIterator(_ret)

qt/gen_qcborarray.h

@@ -95,6 +95,7 @@ void QCborArray_Delete(QCborArray* self);
 
 QCborArray__Iterator* QCborArray__Iterator_new();
 QCborArray__Iterator* QCborArray__Iterator_new2(QCborArray__Iterator* param1);
+void QCborArray__Iterator_OperatorAssign(QCborArray__Iterator* self, QCborArray__Iterator* other);
 QCborValueRef* QCborArray__Iterator_OperatorMultiply(const QCborArray__Iterator* self);
 QCborValueRef* QCborArray__Iterator_OperatorMinusGreater(const QCborArray__Iterator* self);
 QCborValueRef* QCborArray__Iterator_OperatorSubscript(QCborArray__Iterator* self, size_t j);
@@ -110,8 +111,12 @@ bool QCborArray__Iterator_OperatorLesserWithOther(const QCborArray__Iterator* se
 bool QCborArray__Iterator_OperatorLesserOrEqualWithOther(const QCborArray__Iterator* self, QCborArray__ConstIterator* other);
 bool QCborArray__Iterator_OperatorGreaterWithOther(const QCborArray__Iterator* self, QCborArray__ConstIterator* other);
 bool QCborArray__Iterator_OperatorGreaterOrEqualWithOther(const QCborArray__Iterator* self, QCborArray__ConstIterator* other);
-QCborArray__Iterator* QCborArray__Iterator_OperatorPlusPlus(QCborArray__Iterator* self, int param1);
-QCborArray__Iterator* QCborArray__Iterator_OperatorMinusMinus(QCborArray__Iterator* self, int param1);
+QCborArray__Iterator* QCborArray__Iterator_OperatorPlusPlus(QCborArray__Iterator* self);
+QCborArray__Iterator* QCborArray__Iterator_OperatorPlusPlusWithInt(QCborArray__Iterator* self, int param1);
+QCborArray__Iterator* QCborArray__Iterator_OperatorMinusMinus(QCborArray__Iterator* self);
+QCborArray__Iterator* QCborArray__Iterator_OperatorMinusMinusWithInt(QCborArray__Iterator* self, int param1);
+QCborArray__Iterator* QCborArray__Iterator_OperatorPlusAssign(QCborArray__Iterator* self, size_t j);
+QCborArray__Iterator* QCborArray__Iterator_OperatorMinusAssign(QCborArray__Iterator* self, size_t j);
 QCborArray__Iterator* QCborArray__Iterator_OperatorPlus(const QCborArray__Iterator* self, size_t j);
 QCborArray__Iterator* QCborArray__Iterator_OperatorMinus(const QCborArray__Iterator* self, size_t j);
 size_t QCborArray__Iterator_OperatorMinusWithQCborArrayIterator(const QCborArray__Iterator* self, QCborArray__Iterator* j);
@@ -119,6 +124,7 @@ void QCborArray__Iterator_Delete(QCborArray__Iterator* self);
 
 QCborArray__ConstIterator* QCborArray__ConstIterator_new();
 QCborArray__ConstIterator* QCborArray__ConstIterator_new2(QCborArray__ConstIterator* param1);
+void QCborArray__ConstIterator_OperatorAssign(QCborArray__ConstIterator* self, QCborArray__ConstIterator* other);
 QCborValueRef* QCborArray__ConstIterator_OperatorMultiply(const QCborArray__ConstIterator* self);
 QCborValueRef* QCborArray__ConstIterator_OperatorMinusGreater(const QCborArray__ConstIterator* self);
 QCborValueRef* QCborArray__ConstIterator_OperatorSubscript(QCborArray__ConstIterator* self, size_t j);
@@ -134,8 +140,12 @@ bool QCborArray__ConstIterator_OperatorLesserWithOther(const QCborArray__ConstIt
 bool QCborArray__ConstIterator_OperatorLesserOrEqualWithOther(const QCborArray__ConstIterator* self, QCborArray__ConstIterator* other);
 bool QCborArray__ConstIterator_OperatorGreaterWithOther(const QCborArray__ConstIterator* self, QCborArray__ConstIterator* other);
 bool QCborArray__ConstIterator_OperatorGreaterOrEqualWithOther(const QCborArray__ConstIterator* self, QCborArray__ConstIterator* other);
-QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorPlusPlus(QCborArray__ConstIterator* self, int param1);
-QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorMinusMinus(QCborArray__ConstIterator* self, int param1);
+QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorPlusPlus(QCborArray__ConstIterator* self);
+QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorPlusPlusWithInt(QCborArray__ConstIterator* self, int param1);
+QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorMinusMinus(QCborArray__ConstIterator* self);
+QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorMinusMinusWithInt(QCborArray__ConstIterator* self, int param1);
+QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorPlusAssign(QCborArray__ConstIterator* self, size_t j);
+QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorMinusAssign(QCborArray__ConstIterator* self, size_t j);
 QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorPlus(const QCborArray__ConstIterator* self, size_t j);
 QCborArray__ConstIterator* QCborArray__ConstIterator_OperatorMinus(const QCborArray__ConstIterator* self, size_t j);
 size_t QCborArray__ConstIterator_OperatorMinusWithQCborArrayConstIterator(const QCborArray__ConstIterator* self, QCborArray__ConstIterator* j);

qt/gen_qcbormap.cpp

@@ -275,6 +275,10 @@ QCborMap__Iterator* QCborMap__Iterator_new2(QCborMap__Iterator* param1) {
 	return new QCborMap::Iterator(*param1);
 }
 
+void QCborMap__Iterator_OperatorAssign(QCborMap__Iterator* self, QCborMap__Iterator* other) {
+	self->operator=(*other);
+}
+
 QCborValueRef* QCborMap__Iterator_OperatorMinusGreater(const QCborMap__Iterator* self) {
 	return self->operator->();
 }
@@ -335,14 +339,38 @@ bool QCborMap__Iterator_OperatorGreaterOrEqualWithOther(const QCborMap__Iterator
 	return self->operator>=(*other);
 }
 
-QCborMap__Iterator* QCborMap__Iterator_OperatorPlusPlus(QCborMap__Iterator* self, int param1) {
+QCborMap__Iterator* QCborMap__Iterator_OperatorPlusPlus(QCborMap__Iterator* self) {
+	QCborMap::Iterator& _ret = self->operator++();
+	// Cast returned reference into pointer
+	return &_ret;
+}
+
+QCborMap__Iterator* QCborMap__Iterator_OperatorPlusPlusWithInt(QCborMap__Iterator* self, int param1) {
 	return new QCborMap::Iterator(self->operator++(static_cast<int>(param1)));
 }
 
-QCborMap__Iterator* QCborMap__Iterator_OperatorMinusMinus(QCborMap__Iterator* self, int param1) {
+QCborMap__Iterator* QCborMap__Iterator_OperatorMinusMinus(QCborMap__Iterator* self) {
+	QCborMap::Iterator& _ret = self->operator--();
+	// Cast returned reference into pointer
+	return &_ret;
+}
+
+QCborMap__Iterator* QCborMap__Iterator_OperatorMinusMinusWithInt(QCborMap__Iterator* self, int param1) {
 	return new QCborMap::Iterator(self->operator--(static_cast<int>(param1)));
 }
 
+QCborMap__Iterator* QCborMap__Iterator_OperatorPlusAssign(QCborMap__Iterator* self, size_t j) {
+	QCborMap::Iterator& _ret = self->operator+=(static_cast<qsizetype>(j));
+	// Cast returned reference into pointer
+	return &_ret;
+}
+
+QCborMap__Iterator* QCborMap__Iterator_OperatorMinusAssign(QCborMap__Iterator* self, size_t j) {
+	QCborMap::Iterator& _ret = self->operator-=(static_cast<qsizetype>(j));
+	// Cast returned reference into pointer
+	return &_ret;
+}
+
 QCborMap__Iterator* QCborMap__Iterator_OperatorPlus(const QCborMap__Iterator* self, size_t j) {
 	return new QCborMap::Iterator(self->operator+(static_cast<qsizetype>(j)));
 }
@@ -367,6 +395,10 @@ QCborMap__ConstIterator* QCborMap__ConstIterator_new2(QCborMap__ConstIterator* p
 	return new QCborMap::ConstIterator(*param1);
 }
 
+void QCborMap__ConstIterator_OperatorAssign(QCborMap__ConstIterator* self, QCborMap__ConstIterator* other) {
+	self->operator=(*other);
+}
+
 QCborValueRef* QCborMap__ConstIterator_OperatorMinusGreater(const QCborMap__ConstIterator* self) {
 	return (QCborValueRef*) self->operator->();
 }
@@ -427,14 +459,38 @@ bool QCborMap__ConstIterator_OperatorGreaterOrEqualWithOther(const QCborMap__Con
 	return self->operator>=(*other);
 }
 
-QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorPlusPlus(QCborMap__ConstIterator* self, int param1) {
+QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorPlusPlus(QCborMap__ConstIterator* self) {
+	QCborMap::ConstIterator& _ret = self->operator++();
+	// Cast returned reference into pointer
+	return &_ret;
+}
+
+QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorPlusPlusWithInt(QCborMap__ConstIterator* self, int param1) {
 	return new QCborMap::ConstIterator(self->operator++(static_cast<int>(param1)));
 }
 
-QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorMinusMinus(QCborMap__ConstIterator* self, int param1) {
+QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorMinusMinus(QCborMap__ConstIterator* self) {
+	QCborMap::ConstIterator& _ret = self->operator--();
+	// Cast returned reference into pointer
+	return &_ret;
+}
+
+QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorMinusMinusWithInt(QCborMap__ConstIterator* self, int param1) {
 	return new QCborMap::ConstIterator(self->operator--(static_cast<int>(param1)));
 }
 
+QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorPlusAssign(QCborMap__ConstIterator* self, size_t j) {
+	QCborMap::ConstIterator& _ret = self->operator+=(static_cast<qsizetype>(j));
+	// Cast returned reference into pointer
+	return &_ret;
+}
+
+QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorMinusAssign(QCborMap__ConstIterator* self, size_t j) {
+	QCborMap::ConstIterator& _ret = self->operator-=(static_cast<qsizetype>(j));
+	// Cast returned reference into pointer
+	return &_ret;
+}
+
 QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorPlus(const QCborMap__ConstIterator* self, size_t j) {
 	return new QCborMap::ConstIterator(self->operator+(static_cast<qsizetype>(j)));
 }

qt/gen_qcbormap.go

@@ -466,6 +466,10 @@ func NewQCborMap__Iterator2(param1 *QCborMap__Iterator) *QCborMap__Iterator {
 	return newQCborMap__Iterator(ret)
 }
 
+func (this *QCborMap__Iterator) OperatorAssign(other *QCborMap__Iterator) {
+	C.QCborMap__Iterator_OperatorAssign(this.h, other.cPointer())
+}
+
 func (this *QCborMap__Iterator) OperatorMinusGreater() *QCborValueRef {
 	return newQCborValueRef_U(unsafe.Pointer(C.QCborMap__Iterator_OperatorMinusGreater(this.h)))
 }
@@ -532,20 +536,36 @@ func (this *QCborMap__Iterator) OperatorGreaterOrEqualWithOther(other *QCborMap_
 	return (bool)(C.QCborMap__Iterator_OperatorGreaterOrEqualWithOther(this.h, other.cPointer()))
 }
 
-func (this *QCborMap__Iterator) OperatorPlusPlus(param1 int) *QCborMap__Iterator {
-	_ret := C.QCborMap__Iterator_OperatorPlusPlus(this.h, (C.int)(param1))
+func (this *QCborMap__Iterator) OperatorPlusPlus() *QCborMap__Iterator {
+	return newQCborMap__Iterator_U(unsafe.Pointer(C.QCborMap__Iterator_OperatorPlusPlus(this.h)))
+}
+
+func (this *QCborMap__Iterator) OperatorPlusPlusWithInt(param1 int) *QCborMap__Iterator {
+	_ret := C.QCborMap__Iterator_OperatorPlusPlusWithInt(this.h, (C.int)(param1))
 	_goptr := newQCborMap__Iterator(_ret)
 	_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	return _goptr
 }
 
-func (this *QCborMap__Iterator) OperatorMinusMinus(param1 int) *QCborMap__Iterator {
-	_ret := C.QCborMap__Iterator_OperatorMinusMinus(this.h, (C.int)(param1))
+func (this *QCborMap__Iterator) OperatorMinusMinus() *QCborMap__Iterator {
+	return newQCborMap__Iterator_U(unsafe.Pointer(C.QCborMap__Iterator_OperatorMinusMinus(this.h)))
+}
+
+func (this *QCborMap__Iterator) OperatorMinusMinusWithInt(param1 int) *QCborMap__Iterator {
+	_ret := C.QCborMap__Iterator_OperatorMinusMinusWithInt(this.h, (C.int)(param1))
 	_goptr := newQCborMap__Iterator(_ret)
 	_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	return _goptr
 }
 
+func (this *QCborMap__Iterator) OperatorPlusAssign(j uint64) *QCborMap__Iterator {
+	return newQCborMap__Iterator_U(unsafe.Pointer(C.QCborMap__Iterator_OperatorPlusAssign(this.h, (C.size_t)(j))))
+}
+
+func (this *QCborMap__Iterator) OperatorMinusAssign(j uint64) *QCborMap__Iterator {
+	return newQCborMap__Iterator_U(unsafe.Pointer(C.QCborMap__Iterator_OperatorMinusAssign(this.h, (C.size_t)(j))))
+}
+
 func (this *QCborMap__Iterator) OperatorPlus(j uint64) *QCborMap__Iterator {
 	_ret := C.QCborMap__Iterator_OperatorPlus(this.h, (C.size_t)(j))
 	_goptr := newQCborMap__Iterator(_ret)
@@ -612,6 +632,10 @@ func NewQCborMap__ConstIterator2(param1 *QCborMap__ConstIterator) *QCborMap__Con
 	return newQCborMap__ConstIterator(ret)
 }
 
+func (this *QCborMap__ConstIterator) OperatorAssign(other *QCborMap__ConstIterator) {
+	C.QCborMap__ConstIterator_OperatorAssign(this.h, other.cPointer())
+}
+
 func (this *QCborMap__ConstIterator) OperatorMinusGreater() *QCborValueRef {
 	return newQCborValueRef_U(unsafe.Pointer(C.QCborMap__ConstIterator_OperatorMinusGreater(this.h)))
 }
@@ -678,20 +702,36 @@ func (this *QCborMap__ConstIterator) OperatorGreaterOrEqualWithOther(other *QCbo
 	return (bool)(C.QCborMap__ConstIterator_OperatorGreaterOrEqualWithOther(this.h, other.cPointer()))
 }
 
-func (this *QCborMap__ConstIterator) OperatorPlusPlus(param1 int) *QCborMap__ConstIterator {
-	_ret := C.QCborMap__ConstIterator_OperatorPlusPlus(this.h, (C.int)(param1))
+func (this *QCborMap__ConstIterator) OperatorPlusPlus() *QCborMap__ConstIterator {
+	return newQCborMap__ConstIterator_U(unsafe.Pointer(C.QCborMap__ConstIterator_OperatorPlusPlus(this.h)))
+}
+
+func (this *QCborMap__ConstIterator) OperatorPlusPlusWithInt(param1 int) *QCborMap__ConstIterator {
+	_ret := C.QCborMap__ConstIterator_OperatorPlusPlusWithInt(this.h, (C.int)(param1))
 	_goptr := newQCborMap__ConstIterator(_ret)
 	_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	return _goptr
 }
 
-func (this *QCborMap__ConstIterator) OperatorMinusMinus(param1 int) *QCborMap__ConstIterator {
-	_ret := C.QCborMap__ConstIterator_OperatorMinusMinus(this.h, (C.int)(param1))
+func (this *QCborMap__ConstIterator) OperatorMinusMinus() *QCborMap__ConstIterator {
+	return newQCborMap__ConstIterator_U(unsafe.Pointer(C.QCborMap__ConstIterator_OperatorMinusMinus(this.h)))
+}
+
+func (this *QCborMap__ConstIterator) OperatorMinusMinusWithInt(param1 int) *QCborMap__ConstIterator {
+	_ret := C.QCborMap__ConstIterator_OperatorMinusMinusWithInt(this.h, (C.int)(param1))
 	_goptr := newQCborMap__ConstIterator(_ret)
 	_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	return _goptr
 }
 
+func (this *QCborMap__ConstIterator) OperatorPlusAssign(j uint64) *QCborMap__ConstIterator {
+	return newQCborMap__ConstIterator_U(unsafe.Pointer(C.QCborMap__ConstIterator_OperatorPlusAssign(this.h, (C.size_t)(j))))
+}
+
+func (this *QCborMap__ConstIterator) OperatorMinusAssign(j uint64) *QCborMap__ConstIterator {
+	return newQCborMap__ConstIterator_U(unsafe.Pointer(C.QCborMap__ConstIterator_OperatorMinusAssign(this.h, (C.size_t)(j))))
+}
+
 func (this *QCborMap__ConstIterator) OperatorPlus(j uint64) *QCborMap__ConstIterator {
 	_ret := C.QCborMap__ConstIterator_OperatorPlus(this.h, (C.size_t)(j))
 	_goptr := newQCborMap__ConstIterator(_ret)

qt/gen_qcbormap.h

@@ -99,6 +99,7 @@ void QCborMap_Delete(QCborMap* self);
 
 QCborMap__Iterator* QCborMap__Iterator_new();
 QCborMap__Iterator* QCborMap__Iterator_new2(QCborMap__Iterator* param1);
+void QCborMap__Iterator_OperatorAssign(QCborMap__Iterator* self, QCborMap__Iterator* other);
 QCborValueRef* QCborMap__Iterator_OperatorMinusGreater(const QCborMap__Iterator* self);
 QCborValue* QCborMap__Iterator_Key(const QCborMap__Iterator* self);
 QCborValueRef* QCborMap__Iterator_Value(const QCborMap__Iterator* self);
@@ -114,8 +115,12 @@ bool QCborMap__Iterator_OperatorLesserWithOther(const QCborMap__Iterator* self,
 bool QCborMap__Iterator_OperatorLesserOrEqualWithOther(const QCborMap__Iterator* self, QCborMap__ConstIterator* other);
 bool QCborMap__Iterator_OperatorGreaterWithOther(const QCborMap__Iterator* self, QCborMap__ConstIterator* other);
 bool QCborMap__Iterator_OperatorGreaterOrEqualWithOther(const QCborMap__Iterator* self, QCborMap__ConstIterator* other);
-QCborMap__Iterator* QCborMap__Iterator_OperatorPlusPlus(QCborMap__Iterator* self, int param1);
-QCborMap__Iterator* QCborMap__Iterator_OperatorMinusMinus(QCborMap__Iterator* self, int param1);
+QCborMap__Iterator* QCborMap__Iterator_OperatorPlusPlus(QCborMap__Iterator* self);
+QCborMap__Iterator* QCborMap__Iterator_OperatorPlusPlusWithInt(QCborMap__Iterator* self, int param1);
+QCborMap__Iterator* QCborMap__Iterator_OperatorMinusMinus(QCborMap__Iterator* self);
+QCborMap__Iterator* QCborMap__Iterator_OperatorMinusMinusWithInt(QCborMap__Iterator* self, int param1);
+QCborMap__Iterator* QCborMap__Iterator_OperatorPlusAssign(QCborMap__Iterator* self, size_t j);
+QCborMap__Iterator* QCborMap__Iterator_OperatorMinusAssign(QCborMap__Iterator* self, size_t j);
 QCborMap__Iterator* QCborMap__Iterator_OperatorPlus(const QCborMap__Iterator* self, size_t j);
 QCborMap__Iterator* QCborMap__Iterator_OperatorMinus(const QCborMap__Iterator* self, size_t j);
 size_t QCborMap__Iterator_OperatorMinusWithQCborMapIterator(const QCborMap__Iterator* self, QCborMap__Iterator* j);
@@ -123,6 +128,7 @@ void QCborMap__Iterator_Delete(QCborMap__Iterator* self);
 
 QCborMap__ConstIterator* QCborMap__ConstIterator_new();
 QCborMap__ConstIterator* QCborMap__ConstIterator_new2(QCborMap__ConstIterator* param1);
+void QCborMap__ConstIterator_OperatorAssign(QCborMap__ConstIterator* self, QCborMap__ConstIterator* other);
 QCborValueRef* QCborMap__ConstIterator_OperatorMinusGreater(const QCborMap__ConstIterator* self);
 QCborValue* QCborMap__ConstIterator_Key(const QCborMap__ConstIterator* self);
 QCborValueRef* QCborMap__ConstIterator_Value(const QCborMap__ConstIterator* self);
@@ -138,8 +144,12 @@ bool QCborMap__ConstIterator_OperatorLesserWithOther(const QCborMap__ConstIterat
 bool QCborMap__ConstIterator_OperatorLesserOrEqualWithOther(const QCborMap__ConstIterator* self, QCborMap__ConstIterator* other);
 bool QCborMap__ConstIterator_OperatorGreaterWithOther(const QCborMap__ConstIterator* self, QCborMap__ConstIterator* other);
 bool QCborMap__ConstIterator_OperatorGreaterOrEqualWithOther(const QCborMap__ConstIterator* self, QCborMap__ConstIterator* other);
-QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorPlusPlus(QCborMap__ConstIterator* self, int param1);
-QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorMinusMinus(QCborMap__ConstIterator* self, int param1);
+QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorPlusPlus(QCborMap__ConstIterator* self);
+QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorPlusPlusWithInt(QCborMap__ConstIterator* self, int param1);
+QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorMinusMinus(QCborMap__ConstIterator* self);
+QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorMinusMinusWithInt(QCborMap__ConstIterator* self, int param1);
+QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorPlusAssign(QCborMap__ConstIterator* self, size_t j);
+QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorMinusAssign(QCborMap__ConstIterator* self, size_t j);
 QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorPlus(const QCborMap__ConstIterator* self, size_t j);
 QCborMap__ConstIterator* QCborMap__ConstIterator_OperatorMinus(const QCborMap__ConstIterator* self, size_t j);
 size_t QCborMap__ConstIterator_OperatorMinusWithQCborMapConstIterator(const QCborMap__ConstIterator* self, QCborMap__ConstIterator* j);

qt/gen_qcborstreamreader.cpp

@@ -63,7 +63,8 @@ QCborError* QCborStreamReader_LastError(QCborStreamReader* self) {
 }
 
 long long QCborStreamReader_CurrentOffset(const QCborStreamReader* self) {
-	return self->currentOffset();
+	qint64 _ret = self->currentOffset();
+	return static_cast<long long>(_ret);
 }
 
 bool QCborStreamReader_IsValid(const QCborStreamReader* self) {
@@ -74,9 +75,9 @@ int QCborStreamReader_ContainerDepth(const QCborStreamReader* self) {
 	return self->containerDepth();
 }
 
-uintptr_t QCborStreamReader_ParentContainerType(const QCborStreamReader* self) {
+uint8_t QCborStreamReader_ParentContainerType(const QCborStreamReader* self) {
 	QCborStreamReader::Type _ret = self->parentContainerType();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<uint8_t>(_ret);
 }
 
 bool QCborStreamReader_HasNext(const QCborStreamReader* self) {
@@ -87,9 +88,9 @@ bool QCborStreamReader_Next(QCborStreamReader* self) {
 	return self->next();
 }
 
-uintptr_t QCborStreamReader_Type(const QCborStreamReader* self) {
+uint8_t QCborStreamReader_Type(const QCborStreamReader* self) {
 	QCborStreamReader::Type _ret = self->type();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<uint8_t>(_ret);
 }
 
 bool QCborStreamReader_IsUnsignedInteger(const QCborStreamReader* self) {
@@ -144,8 +145,8 @@ bool QCborStreamReader_IsInvalid(const QCborStreamReader* self) {
 	return self->isInvalid();
 }
 
-bool QCborStreamReader_IsSimpleTypeWithSt(const QCborStreamReader* self, QCborSimpleType st) {
-	return self->isSimpleType(st);
+bool QCborStreamReader_IsSimpleTypeWithSt(const QCborStreamReader* self, uint8_t st) {
+	return self->isSimpleType(static_cast<QCborSimpleType>(st));
 }
 
 bool QCborStreamReader_IsFalse(const QCborStreamReader* self) {
@@ -173,7 +174,8 @@ bool QCborStreamReader_IsLengthKnown(const QCborStreamReader* self) {
 }
 
 unsigned long long QCborStreamReader_Length(const QCborStreamReader* self) {
-	return self->length();
+	quint64 _ret = self->length();
+	return static_cast<unsigned long long>(_ret);
 }
 
 bool QCborStreamReader_IsContainer(const QCborStreamReader* self) {
@@ -196,20 +198,24 @@ bool QCborStreamReader_ToBool(const QCborStreamReader* self) {
 	return self->toBool();
 }
 
-QCborTag QCborStreamReader_ToTag(const QCborStreamReader* self) {
-	return self->toTag();
+uint64_t QCborStreamReader_ToTag(const QCborStreamReader* self) {
+	QCborTag _ret = self->toTag();
+	return static_cast<uint64_t>(_ret);
 }
 
 unsigned long long QCborStreamReader_ToUnsignedInteger(const QCborStreamReader* self) {
-	return self->toUnsignedInteger();
+	quint64 _ret = self->toUnsignedInteger();
+	return static_cast<unsigned long long>(_ret);
 }
 
-QCborNegativeInteger QCborStreamReader_ToNegativeInteger(const QCborStreamReader* self) {
-	return self->toNegativeInteger();
+uint64_t QCborStreamReader_ToNegativeInteger(const QCborStreamReader* self) {
+	QCborNegativeInteger _ret = self->toNegativeInteger();
+	return static_cast<uint64_t>(_ret);
 }
 
-QCborSimpleType QCborStreamReader_ToSimpleType(const QCborStreamReader* self) {
-	return self->toSimpleType();
+uint8_t QCborStreamReader_ToSimpleType(const QCborStreamReader* self) {
+	QCborSimpleType _ret = self->toSimpleType();
+	return static_cast<uint8_t>(_ret);
 }
 
 float QCborStreamReader_ToFloat(const QCborStreamReader* self) {
@@ -221,7 +227,8 @@ double QCborStreamReader_ToDouble(const QCborStreamReader* self) {
 }
 
 long long QCborStreamReader_ToInteger(const QCborStreamReader* self) {
-	return self->toInteger();
+	qint64 _ret = self->toInteger();
+	return static_cast<long long>(_ret);
 }
 
 bool QCborStreamReader_Next1(QCborStreamReader* self, int maxRecursion) {

qt/gen_qcborstreamreader.go

@@ -217,7 +217,7 @@ func (this *QCborStreamReader) IsInvalid() bool {
 }
 
 func (this *QCborStreamReader) IsSimpleTypeWithSt(st QCborSimpleType) bool {
-	return (bool)(C.QCborStreamReader_IsSimpleTypeWithSt(this.h, st))
+	return (bool)(C.QCborStreamReader_IsSimpleTypeWithSt(this.h, (C.uint8_t)(st)))
 }
 
 func (this *QCborStreamReader) IsFalse() bool {
@@ -269,7 +269,7 @@ func (this *QCborStreamReader) ToBool() bool {
 }
 
 func (this *QCborStreamReader) ToTag() QCborTag {
-	return C.QCborStreamReader_ToTag(this.h)
+	return (QCborTag)(C.QCborStreamReader_ToTag(this.h))
 }
 
 func (this *QCborStreamReader) ToUnsignedInteger() uint64 {
@@ -277,11 +277,11 @@ func (this *QCborStreamReader) ToUnsignedInteger() uint64 {
 }
 
 func (this *QCborStreamReader) ToNegativeInteger() QCborNegativeInteger {
-	return C.QCborStreamReader_ToNegativeInteger(this.h)
+	return (QCborNegativeInteger)(C.QCborStreamReader_ToNegativeInteger(this.h))
 }
 
 func (this *QCborStreamReader) ToSimpleType() QCborSimpleType {
-	return C.QCborStreamReader_ToSimpleType(this.h)
+	return (QCborSimpleType)(C.QCborStreamReader_ToSimpleType(this.h))
 }
 
 func (this *QCborStreamReader) ToFloat() float32 {

qt/gen_qcborstreamreader.h

@@ -42,10 +42,10 @@ QCborError* QCborStreamReader_LastError(QCborStreamReader* self);
 long long QCborStreamReader_CurrentOffset(const QCborStreamReader* self);
 bool QCborStreamReader_IsValid(const QCborStreamReader* self);
 int QCborStreamReader_ContainerDepth(const QCborStreamReader* self);
-uintptr_t QCborStreamReader_ParentContainerType(const QCborStreamReader* self);
+uint8_t QCborStreamReader_ParentContainerType(const QCborStreamReader* self);
 bool QCborStreamReader_HasNext(const QCborStreamReader* self);
 bool QCborStreamReader_Next(QCborStreamReader* self);
-uintptr_t QCborStreamReader_Type(const QCborStreamReader* self);
+uint8_t QCborStreamReader_Type(const QCborStreamReader* self);
 bool QCborStreamReader_IsUnsignedInteger(const QCborStreamReader* self);
 bool QCborStreamReader_IsNegativeInteger(const QCborStreamReader* self);
 bool QCborStreamReader_IsInteger(const QCborStreamReader* self);
@@ -59,7 +59,7 @@ bool QCborStreamReader_IsFloat16(const QCborStreamReader* self);
 bool QCborStreamReader_IsFloat(const QCborStreamReader* self);
 bool QCborStreamReader_IsDouble(const QCborStreamReader* self);
 bool QCborStreamReader_IsInvalid(const QCborStreamReader* self);
-bool QCborStreamReader_IsSimpleTypeWithSt(const QCborStreamReader* self, QCborSimpleType st);
+bool QCborStreamReader_IsSimpleTypeWithSt(const QCborStreamReader* self, uint8_t st);
 bool QCborStreamReader_IsFalse(const QCborStreamReader* self);
 bool QCborStreamReader_IsTrue(const QCborStreamReader* self);
 bool QCborStreamReader_IsBool(const QCborStreamReader* self);
@@ -72,10 +72,10 @@ bool QCborStreamReader_EnterContainer(QCborStreamReader* self);
 bool QCborStreamReader_LeaveContainer(QCborStreamReader* self);
 size_t QCborStreamReader_CurrentStringChunkSize(const QCborStreamReader* self);
 bool QCborStreamReader_ToBool(const QCborStreamReader* self);
-QCborTag QCborStreamReader_ToTag(const QCborStreamReader* self);
+uint64_t QCborStreamReader_ToTag(const QCborStreamReader* self);
 unsigned long long QCborStreamReader_ToUnsignedInteger(const QCborStreamReader* self);
-QCborNegativeInteger QCborStreamReader_ToNegativeInteger(const QCborStreamReader* self);
-QCborSimpleType QCborStreamReader_ToSimpleType(const QCborStreamReader* self);
+uint64_t QCborStreamReader_ToNegativeInteger(const QCborStreamReader* self);
+uint8_t QCborStreamReader_ToSimpleType(const QCborStreamReader* self);
 float QCborStreamReader_ToFloat(const QCborStreamReader* self);
 double QCborStreamReader_ToDouble(const QCborStreamReader* self);
 long long QCborStreamReader_ToInteger(const QCborStreamReader* self);

qt/gen_qcborstreamwriter.cpp

@@ -29,24 +29,24 @@ void QCborStreamWriter_AppendWithQint64(QCborStreamWriter* self, long long i) {
 	self->append(static_cast<qint64>(i));
 }
 
-void QCborStreamWriter_AppendWithQCborNegativeInteger(QCborStreamWriter* self, QCborNegativeInteger n) {
-	self->append(n);
+void QCborStreamWriter_AppendWithQCborNegativeInteger(QCborStreamWriter* self, uint64_t n) {
+	self->append(static_cast<QCborNegativeInteger>(n));
 }
 
 void QCborStreamWriter_AppendWithBa(QCborStreamWriter* self, QByteArray* ba) {
 	self->append(*ba);
 }
 
-void QCborStreamWriter_AppendWithTag(QCborStreamWriter* self, QCborTag tag) {
-	self->append(tag);
+void QCborStreamWriter_AppendWithTag(QCborStreamWriter* self, uint64_t tag) {
+	self->append(static_cast<QCborTag>(tag));
 }
 
-void QCborStreamWriter_Append3(QCborStreamWriter* self, QCborKnownTags tag) {
-	self->append(tag);
+void QCborStreamWriter_Append3(QCborStreamWriter* self, int tag) {
+	self->append(static_cast<QCborKnownTags>(tag));
 }
 
-void QCborStreamWriter_AppendWithSt(QCborStreamWriter* self, QCborSimpleType st) {
-	self->append(st);
+void QCborStreamWriter_AppendWithSt(QCborStreamWriter* self, uint8_t st) {
+	self->append(static_cast<QCborSimpleType>(st));
 }
 
 void QCborStreamWriter_AppendWithFloat(QCborStreamWriter* self, float f) {

qt/gen_qcborstreamwriter.go

@@ -64,7 +64,7 @@ func (this *QCborStreamWriter) AppendWithQint64(i int64) {
 }
 
 func (this *QCborStreamWriter) AppendWithQCborNegativeInteger(n QCborNegativeInteger) {
-	C.QCborStreamWriter_AppendWithQCborNegativeInteger(this.h, n)
+	C.QCborStreamWriter_AppendWithQCborNegativeInteger(this.h, (C.uint64_t)(n))
 }
 
 func (this *QCborStreamWriter) AppendWithBa(ba *QByteArray) {
@@ -72,15 +72,15 @@ func (this *QCborStreamWriter) AppendWithBa(ba *QByteArray) {
 }
 
 func (this *QCborStreamWriter) AppendWithTag(tag QCborTag) {
-	C.QCborStreamWriter_AppendWithTag(this.h, tag)
+	C.QCborStreamWriter_AppendWithTag(this.h, (C.uint64_t)(tag))
 }
 
 func (this *QCborStreamWriter) Append3(tag QCborKnownTags) {
-	C.QCborStreamWriter_Append3(this.h, tag)
+	C.QCborStreamWriter_Append3(this.h, (C.int)(tag))
 }
 
 func (this *QCborStreamWriter) AppendWithSt(st QCborSimpleType) {
-	C.QCborStreamWriter_AppendWithSt(this.h, st)
+	C.QCborStreamWriter_AppendWithSt(this.h, (C.uint8_t)(st))
 }
 
 func (this *QCborStreamWriter) AppendWithFloat(f float32) {

qt/gen_qcborstreamwriter.h

@@ -29,11 +29,11 @@ void QCborStreamWriter_SetDevice(QCborStreamWriter* self, QIODevice* device);
 QIODevice* QCborStreamWriter_Device(const QCborStreamWriter* self);
 void QCborStreamWriter_Append(QCborStreamWriter* self, unsigned long long u);
 void QCborStreamWriter_AppendWithQint64(QCborStreamWriter* self, long long i);
-void QCborStreamWriter_AppendWithQCborNegativeInteger(QCborStreamWriter* self, QCborNegativeInteger n);
+void QCborStreamWriter_AppendWithQCborNegativeInteger(QCborStreamWriter* self, uint64_t n);
 void QCborStreamWriter_AppendWithBa(QCborStreamWriter* self, QByteArray* ba);
-void QCborStreamWriter_AppendWithTag(QCborStreamWriter* self, QCborTag tag);
-void QCborStreamWriter_Append3(QCborStreamWriter* self, QCborKnownTags tag);
-void QCborStreamWriter_AppendWithSt(QCborStreamWriter* self, QCborSimpleType st);
+void QCborStreamWriter_AppendWithTag(QCborStreamWriter* self, uint64_t tag);
+void QCborStreamWriter_Append3(QCborStreamWriter* self, int tag);
+void QCborStreamWriter_AppendWithSt(QCborStreamWriter* self, uint8_t st);
 void QCborStreamWriter_AppendWithFloat(QCborStreamWriter* self, float f);
 void QCborStreamWriter_AppendWithDouble(QCborStreamWriter* self, double d);
 void QCborStreamWriter_AppendByteString(QCborStreamWriter* self, const char* data, size_t lenVal);

qt/gen_qcborvalue.cpp

@@ -34,7 +34,7 @@ QCborValue* QCborValue_new() {
 	return new QCborValue();
 }
 
-QCborValue* QCborValue_new2(uintptr_t t_) {
+QCborValue* QCborValue_new2(int t_) {
 	return new QCborValue(static_cast<QCborValue::Type>(t_));
 }
 
@@ -58,8 +58,8 @@ QCborValue* QCborValue_new7(double v) {
 	return new QCborValue(static_cast<double>(v));
 }
 
-QCborValue* QCborValue_new8(QCborSimpleType st) {
-	return new QCborValue(st);
+QCborValue* QCborValue_new8(uint8_t st) {
+	return new QCborValue(static_cast<QCborSimpleType>(st));
 }
 
 QCborValue* QCborValue_new9(QByteArray* ba) {
@@ -83,12 +83,12 @@ QCborValue* QCborValue_new13(QCborMap* m) {
 	return new QCborValue(*m);
 }
 
-QCborValue* QCborValue_new14(QCborTag tag) {
-	return new QCborValue(tag);
+QCborValue* QCborValue_new14(uint64_t tag) {
+	return new QCborValue(static_cast<QCborTag>(tag));
 }
 
-QCborValue* QCborValue_new15(QCborKnownTags t_) {
-	return new QCborValue(t_);
+QCborValue* QCborValue_new15(int t_) {
+	return new QCborValue(static_cast<QCborKnownTags>(t_));
 }
 
 QCborValue* QCborValue_new16(QDateTime* dt) {
@@ -111,12 +111,12 @@ QCborValue* QCborValue_new20(QCborValue* other) {
 	return new QCborValue(*other);
 }
 
-QCborValue* QCborValue_new21(QCborTag tag, QCborValue* taggedValue) {
-	return new QCborValue(tag, *taggedValue);
+QCborValue* QCborValue_new21(uint64_t tag, QCborValue* taggedValue) {
+	return new QCborValue(static_cast<QCborTag>(tag), *taggedValue);
 }
 
-QCborValue* QCborValue_new22(QCborKnownTags t_, QCborValue* tv) {
-	return new QCborValue(t_, *tv);
+QCborValue* QCborValue_new22(int t_, QCborValue* tv) {
+	return new QCborValue(static_cast<QCborKnownTags>(t_), *tv);
 }
 
 void QCborValue_OperatorAssign(QCborValue* self, QCborValue* other) {
@@ -127,9 +127,9 @@ void QCborValue_Swap(QCborValue* self, QCborValue* other) {
 	self->swap(*other);
 }
 
-uintptr_t QCborValue_Type(const QCborValue* self) {
+int QCborValue_Type(const QCborValue* self) {
 	QCborValue::Type _ret = self->type();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 bool QCborValue_IsInteger(const QCborValue* self) {
@@ -208,16 +208,18 @@ bool QCborValue_IsSimpleType(const QCborValue* self) {
 	return self->isSimpleType();
 }
 
-bool QCborValue_IsSimpleTypeWithSt(const QCborValue* self, QCborSimpleType st) {
-	return self->isSimpleType(st);
+bool QCborValue_IsSimpleTypeWithSt(const QCborValue* self, uint8_t st) {
+	return self->isSimpleType(static_cast<QCborSimpleType>(st));
 }
 
-QCborSimpleType QCborValue_ToSimpleType(const QCborValue* self) {
-	return self->toSimpleType();
+uint8_t QCborValue_ToSimpleType(const QCborValue* self) {
+	QCborSimpleType _ret = self->toSimpleType();
+	return static_cast<uint8_t>(_ret);
 }
 
 long long QCborValue_ToInteger(const QCborValue* self) {
-	return self->toInteger();
+	qint64 _ret = self->toInteger();
+	return static_cast<long long>(_ret);
 }
 
 bool QCborValue_ToBool(const QCborValue* self) {
@@ -228,8 +230,9 @@ double QCborValue_ToDouble(const QCborValue* self) {
 	return self->toDouble();
 }
 
-QCborTag QCborValue_Tag(const QCborValue* self) {
-	return self->tag();
+uint64_t QCborValue_Tag(const QCborValue* self) {
+	QCborTag _ret = self->tag();
+	return static_cast<uint64_t>(_ret);
 }
 
 QCborValue* QCborValue_TaggedValue(const QCborValue* self) {
@@ -360,12 +363,14 @@ struct miqt_string* QCborValue_ToDiagnosticNotation(const QCborValue* self) {
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-QCborSimpleType QCborValue_ToSimpleType1(const QCborValue* self, QCborSimpleType defaultValue) {
-	return self->toSimpleType(defaultValue);
+uint8_t QCborValue_ToSimpleType1(const QCborValue* self, uint8_t defaultValue) {
+	QCborSimpleType _ret = self->toSimpleType(static_cast<QCborSimpleType>(defaultValue));
+	return static_cast<uint8_t>(_ret);
 }
 
 long long QCborValue_ToInteger1(const QCborValue* self, long long defaultValue) {
-	return self->toInteger(static_cast<qint64>(defaultValue));
+	qint64 _ret = self->toInteger(static_cast<qint64>(defaultValue));
+	return static_cast<long long>(_ret);
 }
 
 bool QCborValue_ToBool1(const QCborValue* self, bool defaultValue) {
@@ -376,8 +381,9 @@ double QCborValue_ToDouble1(const QCborValue* self, double defaultValue) {
 	return self->toDouble(static_cast<double>(defaultValue));
 }
 
-QCborTag QCborValue_Tag1(const QCborValue* self, QCborTag defaultValue) {
-	return self->tag(defaultValue);
+uint64_t QCborValue_Tag1(const QCborValue* self, uint64_t defaultValue) {
+	QCborTag _ret = self->tag(static_cast<QCborTag>(defaultValue));
+	return static_cast<uint64_t>(_ret);
 }
 
 QCborValue* QCborValue_TaggedValue1(const QCborValue* self, QCborValue* defaultValue) {
@@ -455,9 +461,9 @@ void QCborValueRef_OperatorAssignWithOther(QCborValueRef* self, QCborValueRef* o
 	self->operator=(*other);
 }
 
-uintptr_t QCborValueRef_Type(const QCborValueRef* self) {
+int QCborValueRef_Type(const QCborValueRef* self) {
 	QCborValue::Type _ret = self->type();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 bool QCborValueRef_IsInteger(const QCborValueRef* self) {
@@ -536,12 +542,13 @@ bool QCborValueRef_IsSimpleType(const QCborValueRef* self) {
 	return self->isSimpleType();
 }
 
-bool QCborValueRef_IsSimpleTypeWithSt(const QCborValueRef* self, QCborSimpleType st) {
-	return self->isSimpleType(st);
+bool QCborValueRef_IsSimpleTypeWithSt(const QCborValueRef* self, uint8_t st) {
+	return self->isSimpleType(static_cast<QCborSimpleType>(st));
 }
 
-QCborTag QCborValueRef_Tag(const QCborValueRef* self) {
-	return self->tag();
+uint64_t QCborValueRef_Tag(const QCborValueRef* self) {
+	QCborTag _ret = self->tag();
+	return static_cast<uint64_t>(_ret);
 }
 
 QCborValue* QCborValueRef_TaggedValue(const QCborValueRef* self) {
@@ -549,7 +556,8 @@ QCborValue* QCborValueRef_TaggedValue(const QCborValueRef* self) {
 }
 
 long long QCborValueRef_ToInteger(const QCborValueRef* self) {
-	return self->toInteger();
+	qint64 _ret = self->toInteger();
+	return static_cast<long long>(_ret);
 }
 
 bool QCborValueRef_ToBool(const QCborValueRef* self) {
@@ -660,8 +668,9 @@ struct miqt_string* QCborValueRef_ToDiagnosticNotation(QCborValueRef* self) {
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-QCborTag QCborValueRef_Tag1(const QCborValueRef* self, QCborTag defaultValue) {
-	return self->tag(defaultValue);
+uint64_t QCborValueRef_Tag1(const QCborValueRef* self, uint64_t defaultValue) {
+	QCborTag _ret = self->tag(static_cast<QCborTag>(defaultValue));
+	return static_cast<uint64_t>(_ret);
 }
 
 QCborValue* QCborValueRef_TaggedValue1(const QCborValueRef* self, QCborValue* defaultValue) {
@@ -669,7 +678,8 @@ QCborValue* QCborValueRef_TaggedValue1(const QCborValueRef* self, QCborValue* de
 }
 
 long long QCborValueRef_ToInteger1(const QCborValueRef* self, long long defaultValue) {
-	return self->toInteger(static_cast<qint64>(defaultValue));
+	qint64 _ret = self->toInteger(static_cast<qint64>(defaultValue));
+	return static_cast<long long>(_ret);
 }
 
 bool QCborValueRef_ToBool1(const QCborValueRef* self, bool defaultValue) {

qt/gen_qcborvalue.go

@@ -126,7 +126,7 @@ func NewQCborValue() *QCborValue {
 
 // NewQCborValue2 constructs a new QCborValue object.
 func NewQCborValue2(t_ QCborValue__Type) *QCborValue {
-	ret := C.QCborValue_new2((C.uintptr_t)(t_))
+	ret := C.QCborValue_new2((C.int)(t_))
 	return newQCborValue(ret)
 }
 
@@ -162,7 +162,7 @@ func NewQCborValue7(v float64) *QCborValue {
 
 // NewQCborValue8 constructs a new QCborValue object.
 func NewQCborValue8(st QCborSimpleType) *QCborValue {
-	ret := C.QCborValue_new8(st)
+	ret := C.QCborValue_new8((C.uint8_t)(st))
 	return newQCborValue(ret)
 }
 
@@ -202,13 +202,13 @@ func NewQCborValue13(m *QCborMap) *QCborValue {
 
 // NewQCborValue14 constructs a new QCborValue object.
 func NewQCborValue14(tag QCborTag) *QCborValue {
-	ret := C.QCborValue_new14(tag)
+	ret := C.QCborValue_new14((C.uint64_t)(tag))
 	return newQCborValue(ret)
 }
 
 // NewQCborValue15 constructs a new QCborValue object.
 func NewQCborValue15(t_ QCborKnownTags) *QCborValue {
-	ret := C.QCborValue_new15(t_)
+	ret := C.QCborValue_new15((C.int)(t_))
 	return newQCborValue(ret)
 }
 
@@ -244,13 +244,13 @@ func NewQCborValue20(other *QCborValue) *QCborValue {
 
 // NewQCborValue21 constructs a new QCborValue object.
 func NewQCborValue21(tag QCborTag, taggedValue *QCborValue) *QCborValue {
-	ret := C.QCborValue_new21(tag, taggedValue.cPointer())
+	ret := C.QCborValue_new21((C.uint64_t)(tag), taggedValue.cPointer())
 	return newQCborValue(ret)
 }
 
 // NewQCborValue22 constructs a new QCborValue object.
 func NewQCborValue22(t_ QCborKnownTags, tv *QCborValue) *QCborValue {
-	ret := C.QCborValue_new22(t_, tv.cPointer())
+	ret := C.QCborValue_new22((C.int)(t_), tv.cPointer())
 	return newQCborValue(ret)
 }
 
@@ -343,11 +343,11 @@ func (this *QCborValue) IsSimpleType() bool {
 }
 
 func (this *QCborValue) IsSimpleTypeWithSt(st QCborSimpleType) bool {
-	return (bool)(C.QCborValue_IsSimpleTypeWithSt(this.h, st))
+	return (bool)(C.QCborValue_IsSimpleTypeWithSt(this.h, (C.uint8_t)(st)))
 }
 
 func (this *QCborValue) ToSimpleType() QCborSimpleType {
-	return C.QCborValue_ToSimpleType(this.h)
+	return (QCborSimpleType)(C.QCborValue_ToSimpleType(this.h))
 }
 
 func (this *QCborValue) ToInteger() int64 {
@@ -363,7 +363,7 @@ func (this *QCborValue) ToDouble() float64 {
 }
 
 func (this *QCborValue) Tag() QCborTag {
-	return C.QCborValue_Tag(this.h)
+	return (QCborTag)(C.QCborValue_Tag(this.h))
 }
 
 func (this *QCborValue) TaggedValue() *QCborValue {
@@ -568,7 +568,7 @@ func (this *QCborValue) ToDiagnosticNotation() string {
 }
 
 func (this *QCborValue) ToSimpleType1(defaultValue QCborSimpleType) QCborSimpleType {
-	return C.QCborValue_ToSimpleType1(this.h, defaultValue)
+	return (QCborSimpleType)(C.QCborValue_ToSimpleType1(this.h, (C.uint8_t)(defaultValue)))
 }
 
 func (this *QCborValue) ToInteger1(defaultValue int64) int64 {
@@ -584,7 +584,7 @@ func (this *QCborValue) ToDouble1(defaultValue float64) float64 {
 }
 
 func (this *QCborValue) Tag1(defaultValue QCborTag) QCborTag {
-	return C.QCborValue_Tag1(this.h, defaultValue)
+	return (QCborTag)(C.QCborValue_Tag1(this.h, (C.uint64_t)(defaultValue)))
 }
 
 func (this *QCborValue) TaggedValue1(defaultValue *QCborValue) *QCborValue {
@@ -662,18 +662,18 @@ func QCborValue_FromCbor33(data *byte, lenVal uint64, error *QCborParserError) *
 }
 
 func (this *QCborValue) ToCbor1(opt int) *QByteArray {
-	_ret := C.QCborValue_ToCbor1(this.h, (C.int)(opt))
+	_ret := C.QCborValue_ToCbor1(this.h, opt)
 	_goptr := newQByteArray(_ret)
 	_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	return _goptr
 }
 
 func (this *QCborValue) ToCbor2(writer *QCborStreamWriter, opt int) {
-	C.QCborValue_ToCbor2(this.h, writer.cPointer(), (C.int)(opt))
+	C.QCborValue_ToCbor2(this.h, writer.cPointer(), opt)
 }
 
 func (this *QCborValue) ToDiagnosticNotation1(opts int) string {
-	var _ms *C.struct_miqt_string = C.QCborValue_ToDiagnosticNotation1(this.h, (C.int)(opts))
+	var _ms *C.struct_miqt_string = C.QCborValue_ToDiagnosticNotation1(this.h, opts)
 	_ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len)))
 	C.free(unsafe.Pointer(_ms))
 	return _ret
@@ -810,11 +810,11 @@ func (this *QCborValueRef) IsSimpleType() bool {
 }
 
 func (this *QCborValueRef) IsSimpleTypeWithSt(st QCborSimpleType) bool {
-	return (bool)(C.QCborValueRef_IsSimpleTypeWithSt(this.h, st))
+	return (bool)(C.QCborValueRef_IsSimpleTypeWithSt(this.h, (C.uint8_t)(st)))
 }
 
 func (this *QCborValueRef) Tag() QCborTag {
-	return C.QCborValueRef_Tag(this.h)
+	return (QCborTag)(C.QCborValueRef_Tag(this.h))
 }
 
 func (this *QCborValueRef) TaggedValue() *QCborValue {
@@ -987,7 +987,7 @@ func (this *QCborValueRef) ToDiagnosticNotation() string {
 }
 
 func (this *QCborValueRef) Tag1(defaultValue QCborTag) QCborTag {
-	return C.QCborValueRef_Tag1(this.h, defaultValue)
+	return (QCborTag)(C.QCborValueRef_Tag1(this.h, (C.uint64_t)(defaultValue)))
 }
 
 func (this *QCborValueRef) TaggedValue1(defaultValue *QCborValue) *QCborValue {
@@ -1054,18 +1054,18 @@ func (this *QCborValueRef) ToUuid1(defaultValue *QUuid) *QUuid {
 }
 
 func (this *QCborValueRef) ToCbor1(opt int) *QByteArray {
-	_ret := C.QCborValueRef_ToCbor1(this.h, (C.int)(opt))
+	_ret := C.QCborValueRef_ToCbor1(this.h, opt)
 	_goptr := newQByteArray(_ret)
 	_goptr.GoGC() // Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	return _goptr
 }
 
 func (this *QCborValueRef) ToCbor2(writer *QCborStreamWriter, opt int) {
-	C.QCborValueRef_ToCbor2(this.h, writer.cPointer(), (C.int)(opt))
+	C.QCborValueRef_ToCbor2(this.h, writer.cPointer(), opt)
 }
 
 func (this *QCborValueRef) ToDiagnosticNotation1(opt int) string {
-	var _ms *C.struct_miqt_string = C.QCborValueRef_ToDiagnosticNotation1(this.h, (C.int)(opt))
+	var _ms *C.struct_miqt_string = C.QCborValueRef_ToDiagnosticNotation1(this.h, opt)
 	_ret := C.GoStringN(&_ms.data, C.int(int64(_ms.len)))
 	C.free(unsafe.Pointer(_ms))
 	return _ret

qt/gen_qcborvalue.h

@@ -49,30 +49,30 @@ struct miqt_string* QCborParserError_ErrorString(const QCborParserError* self);
 void QCborParserError_Delete(QCborParserError* self);
 
 QCborValue* QCborValue_new();
-QCborValue* QCborValue_new2(uintptr_t t_);
+QCborValue* QCborValue_new2(int t_);
 QCborValue* QCborValue_new3(bool b_);
 QCborValue* QCborValue_new4(int i);
 QCborValue* QCborValue_new5(unsigned int u);
 QCborValue* QCborValue_new6(long long i);
 QCborValue* QCborValue_new7(double v);
-QCborValue* QCborValue_new8(QCborSimpleType st);
+QCborValue* QCborValue_new8(uint8_t st);
 QCborValue* QCborValue_new9(QByteArray* ba);
 QCborValue* QCborValue_new10(struct miqt_string* s);
 QCborValue* QCborValue_new11(const char* s);
 QCborValue* QCborValue_new12(QCborArray* a);
 QCborValue* QCborValue_new13(QCborMap* m);
-QCborValue* QCborValue_new14(QCborTag tag);
-QCborValue* QCborValue_new15(QCborKnownTags t_);
+QCborValue* QCborValue_new14(uint64_t tag);
+QCborValue* QCborValue_new15(int t_);
 QCborValue* QCborValue_new16(QDateTime* dt);
 QCborValue* QCborValue_new17(QUrl* url);
 QCborValue* QCborValue_new18(QRegularExpression* rx);
 QCborValue* QCborValue_new19(QUuid* uuid);
 QCborValue* QCborValue_new20(QCborValue* other);
-QCborValue* QCborValue_new21(QCborTag tag, QCborValue* taggedValue);
-QCborValue* QCborValue_new22(QCborKnownTags t_, QCborValue* tv);
+QCborValue* QCborValue_new21(uint64_t tag, QCborValue* taggedValue);
+QCborValue* QCborValue_new22(int t_, QCborValue* tv);
 void QCborValue_OperatorAssign(QCborValue* self, QCborValue* other);
 void QCborValue_Swap(QCborValue* self, QCborValue* other);
-uintptr_t QCborValue_Type(const QCborValue* self);
+int QCborValue_Type(const QCborValue* self);
 bool QCborValue_IsInteger(const QCborValue* self);
 bool QCborValue_IsByteArray(const QCborValue* self);
 bool QCborValue_IsString(const QCborValue* self);
@@ -92,12 +92,12 @@ bool QCborValue_IsUuid(const QCborValue* self);
 bool QCborValue_IsInvalid(const QCborValue* self);
 bool QCborValue_IsContainer(const QCborValue* self);
 bool QCborValue_IsSimpleType(const QCborValue* self);
-bool QCborValue_IsSimpleTypeWithSt(const QCborValue* self, QCborSimpleType st);
-QCborSimpleType QCborValue_ToSimpleType(const QCborValue* self);
+bool QCborValue_IsSimpleTypeWithSt(const QCborValue* self, uint8_t st);
+uint8_t QCborValue_ToSimpleType(const QCborValue* self);
 long long QCborValue_ToInteger(const QCborValue* self);
 bool QCborValue_ToBool(const QCborValue* self);
 double QCborValue_ToDouble(const QCborValue* self);
-QCborTag QCborValue_Tag(const QCborValue* self);
+uint64_t QCborValue_Tag(const QCborValue* self);
 QCborValue* QCborValue_TaggedValue(const QCborValue* self);
 QByteArray* QCborValue_ToByteArray(const QCborValue* self);
 struct miqt_string* QCborValue_ToString(const QCborValue* self);
@@ -128,11 +128,11 @@ QCborValue* QCborValue_FromCbor3(const unsigned char* data, size_t lenVal);
 QByteArray* QCborValue_ToCbor(QCborValue* self);
 void QCborValue_ToCborWithWriter(QCborValue* self, QCborStreamWriter* writer);
 struct miqt_string* QCborValue_ToDiagnosticNotation(const QCborValue* self);
-QCborSimpleType QCborValue_ToSimpleType1(const QCborValue* self, QCborSimpleType defaultValue);
+uint8_t QCborValue_ToSimpleType1(const QCborValue* self, uint8_t defaultValue);
 long long QCborValue_ToInteger1(const QCborValue* self, long long defaultValue);
 bool QCborValue_ToBool1(const QCborValue* self, bool defaultValue);
 double QCborValue_ToDouble1(const QCborValue* self, double defaultValue);
-QCborTag QCborValue_Tag1(const QCborValue* self, QCborTag defaultValue);
+uint64_t QCborValue_Tag1(const QCborValue* self, uint64_t defaultValue);
 QCborValue* QCborValue_TaggedValue1(const QCborValue* self, QCborValue* defaultValue);
 QByteArray* QCborValue_ToByteArray1(const QCborValue* self, QByteArray* defaultValue);
 struct miqt_string* QCborValue_ToString1(const QCborValue* self, struct miqt_string* defaultValue);
@@ -151,7 +151,7 @@ void QCborValue_Delete(QCborValue* self);
 QCborValueRef* QCborValueRef_new(QCborValueRef* param1);
 void QCborValueRef_OperatorAssign(QCborValueRef* self, QCborValue* other);
 void QCborValueRef_OperatorAssignWithOther(QCborValueRef* self, QCborValueRef* other);
-uintptr_t QCborValueRef_Type(const QCborValueRef* self);
+int QCborValueRef_Type(const QCborValueRef* self);
 bool QCborValueRef_IsInteger(const QCborValueRef* self);
 bool QCborValueRef_IsByteArray(const QCborValueRef* self);
 bool QCborValueRef_IsString(const QCborValueRef* self);
@@ -171,8 +171,8 @@ bool QCborValueRef_IsUuid(const QCborValueRef* self);
 bool QCborValueRef_IsInvalid(const QCborValueRef* self);
 bool QCborValueRef_IsContainer(const QCborValueRef* self);
 bool QCborValueRef_IsSimpleType(const QCborValueRef* self);
-bool QCborValueRef_IsSimpleTypeWithSt(const QCborValueRef* self, QCborSimpleType st);
-QCborTag QCborValueRef_Tag(const QCborValueRef* self);
+bool QCborValueRef_IsSimpleTypeWithSt(const QCborValueRef* self, uint8_t st);
+uint64_t QCborValueRef_Tag(const QCborValueRef* self);
 QCborValue* QCborValueRef_TaggedValue(const QCborValueRef* self);
 long long QCborValueRef_ToInteger(const QCborValueRef* self);
 bool QCborValueRef_ToBool(const QCborValueRef* self);
@@ -200,7 +200,7 @@ QJsonValue* QCborValueRef_ToJsonValue(const QCborValueRef* self);
 QByteArray* QCborValueRef_ToCbor(QCborValueRef* self);
 void QCborValueRef_ToCborWithWriter(QCborValueRef* self, QCborStreamWriter* writer);
 struct miqt_string* QCborValueRef_ToDiagnosticNotation(QCborValueRef* self);
-QCborTag QCborValueRef_Tag1(const QCborValueRef* self, QCborTag defaultValue);
+uint64_t QCborValueRef_Tag1(const QCborValueRef* self, uint64_t defaultValue);
 QCborValue* QCborValueRef_TaggedValue1(const QCborValueRef* self, QCborValue* defaultValue);
 long long QCborValueRef_ToInteger1(const QCborValueRef* self, long long defaultValue);
 bool QCborValueRef_ToBool1(const QCborValueRef* self, bool defaultValue);

qt/gen_qchar.cpp

@@ -20,7 +20,8 @@ char QLatin1Char_ToLatin1(const QLatin1Char* self) {
 }
 
 uint16_t QLatin1Char_Unicode(const QLatin1Char* self) {
-	return self->unicode();
+	ushort _ret = self->unicode();
+	return static_cast<uint16_t>(_ret);
 }
 
 void QLatin1Char_Delete(QLatin1Char* self) {
@@ -51,7 +52,7 @@ QChar* QChar_new6(int rc) {
 	return new QChar(static_cast<int>(rc));
 }
 
-QChar* QChar_new7(uintptr_t s) {
+QChar* QChar_new7(int s) {
 	return new QChar(static_cast<QChar::SpecialCharacter>(s));
 }
 
@@ -71,24 +72,24 @@ QChar* QChar_new11(QChar* param1) {
 	return new QChar(*param1);
 }
 
-uintptr_t QChar_Category(const QChar* self) {
+int QChar_Category(const QChar* self) {
 	QChar::Category _ret = self->category();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-uintptr_t QChar_Direction(const QChar* self) {
+int QChar_Direction(const QChar* self) {
 	QChar::Direction _ret = self->direction();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-uintptr_t QChar_JoiningType(const QChar* self) {
+int QChar_JoiningType(const QChar* self) {
 	QChar::JoiningType _ret = self->joiningType();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-uintptr_t QChar_Joining(const QChar* self) {
+int QChar_Joining(const QChar* self) {
 	QChar::Joining _ret = self->joining();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 unsigned char QChar_CombiningClass(const QChar* self) {
@@ -110,9 +111,9 @@ struct miqt_string* QChar_Decomposition(const QChar* self) {
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-uintptr_t QChar_DecompositionTag(const QChar* self) {
+int QChar_DecompositionTag(const QChar* self) {
 	QChar::Decomposition _ret = self->decompositionTag();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 int QChar_DigitValue(const QChar* self) {
@@ -135,14 +136,14 @@ QChar* QChar_ToCaseFolded(const QChar* self) {
 	return new QChar(self->toCaseFolded());
 }
 
-uintptr_t QChar_Script(const QChar* self) {
+int QChar_Script(const QChar* self) {
 	QChar::Script _ret = self->script();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-uintptr_t QChar_UnicodeVersion(const QChar* self) {
+int QChar_UnicodeVersion(const QChar* self) {
 	QChar::UnicodeVersion _ret = self->unicodeVersion();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 char QChar_ToLatin1(const QChar* self) {
@@ -150,7 +151,8 @@ char QChar_ToLatin1(const QChar* self) {
 }
 
 uint16_t QChar_Unicode(const QChar* self) {
-	return self->unicode();
+	ushort _ret = self->unicode();
+	return static_cast<uint16_t>(_ret);
 }
 
 QChar* QChar_FromLatin1(char c) {
@@ -226,11 +228,13 @@ bool QChar_IsSurrogate(const QChar* self) {
 }
 
 unsigned char QChar_Cell(const QChar* self) {
-	return self->cell();
+	uchar _ret = self->cell();
+	return static_cast<unsigned char>(_ret);
 }
 
 unsigned char QChar_Row(const QChar* self) {
-	return self->row();
+	uchar _ret = self->row();
+	return static_cast<unsigned char>(_ret);
 }
 
 void QChar_SetCell(QChar* self, unsigned char acell) {
@@ -262,39 +266,43 @@ bool QChar_RequiresSurrogates(unsigned int ucs4) {
 }
 
 unsigned int QChar_SurrogateToUcs4(uint16_t high, uint16_t low) {
-	return QChar::surrogateToUcs4(static_cast<ushort>(high), static_cast<ushort>(low));
+	uint _ret = QChar::surrogateToUcs4(static_cast<ushort>(high), static_cast<ushort>(low));
+	return static_cast<unsigned int>(_ret);
 }
 
 unsigned int QChar_SurrogateToUcs42(QChar* high, QChar* low) {
-	return QChar::surrogateToUcs4(*high, *low);
+	uint _ret = QChar::surrogateToUcs4(*high, *low);
+	return static_cast<unsigned int>(_ret);
 }
 
 uint16_t QChar_HighSurrogate(unsigned int ucs4) {
-	return QChar::highSurrogate(static_cast<uint>(ucs4));
+	ushort _ret = QChar::highSurrogate(static_cast<uint>(ucs4));
+	return static_cast<uint16_t>(_ret);
 }
 
 uint16_t QChar_LowSurrogate(unsigned int ucs4) {
-	return QChar::lowSurrogate(static_cast<uint>(ucs4));
+	ushort _ret = QChar::lowSurrogate(static_cast<uint>(ucs4));
+	return static_cast<uint16_t>(_ret);
 }
 
-uintptr_t QChar_CategoryWithUcs4(unsigned int ucs4) {
+int QChar_CategoryWithUcs4(unsigned int ucs4) {
 	QChar::Category _ret = QChar::category(static_cast<uint>(ucs4));
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-uintptr_t QChar_DirectionWithUcs4(unsigned int ucs4) {
+int QChar_DirectionWithUcs4(unsigned int ucs4) {
 	QChar::Direction _ret = QChar::direction(static_cast<uint>(ucs4));
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-uintptr_t QChar_JoiningTypeWithUcs4(unsigned int ucs4) {
+int QChar_JoiningTypeWithUcs4(unsigned int ucs4) {
 	QChar::JoiningType _ret = QChar::joiningType(static_cast<uint>(ucs4));
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-uintptr_t QChar_JoiningWithUcs4(unsigned int ucs4) {
+int QChar_JoiningWithUcs4(unsigned int ucs4) {
 	QChar::Joining _ret = QChar::joining(static_cast<uint>(ucs4));
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 unsigned char QChar_CombiningClassWithUcs4(unsigned int ucs4) {
@@ -302,7 +310,8 @@ unsigned char QChar_CombiningClassWithUcs4(unsigned int ucs4) {
 }
 
 unsigned int QChar_MirroredCharWithUcs4(unsigned int ucs4) {
-	return QChar::mirroredChar(static_cast<uint>(ucs4));
+	uint _ret = QChar::mirroredChar(static_cast<uint>(ucs4));
+	return static_cast<unsigned int>(_ret);
 }
 
 bool QChar_HasMirroredWithUcs4(unsigned int ucs4) {
@@ -316,9 +325,9 @@ struct miqt_string* QChar_DecompositionWithUcs4(unsigned int ucs4) {
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-uintptr_t QChar_DecompositionTagWithUcs4(unsigned int ucs4) {
+int QChar_DecompositionTagWithUcs4(unsigned int ucs4) {
 	QChar::Decomposition _ret = QChar::decompositionTag(static_cast<uint>(ucs4));
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 int QChar_DigitValueWithUcs4(unsigned int ucs4) {
@@ -326,34 +335,38 @@ int QChar_DigitValueWithUcs4(unsigned int ucs4) {
 }
 
 unsigned int QChar_ToLowerWithUcs4(unsigned int ucs4) {
-	return QChar::toLower(static_cast<uint>(ucs4));
+	uint _ret = QChar::toLower(static_cast<uint>(ucs4));
+	return static_cast<unsigned int>(_ret);
 }
 
 unsigned int QChar_ToUpperWithUcs4(unsigned int ucs4) {
-	return QChar::toUpper(static_cast<uint>(ucs4));
+	uint _ret = QChar::toUpper(static_cast<uint>(ucs4));
+	return static_cast<unsigned int>(_ret);
 }
 
 unsigned int QChar_ToTitleCaseWithUcs4(unsigned int ucs4) {
-	return QChar::toTitleCase(static_cast<uint>(ucs4));
+	uint _ret = QChar::toTitleCase(static_cast<uint>(ucs4));
+	return static_cast<unsigned int>(_ret);
 }
 
 unsigned int QChar_ToCaseFoldedWithUcs4(unsigned int ucs4) {
-	return QChar::toCaseFolded(static_cast<uint>(ucs4));
+	uint _ret = QChar::toCaseFolded(static_cast<uint>(ucs4));
+	return static_cast<unsigned int>(_ret);
 }
 
-uintptr_t QChar_ScriptWithUcs4(unsigned int ucs4) {
+int QChar_ScriptWithUcs4(unsigned int ucs4) {
 	QChar::Script _ret = QChar::script(static_cast<uint>(ucs4));
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-uintptr_t QChar_UnicodeVersionWithUcs4(unsigned int ucs4) {
+int QChar_UnicodeVersionWithUcs4(unsigned int ucs4) {
 	QChar::UnicodeVersion _ret = QChar::unicodeVersion(static_cast<uint>(ucs4));
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-uintptr_t QChar_CurrentUnicodeVersion() {
+int QChar_CurrentUnicodeVersion() {
 	QChar::UnicodeVersion _ret = QChar::currentUnicodeVersion();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
 bool QChar_IsPrintWithUcs4(unsigned int ucs4) {

qt/gen_qchar.go

@@ -471,7 +471,7 @@ func NewQChar6(rc int) *QChar {
 
 // NewQChar7 constructs a new QChar object.
 func NewQChar7(s QChar__SpecialCharacter) *QChar {
-	ret := C.QChar_new7((C.uintptr_t)(s))
+	ret := C.QChar_new7((C.int)(s))
 	return newQChar(ret)
 }
 

qt/gen_qchar.h

@@ -33,27 +33,27 @@ QChar* QChar_new3(unsigned char c, unsigned char r);
 QChar* QChar_new4(int16_t rc);
 QChar* QChar_new5(unsigned int rc);
 QChar* QChar_new6(int rc);
-QChar* QChar_new7(uintptr_t s);
+QChar* QChar_new7(int s);
 QChar* QChar_new8(QLatin1Char* ch);
 QChar* QChar_new9(char c);
 QChar* QChar_new10(unsigned char c);
 QChar* QChar_new11(QChar* param1);
-uintptr_t QChar_Category(const QChar* self);
-uintptr_t QChar_Direction(const QChar* self);
-uintptr_t QChar_JoiningType(const QChar* self);
-uintptr_t QChar_Joining(const QChar* self);
+int QChar_Category(const QChar* self);
+int QChar_Direction(const QChar* self);
+int QChar_JoiningType(const QChar* self);
+int QChar_Joining(const QChar* self);
 unsigned char QChar_CombiningClass(const QChar* self);
 QChar* QChar_MirroredChar(const QChar* self);
 bool QChar_HasMirrored(const QChar* self);
 struct miqt_string* QChar_Decomposition(const QChar* self);
-uintptr_t QChar_DecompositionTag(const QChar* self);
+int QChar_DecompositionTag(const QChar* self);
 int QChar_DigitValue(const QChar* self);
 QChar* QChar_ToLower(const QChar* self);
 QChar* QChar_ToUpper(const QChar* self);
 QChar* QChar_ToTitleCase(const QChar* self);
 QChar* QChar_ToCaseFolded(const QChar* self);
-uintptr_t QChar_Script(const QChar* self);
-uintptr_t QChar_UnicodeVersion(const QChar* self);
+int QChar_Script(const QChar* self);
+int QChar_UnicodeVersion(const QChar* self);
 char QChar_ToLatin1(const QChar* self);
 uint16_t QChar_Unicode(const QChar* self);
 QChar* QChar_FromLatin1(char c);
@@ -87,23 +87,23 @@ unsigned int QChar_SurrogateToUcs4(uint16_t high, uint16_t low);
 unsigned int QChar_SurrogateToUcs42(QChar* high, QChar* low);
 uint16_t QChar_HighSurrogate(unsigned int ucs4);
 uint16_t QChar_LowSurrogate(unsigned int ucs4);
-uintptr_t QChar_CategoryWithUcs4(unsigned int ucs4);
-uintptr_t QChar_DirectionWithUcs4(unsigned int ucs4);
-uintptr_t QChar_JoiningTypeWithUcs4(unsigned int ucs4);
-uintptr_t QChar_JoiningWithUcs4(unsigned int ucs4);
+int QChar_CategoryWithUcs4(unsigned int ucs4);
+int QChar_DirectionWithUcs4(unsigned int ucs4);
+int QChar_JoiningTypeWithUcs4(unsigned int ucs4);
+int QChar_JoiningWithUcs4(unsigned int ucs4);
 unsigned char QChar_CombiningClassWithUcs4(unsigned int ucs4);
 unsigned int QChar_MirroredCharWithUcs4(unsigned int ucs4);
 bool QChar_HasMirroredWithUcs4(unsigned int ucs4);
 struct miqt_string* QChar_DecompositionWithUcs4(unsigned int ucs4);
-uintptr_t QChar_DecompositionTagWithUcs4(unsigned int ucs4);
+int QChar_DecompositionTagWithUcs4(unsigned int ucs4);
 int QChar_DigitValueWithUcs4(unsigned int ucs4);
 unsigned int QChar_ToLowerWithUcs4(unsigned int ucs4);
 unsigned int QChar_ToUpperWithUcs4(unsigned int ucs4);
 unsigned int QChar_ToTitleCaseWithUcs4(unsigned int ucs4);
 unsigned int QChar_ToCaseFoldedWithUcs4(unsigned int ucs4);
-uintptr_t QChar_ScriptWithUcs4(unsigned int ucs4);
-uintptr_t QChar_UnicodeVersionWithUcs4(unsigned int ucs4);
-uintptr_t QChar_CurrentUnicodeVersion();
+int QChar_ScriptWithUcs4(unsigned int ucs4);
+int QChar_UnicodeVersionWithUcs4(unsigned int ucs4);
+int QChar_CurrentUnicodeVersion();
 bool QChar_IsPrintWithUcs4(unsigned int ucs4);
 bool QChar_IsSpaceWithUcs4(unsigned int ucs4);
 bool QChar_IsMarkWithUcs4(unsigned int ucs4);

qt/gen_qcheckbox.cpp

@@ -61,12 +61,12 @@ bool QCheckBox_IsTristate(const QCheckBox* self) {
 	return self->isTristate();
 }
 
-uintptr_t QCheckBox_CheckState(const QCheckBox* self) {
+int QCheckBox_CheckState(const QCheckBox* self) {
 	Qt::CheckState _ret = self->checkState();
-	return static_cast<uintptr_t>(_ret);
+	return static_cast<int>(_ret);
 }
 
-void QCheckBox_SetCheckState(QCheckBox* self, uintptr_t state) {
+void QCheckBox_SetCheckState(QCheckBox* self, int state) {
 	self->setCheckState(static_cast<Qt::CheckState>(state));
 }
 

qt/gen_qcheckbox.go

@@ -114,7 +114,7 @@ func (this *QCheckBox) CheckState() CheckState {
 }
 
 func (this *QCheckBox) SetCheckState(state CheckState) {
-	C.QCheckBox_SetCheckState(this.h, (C.uintptr_t)(state))
+	C.QCheckBox_SetCheckState(this.h, (C.int)(state))
 }
 
 func (this *QCheckBox) StateChanged(param1 int) {

qt/gen_qcheckbox.h

@@ -36,8 +36,8 @@ QSize* QCheckBox_SizeHint(const QCheckBox* self);
 QSize* QCheckBox_MinimumSizeHint(const QCheckBox* self);
 void QCheckBox_SetTristate(QCheckBox* self);
 bool QCheckBox_IsTristate(const QCheckBox* self);
-uintptr_t QCheckBox_CheckState(const QCheckBox* self);
-void QCheckBox_SetCheckState(QCheckBox* self, uintptr_t state);
+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);
 struct miqt_string* QCheckBox_Tr2(const char* s, const char* c);

qt/gen_qclipboard.cpp

@@ -96,14 +96,14 @@ void QClipboard_SetPixmap(QClipboard* self, QPixmap* param1) {
 	self->setPixmap(*param1);
 }
 
-void QClipboard_Changed(QClipboard* self, uintptr_t mode) {
+void QClipboard_Changed(QClipboard* self, int mode) {
 	self->changed(static_cast<QClipboard::Mode>(mode));
 }
 
 void QClipboard_connect_Changed(QClipboard* self, void* slot) {
 	QClipboard::connect(self, static_cast<void (QClipboard::*)(QClipboard::Mode)>(&QClipboard::changed), self, [=](QClipboard::Mode mode) {
 		QClipboard::Mode mode_ret = mode;
-		uintptr_t sigval1 = static_cast<uintptr_t>(mode_ret);
+		int sigval1 = static_cast<int>(mode_ret);
 		miqt_exec_callback_QClipboard_Changed(slot, sigval1);
 	});
 }
@@ -166,18 +166,18 @@ struct miqt_string* QClipboard_TrUtf83(const char* s, const char* c, int n) {
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-void QClipboard_Clear1(QClipboard* self, uintptr_t mode) {
+void QClipboard_Clear1(QClipboard* self, int mode) {
 	self->clear(static_cast<QClipboard::Mode>(mode));
 }
 
-struct miqt_string* QClipboard_Text1(const QClipboard* self, uintptr_t mode) {
+struct miqt_string* QClipboard_Text1(const QClipboard* self, int mode) {
 	QString _ret = self->text(static_cast<QClipboard::Mode>(mode));
 	// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
 	QByteArray _b = _ret.toUtf8();
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-struct miqt_string* QClipboard_Text2(const QClipboard* self, struct miqt_string* subtype, uintptr_t mode) {
+struct miqt_string* QClipboard_Text2(const QClipboard* self, struct miqt_string* subtype, int mode) {
 	QString subtype_QString = QString::fromUtf8(&subtype->data, subtype->len);
 	QString _ret = self->text(subtype_QString, static_cast<QClipboard::Mode>(mode));
 	// Convert QString from UTF-16 in C++ RAII memory to UTF-8 in manually-managed C memory
@@ -185,32 +185,32 @@ struct miqt_string* QClipboard_Text2(const QClipboard* self, struct miqt_string*
 	return miqt_strdup(_b.data(), _b.length());
 }
 
-void QClipboard_SetText2(QClipboard* self, struct miqt_string* param1, uintptr_t mode) {
+void QClipboard_SetText2(QClipboard* self, struct miqt_string* param1, int mode) {
 	QString param1_QString = QString::fromUtf8(&param1->data, param1->len);
 	self->setText(param1_QString, static_cast<QClipboard::Mode>(mode));
 }
 
-QMimeData* QClipboard_MimeData1(const QClipboard* self, uintptr_t mode) {
+QMimeData* QClipboard_MimeData1(const QClipboard* self, int mode) {
 	return (QMimeData*) self->mimeData(static_cast<QClipboard::Mode>(mode));
 }
 
-void QClipboard_SetMimeData2(QClipboard* self, QMimeData* data, uintptr_t mode) {
+void QClipboard_SetMimeData2(QClipboard* self, QMimeData* data, int mode) {
 	self->setMimeData(data, static_cast<QClipboard::Mode>(mode));
 }
 
-QImage* QClipboard_Image1(const QClipboard* self, uintptr_t mode) {
+QImage* QClipboard_Image1(const QClipboard* self, int mode) {
 	return new QImage(self->image(static_cast<QClipboard::Mode>(mode)));
 }
 
-QPixmap* QClipboard_Pixmap1(const QClipboard* self, uintptr_t mode) {
+QPixmap* QClipboard_Pixmap1(const QClipboard* self, int mode) {
 	return new QPixmap(self->pixmap(static_cast<QClipboard::Mode>(mode)));
 }
 
-void QClipboard_SetImage2(QClipboard* self, QImage* param1, uintptr_t mode) {
+void QClipboard_SetImage2(QClipboard* self, QImage* param1, int mode) {
 	self->setImage(*param1, static_cast<QClipboard::Mode>(mode));
 }
 
-void QClipboard_SetPixmap2(QClipboard* self, QPixmap* param1, uintptr_t mode) {
+void QClipboard_SetPixmap2(QClipboard* self, QPixmap* param1, int mode) {
 	self->setPixmap(*param1, static_cast<QClipboard::Mode>(mode));
 }