qt: rebuild to add enums

qt/gen_qabstractanimation.go

@@ -13,6 +13,28 @@ import (
 	"unsafe"
 )
 
+type QAbstractAnimation__Direction int
+
+const (
+	QAbstractAnimation__Direction__Forward  QAbstractAnimation__Direction = 0
+	QAbstractAnimation__Direction__Backward QAbstractAnimation__Direction = 1
+)
+
+type QAbstractAnimation__State int
+
+const (
+	QAbstractAnimation__State__Stopped QAbstractAnimation__State = 0
+	QAbstractAnimation__State__Paused  QAbstractAnimation__State = 1
+	QAbstractAnimation__State__Running QAbstractAnimation__State = 2
+)
+
+type QAbstractAnimation__DeletionPolicy int
+
+const (
+	QAbstractAnimation__DeletionPolicy__KeepWhenStopped   QAbstractAnimation__DeletionPolicy = 0
+	QAbstractAnimation__DeletionPolicy__DeleteWhenStopped QAbstractAnimation__DeletionPolicy = 1
+)
+
 type QAbstractAnimation struct {
 	h *C.QAbstractAnimation
 	*QObject
@@ -63,9 +85,9 @@ func QAbstractAnimation_TrUtf8(s string) string {
 	return ret
 }
 
-func (this *QAbstractAnimation) State() uintptr {
+func (this *QAbstractAnimation) State() QAbstractAnimation__State {
 	ret := C.QAbstractAnimation_State(this.h)
-	return (uintptr)(ret)
+	return (QAbstractAnimation__State)(ret)
 }
 
 func (this *QAbstractAnimation) Group() *QAnimationGroup {
@@ -73,12 +95,12 @@ func (this *QAbstractAnimation) Group() *QAnimationGroup {
 	return newQAnimationGroup_U(unsafe.Pointer(ret))
 }
 
-func (this *QAbstractAnimation) Direction() uintptr {
+func (this *QAbstractAnimation) Direction() QAbstractAnimation__Direction {
 	ret := C.QAbstractAnimation_Direction(this.h)
-	return (uintptr)(ret)
+	return (QAbstractAnimation__Direction)(ret)
 }
 
-func (this *QAbstractAnimation) SetDirection(direction uintptr) {
+func (this *QAbstractAnimation) SetDirection(direction QAbstractAnimation__Direction) {
 	C.QAbstractAnimation_SetDirection(this.h, (C.uintptr_t)(direction))
 }
 
@@ -128,7 +150,7 @@ func (this *QAbstractAnimation) OnFinished(slot func()) {
 	C.QAbstractAnimation_connect_Finished(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slotWrapper))))
 }
 
-func (this *QAbstractAnimation) StateChanged(newState uintptr, oldState uintptr) {
+func (this *QAbstractAnimation) StateChanged(newState QAbstractAnimation__State, oldState QAbstractAnimation__State) {
 	C.QAbstractAnimation_StateChanged(this.h, (C.uintptr_t)(newState), (C.uintptr_t)(oldState))
 }
 
@@ -152,7 +174,7 @@ func (this *QAbstractAnimation) OnCurrentLoopChanged(slot func()) {
 	C.QAbstractAnimation_connect_CurrentLoopChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slotWrapper))))
 }
 
-func (this *QAbstractAnimation) DirectionChanged(param1 uintptr) {
+func (this *QAbstractAnimation) DirectionChanged(param1 QAbstractAnimation__Direction) {
 	C.QAbstractAnimation_DirectionChanged(this.h, (C.uintptr_t)(param1))
 }
 
@@ -240,7 +262,7 @@ func QAbstractAnimation_TrUtf83(s string, c string, n int) string {
 	return ret
 }
 
-func (this *QAbstractAnimation) Start1(policy uintptr) {
+func (this *QAbstractAnimation) Start1(policy QAbstractAnimation__DeletionPolicy) {
 	C.QAbstractAnimation_Start1(this.h, (C.uintptr_t)(policy))
 }
 

qt/gen_qabstracteventdispatcher.go

@@ -86,12 +86,12 @@ func (this *QAbstractEventDispatcher) UnregisterSocketNotifier(notifier *QSocket
 	C.QAbstractEventDispatcher_UnregisterSocketNotifier(this.h, notifier.cPointer())
 }
 
-func (this *QAbstractEventDispatcher) RegisterTimer(interval int, timerType uintptr, object *QObject) int {
+func (this *QAbstractEventDispatcher) RegisterTimer(interval int, timerType TimerType, object *QObject) int {
 	ret := C.QAbstractEventDispatcher_RegisterTimer(this.h, (C.int)(interval), (C.uintptr_t)(timerType), object.cPointer())
 	return (int)(ret)
 }
 
-func (this *QAbstractEventDispatcher) RegisterTimer2(timerId int, interval int, timerType uintptr, object *QObject) {
+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())
 }
 
@@ -259,7 +259,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 uintptr) *QAbstractEventDispatcher__TimerInfo {
+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))
 	return newQAbstractEventDispatcher__TimerInfo(ret)
 }

qt/gen_qabstractitemdelegate.go

@@ -14,6 +14,16 @@ import (
 	"unsafe"
 )
 
+type QAbstractItemDelegate__EndEditHint int
+
+const (
+	QAbstractItemDelegate__EndEditHint__NoHint           QAbstractItemDelegate__EndEditHint = 0
+	QAbstractItemDelegate__EndEditHint__EditNextItem     QAbstractItemDelegate__EndEditHint = 1
+	QAbstractItemDelegate__EndEditHint__EditPreviousItem QAbstractItemDelegate__EndEditHint = 2
+	QAbstractItemDelegate__EndEditHint__SubmitModelCache QAbstractItemDelegate__EndEditHint = 3
+	QAbstractItemDelegate__EndEditHint__RevertModelCache QAbstractItemDelegate__EndEditHint = 4
+)
+
 type QAbstractItemDelegate struct {
 	h *C.QAbstractItemDelegate
 	*QObject
@@ -105,7 +115,7 @@ func (this *QAbstractItemDelegate) EditorEvent(event *QEvent, model *QAbstractIt
 	return (bool)(ret)
 }
 
-func QAbstractItemDelegate_ElidedText(fontMetrics *QFontMetrics, width int, mode uintptr, text string) string {
+func QAbstractItemDelegate_ElidedText(fontMetrics *QFontMetrics, width int, mode TextElideMode, text string) string {
 	text_Cstring := C.CString(text)
 	defer C.free(unsafe.Pointer(text_Cstring))
 	var _out *C.char = nil
@@ -214,7 +224,7 @@ func QAbstractItemDelegate_TrUtf83(s string, c string, n int) string {
 	return ret
 }
 
-func (this *QAbstractItemDelegate) CloseEditor2(editor *QWidget, hint uintptr) {
+func (this *QAbstractItemDelegate) CloseEditor2(editor *QWidget, hint QAbstractItemDelegate__EndEditHint) {
 	C.QAbstractItemDelegate_CloseEditor2(this.h, editor.cPointer(), (C.uintptr_t)(hint))
 }
 

qt/gen_qabstractitemmodel.go

@@ -14,6 +14,23 @@ import (
 	"unsafe"
 )
 
+type QAbstractItemModel__LayoutChangeHint int
+
+const (
+	QAbstractItemModel__LayoutChangeHint__NoLayoutChangeHint QAbstractItemModel__LayoutChangeHint = 0
+	QAbstractItemModel__LayoutChangeHint__VerticalSortHint   QAbstractItemModel__LayoutChangeHint = 1
+	QAbstractItemModel__LayoutChangeHint__HorizontalSortHint QAbstractItemModel__LayoutChangeHint = 2
+)
+
+type QAbstractItemModel__CheckIndexOption int
+
+const (
+	QAbstractItemModel__CheckIndexOption__NoOption        QAbstractItemModel__CheckIndexOption = 0
+	QAbstractItemModel__CheckIndexOption__IndexIsValid    QAbstractItemModel__CheckIndexOption = 1
+	QAbstractItemModel__CheckIndexOption__DoNotUseParent  QAbstractItemModel__CheckIndexOption = 2
+	QAbstractItemModel__CheckIndexOption__ParentIsInvalid QAbstractItemModel__CheckIndexOption = 4
+)
+
 type QModelIndex struct {
 	h *C.QModelIndex
 }
@@ -459,7 +476,7 @@ func (this *QAbstractItemModel) SetData(index *QModelIndex, value *QVariant) boo
 	return (bool)(ret)
 }
 
-func (this *QAbstractItemModel) HeaderData(section int, orientation uintptr) *QVariant {
+func (this *QAbstractItemModel) HeaderData(section int, orientation Orientation) *QVariant {
 	ret := C.QAbstractItemModel_HeaderData(this.h, (C.int)(section), (C.uintptr_t)(orientation))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQVariant(ret)
@@ -470,7 +487,7 @@ func (this *QAbstractItemModel) HeaderData(section int, orientation uintptr) *QV
 	return ret1
 }
 
-func (this *QAbstractItemModel) SetHeaderData(section int, orientation uintptr, value *QVariant) bool {
+func (this *QAbstractItemModel) SetHeaderData(section int, orientation Orientation, value *QVariant) bool {
 	ret := C.QAbstractItemModel_SetHeaderData(this.h, (C.int)(section), (C.uintptr_t)(orientation), value.cPointer())
 	return (bool)(ret)
 }
@@ -501,12 +518,12 @@ func (this *QAbstractItemModel) MimeData(indexes []QModelIndex) *QMimeData {
 	return newQMimeData_U(unsafe.Pointer(ret))
 }
 
-func (this *QAbstractItemModel) CanDropMimeData(data *QMimeData, action uintptr, row int, column int, parent *QModelIndex) bool {
+func (this *QAbstractItemModel) CanDropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool {
 	ret := C.QAbstractItemModel_CanDropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer())
 	return (bool)(ret)
 }
 
-func (this *QAbstractItemModel) DropMimeData(data *QMimeData, action uintptr, row int, column int, parent *QModelIndex) bool {
+func (this *QAbstractItemModel) DropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool {
 	ret := C.QAbstractItemModel_DropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer())
 	return (bool)(ret)
 }
@@ -643,7 +660,7 @@ func (this *QAbstractItemModel) DataChanged(topLeft *QModelIndex, bottomRight *Q
 	C.QAbstractItemModel_DataChanged(this.h, topLeft.cPointer(), bottomRight.cPointer())
 }
 
-func (this *QAbstractItemModel) HeaderDataChanged(orientation uintptr, first int, last int) {
+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))
 }
 
@@ -771,7 +788,7 @@ func (this *QAbstractItemModel) SetData3(index *QModelIndex, value *QVariant, ro
 	return (bool)(ret)
 }
 
-func (this *QAbstractItemModel) HeaderData3(section int, orientation uintptr, role int) *QVariant {
+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))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQVariant(ret)
@@ -782,7 +799,7 @@ func (this *QAbstractItemModel) HeaderData3(section int, orientation uintptr, ro
 	return ret1
 }
 
-func (this *QAbstractItemModel) SetHeaderData4(section int, orientation uintptr, value *QVariant, role int) bool {
+func (this *QAbstractItemModel) SetHeaderData4(section int, orientation Orientation, value *QVariant, role int) bool {
 	ret := C.QAbstractItemModel_SetHeaderData4(this.h, (C.int)(section), (C.uintptr_t)(orientation), value.cPointer(), (C.int)(role))
 	return (bool)(ret)
 }
@@ -827,7 +844,7 @@ func (this *QAbstractItemModel) RemoveColumn2(column int, parent *QModelIndex) b
 	return (bool)(ret)
 }
 
-func (this *QAbstractItemModel) Sort2(column int, order uintptr) {
+func (this *QAbstractItemModel) Sort2(column int, order SortOrder) {
 	C.QAbstractItemModel_Sort2(this.h, (C.int)(column), (C.uintptr_t)(order))
 }
 
@@ -890,7 +907,7 @@ func (this *QAbstractItemModel) LayoutChanged1(parents []QPersistentModelIndex)
 	C.QAbstractItemModel_LayoutChanged1(this.h, &parents_CArray[0], C.size_t(len(parents)))
 }
 
-func (this *QAbstractItemModel) LayoutChanged2(parents []QPersistentModelIndex, hint uintptr) {
+func (this *QAbstractItemModel) LayoutChanged2(parents []QPersistentModelIndex, hint QAbstractItemModel__LayoutChangeHint) {
 	// For the C ABI, malloc a C array of raw pointers
 	parents_CArray := (*[0xffff]*C.QPersistentModelIndex)(C.malloc(C.size_t(8 * len(parents))))
 	defer C.free(unsafe.Pointer(parents_CArray))
@@ -918,7 +935,7 @@ func (this *QAbstractItemModel) LayoutAboutToBeChanged1(parents []QPersistentMod
 	C.QAbstractItemModel_LayoutAboutToBeChanged1(this.h, &parents_CArray[0], C.size_t(len(parents)))
 }
 
-func (this *QAbstractItemModel) LayoutAboutToBeChanged2(parents []QPersistentModelIndex, hint uintptr) {
+func (this *QAbstractItemModel) LayoutAboutToBeChanged2(parents []QPersistentModelIndex, hint QAbstractItemModel__LayoutChangeHint) {
 	// For the C ABI, malloc a C array of raw pointers
 	parents_CArray := (*[0xffff]*C.QPersistentModelIndex)(C.malloc(C.size_t(8 * len(parents))))
 	defer C.free(unsafe.Pointer(parents_CArray))
@@ -1012,7 +1029,7 @@ func (this *QAbstractTableModel) Sibling(row int, column int, idx *QModelIndex)
 	return ret1
 }
 
-func (this *QAbstractTableModel) DropMimeData(data *QMimeData, action uintptr, row int, column int, parent *QModelIndex) bool {
+func (this *QAbstractTableModel) DropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool {
 	ret := C.QAbstractTableModel_DropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer())
 	return (bool)(ret)
 }
@@ -1161,7 +1178,7 @@ func (this *QAbstractListModel) Sibling(row int, column int, idx *QModelIndex) *
 	return ret1
 }
 
-func (this *QAbstractListModel) DropMimeData(data *QMimeData, action uintptr, row int, column int, parent *QModelIndex) bool {
+func (this *QAbstractListModel) DropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool {
 	ret := C.QAbstractListModel_DropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer())
 	return (bool)(ret)
 }

qt/gen_qabstractitemview.go

@@ -14,6 +14,62 @@ import (
 	"unsafe"
 )
 
+type QAbstractItemView__SelectionMode int
+
+const (
+	QAbstractItemView__SelectionMode__NoSelection         QAbstractItemView__SelectionMode = 0
+	QAbstractItemView__SelectionMode__SingleSelection     QAbstractItemView__SelectionMode = 1
+	QAbstractItemView__SelectionMode__MultiSelection      QAbstractItemView__SelectionMode = 2
+	QAbstractItemView__SelectionMode__ExtendedSelection   QAbstractItemView__SelectionMode = 3
+	QAbstractItemView__SelectionMode__ContiguousSelection QAbstractItemView__SelectionMode = 4
+)
+
+type QAbstractItemView__SelectionBehavior int
+
+const (
+	QAbstractItemView__SelectionBehavior__SelectItems   QAbstractItemView__SelectionBehavior = 0
+	QAbstractItemView__SelectionBehavior__SelectRows    QAbstractItemView__SelectionBehavior = 1
+	QAbstractItemView__SelectionBehavior__SelectColumns QAbstractItemView__SelectionBehavior = 2
+)
+
+type QAbstractItemView__ScrollHint int
+
+const (
+	QAbstractItemView__ScrollHint__EnsureVisible    QAbstractItemView__ScrollHint = 0
+	QAbstractItemView__ScrollHint__PositionAtTop    QAbstractItemView__ScrollHint = 1
+	QAbstractItemView__ScrollHint__PositionAtBottom QAbstractItemView__ScrollHint = 2
+	QAbstractItemView__ScrollHint__PositionAtCenter QAbstractItemView__ScrollHint = 3
+)
+
+type QAbstractItemView__EditTrigger int
+
+const (
+	QAbstractItemView__EditTrigger__NoEditTriggers  QAbstractItemView__EditTrigger = 0
+	QAbstractItemView__EditTrigger__CurrentChanged  QAbstractItemView__EditTrigger = 1
+	QAbstractItemView__EditTrigger__DoubleClicked   QAbstractItemView__EditTrigger = 2
+	QAbstractItemView__EditTrigger__SelectedClicked QAbstractItemView__EditTrigger = 4
+	QAbstractItemView__EditTrigger__EditKeyPressed  QAbstractItemView__EditTrigger = 8
+	QAbstractItemView__EditTrigger__AnyKeyPressed   QAbstractItemView__EditTrigger = 16
+	QAbstractItemView__EditTrigger__AllEditTriggers QAbstractItemView__EditTrigger = 31
+)
+
+type QAbstractItemView__ScrollMode int
+
+const (
+	QAbstractItemView__ScrollMode__ScrollPerItem  QAbstractItemView__ScrollMode = 0
+	QAbstractItemView__ScrollMode__ScrollPerPixel QAbstractItemView__ScrollMode = 1
+)
+
+type QAbstractItemView__DragDropMode int
+
+const (
+	QAbstractItemView__DragDropMode__NoDragDrop   QAbstractItemView__DragDropMode = 0
+	QAbstractItemView__DragDropMode__DragOnly     QAbstractItemView__DragDropMode = 1
+	QAbstractItemView__DragDropMode__DropOnly     QAbstractItemView__DragDropMode = 2
+	QAbstractItemView__DragDropMode__DragDrop     QAbstractItemView__DragDropMode = 3
+	QAbstractItemView__DragDropMode__InternalMove QAbstractItemView__DragDropMode = 4
+)
+
 type QAbstractItemView struct {
 	h *C.QAbstractItemView
 	*QAbstractScrollArea
@@ -91,22 +147,22 @@ func (this *QAbstractItemView) ItemDelegate() *QAbstractItemDelegate {
 	return newQAbstractItemDelegate_U(unsafe.Pointer(ret))
 }
 
-func (this *QAbstractItemView) SetSelectionMode(mode uintptr) {
+func (this *QAbstractItemView) SetSelectionMode(mode QAbstractItemView__SelectionMode) {
 	C.QAbstractItemView_SetSelectionMode(this.h, (C.uintptr_t)(mode))
 }
 
-func (this *QAbstractItemView) SelectionMode() uintptr {
+func (this *QAbstractItemView) SelectionMode() QAbstractItemView__SelectionMode {
 	ret := C.QAbstractItemView_SelectionMode(this.h)
-	return (uintptr)(ret)
+	return (QAbstractItemView__SelectionMode)(ret)
 }
 
-func (this *QAbstractItemView) SetSelectionBehavior(behavior uintptr) {
+func (this *QAbstractItemView) SetSelectionBehavior(behavior QAbstractItemView__SelectionBehavior) {
 	C.QAbstractItemView_SetSelectionBehavior(this.h, (C.uintptr_t)(behavior))
 }
 
-func (this *QAbstractItemView) SelectionBehavior() uintptr {
+func (this *QAbstractItemView) SelectionBehavior() QAbstractItemView__SelectionBehavior {
 	ret := C.QAbstractItemView_SelectionBehavior(this.h)
-	return (uintptr)(ret)
+	return (QAbstractItemView__SelectionBehavior)(ret)
 }
 
 func (this *QAbstractItemView) CurrentIndex() *QModelIndex {
@@ -140,26 +196,26 @@ func (this *QAbstractItemView) EditTriggers() int {
 	return (int)(ret)
 }
 
-func (this *QAbstractItemView) SetVerticalScrollMode(mode uintptr) {
+func (this *QAbstractItemView) SetVerticalScrollMode(mode QAbstractItemView__ScrollMode) {
 	C.QAbstractItemView_SetVerticalScrollMode(this.h, (C.uintptr_t)(mode))
 }
 
-func (this *QAbstractItemView) VerticalScrollMode() uintptr {
+func (this *QAbstractItemView) VerticalScrollMode() QAbstractItemView__ScrollMode {
 	ret := C.QAbstractItemView_VerticalScrollMode(this.h)
-	return (uintptr)(ret)
+	return (QAbstractItemView__ScrollMode)(ret)
 }
 
 func (this *QAbstractItemView) ResetVerticalScrollMode() {
 	C.QAbstractItemView_ResetVerticalScrollMode(this.h)
 }
 
-func (this *QAbstractItemView) SetHorizontalScrollMode(mode uintptr) {
+func (this *QAbstractItemView) SetHorizontalScrollMode(mode QAbstractItemView__ScrollMode) {
 	C.QAbstractItemView_SetHorizontalScrollMode(this.h, (C.uintptr_t)(mode))
 }
 
-func (this *QAbstractItemView) HorizontalScrollMode() uintptr {
+func (this *QAbstractItemView) HorizontalScrollMode() QAbstractItemView__ScrollMode {
 	ret := C.QAbstractItemView_HorizontalScrollMode(this.h)
-	return (uintptr)(ret)
+	return (QAbstractItemView__ScrollMode)(ret)
 }
 
 func (this *QAbstractItemView) ResetHorizontalScrollMode() {
@@ -220,22 +276,22 @@ func (this *QAbstractItemView) DragDropOverwriteMode() bool {
 	return (bool)(ret)
 }
 
-func (this *QAbstractItemView) SetDragDropMode(behavior uintptr) {
+func (this *QAbstractItemView) SetDragDropMode(behavior QAbstractItemView__DragDropMode) {
 	C.QAbstractItemView_SetDragDropMode(this.h, (C.uintptr_t)(behavior))
 }
 
-func (this *QAbstractItemView) DragDropMode() uintptr {
+func (this *QAbstractItemView) DragDropMode() QAbstractItemView__DragDropMode {
 	ret := C.QAbstractItemView_DragDropMode(this.h)
-	return (uintptr)(ret)
+	return (QAbstractItemView__DragDropMode)(ret)
 }
 
-func (this *QAbstractItemView) SetDefaultDropAction(dropAction uintptr) {
+func (this *QAbstractItemView) SetDefaultDropAction(dropAction DropAction) {
 	C.QAbstractItemView_SetDefaultDropAction(this.h, (C.uintptr_t)(dropAction))
 }
 
-func (this *QAbstractItemView) DefaultDropAction() uintptr {
+func (this *QAbstractItemView) DefaultDropAction() DropAction {
 	ret := C.QAbstractItemView_DefaultDropAction(this.h)
-	return (uintptr)(ret)
+	return (DropAction)(ret)
 }
 
 func (this *QAbstractItemView) SetAlternatingRowColors(enable bool) {
@@ -262,13 +318,13 @@ func (this *QAbstractItemView) IconSize() *QSize {
 	return ret1
 }
 
-func (this *QAbstractItemView) SetTextElideMode(mode uintptr) {
+func (this *QAbstractItemView) SetTextElideMode(mode TextElideMode) {
 	C.QAbstractItemView_SetTextElideMode(this.h, (C.uintptr_t)(mode))
 }
 
-func (this *QAbstractItemView) TextElideMode() uintptr {
+func (this *QAbstractItemView) TextElideMode() TextElideMode {
 	ret := C.QAbstractItemView_TextElideMode(this.h)
-	return (uintptr)(ret)
+	return (TextElideMode)(ret)
 }
 
 func (this *QAbstractItemView) KeyboardSearch(search string) {
@@ -369,7 +425,7 @@ func (this *QAbstractItemView) ItemDelegateWithIndex(index *QModelIndex) *QAbstr
 	return newQAbstractItemDelegate_U(unsafe.Pointer(ret))
 }
 
-func (this *QAbstractItemView) InputMethodQuery(query uintptr) *QVariant {
+func (this *QAbstractItemView) InputMethodQuery(query InputMethodQuery) *QVariant {
 	ret := C.QAbstractItemView_InputMethodQuery(this.h, (C.uintptr_t)(query))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQVariant(ret)
@@ -556,7 +612,7 @@ func QAbstractItemView_TrUtf83(s string, c string, n int) string {
 	return ret
 }
 
-func (this *QAbstractItemView) ScrollTo2(index *QModelIndex, hint uintptr) {
+func (this *QAbstractItemView) ScrollTo2(index *QModelIndex, hint QAbstractItemView__ScrollHint) {
 	C.QAbstractItemView_ScrollTo2(this.h, index.cPointer(), (C.uintptr_t)(hint))
 }
 

qt/gen_qabstractproxymodel.go

@@ -114,7 +114,7 @@ func (this *QAbstractProxyModel) Data(proxyIndex *QModelIndex) *QVariant {
 	return ret1
 }
 
-func (this *QAbstractProxyModel) HeaderData(section int, orientation uintptr) *QVariant {
+func (this *QAbstractProxyModel) HeaderData(section int, orientation Orientation) *QVariant {
 	ret := C.QAbstractProxyModel_HeaderData(this.h, (C.int)(section), (C.uintptr_t)(orientation))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQVariant(ret)
@@ -135,7 +135,7 @@ func (this *QAbstractProxyModel) SetData(index *QModelIndex, value *QVariant) bo
 	return (bool)(ret)
 }
 
-func (this *QAbstractProxyModel) SetHeaderData(section int, orientation uintptr, value *QVariant) bool {
+func (this *QAbstractProxyModel) SetHeaderData(section int, orientation Orientation, value *QVariant) bool {
 	ret := C.QAbstractProxyModel_SetHeaderData(this.h, (C.int)(section), (C.uintptr_t)(orientation), value.cPointer())
 	return (bool)(ret)
 }
@@ -202,12 +202,12 @@ func (this *QAbstractProxyModel) MimeData(indexes []QModelIndex) *QMimeData {
 	return newQMimeData_U(unsafe.Pointer(ret))
 }
 
-func (this *QAbstractProxyModel) CanDropMimeData(data *QMimeData, action uintptr, row int, column int, parent *QModelIndex) bool {
+func (this *QAbstractProxyModel) CanDropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool {
 	ret := C.QAbstractProxyModel_CanDropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer())
 	return (bool)(ret)
 }
 
-func (this *QAbstractProxyModel) DropMimeData(data *QMimeData, action uintptr, row int, column int, parent *QModelIndex) bool {
+func (this *QAbstractProxyModel) DropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool {
 	ret := C.QAbstractProxyModel_DropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer())
 	return (bool)(ret)
 }
@@ -300,7 +300,7 @@ func (this *QAbstractProxyModel) Data2(proxyIndex *QModelIndex, role int) *QVari
 	return ret1
 }
 
-func (this *QAbstractProxyModel) HeaderData3(section int, orientation uintptr, role int) *QVariant {
+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))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQVariant(ret)
@@ -316,12 +316,12 @@ func (this *QAbstractProxyModel) SetData3(index *QModelIndex, value *QVariant, r
 	return (bool)(ret)
 }
 
-func (this *QAbstractProxyModel) SetHeaderData4(section int, orientation uintptr, value *QVariant, role int) bool {
+func (this *QAbstractProxyModel) SetHeaderData4(section int, orientation Orientation, value *QVariant, role int) bool {
 	ret := C.QAbstractProxyModel_SetHeaderData4(this.h, (C.int)(section), (C.uintptr_t)(orientation), value.cPointer(), (C.int)(role))
 	return (bool)(ret)
 }
 
-func (this *QAbstractProxyModel) Sort2(column int, order uintptr) {
+func (this *QAbstractProxyModel) Sort2(column int, order SortOrder) {
 	C.QAbstractProxyModel_Sort2(this.h, (C.int)(column), (C.uintptr_t)(order))
 }
 

qt/gen_qabstractscrollarea.go

@@ -13,6 +13,14 @@ import (
 	"unsafe"
 )
 
+type QAbstractScrollArea__SizeAdjustPolicy int
+
+const (
+	QAbstractScrollArea__SizeAdjustPolicy__AdjustIgnored               QAbstractScrollArea__SizeAdjustPolicy = 0
+	QAbstractScrollArea__SizeAdjustPolicy__AdjustToContentsOnFirstShow QAbstractScrollArea__SizeAdjustPolicy = 1
+	QAbstractScrollArea__SizeAdjustPolicy__AdjustToContents            QAbstractScrollArea__SizeAdjustPolicy = 2
+)
+
 type QAbstractScrollArea struct {
 	h *C.QAbstractScrollArea
 	*QFrame
@@ -75,12 +83,12 @@ func QAbstractScrollArea_TrUtf8(s string) string {
 	return ret
 }
 
-func (this *QAbstractScrollArea) VerticalScrollBarPolicy() uintptr {
+func (this *QAbstractScrollArea) VerticalScrollBarPolicy() ScrollBarPolicy {
 	ret := C.QAbstractScrollArea_VerticalScrollBarPolicy(this.h)
-	return (uintptr)(ret)
+	return (ScrollBarPolicy)(ret)
 }
 
-func (this *QAbstractScrollArea) SetVerticalScrollBarPolicy(verticalScrollBarPolicy uintptr) {
+func (this *QAbstractScrollArea) SetVerticalScrollBarPolicy(verticalScrollBarPolicy ScrollBarPolicy) {
 	C.QAbstractScrollArea_SetVerticalScrollBarPolicy(this.h, (C.uintptr_t)(verticalScrollBarPolicy))
 }
 
@@ -93,12 +101,12 @@ func (this *QAbstractScrollArea) SetVerticalScrollBar(scrollbar *QScrollBar) {
 	C.QAbstractScrollArea_SetVerticalScrollBar(this.h, scrollbar.cPointer())
 }
 
-func (this *QAbstractScrollArea) HorizontalScrollBarPolicy() uintptr {
+func (this *QAbstractScrollArea) HorizontalScrollBarPolicy() ScrollBarPolicy {
 	ret := C.QAbstractScrollArea_HorizontalScrollBarPolicy(this.h)
-	return (uintptr)(ret)
+	return (ScrollBarPolicy)(ret)
 }
 
-func (this *QAbstractScrollArea) SetHorizontalScrollBarPolicy(horizontalScrollBarPolicy uintptr) {
+func (this *QAbstractScrollArea) SetHorizontalScrollBarPolicy(horizontalScrollBarPolicy ScrollBarPolicy) {
 	C.QAbstractScrollArea_SetHorizontalScrollBarPolicy(this.h, (C.uintptr_t)(horizontalScrollBarPolicy))
 }
 
@@ -183,12 +191,12 @@ func (this *QAbstractScrollArea) SetupViewport(viewport *QWidget) {
 	C.QAbstractScrollArea_SetupViewport(this.h, viewport.cPointer())
 }
 
-func (this *QAbstractScrollArea) SizeAdjustPolicy() uintptr {
+func (this *QAbstractScrollArea) SizeAdjustPolicy() QAbstractScrollArea__SizeAdjustPolicy {
 	ret := C.QAbstractScrollArea_SizeAdjustPolicy(this.h)
-	return (uintptr)(ret)
+	return (QAbstractScrollArea__SizeAdjustPolicy)(ret)
 }
 
-func (this *QAbstractScrollArea) SetSizeAdjustPolicy(policy uintptr) {
+func (this *QAbstractScrollArea) SetSizeAdjustPolicy(policy QAbstractScrollArea__SizeAdjustPolicy) {
 	C.QAbstractScrollArea_SetSizeAdjustPolicy(this.h, (C.uintptr_t)(policy))
 }
 

qt/gen_qabstractslider.go

@@ -13,6 +13,19 @@ import (
 	"unsafe"
 )
 
+type QAbstractSlider__SliderAction int
+
+const (
+	QAbstractSlider__SliderAction__SliderNoAction      QAbstractSlider__SliderAction = 0
+	QAbstractSlider__SliderAction__SliderSingleStepAdd QAbstractSlider__SliderAction = 1
+	QAbstractSlider__SliderAction__SliderSingleStepSub QAbstractSlider__SliderAction = 2
+	QAbstractSlider__SliderAction__SliderPageStepAdd   QAbstractSlider__SliderAction = 3
+	QAbstractSlider__SliderAction__SliderPageStepSub   QAbstractSlider__SliderAction = 4
+	QAbstractSlider__SliderAction__SliderToMinimum     QAbstractSlider__SliderAction = 5
+	QAbstractSlider__SliderAction__SliderToMaximum     QAbstractSlider__SliderAction = 6
+	QAbstractSlider__SliderAction__SliderMove          QAbstractSlider__SliderAction = 7
+)
+
 type QAbstractSlider struct {
 	h *C.QAbstractSlider
 	*QWidget
@@ -75,9 +88,9 @@ func QAbstractSlider_TrUtf8(s string) string {
 	return ret
 }
 
-func (this *QAbstractSlider) Orientation() uintptr {
+func (this *QAbstractSlider) Orientation() Orientation {
 	ret := C.QAbstractSlider_Orientation(this.h)
-	return (uintptr)(ret)
+	return (Orientation)(ret)
 }
 
 func (this *QAbstractSlider) SetMinimum(minimum int) {
@@ -166,7 +179,7 @@ func (this *QAbstractSlider) Value() int {
 	return (int)(ret)
 }
 
-func (this *QAbstractSlider) TriggerAction(action uintptr) {
+func (this *QAbstractSlider) TriggerAction(action QAbstractSlider__SliderAction) {
 	C.QAbstractSlider_TriggerAction(this.h, (C.uintptr_t)(action))
 }
 
@@ -174,7 +187,7 @@ func (this *QAbstractSlider) SetValue(value int) {
 	C.QAbstractSlider_SetValue(this.h, (C.int)(value))
 }
 
-func (this *QAbstractSlider) SetOrientation(orientation uintptr) {
+func (this *QAbstractSlider) SetOrientation(orientation Orientation) {
 	C.QAbstractSlider_SetOrientation(this.h, (C.uintptr_t)(orientation))
 }
 

qt/gen_qabstractspinbox.go

@@ -14,6 +14,36 @@ import (
 	"unsafe"
 )
 
+type QAbstractSpinBox__StepEnabledFlag int
+
+const (
+	QAbstractSpinBox__StepEnabledFlag__StepNone        QAbstractSpinBox__StepEnabledFlag = 0
+	QAbstractSpinBox__StepEnabledFlag__StepUpEnabled   QAbstractSpinBox__StepEnabledFlag = 1
+	QAbstractSpinBox__StepEnabledFlag__StepDownEnabled QAbstractSpinBox__StepEnabledFlag = 2
+)
+
+type QAbstractSpinBox__ButtonSymbols int
+
+const (
+	QAbstractSpinBox__ButtonSymbols__UpDownArrows QAbstractSpinBox__ButtonSymbols = 0
+	QAbstractSpinBox__ButtonSymbols__PlusMinus    QAbstractSpinBox__ButtonSymbols = 1
+	QAbstractSpinBox__ButtonSymbols__NoButtons    QAbstractSpinBox__ButtonSymbols = 2
+)
+
+type QAbstractSpinBox__CorrectionMode int
+
+const (
+	QAbstractSpinBox__CorrectionMode__CorrectToPreviousValue QAbstractSpinBox__CorrectionMode = 0
+	QAbstractSpinBox__CorrectionMode__CorrectToNearestValue  QAbstractSpinBox__CorrectionMode = 1
+)
+
+type QAbstractSpinBox__StepType int
+
+const (
+	QAbstractSpinBox__StepType__DefaultStepType         QAbstractSpinBox__StepType = 0
+	QAbstractSpinBox__StepType__AdaptiveDecimalStepType QAbstractSpinBox__StepType = 1
+)
+
 type QAbstractSpinBox struct {
 	h *C.QAbstractSpinBox
 	*QWidget
@@ -76,22 +106,22 @@ func QAbstractSpinBox_TrUtf8(s string) string {
 	return ret
 }
 
-func (this *QAbstractSpinBox) ButtonSymbols() uintptr {
+func (this *QAbstractSpinBox) ButtonSymbols() QAbstractSpinBox__ButtonSymbols {
 	ret := C.QAbstractSpinBox_ButtonSymbols(this.h)
-	return (uintptr)(ret)
+	return (QAbstractSpinBox__ButtonSymbols)(ret)
 }
 
-func (this *QAbstractSpinBox) SetButtonSymbols(bs uintptr) {
+func (this *QAbstractSpinBox) SetButtonSymbols(bs QAbstractSpinBox__ButtonSymbols) {
 	C.QAbstractSpinBox_SetButtonSymbols(this.h, (C.uintptr_t)(bs))
 }
 
-func (this *QAbstractSpinBox) SetCorrectionMode(cm uintptr) {
+func (this *QAbstractSpinBox) SetCorrectionMode(cm QAbstractSpinBox__CorrectionMode) {
 	C.QAbstractSpinBox_SetCorrectionMode(this.h, (C.uintptr_t)(cm))
 }
 
-func (this *QAbstractSpinBox) CorrectionMode() uintptr {
+func (this *QAbstractSpinBox) CorrectionMode() QAbstractSpinBox__CorrectionMode {
 	ret := C.QAbstractSpinBox_CorrectionMode(this.h)
-	return (uintptr)(ret)
+	return (QAbstractSpinBox__CorrectionMode)(ret)
 }
 
 func (this *QAbstractSpinBox) HasAcceptableInput() bool {
@@ -217,7 +247,7 @@ func (this *QAbstractSpinBox) Event(event *QEvent) bool {
 	return (bool)(ret)
 }
 
-func (this *QAbstractSpinBox) InputMethodQuery(param1 uintptr) *QVariant {
+func (this *QAbstractSpinBox) InputMethodQuery(param1 InputMethodQuery) *QVariant {
 	ret := C.QAbstractSpinBox_InputMethodQuery(this.h, (C.uintptr_t)(param1))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQVariant(ret)
@@ -228,11 +258,11 @@ func (this *QAbstractSpinBox) InputMethodQuery(param1 uintptr) *QVariant {
 	return ret1
 }
 
-func (this *QAbstractSpinBox) Validate(input string, pos *int) uintptr {
+func (this *QAbstractSpinBox) Validate(input string, pos *int) QValidator__State {
 	input_Cstring := C.CString(input)
 	defer C.free(unsafe.Pointer(input_Cstring))
 	ret := C.QAbstractSpinBox_Validate(this.h, input_Cstring, C.size_t(len(input)), (*C.int)(unsafe.Pointer(pos)))
-	return (uintptr)(ret)
+	return (QValidator__State)(ret)
 }
 
 func (this *QAbstractSpinBox) Fixup(input string) {

qt/gen_qabstracttextdocumentlayout.go

@@ -68,7 +68,7 @@ func (this *QAbstractTextDocumentLayout) Draw(painter *QPainter, context *QAbstr
 	C.QAbstractTextDocumentLayout_Draw(this.h, painter.cPointer(), context.cPointer())
 }
 
-func (this *QAbstractTextDocumentLayout) HitTest(point *QPointF, accuracy uintptr) int {
+func (this *QAbstractTextDocumentLayout) HitTest(point *QPointF, accuracy HitTestAccuracy) int {
 	ret := C.QAbstractTextDocumentLayout_HitTest(this.h, point.cPointer(), (C.uintptr_t)(accuracy))
 	return (int)(ret)
 }

qt/gen_qabstracttransition.go

@@ -12,6 +12,13 @@ import (
 	"unsafe"
 )
 
+type QAbstractTransition__TransitionType int
+
+const (
+	QAbstractTransition__TransitionType__ExternalTransition QAbstractTransition__TransitionType = 0
+	QAbstractTransition__TransitionType__InternalTransition QAbstractTransition__TransitionType = 1
+)
+
 type QAbstractTransition struct {
 	h *C.QAbstractTransition
 	*QObject
@@ -99,12 +106,12 @@ func (this *QAbstractTransition) SetTargetStates(targets []*QAbstractState) {
 	C.QAbstractTransition_SetTargetStates(this.h, &targets_CArray[0], C.size_t(len(targets)))
 }
 
-func (this *QAbstractTransition) TransitionType() uintptr {
+func (this *QAbstractTransition) TransitionType() QAbstractTransition__TransitionType {
 	ret := C.QAbstractTransition_TransitionType(this.h)
-	return (uintptr)(ret)
+	return (QAbstractTransition__TransitionType)(ret)
 }
 
-func (this *QAbstractTransition) SetTransitionType(typeVal uintptr) {
+func (this *QAbstractTransition) SetTransitionType(typeVal QAbstractTransition__TransitionType) {
 	C.QAbstractTransition_SetTransitionType(this.h, (C.uintptr_t)(typeVal))
 }
 

qt/gen_qaccessible.go

@@ -13,6 +13,218 @@ import (
 	"unsafe"
 )
 
+type QAccessible__Event int
+
+const (
+	QAccessible__Event__SoundPlayed                     QAccessible__Event = 1
+	QAccessible__Event__Alert                           QAccessible__Event = 2
+	QAccessible__Event__ForegroundChanged               QAccessible__Event = 3
+	QAccessible__Event__MenuStart                       QAccessible__Event = 4
+	QAccessible__Event__MenuEnd                         QAccessible__Event = 5
+	QAccessible__Event__PopupMenuStart                  QAccessible__Event = 6
+	QAccessible__Event__PopupMenuEnd                    QAccessible__Event = 7
+	QAccessible__Event__ContextHelpStart                QAccessible__Event = 12
+	QAccessible__Event__ContextHelpEnd                  QAccessible__Event = 13
+	QAccessible__Event__DragDropStart                   QAccessible__Event = 14
+	QAccessible__Event__DragDropEnd                     QAccessible__Event = 15
+	QAccessible__Event__DialogStart                     QAccessible__Event = 16
+	QAccessible__Event__DialogEnd                       QAccessible__Event = 17
+	QAccessible__Event__ScrollingStart                  QAccessible__Event = 18
+	QAccessible__Event__ScrollingEnd                    QAccessible__Event = 19
+	QAccessible__Event__MenuCommand                     QAccessible__Event = 24
+	QAccessible__Event__ActionChanged                   QAccessible__Event = 257
+	QAccessible__Event__ActiveDescendantChanged         QAccessible__Event = 258
+	QAccessible__Event__AttributeChanged                QAccessible__Event = 259
+	QAccessible__Event__DocumentContentChanged          QAccessible__Event = 260
+	QAccessible__Event__DocumentLoadComplete            QAccessible__Event = 261
+	QAccessible__Event__DocumentLoadStopped             QAccessible__Event = 262
+	QAccessible__Event__DocumentReload                  QAccessible__Event = 263
+	QAccessible__Event__HyperlinkEndIndexChanged        QAccessible__Event = 264
+	QAccessible__Event__HyperlinkNumberOfAnchorsChanged QAccessible__Event = 265
+	QAccessible__Event__HyperlinkSelectedLinkChanged    QAccessible__Event = 266
+	QAccessible__Event__HypertextLinkActivated          QAccessible__Event = 267
+	QAccessible__Event__HypertextLinkSelected           QAccessible__Event = 268
+	QAccessible__Event__HyperlinkStartIndexChanged      QAccessible__Event = 269
+	QAccessible__Event__HypertextChanged                QAccessible__Event = 270
+	QAccessible__Event__HypertextNLinksChanged          QAccessible__Event = 271
+	QAccessible__Event__ObjectAttributeChanged          QAccessible__Event = 272
+	QAccessible__Event__PageChanged                     QAccessible__Event = 273
+	QAccessible__Event__SectionChanged                  QAccessible__Event = 274
+	QAccessible__Event__TableCaptionChanged             QAccessible__Event = 275
+	QAccessible__Event__TableColumnDescriptionChanged   QAccessible__Event = 276
+	QAccessible__Event__TableColumnHeaderChanged        QAccessible__Event = 277
+	QAccessible__Event__TableModelChanged               QAccessible__Event = 278
+	QAccessible__Event__TableRowDescriptionChanged      QAccessible__Event = 279
+	QAccessible__Event__TableRowHeaderChanged           QAccessible__Event = 280
+	QAccessible__Event__TableSummaryChanged             QAccessible__Event = 281
+	QAccessible__Event__TextAttributeChanged            QAccessible__Event = 282
+	QAccessible__Event__TextCaretMoved                  QAccessible__Event = 283
+	QAccessible__Event__TextColumnChanged               QAccessible__Event = 285
+	QAccessible__Event__TextInserted                    QAccessible__Event = 286
+	QAccessible__Event__TextRemoved                     QAccessible__Event = 287
+	QAccessible__Event__TextUpdated                     QAccessible__Event = 288
+	QAccessible__Event__TextSelectionChanged            QAccessible__Event = 289
+	QAccessible__Event__VisibleDataChanged              QAccessible__Event = 290
+	QAccessible__Event__ObjectCreated                   QAccessible__Event = 32768
+	QAccessible__Event__ObjectDestroyed                 QAccessible__Event = 32769
+	QAccessible__Event__ObjectShow                      QAccessible__Event = 32770
+	QAccessible__Event__ObjectHide                      QAccessible__Event = 32771
+	QAccessible__Event__ObjectReorder                   QAccessible__Event = 32772
+	QAccessible__Event__Focus                           QAccessible__Event = 32773
+	QAccessible__Event__Selection                       QAccessible__Event = 32774
+	QAccessible__Event__SelectionAdd                    QAccessible__Event = 32775
+	QAccessible__Event__SelectionRemove                 QAccessible__Event = 32776
+	QAccessible__Event__SelectionWithin                 QAccessible__Event = 32777
+	QAccessible__Event__StateChanged                    QAccessible__Event = 32778
+	QAccessible__Event__LocationChanged                 QAccessible__Event = 32779
+	QAccessible__Event__NameChanged                     QAccessible__Event = 32780
+	QAccessible__Event__DescriptionChanged              QAccessible__Event = 32781
+	QAccessible__Event__ValueChanged                    QAccessible__Event = 32782
+	QAccessible__Event__ParentChanged                   QAccessible__Event = 32783
+	QAccessible__Event__HelpChanged                     QAccessible__Event = 32928
+	QAccessible__Event__DefaultActionChanged            QAccessible__Event = 32944
+	QAccessible__Event__AcceleratorChanged              QAccessible__Event = 32960
+	QAccessible__Event__InvalidEvent                    QAccessible__Event = 32961
+)
+
+type QAccessible__Role int
+
+const (
+	QAccessible__Role__NoRole               QAccessible__Role = 0
+	QAccessible__Role__TitleBar             QAccessible__Role = 1
+	QAccessible__Role__MenuBar              QAccessible__Role = 2
+	QAccessible__Role__ScrollBar            QAccessible__Role = 3
+	QAccessible__Role__Grip                 QAccessible__Role = 4
+	QAccessible__Role__Sound                QAccessible__Role = 5
+	QAccessible__Role__Cursor               QAccessible__Role = 6
+	QAccessible__Role__Caret                QAccessible__Role = 7
+	QAccessible__Role__AlertMessage         QAccessible__Role = 8
+	QAccessible__Role__Window               QAccessible__Role = 9
+	QAccessible__Role__Client               QAccessible__Role = 10
+	QAccessible__Role__PopupMenu            QAccessible__Role = 11
+	QAccessible__Role__MenuItem             QAccessible__Role = 12
+	QAccessible__Role__ToolTip              QAccessible__Role = 13
+	QAccessible__Role__Application          QAccessible__Role = 14
+	QAccessible__Role__Document             QAccessible__Role = 15
+	QAccessible__Role__Pane                 QAccessible__Role = 16
+	QAccessible__Role__Chart                QAccessible__Role = 17
+	QAccessible__Role__Dialog               QAccessible__Role = 18
+	QAccessible__Role__Border               QAccessible__Role = 19
+	QAccessible__Role__Grouping             QAccessible__Role = 20
+	QAccessible__Role__Separator            QAccessible__Role = 21
+	QAccessible__Role__ToolBar              QAccessible__Role = 22
+	QAccessible__Role__StatusBar            QAccessible__Role = 23
+	QAccessible__Role__Table                QAccessible__Role = 24
+	QAccessible__Role__ColumnHeader         QAccessible__Role = 25
+	QAccessible__Role__RowHeader            QAccessible__Role = 26
+	QAccessible__Role__Column               QAccessible__Role = 27
+	QAccessible__Role__Row                  QAccessible__Role = 28
+	QAccessible__Role__Cell                 QAccessible__Role = 29
+	QAccessible__Role__Link                 QAccessible__Role = 30
+	QAccessible__Role__HelpBalloon          QAccessible__Role = 31
+	QAccessible__Role__Assistant            QAccessible__Role = 32
+	QAccessible__Role__List                 QAccessible__Role = 33
+	QAccessible__Role__ListItem             QAccessible__Role = 34
+	QAccessible__Role__Tree                 QAccessible__Role = 35
+	QAccessible__Role__TreeItem             QAccessible__Role = 36
+	QAccessible__Role__PageTab              QAccessible__Role = 37
+	QAccessible__Role__PropertyPage         QAccessible__Role = 38
+	QAccessible__Role__Indicator            QAccessible__Role = 39
+	QAccessible__Role__Graphic              QAccessible__Role = 40
+	QAccessible__Role__StaticText           QAccessible__Role = 41
+	QAccessible__Role__EditableText         QAccessible__Role = 42
+	QAccessible__Role__Button               QAccessible__Role = 43
+	QAccessible__Role__PushButton           QAccessible__Role = 43
+	QAccessible__Role__CheckBox             QAccessible__Role = 44
+	QAccessible__Role__RadioButton          QAccessible__Role = 45
+	QAccessible__Role__ComboBox             QAccessible__Role = 46
+	QAccessible__Role__ProgressBar          QAccessible__Role = 48
+	QAccessible__Role__Dial                 QAccessible__Role = 49
+	QAccessible__Role__HotkeyField          QAccessible__Role = 50
+	QAccessible__Role__Slider               QAccessible__Role = 51
+	QAccessible__Role__SpinBox              QAccessible__Role = 52
+	QAccessible__Role__Canvas               QAccessible__Role = 53
+	QAccessible__Role__Animation            QAccessible__Role = 54
+	QAccessible__Role__Equation             QAccessible__Role = 55
+	QAccessible__Role__ButtonDropDown       QAccessible__Role = 56
+	QAccessible__Role__ButtonMenu           QAccessible__Role = 57
+	QAccessible__Role__ButtonDropGrid       QAccessible__Role = 58
+	QAccessible__Role__Whitespace           QAccessible__Role = 59
+	QAccessible__Role__PageTabList          QAccessible__Role = 60
+	QAccessible__Role__Clock                QAccessible__Role = 61
+	QAccessible__Role__Splitter             QAccessible__Role = 62
+	QAccessible__Role__LayeredPane          QAccessible__Role = 128
+	QAccessible__Role__Terminal             QAccessible__Role = 129
+	QAccessible__Role__Desktop              QAccessible__Role = 130
+	QAccessible__Role__Paragraph            QAccessible__Role = 131
+	QAccessible__Role__WebDocument          QAccessible__Role = 132
+	QAccessible__Role__Section              QAccessible__Role = 133
+	QAccessible__Role__Notification         QAccessible__Role = 134
+	QAccessible__Role__ColorChooser         QAccessible__Role = 1028
+	QAccessible__Role__Footer               QAccessible__Role = 1038
+	QAccessible__Role__Form                 QAccessible__Role = 1040
+	QAccessible__Role__Heading              QAccessible__Role = 1044
+	QAccessible__Role__Note                 QAccessible__Role = 1051
+	QAccessible__Role__ComplementaryContent QAccessible__Role = 1068
+	QAccessible__Role__UserRole             QAccessible__Role = 65535
+)
+
+type QAccessible__Text int
+
+const (
+	QAccessible__Text__Name             QAccessible__Text = 0
+	QAccessible__Text__Description      QAccessible__Text = 1
+	QAccessible__Text__Value            QAccessible__Text = 2
+	QAccessible__Text__Help             QAccessible__Text = 3
+	QAccessible__Text__Accelerator      QAccessible__Text = 4
+	QAccessible__Text__DebugDescription QAccessible__Text = 5
+	QAccessible__Text__UserText         QAccessible__Text = 65535
+)
+
+type QAccessible__RelationFlag int
+
+const (
+	QAccessible__RelationFlag__Label        QAccessible__RelationFlag = 1
+	QAccessible__RelationFlag__Labelled     QAccessible__RelationFlag = 2
+	QAccessible__RelationFlag__Controller   QAccessible__RelationFlag = 4
+	QAccessible__RelationFlag__Controlled   QAccessible__RelationFlag = 8
+	QAccessible__RelationFlag__AllRelations QAccessible__RelationFlag = 4294967295
+)
+
+type QAccessible__InterfaceType int
+
+const (
+	QAccessible__InterfaceType__TextInterface         QAccessible__InterfaceType = 0
+	QAccessible__InterfaceType__EditableTextInterface QAccessible__InterfaceType = 1
+	QAccessible__InterfaceType__ValueInterface        QAccessible__InterfaceType = 2
+	QAccessible__InterfaceType__ActionInterface       QAccessible__InterfaceType = 3
+	QAccessible__InterfaceType__ImageInterface        QAccessible__InterfaceType = 4
+	QAccessible__InterfaceType__TableInterface        QAccessible__InterfaceType = 5
+	QAccessible__InterfaceType__TableCellInterface    QAccessible__InterfaceType = 6
+)
+
+type QAccessible__TextBoundaryType int
+
+const (
+	QAccessible__TextBoundaryType__CharBoundary      QAccessible__TextBoundaryType = 0
+	QAccessible__TextBoundaryType__WordBoundary      QAccessible__TextBoundaryType = 1
+	QAccessible__TextBoundaryType__SentenceBoundary  QAccessible__TextBoundaryType = 2
+	QAccessible__TextBoundaryType__ParagraphBoundary QAccessible__TextBoundaryType = 3
+	QAccessible__TextBoundaryType__LineBoundary      QAccessible__TextBoundaryType = 4
+	QAccessible__TextBoundaryType__NoBoundary        QAccessible__TextBoundaryType = 5
+)
+
+type QAccessibleTableModelChangeEvent__ModelChangeType int
+
+const (
+	QAccessibleTableModelChangeEvent__ModelChangeType__ModelReset      QAccessibleTableModelChangeEvent__ModelChangeType = 0
+	QAccessibleTableModelChangeEvent__ModelChangeType__DataChanged     QAccessibleTableModelChangeEvent__ModelChangeType = 1
+	QAccessibleTableModelChangeEvent__ModelChangeType__RowsInserted    QAccessibleTableModelChangeEvent__ModelChangeType = 2
+	QAccessibleTableModelChangeEvent__ModelChangeType__ColumnsInserted QAccessibleTableModelChangeEvent__ModelChangeType = 3
+	QAccessibleTableModelChangeEvent__ModelChangeType__RowsRemoved     QAccessibleTableModelChangeEvent__ModelChangeType = 4
+	QAccessibleTableModelChangeEvent__ModelChangeType__ColumnsRemoved  QAccessibleTableModelChangeEvent__ModelChangeType = 5
+)
+
 type QAccessible struct {
 	h *C.QAccessible
 }
@@ -159,7 +371,7 @@ func (this *QAccessibleInterface) IndexOfChild(param1 *QAccessibleInterface) int
 	return (int)(ret)
 }
 
-func (this *QAccessibleInterface) Text(t uintptr) string {
+func (this *QAccessibleInterface) Text(t QAccessible__Text) string {
 	var _out *C.char = nil
 	var _out_Strlen C.int = 0
 	C.QAccessibleInterface_Text(this.h, (C.uintptr_t)(t), &_out, &_out_Strlen)
@@ -168,7 +380,7 @@ func (this *QAccessibleInterface) Text(t uintptr) string {
 	return ret
 }
 
-func (this *QAccessibleInterface) SetText(t uintptr, text string) {
+func (this *QAccessibleInterface) SetText(t QAccessible__Text, text string) {
 	text_Cstring := C.CString(text)
 	defer C.free(unsafe.Pointer(text_Cstring))
 	C.QAccessibleInterface_SetText(this.h, (C.uintptr_t)(t), text_Cstring, C.size_t(len(text)))
@@ -185,9 +397,9 @@ func (this *QAccessibleInterface) Rect() *QRect {
 	return ret1
 }
 
-func (this *QAccessibleInterface) Role() uintptr {
+func (this *QAccessibleInterface) Role() QAccessible__Role {
 	ret := C.QAccessibleInterface_Role(this.h)
-	return (uintptr)(ret)
+	return (QAccessible__Role)(ret)
 }
 
 func (this *QAccessibleInterface) State() *QAccessible__State {
@@ -319,7 +531,7 @@ func (this *QAccessibleTextInterface) Text(startOffset int, endOffset int) strin
 	return ret
 }
 
-func (this *QAccessibleTextInterface) TextBeforeOffset(offset int, boundaryType uintptr, startOffset *int, endOffset *int) string {
+func (this *QAccessibleTextInterface) TextBeforeOffset(offset int, boundaryType QAccessible__TextBoundaryType, startOffset *int, endOffset *int) string {
 	var _out *C.char = nil
 	var _out_Strlen C.int = 0
 	C.QAccessibleTextInterface_TextBeforeOffset(this.h, (C.int)(offset), (C.uintptr_t)(boundaryType), (*C.int)(unsafe.Pointer(startOffset)), (*C.int)(unsafe.Pointer(endOffset)), &_out, &_out_Strlen)
@@ -328,7 +540,7 @@ func (this *QAccessibleTextInterface) TextBeforeOffset(offset int, boundaryType
 	return ret
 }
 
-func (this *QAccessibleTextInterface) TextAfterOffset(offset int, boundaryType uintptr, startOffset *int, endOffset *int) string {
+func (this *QAccessibleTextInterface) TextAfterOffset(offset int, boundaryType QAccessible__TextBoundaryType, startOffset *int, endOffset *int) string {
 	var _out *C.char = nil
 	var _out_Strlen C.int = 0
 	C.QAccessibleTextInterface_TextAfterOffset(this.h, (C.int)(offset), (C.uintptr_t)(boundaryType), (*C.int)(unsafe.Pointer(startOffset)), (*C.int)(unsafe.Pointer(endOffset)), &_out, &_out_Strlen)
@@ -337,7 +549,7 @@ func (this *QAccessibleTextInterface) TextAfterOffset(offset int, boundaryType u
 	return ret
 }
 
-func (this *QAccessibleTextInterface) TextAtOffset(offset int, boundaryType uintptr, startOffset *int, endOffset *int) string {
+func (this *QAccessibleTextInterface) TextAtOffset(offset int, boundaryType QAccessible__TextBoundaryType, startOffset *int, endOffset *int) string {
 	var _out *C.char = nil
 	var _out_Strlen C.int = 0
 	C.QAccessibleTextInterface_TextAtOffset(this.h, (C.int)(offset), (C.uintptr_t)(boundaryType), (*C.int)(unsafe.Pointer(startOffset)), (*C.int)(unsafe.Pointer(endOffset)), &_out, &_out_Strlen)
@@ -1111,20 +1323,20 @@ func newQAccessibleEvent_U(h unsafe.Pointer) *QAccessibleEvent {
 }
 
 // NewQAccessibleEvent constructs a new QAccessibleEvent object.
-func NewQAccessibleEvent(obj *QObject, typ uintptr) *QAccessibleEvent {
+func NewQAccessibleEvent(obj *QObject, typ QAccessible__Event) *QAccessibleEvent {
 	ret := C.QAccessibleEvent_new(obj.cPointer(), (C.uintptr_t)(typ))
 	return newQAccessibleEvent(ret)
 }
 
 // NewQAccessibleEvent2 constructs a new QAccessibleEvent object.
-func NewQAccessibleEvent2(iface *QAccessibleInterface, typ uintptr) *QAccessibleEvent {
+func NewQAccessibleEvent2(iface *QAccessibleInterface, typ QAccessible__Event) *QAccessibleEvent {
 	ret := C.QAccessibleEvent_new2(iface.cPointer(), (C.uintptr_t)(typ))
 	return newQAccessibleEvent(ret)
 }
 
-func (this *QAccessibleEvent) Type() uintptr {
+func (this *QAccessibleEvent) Type() QAccessible__Event {
 	ret := C.QAccessibleEvent_Type(this.h)
-	return (uintptr)(ret)
+	return (QAccessible__Event)(ret)
 }
 
 func (this *QAccessibleEvent) Object() *QObject {
@@ -1568,24 +1780,24 @@ func newQAccessibleTableModelChangeEvent_U(h unsafe.Pointer) *QAccessibleTableMo
 }
 
 // NewQAccessibleTableModelChangeEvent constructs a new QAccessibleTableModelChangeEvent object.
-func NewQAccessibleTableModelChangeEvent(obj *QObject, changeType uintptr) *QAccessibleTableModelChangeEvent {
+func NewQAccessibleTableModelChangeEvent(obj *QObject, changeType QAccessibleTableModelChangeEvent__ModelChangeType) *QAccessibleTableModelChangeEvent {
 	ret := C.QAccessibleTableModelChangeEvent_new(obj.cPointer(), (C.uintptr_t)(changeType))
 	return newQAccessibleTableModelChangeEvent(ret)
 }
 
 // NewQAccessibleTableModelChangeEvent2 constructs a new QAccessibleTableModelChangeEvent object.
-func NewQAccessibleTableModelChangeEvent2(iface *QAccessibleInterface, changeType uintptr) *QAccessibleTableModelChangeEvent {
+func NewQAccessibleTableModelChangeEvent2(iface *QAccessibleInterface, changeType QAccessibleTableModelChangeEvent__ModelChangeType) *QAccessibleTableModelChangeEvent {
 	ret := C.QAccessibleTableModelChangeEvent_new2(iface.cPointer(), (C.uintptr_t)(changeType))
 	return newQAccessibleTableModelChangeEvent(ret)
 }
 
-func (this *QAccessibleTableModelChangeEvent) SetModelChangeType(changeType uintptr) {
+func (this *QAccessibleTableModelChangeEvent) SetModelChangeType(changeType QAccessibleTableModelChangeEvent__ModelChangeType) {
 	C.QAccessibleTableModelChangeEvent_SetModelChangeType(this.h, (C.uintptr_t)(changeType))
 }
 
-func (this *QAccessibleTableModelChangeEvent) ModelChangeType() uintptr {
+func (this *QAccessibleTableModelChangeEvent) ModelChangeType() QAccessibleTableModelChangeEvent__ModelChangeType {
 	ret := C.QAccessibleTableModelChangeEvent_ModelChangeType(this.h)
-	return (uintptr)(ret)
+	return (QAccessibleTableModelChangeEvent__ModelChangeType)(ret)
 }
 
 func (this *QAccessibleTableModelChangeEvent) SetFirstRow(row int) {

qt/gen_qaccessibleobject.go

@@ -57,7 +57,7 @@ func (this *QAccessibleObject) Rect() *QRect {
 	return ret1
 }
 
-func (this *QAccessibleObject) SetText(t uintptr, text string) {
+func (this *QAccessibleObject) SetText(t QAccessible__Text, text string) {
 	text_Cstring := C.CString(text)
 	defer C.free(unsafe.Pointer(text_Cstring))
 	C.QAccessibleObject_SetText(this.h, (C.uintptr_t)(t), text_Cstring, C.size_t(len(text)))
@@ -127,7 +127,7 @@ func (this *QAccessibleApplication) Child(index int) *QAccessibleInterface {
 	return newQAccessibleInterface_U(unsafe.Pointer(ret))
 }
 
-func (this *QAccessibleApplication) Text(t uintptr) string {
+func (this *QAccessibleApplication) Text(t QAccessible__Text) string {
 	var _out *C.char = nil
 	var _out_Strlen C.int = 0
 	C.QAccessibleApplication_Text(this.h, (C.uintptr_t)(t), &_out, &_out_Strlen)
@@ -136,9 +136,9 @@ func (this *QAccessibleApplication) Text(t uintptr) string {
 	return ret
 }
 
-func (this *QAccessibleApplication) Role() uintptr {
+func (this *QAccessibleApplication) Role() QAccessible__Role {
 	ret := C.QAccessibleApplication_Role(this.h)
-	return (uintptr)(ret)
+	return (QAccessible__Role)(ret)
 }
 
 func (this *QAccessibleApplication) State() *QAccessible__State {

qt/gen_qaccessiblewidget.go

@@ -44,13 +44,13 @@ func NewQAccessibleWidget(o *QWidget) *QAccessibleWidget {
 }
 
 // NewQAccessibleWidget2 constructs a new QAccessibleWidget object.
-func NewQAccessibleWidget2(o *QWidget, r uintptr) *QAccessibleWidget {
+func NewQAccessibleWidget2(o *QWidget, r QAccessible__Role) *QAccessibleWidget {
 	ret := C.QAccessibleWidget_new2(o.cPointer(), (C.uintptr_t)(r))
 	return newQAccessibleWidget(ret)
 }
 
 // NewQAccessibleWidget3 constructs a new QAccessibleWidget object.
-func NewQAccessibleWidget3(o *QWidget, r uintptr, name string) *QAccessibleWidget {
+func NewQAccessibleWidget3(o *QWidget, r QAccessible__Role, name string) *QAccessibleWidget {
 	name_Cstring := C.CString(name)
 	defer C.free(unsafe.Pointer(name_Cstring))
 	ret := C.QAccessibleWidget_new3(o.cPointer(), (C.uintptr_t)(r), name_Cstring, C.size_t(len(name)))
@@ -103,7 +103,7 @@ func (this *QAccessibleWidget) Child(index int) *QAccessibleInterface {
 	return newQAccessibleInterface_U(unsafe.Pointer(ret))
 }
 
-func (this *QAccessibleWidget) Text(t uintptr) string {
+func (this *QAccessibleWidget) Text(t QAccessible__Text) string {
 	var _out *C.char = nil
 	var _out_Strlen C.int = 0
 	C.QAccessibleWidget_Text(this.h, (C.uintptr_t)(t), &_out, &_out_Strlen)
@@ -112,9 +112,9 @@ func (this *QAccessibleWidget) Text(t uintptr) string {
 	return ret
 }
 
-func (this *QAccessibleWidget) Role() uintptr {
+func (this *QAccessibleWidget) Role() QAccessible__Role {
 	ret := C.QAccessibleWidget_Role(this.h)
-	return (uintptr)(ret)
+	return (QAccessible__Role)(ret)
 }
 
 func (this *QAccessibleWidget) State() *QAccessible__State {

qt/gen_qaction.go

@@ -14,6 +14,33 @@ import (
 	"unsafe"
 )
 
+type QAction__MenuRole int
+
+const (
+	QAction__MenuRole__NoRole                  QAction__MenuRole = 0
+	QAction__MenuRole__TextHeuristicRole       QAction__MenuRole = 1
+	QAction__MenuRole__ApplicationSpecificRole QAction__MenuRole = 2
+	QAction__MenuRole__AboutQtRole             QAction__MenuRole = 3
+	QAction__MenuRole__AboutRole               QAction__MenuRole = 4
+	QAction__MenuRole__PreferencesRole         QAction__MenuRole = 5
+	QAction__MenuRole__QuitRole                QAction__MenuRole = 6
+)
+
+type QAction__Priority int
+
+const (
+	QAction__Priority__LowPriority    QAction__Priority = 0
+	QAction__Priority__NormalPriority QAction__Priority = 128
+	QAction__Priority__HighPriority   QAction__Priority = 256
+)
+
+type QAction__ActionEvent int
+
+const (
+	QAction__ActionEvent__Trigger QAction__ActionEvent = 0
+	QAction__ActionEvent__Hover   QAction__ActionEvent = 1
+)
+
 type QAction struct {
 	h *C.QAction
 	*QObject
@@ -207,13 +234,13 @@ func (this *QAction) WhatsThis() string {
 	return ret
 }
 
-func (this *QAction) SetPriority(priority uintptr) {
+func (this *QAction) SetPriority(priority QAction__Priority) {
 	C.QAction_SetPriority(this.h, (C.uintptr_t)(priority))
 }
 
-func (this *QAction) Priority() uintptr {
+func (this *QAction) Priority() QAction__Priority {
 	ret := C.QAction_Priority(this.h)
-	return (uintptr)(ret)
+	return (QAction__Priority)(ret)
 }
 
 func (this *QAction) Menu() *QMenu {
@@ -259,7 +286,7 @@ func (this *QAction) SetShortcuts(shortcuts []QKeySequence) {
 	C.QAction_SetShortcuts(this.h, &shortcuts_CArray[0], C.size_t(len(shortcuts)))
 }
 
-func (this *QAction) SetShortcutsWithShortcuts(shortcuts uintptr) {
+func (this *QAction) SetShortcutsWithShortcuts(shortcuts QKeySequence__StandardKey) {
 	C.QAction_SetShortcutsWithShortcuts(this.h, (C.uintptr_t)(shortcuts))
 }
 
@@ -276,13 +303,13 @@ func (this *QAction) Shortcuts() []QKeySequence {
 	return ret
 }
 
-func (this *QAction) SetShortcutContext(context uintptr) {
+func (this *QAction) SetShortcutContext(context ShortcutContext) {
 	C.QAction_SetShortcutContext(this.h, (C.uintptr_t)(context))
 }
 
-func (this *QAction) ShortcutContext() uintptr {
+func (this *QAction) ShortcutContext() ShortcutContext {
 	ret := C.QAction_ShortcutContext(this.h)
-	return (uintptr)(ret)
+	return (ShortcutContext)(ret)
 }
 
 func (this *QAction) SetAutoRepeat(autoRepeat bool) {
@@ -348,7 +375,7 @@ func (this *QAction) IsVisible() bool {
 	return (bool)(ret)
 }
 
-func (this *QAction) Activate(event uintptr) {
+func (this *QAction) Activate(event QAction__ActionEvent) {
 	C.QAction_Activate(this.h, (C.uintptr_t)(event))
 }
 
@@ -357,13 +384,13 @@ func (this *QAction) ShowStatusText() bool {
 	return (bool)(ret)
 }
 
-func (this *QAction) SetMenuRole(menuRole uintptr) {
+func (this *QAction) SetMenuRole(menuRole QAction__MenuRole) {
 	C.QAction_SetMenuRole(this.h, (C.uintptr_t)(menuRole))
 }
 
-func (this *QAction) MenuRole() uintptr {
+func (this *QAction) MenuRole() QAction__MenuRole {
 	ret := C.QAction_MenuRole(this.h)
-	return (uintptr)(ret)
+	return (QAction__MenuRole)(ret)
 }
 
 func (this *QAction) SetIconVisibleInMenu(visible bool) {

qt/gen_qactiongroup.go

@@ -13,6 +13,14 @@ import (
 	"unsafe"
 )
 
+type QActionGroup__ExclusionPolicy int
+
+const (
+	QActionGroup__ExclusionPolicy__None              QActionGroup__ExclusionPolicy = 0
+	QActionGroup__ExclusionPolicy__Exclusive         QActionGroup__ExclusionPolicy = 1
+	QActionGroup__ExclusionPolicy__ExclusiveOptional QActionGroup__ExclusionPolicy = 2
+)
+
 type QActionGroup struct {
 	h *C.QActionGroup
 	*QObject
@@ -125,9 +133,9 @@ func (this *QActionGroup) IsVisible() bool {
 	return (bool)(ret)
 }
 
-func (this *QActionGroup) ExclusionPolicy() uintptr {
+func (this *QActionGroup) ExclusionPolicy() QActionGroup__ExclusionPolicy {
 	ret := C.QActionGroup_ExclusionPolicy(this.h)
-	return (uintptr)(ret)
+	return (QActionGroup__ExclusionPolicy)(ret)
 }
 
 func (this *QActionGroup) SetEnabled(enabled bool) {
@@ -146,7 +154,7 @@ func (this *QActionGroup) SetExclusive(exclusive bool) {
 	C.QActionGroup_SetExclusive(this.h, (C.bool)(exclusive))
 }
 
-func (this *QActionGroup) SetExclusionPolicy(policy uintptr) {
+func (this *QActionGroup) SetExclusionPolicy(policy QActionGroup__ExclusionPolicy) {
 	C.QActionGroup_SetExclusionPolicy(this.h, (C.uintptr_t)(policy))
 }
 

qt/gen_qapplication.go

@@ -14,6 +14,14 @@ import (
 	"unsafe"
 )
 
+type QApplication__ColorSpec int
+
+const (
+	QApplication__ColorSpec__NormalColor QApplication__ColorSpec = 0
+	QApplication__ColorSpec__CustomColor QApplication__ColorSpec = 1
+	QApplication__ColorSpec__ManyColor   QApplication__ColorSpec = 2
+)
+
 type QApplication struct {
 	h *C.QApplication
 	*QGuiApplication
@@ -360,12 +368,12 @@ func QApplication_StartDragDistance() int {
 	return (int)(ret)
 }
 
-func QApplication_IsEffectEnabled(param1 uintptr) bool {
+func QApplication_IsEffectEnabled(param1 UIEffect) bool {
 	ret := C.QApplication_IsEffectEnabled((C.uintptr_t)(param1))
 	return (bool)(ret)
 }
 
-func QApplication_SetEffectEnabled(param1 uintptr) {
+func QApplication_SetEffectEnabled(param1 UIEffect) {
 	C.QApplication_SetEffectEnabled((C.uintptr_t)(param1))
 }
 
@@ -491,7 +499,7 @@ func QApplication_Alert2(widget *QWidget, duration int) {
 	C.QApplication_Alert2(widget.cPointer(), (C.int)(duration))
 }
 
-func QApplication_SetEffectEnabled2(param1 uintptr, enable bool) {
+func QApplication_SetEffectEnabled2(param1 UIEffect, enable bool) {
 	C.QApplication_SetEffectEnabled2((C.uintptr_t)(param1), (C.bool)(enable))
 }
 

qt/gen_qarraydata.go

@@ -12,6 +12,25 @@ import (
 	"unsafe"
 )
 
+type QArrayData__AllocationOption int
+
+const (
+	QArrayData__AllocationOption__CapacityReserved QArrayData__AllocationOption = 1
+	QArrayData__AllocationOption__Unsharable       QArrayData__AllocationOption = 2
+	QArrayData__AllocationOption__RawData          QArrayData__AllocationOption = 4
+	QArrayData__AllocationOption__Grow             QArrayData__AllocationOption = 8
+	QArrayData__AllocationOption__Default          QArrayData__AllocationOption = 0
+)
+
+type QtPrivate__QContainerImplHelper__CutResult int
+
+const (
+	QtPrivate__QContainerImplHelper__CutResult__Null   QtPrivate__QContainerImplHelper__CutResult = 0
+	QtPrivate__QContainerImplHelper__CutResult__Empty  QtPrivate__QContainerImplHelper__CutResult = 1
+	QtPrivate__QContainerImplHelper__CutResult__Full   QtPrivate__QContainerImplHelper__CutResult = 2
+	QtPrivate__QContainerImplHelper__CutResult__Subset QtPrivate__QContainerImplHelper__CutResult = 3
+)
+
 type QArrayData struct {
 	h *C.QArrayData
 }
@@ -109,9 +128,9 @@ func newQtPrivate__QContainerImplHelper_U(h unsafe.Pointer) *QtPrivate__QContain
 	return newQtPrivate__QContainerImplHelper((*C.QtPrivate__QContainerImplHelper)(h))
 }
 
-func QtPrivate__QContainerImplHelper_Mid(originalLength int, position *int, length *int) uintptr {
+func QtPrivate__QContainerImplHelper_Mid(originalLength int, position *int, length *int) QtPrivate__QContainerImplHelper__CutResult {
 	ret := C.QtPrivate__QContainerImplHelper_Mid((C.int)(originalLength), (*C.int)(unsafe.Pointer(position)), (*C.int)(unsafe.Pointer(length)))
-	return (uintptr)(ret)
+	return (QtPrivate__QContainerImplHelper__CutResult)(ret)
 }
 
 func (this *QtPrivate__QContainerImplHelper) Delete() {

qt/gen_qbasictimer.go

@@ -68,7 +68,7 @@ func (this *QBasicTimer) Start(msec int, obj *QObject) {
 	C.QBasicTimer_Start(this.h, (C.int)(msec), obj.cPointer())
 }
 
-func (this *QBasicTimer) Start2(msec int, timerType uintptr, 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())
 }
 

qt/gen_qbitmap.go

@@ -155,7 +155,7 @@ func QBitmap_FromImage2(image *QImage, flags int) *QBitmap {
 	return ret1
 }
 
-func QBitmap_FromData3(size *QSize, bits *byte, monoFormat uintptr) *QBitmap {
+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))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQBitmap(ret)

qt/gen_qboxlayout.go

@@ -13,6 +13,17 @@ import (
 	"unsafe"
 )
 
+type QBoxLayout__Direction int
+
+const (
+	QBoxLayout__Direction__LeftToRight QBoxLayout__Direction = 0
+	QBoxLayout__Direction__RightToLeft QBoxLayout__Direction = 1
+	QBoxLayout__Direction__TopToBottom QBoxLayout__Direction = 2
+	QBoxLayout__Direction__BottomToTop QBoxLayout__Direction = 3
+	QBoxLayout__Direction__Down        QBoxLayout__Direction = 2
+	QBoxLayout__Direction__Up          QBoxLayout__Direction = 3
+)
+
 type QBoxLayout struct {
 	h *C.QBoxLayout
 	*QLayout
@@ -37,13 +48,13 @@ func newQBoxLayout_U(h unsafe.Pointer) *QBoxLayout {
 }
 
 // NewQBoxLayout constructs a new QBoxLayout object.
-func NewQBoxLayout(param1 uintptr) *QBoxLayout {
+func NewQBoxLayout(param1 QBoxLayout__Direction) *QBoxLayout {
 	ret := C.QBoxLayout_new((C.uintptr_t)(param1))
 	return newQBoxLayout(ret)
 }
 
 // NewQBoxLayout2 constructs a new QBoxLayout object.
-func NewQBoxLayout2(param1 uintptr, parent *QWidget) *QBoxLayout {
+func NewQBoxLayout2(param1 QBoxLayout__Direction, parent *QWidget) *QBoxLayout {
 	ret := C.QBoxLayout_new2((C.uintptr_t)(param1), parent.cPointer())
 	return newQBoxLayout(ret)
 }
@@ -75,12 +86,12 @@ func QBoxLayout_TrUtf8(s string) string {
 	return ret
 }
 
-func (this *QBoxLayout) Direction() uintptr {
+func (this *QBoxLayout) Direction() QBoxLayout__Direction {
 	ret := C.QBoxLayout_Direction(this.h)
-	return (uintptr)(ret)
+	return (QBoxLayout__Direction)(ret)
 }
 
-func (this *QBoxLayout) SetDirection(direction uintptr) {
+func (this *QBoxLayout) SetDirection(direction QBoxLayout__Direction) {
 	C.QBoxLayout_SetDirection(this.h, (C.uintptr_t)(direction))
 }
 

qt/gen_qbrush.go

@@ -13,6 +13,213 @@ import (
 	"unsafe"
 )
 
+type QGradient__Type int
+
+const (
+	QGradient__Type__LinearGradient  QGradient__Type = 0
+	QGradient__Type__RadialGradient  QGradient__Type = 1
+	QGradient__Type__ConicalGradient QGradient__Type = 2
+	QGradient__Type__NoGradient      QGradient__Type = 3
+)
+
+type QGradient__Spread int
+
+const (
+	QGradient__Spread__PadSpread     QGradient__Spread = 0
+	QGradient__Spread__ReflectSpread QGradient__Spread = 1
+	QGradient__Spread__RepeatSpread  QGradient__Spread = 2
+)
+
+type QGradient__CoordinateMode int
+
+const (
+	QGradient__CoordinateMode__LogicalMode         QGradient__CoordinateMode = 0
+	QGradient__CoordinateMode__StretchToDeviceMode QGradient__CoordinateMode = 1
+	QGradient__CoordinateMode__ObjectBoundingMode  QGradient__CoordinateMode = 2
+	QGradient__CoordinateMode__ObjectMode          QGradient__CoordinateMode = 3
+)
+
+type QGradient__InterpolationMode int
+
+const (
+	QGradient__InterpolationMode__ColorInterpolation     QGradient__InterpolationMode = 0
+	QGradient__InterpolationMode__ComponentInterpolation QGradient__InterpolationMode = 1
+)
+
+type QGradient__Preset int
+
+const (
+	QGradient__Preset__WarmFlame        QGradient__Preset = 1
+	QGradient__Preset__NightFade        QGradient__Preset = 2
+	QGradient__Preset__SpringWarmth     QGradient__Preset = 3
+	QGradient__Preset__JuicyPeach       QGradient__Preset = 4
+	QGradient__Preset__YoungPassion     QGradient__Preset = 5
+	QGradient__Preset__LadyLips         QGradient__Preset = 6
+	QGradient__Preset__SunnyMorning     QGradient__Preset = 7
+	QGradient__Preset__RainyAshville    QGradient__Preset = 8
+	QGradient__Preset__FrozenDreams     QGradient__Preset = 9
+	QGradient__Preset__WinterNeva       QGradient__Preset = 10
+	QGradient__Preset__DustyGrass       QGradient__Preset = 11
+	QGradient__Preset__TemptingAzure    QGradient__Preset = 12
+	QGradient__Preset__HeavyRain        QGradient__Preset = 13
+	QGradient__Preset__AmyCrisp         QGradient__Preset = 14
+	QGradient__Preset__MeanFruit        QGradient__Preset = 15
+	QGradient__Preset__DeepBlue         QGradient__Preset = 16
+	QGradient__Preset__RipeMalinka      QGradient__Preset = 17
+	QGradient__Preset__CloudyKnoxville  QGradient__Preset = 18
+	QGradient__Preset__MalibuBeach      QGradient__Preset = 19
+	QGradient__Preset__NewLife          QGradient__Preset = 20
+	QGradient__Preset__TrueSunset       QGradient__Preset = 21
+	QGradient__Preset__MorpheusDen      QGradient__Preset = 22
+	QGradient__Preset__RareWind         QGradient__Preset = 23
+	QGradient__Preset__NearMoon         QGradient__Preset = 24
+	QGradient__Preset__WildApple        QGradient__Preset = 25
+	QGradient__Preset__SaintPetersburg  QGradient__Preset = 26
+	QGradient__Preset__PlumPlate        QGradient__Preset = 28
+	QGradient__Preset__EverlastingSky   QGradient__Preset = 29
+	QGradient__Preset__HappyFisher      QGradient__Preset = 30
+	QGradient__Preset__Blessing         QGradient__Preset = 31
+	QGradient__Preset__SharpeyeEagle    QGradient__Preset = 32
+	QGradient__Preset__LadogaBottom     QGradient__Preset = 33
+	QGradient__Preset__LemonGate        QGradient__Preset = 34
+	QGradient__Preset__ItmeoBranding    QGradient__Preset = 35
+	QGradient__Preset__ZeusMiracle      QGradient__Preset = 36
+	QGradient__Preset__OldHat           QGradient__Preset = 37
+	QGradient__Preset__StarWine         QGradient__Preset = 38
+	QGradient__Preset__HappyAcid        QGradient__Preset = 41
+	QGradient__Preset__AwesomePine      QGradient__Preset = 42
+	QGradient__Preset__NewYork          QGradient__Preset = 43
+	QGradient__Preset__ShyRainbow       QGradient__Preset = 44
+	QGradient__Preset__MixedHopes       QGradient__Preset = 46
+	QGradient__Preset__FlyHigh          QGradient__Preset = 47
+	QGradient__Preset__StrongBliss      QGradient__Preset = 48
+	QGradient__Preset__FreshMilk        QGradient__Preset = 49
+	QGradient__Preset__SnowAgain        QGradient__Preset = 50
+	QGradient__Preset__FebruaryInk      QGradient__Preset = 51
+	QGradient__Preset__KindSteel        QGradient__Preset = 52
+	QGradient__Preset__SoftGrass        QGradient__Preset = 53
+	QGradient__Preset__GrownEarly       QGradient__Preset = 54
+	QGradient__Preset__SharpBlues       QGradient__Preset = 55
+	QGradient__Preset__ShadyWater       QGradient__Preset = 56
+	QGradient__Preset__DirtyBeauty      QGradient__Preset = 57
+	QGradient__Preset__GreatWhale       QGradient__Preset = 58
+	QGradient__Preset__TeenNotebook     QGradient__Preset = 59
+	QGradient__Preset__PoliteRumors     QGradient__Preset = 60
+	QGradient__Preset__SweetPeriod      QGradient__Preset = 61
+	QGradient__Preset__WideMatrix       QGradient__Preset = 62
+	QGradient__Preset__SoftCherish      QGradient__Preset = 63
+	QGradient__Preset__RedSalvation     QGradient__Preset = 64
+	QGradient__Preset__BurningSpring    QGradient__Preset = 65
+	QGradient__Preset__NightParty       QGradient__Preset = 66
+	QGradient__Preset__SkyGlider        QGradient__Preset = 67
+	QGradient__Preset__HeavenPeach      QGradient__Preset = 68
+	QGradient__Preset__PurpleDivision   QGradient__Preset = 69
+	QGradient__Preset__AquaSplash       QGradient__Preset = 70
+	QGradient__Preset__SpikyNaga        QGradient__Preset = 72
+	QGradient__Preset__LoveKiss         QGradient__Preset = 73
+	QGradient__Preset__CleanMirror      QGradient__Preset = 75
+	QGradient__Preset__PremiumDark      QGradient__Preset = 76
+	QGradient__Preset__ColdEvening      QGradient__Preset = 77
+	QGradient__Preset__CochitiLake      QGradient__Preset = 78
+	QGradient__Preset__SummerGames      QGradient__Preset = 79
+	QGradient__Preset__PassionateBed    QGradient__Preset = 80
+	QGradient__Preset__MountainRock     QGradient__Preset = 81
+	QGradient__Preset__DesertHump       QGradient__Preset = 82
+	QGradient__Preset__JungleDay        QGradient__Preset = 83
+	QGradient__Preset__PhoenixStart     QGradient__Preset = 84
+	QGradient__Preset__OctoberSilence   QGradient__Preset = 85
+	QGradient__Preset__FarawayRiver     QGradient__Preset = 86
+	QGradient__Preset__AlchemistLab     QGradient__Preset = 87
+	QGradient__Preset__OverSun          QGradient__Preset = 88
+	QGradient__Preset__PremiumWhite     QGradient__Preset = 89
+	QGradient__Preset__MarsParty        QGradient__Preset = 90
+	QGradient__Preset__EternalConstance QGradient__Preset = 91
+	QGradient__Preset__JapanBlush       QGradient__Preset = 92
+	QGradient__Preset__SmilingRain      QGradient__Preset = 93
+	QGradient__Preset__CloudyApple      QGradient__Preset = 94
+	QGradient__Preset__BigMango         QGradient__Preset = 95
+	QGradient__Preset__HealthyWater     QGradient__Preset = 96
+	QGradient__Preset__AmourAmour       QGradient__Preset = 97
+	QGradient__Preset__RiskyConcrete    QGradient__Preset = 98
+	QGradient__Preset__StrongStick      QGradient__Preset = 99
+	QGradient__Preset__ViciousStance    QGradient__Preset = 100
+	QGradient__Preset__PaloAlto         QGradient__Preset = 101
+	QGradient__Preset__HappyMemories    QGradient__Preset = 102
+	QGradient__Preset__MidnightBloom    QGradient__Preset = 103
+	QGradient__Preset__Crystalline      QGradient__Preset = 104
+	QGradient__Preset__PartyBliss       QGradient__Preset = 106
+	QGradient__Preset__ConfidentCloud   QGradient__Preset = 107
+	QGradient__Preset__LeCocktail       QGradient__Preset = 108
+	QGradient__Preset__RiverCity        QGradient__Preset = 109
+	QGradient__Preset__FrozenBerry      QGradient__Preset = 110
+	QGradient__Preset__ChildCare        QGradient__Preset = 112
+	QGradient__Preset__FlyingLemon      QGradient__Preset = 113
+	QGradient__Preset__NewRetrowave     QGradient__Preset = 114
+	QGradient__Preset__HiddenJaguar     QGradient__Preset = 115
+	QGradient__Preset__AboveTheSky      QGradient__Preset = 116
+	QGradient__Preset__Nega             QGradient__Preset = 117
+	QGradient__Preset__DenseWater       QGradient__Preset = 118
+	QGradient__Preset__Seashore         QGradient__Preset = 120
+	QGradient__Preset__MarbleWall       QGradient__Preset = 121
+	QGradient__Preset__CheerfulCaramel  QGradient__Preset = 122
+	QGradient__Preset__NightSky         QGradient__Preset = 123
+	QGradient__Preset__MagicLake        QGradient__Preset = 124
+	QGradient__Preset__YoungGrass       QGradient__Preset = 125
+	QGradient__Preset__ColorfulPeach    QGradient__Preset = 126
+	QGradient__Preset__GentleCare       QGradient__Preset = 127
+	QGradient__Preset__PlumBath         QGradient__Preset = 128
+	QGradient__Preset__HappyUnicorn     QGradient__Preset = 129
+	QGradient__Preset__AfricanField     QGradient__Preset = 131
+	QGradient__Preset__SolidStone       QGradient__Preset = 132
+	QGradient__Preset__OrangeJuice      QGradient__Preset = 133
+	QGradient__Preset__GlassWater       QGradient__Preset = 134
+	QGradient__Preset__NorthMiracle     QGradient__Preset = 136
+	QGradient__Preset__FruitBlend       QGradient__Preset = 137
+	QGradient__Preset__MillenniumPine   QGradient__Preset = 138
+	QGradient__Preset__HighFlight       QGradient__Preset = 139
+	QGradient__Preset__MoleHall         QGradient__Preset = 140
+	QGradient__Preset__SpaceShift       QGradient__Preset = 142
+	QGradient__Preset__ForestInei       QGradient__Preset = 143
+	QGradient__Preset__RoyalGarden      QGradient__Preset = 144
+	QGradient__Preset__RichMetal        QGradient__Preset = 145
+	QGradient__Preset__JuicyCake        QGradient__Preset = 146
+	QGradient__Preset__SmartIndigo      QGradient__Preset = 147
+	QGradient__Preset__SandStrike       QGradient__Preset = 148
+	QGradient__Preset__NorseBeauty      QGradient__Preset = 149
+	QGradient__Preset__AquaGuidance     QGradient__Preset = 150
+	QGradient__Preset__SunVeggie        QGradient__Preset = 151
+	QGradient__Preset__SeaLord          QGradient__Preset = 152
+	QGradient__Preset__BlackSea         QGradient__Preset = 153
+	QGradient__Preset__GrassShampoo     QGradient__Preset = 154
+	QGradient__Preset__LandingAircraft  QGradient__Preset = 155
+	QGradient__Preset__WitchDance       QGradient__Preset = 156
+	QGradient__Preset__SleeplessNight   QGradient__Preset = 157
+	QGradient__Preset__AngelCare        QGradient__Preset = 158
+	QGradient__Preset__CrystalRiver     QGradient__Preset = 159
+	QGradient__Preset__SoftLipstick     QGradient__Preset = 160
+	QGradient__Preset__SaltMountain     QGradient__Preset = 161
+	QGradient__Preset__PerfectWhite     QGradient__Preset = 162
+	QGradient__Preset__FreshOasis       QGradient__Preset = 163
+	QGradient__Preset__StrictNovember   QGradient__Preset = 164
+	QGradient__Preset__MorningSalad     QGradient__Preset = 165
+	QGradient__Preset__DeepRelief       QGradient__Preset = 166
+	QGradient__Preset__SeaStrike        QGradient__Preset = 167
+	QGradient__Preset__NightCall        QGradient__Preset = 168
+	QGradient__Preset__SupremeSky       QGradient__Preset = 169
+	QGradient__Preset__LightBlue        QGradient__Preset = 170
+	QGradient__Preset__MindCrawl        QGradient__Preset = 171
+	QGradient__Preset__LilyMeadow       QGradient__Preset = 172
+	QGradient__Preset__SugarLollipop    QGradient__Preset = 173
+	QGradient__Preset__SweetDessert     QGradient__Preset = 174
+	QGradient__Preset__MagicRay         QGradient__Preset = 175
+	QGradient__Preset__TeenParty        QGradient__Preset = 176
+	QGradient__Preset__FrozenHeat       QGradient__Preset = 177
+	QGradient__Preset__GagarinView      QGradient__Preset = 178
+	QGradient__Preset__FabledSunset     QGradient__Preset = 179
+	QGradient__Preset__PerfectBlue      QGradient__Preset = 180
+	QGradient__Preset__NumPresets       QGradient__Preset = 181
+)
+
 type QBrush struct {
 	h *C.QBrush
 }
@@ -42,7 +249,7 @@ func NewQBrush() *QBrush {
 }
 
 // NewQBrush2 constructs a new QBrush object.
-func NewQBrush2(bs uintptr) *QBrush {
+func NewQBrush2(bs BrushStyle) *QBrush {
 	ret := C.QBrush_new2((C.uintptr_t)(bs))
 	return newQBrush(ret)
 }
@@ -54,7 +261,7 @@ func NewQBrush3(color *QColor) *QBrush {
 }
 
 // NewQBrush4 constructs a new QBrush object.
-func NewQBrush4(color uintptr) *QBrush {
+func NewQBrush4(color GlobalColor) *QBrush {
 	ret := C.QBrush_new4((C.uintptr_t)(color))
 	return newQBrush(ret)
 }
@@ -66,7 +273,7 @@ func NewQBrush5(color *QColor, pixmap *QPixmap) *QBrush {
 }
 
 // NewQBrush6 constructs a new QBrush object.
-func NewQBrush6(color uintptr, pixmap *QPixmap) *QBrush {
+func NewQBrush6(color GlobalColor, pixmap *QPixmap) *QBrush {
 	ret := C.QBrush_new6((C.uintptr_t)(color), pixmap.cPointer())
 	return newQBrush(ret)
 }
@@ -96,13 +303,13 @@ func NewQBrush10(gradient *QGradient) *QBrush {
 }
 
 // NewQBrush11 constructs a new QBrush object.
-func NewQBrush11(color *QColor, bs uintptr) *QBrush {
+func NewQBrush11(color *QColor, bs BrushStyle) *QBrush {
 	ret := C.QBrush_new11(color.cPointer(), (C.uintptr_t)(bs))
 	return newQBrush(ret)
 }
 
 // NewQBrush12 constructs a new QBrush object.
-func NewQBrush12(color uintptr, bs uintptr) *QBrush {
+func NewQBrush12(color GlobalColor, bs BrushStyle) *QBrush {
 	ret := C.QBrush_new12((C.uintptr_t)(color), (C.uintptr_t)(bs))
 	return newQBrush(ret)
 }
@@ -115,12 +322,12 @@ func (this *QBrush) Swap(other *QBrush) {
 	C.QBrush_Swap(this.h, other.cPointer())
 }
 
-func (this *QBrush) Style() uintptr {
+func (this *QBrush) Style() BrushStyle {
 	ret := C.QBrush_Style(this.h)
-	return (uintptr)(ret)
+	return (BrushStyle)(ret)
 }
 
-func (this *QBrush) SetStyle(style uintptr) {
+func (this *QBrush) SetStyle(style BrushStyle) {
 	C.QBrush_SetStyle(this.h, (C.uintptr_t)(style))
 }
 
@@ -187,7 +394,7 @@ func (this *QBrush) SetColor(color *QColor) {
 	C.QBrush_SetColor(this.h, color.cPointer())
 }
 
-func (this *QBrush) SetColorWithColor(color uintptr) {
+func (this *QBrush) SetColorWithColor(color GlobalColor) {
 	C.QBrush_SetColorWithColor(this.h, (C.uintptr_t)(color))
 }
 
@@ -285,7 +492,7 @@ func NewQGradient() *QGradient {
 }
 
 // NewQGradient2 constructs a new QGradient object.
-func NewQGradient2(param1 uintptr) *QGradient {
+func NewQGradient2(param1 QGradient__Preset) *QGradient {
 	ret := C.QGradient_new2((C.uintptr_t)(param1))
 	return newQGradient(ret)
 }
@@ -296,39 +503,39 @@ func NewQGradient3(param1 *QGradient) *QGradient {
 	return newQGradient(ret)
 }
 
-func (this *QGradient) Type() uintptr {
+func (this *QGradient) Type() QGradient__Type {
 	ret := C.QGradient_Type(this.h)
-	return (uintptr)(ret)
+	return (QGradient__Type)(ret)
 }
 
-func (this *QGradient) SetSpread(spread uintptr) {
+func (this *QGradient) SetSpread(spread QGradient__Spread) {
 	C.QGradient_SetSpread(this.h, (C.uintptr_t)(spread))
 }
 
-func (this *QGradient) Spread() uintptr {
+func (this *QGradient) Spread() QGradient__Spread {
 	ret := C.QGradient_Spread(this.h)
-	return (uintptr)(ret)
+	return (QGradient__Spread)(ret)
 }
 
 func (this *QGradient) SetColorAt(pos float64, color *QColor) {
 	C.QGradient_SetColorAt(this.h, (C.double)(pos), color.cPointer())
 }
 
-func (this *QGradient) CoordinateMode() uintptr {
+func (this *QGradient) CoordinateMode() QGradient__CoordinateMode {
 	ret := C.QGradient_CoordinateMode(this.h)
-	return (uintptr)(ret)
+	return (QGradient__CoordinateMode)(ret)
 }
 
-func (this *QGradient) SetCoordinateMode(mode uintptr) {
+func (this *QGradient) SetCoordinateMode(mode QGradient__CoordinateMode) {
 	C.QGradient_SetCoordinateMode(this.h, (C.uintptr_t)(mode))
 }
 
-func (this *QGradient) InterpolationMode() uintptr {
+func (this *QGradient) InterpolationMode() QGradient__InterpolationMode {
 	ret := C.QGradient_InterpolationMode(this.h)
-	return (uintptr)(ret)
+	return (QGradient__InterpolationMode)(ret)
 }
 
-func (this *QGradient) SetInterpolationMode(mode uintptr) {
+func (this *QGradient) SetInterpolationMode(mode QGradient__InterpolationMode) {
 	C.QGradient_SetInterpolationMode(this.h, (C.uintptr_t)(mode))
 }
 

qt/gen_qbytearray.go

@@ -13,6 +13,40 @@ import (
 	"unsafe"
 )
 
+type DeprecatedRefClassBehavior__EmittingClass int
+
+const (
+	DeprecatedRefClassBehavior__EmittingClass__QByteRef DeprecatedRefClassBehavior__EmittingClass = 0
+	DeprecatedRefClassBehavior__EmittingClass__QCharRef DeprecatedRefClassBehavior__EmittingClass = 1
+)
+
+type DeprecatedRefClassBehavior__WarningType int
+
+const (
+	DeprecatedRefClassBehavior__WarningType__OutOfRange    DeprecatedRefClassBehavior__WarningType = 0
+	DeprecatedRefClassBehavior__WarningType__DelayedDetach DeprecatedRefClassBehavior__WarningType = 1
+)
+
+type QByteArray__Base64Option int
+
+const (
+	QByteArray__Base64Option__Base64Encoding              QByteArray__Base64Option = 0
+	QByteArray__Base64Option__Base64UrlEncoding           QByteArray__Base64Option = 1
+	QByteArray__Base64Option__KeepTrailingEquals          QByteArray__Base64Option = 0
+	QByteArray__Base64Option__OmitTrailingEquals          QByteArray__Base64Option = 2
+	QByteArray__Base64Option__IgnoreBase64DecodingErrors  QByteArray__Base64Option = 0
+	QByteArray__Base64Option__AbortOnBase64DecodingErrors QByteArray__Base64Option = 4
+)
+
+type QByteArray__Base64DecodingStatus int
+
+const (
+	QByteArray__Base64DecodingStatus__Ok                 QByteArray__Base64DecodingStatus = 0
+	QByteArray__Base64DecodingStatus__IllegalInputLength QByteArray__Base64DecodingStatus = 1
+	QByteArray__Base64DecodingStatus__IllegalCharacter   QByteArray__Base64DecodingStatus = 2
+	QByteArray__Base64DecodingStatus__IllegalPadding     QByteArray__Base64DecodingStatus = 3
+)
+
 type QByteArrayDataPtr struct {
 	h *C.QByteArrayDataPtr
 }
@@ -94,7 +128,7 @@ func NewQByteArray3(size int, c byte) *QByteArray {
 }
 
 // NewQByteArray4 constructs a new QByteArray object.
-func NewQByteArray4(size int, param2 uintptr) *QByteArray {
+func NewQByteArray4(size int, param2 Initialization) *QByteArray {
 	ret := C.QByteArray_new4((C.int)(size), (C.uintptr_t)(param2))
 	return newQByteArray(ret)
 }
@@ -1216,14 +1250,14 @@ func (this *QByteArray) LastIndexOf23(a *QByteArray, from int) int {
 	return (int)(ret)
 }
 
-func (this *QByteArray) Compare2(c string, cs uintptr) int {
+func (this *QByteArray) Compare2(c string, cs CaseSensitivity) int {
 	c_Cstring := C.CString(c)
 	defer C.free(unsafe.Pointer(c_Cstring))
 	ret := C.QByteArray_Compare2(this.h, c_Cstring, (C.uintptr_t)(cs))
 	return (int)(ret)
 }
 
-func (this *QByteArray) Compare22(a *QByteArray, cs uintptr) int {
+func (this *QByteArray) Compare22(a *QByteArray, cs CaseSensitivity) int {
 	ret := C.QByteArray_Compare22(this.h, a.cPointer(), (C.uintptr_t)(cs))
 	return (int)(ret)
 }

qt/gen_qcalendar.go

@@ -13,6 +13,24 @@ import (
 	"unsafe"
 )
 
+type QCalendar__ int
+
+const (
+	QCalendar____Unspecified QCalendar__ = -2147483648
+)
+
+type QCalendar__System int
+
+const (
+	QCalendar__System__Gregorian    QCalendar__System = 0
+	QCalendar__System__Julian       QCalendar__System = 8
+	QCalendar__System__Milankovic   QCalendar__System = 9
+	QCalendar__System__Jalali       QCalendar__System = 10
+	QCalendar__System__IslamicCivil QCalendar__System = 11
+	QCalendar__System__Last         QCalendar__System = 11
+	QCalendar__System__User         QCalendar__System = -1
+)
+
 type QCalendar struct {
 	h *C.QCalendar
 }
@@ -42,7 +60,7 @@ func NewQCalendar() *QCalendar {
 }
 
 // NewQCalendar2 constructs a new QCalendar object.
-func NewQCalendar2(system uintptr) *QCalendar {
+func NewQCalendar2(system QCalendar__System) *QCalendar {
 	ret := C.QCalendar_new2((C.uintptr_t)(system))
 	return newQCalendar(ret)
 }
@@ -234,7 +252,7 @@ func (this *QCalendar) MonthName3(locale *QLocale, month int, year int) string {
 	return ret
 }
 
-func (this *QCalendar) MonthName4(locale *QLocale, month int, year int, format uintptr) string {
+func (this *QCalendar) MonthName4(locale *QLocale, month int, year int, format QLocale__FormatType) string {
 	var _out *C.char = nil
 	var _out_Strlen C.int = 0
 	C.QCalendar_MonthName4(this.h, locale.cPointer(), (C.int)(month), (C.int)(year), (C.uintptr_t)(format), &_out, &_out_Strlen)
@@ -252,7 +270,7 @@ func (this *QCalendar) StandaloneMonthName3(locale *QLocale, month int, year int
 	return ret
 }
 
-func (this *QCalendar) StandaloneMonthName4(locale *QLocale, month int, year int, format uintptr) string {
+func (this *QCalendar) StandaloneMonthName4(locale *QLocale, month int, year int, format QLocale__FormatType) string {
 	var _out *C.char = nil
 	var _out_Strlen C.int = 0
 	C.QCalendar_StandaloneMonthName4(this.h, locale.cPointer(), (C.int)(month), (C.int)(year), (C.uintptr_t)(format), &_out, &_out_Strlen)
@@ -261,7 +279,7 @@ func (this *QCalendar) StandaloneMonthName4(locale *QLocale, month int, year int
 	return ret
 }
 
-func (this *QCalendar) WeekDayName3(locale *QLocale, day int, format uintptr) string {
+func (this *QCalendar) WeekDayName3(locale *QLocale, day int, format QLocale__FormatType) string {
 	var _out *C.char = nil
 	var _out_Strlen C.int = 0
 	C.QCalendar_WeekDayName3(this.h, locale.cPointer(), (C.int)(day), (C.uintptr_t)(format), &_out, &_out_Strlen)
@@ -270,7 +288,7 @@ func (this *QCalendar) WeekDayName3(locale *QLocale, day int, format uintptr) st
 	return ret
 }
 
-func (this *QCalendar) StandaloneWeekDayName3(locale *QLocale, day int, format uintptr) string {
+func (this *QCalendar) StandaloneWeekDayName3(locale *QLocale, day int, format QLocale__FormatType) string {
 	var _out *C.char = nil
 	var _out_Strlen C.int = 0
 	C.QCalendar_StandaloneWeekDayName3(this.h, locale.cPointer(), (C.int)(day), (C.uintptr_t)(format), &_out, &_out_Strlen)

qt/gen_qcalendarwidget.go

@@ -14,6 +14,29 @@ import (
 	"unsafe"
 )
 
+type QCalendarWidget__HorizontalHeaderFormat int
+
+const (
+	QCalendarWidget__HorizontalHeaderFormat__NoHorizontalHeader   QCalendarWidget__HorizontalHeaderFormat = 0
+	QCalendarWidget__HorizontalHeaderFormat__SingleLetterDayNames QCalendarWidget__HorizontalHeaderFormat = 1
+	QCalendarWidget__HorizontalHeaderFormat__ShortDayNames        QCalendarWidget__HorizontalHeaderFormat = 2
+	QCalendarWidget__HorizontalHeaderFormat__LongDayNames         QCalendarWidget__HorizontalHeaderFormat = 3
+)
+
+type QCalendarWidget__VerticalHeaderFormat int
+
+const (
+	QCalendarWidget__VerticalHeaderFormat__NoVerticalHeader QCalendarWidget__VerticalHeaderFormat = 0
+	QCalendarWidget__VerticalHeaderFormat__ISOWeekNumbers   QCalendarWidget__VerticalHeaderFormat = 1
+)
+
+type QCalendarWidget__SelectionMode int
+
+const (
+	QCalendarWidget__SelectionMode__NoSelection     QCalendarWidget__SelectionMode = 0
+	QCalendarWidget__SelectionMode__SingleSelection QCalendarWidget__SelectionMode = 1
+)
+
 type QCalendarWidget struct {
 	h *C.QCalendarWidget
 	*QWidget
@@ -149,12 +172,12 @@ func (this *QCalendarWidget) SetMaximumDate(date *QDate) {
 	C.QCalendarWidget_SetMaximumDate(this.h, date.cPointer())
 }
 
-func (this *QCalendarWidget) FirstDayOfWeek() uintptr {
+func (this *QCalendarWidget) FirstDayOfWeek() DayOfWeek {
 	ret := C.QCalendarWidget_FirstDayOfWeek(this.h)
-	return (uintptr)(ret)
+	return (DayOfWeek)(ret)
 }
 
-func (this *QCalendarWidget) SetFirstDayOfWeek(dayOfWeek uintptr) {
+func (this *QCalendarWidget) SetFirstDayOfWeek(dayOfWeek DayOfWeek) {
 	C.QCalendarWidget_SetFirstDayOfWeek(this.h, (C.uintptr_t)(dayOfWeek))
 }
 
@@ -183,30 +206,30 @@ func (this *QCalendarWidget) SetCalendar(calendar QCalendar) {
 	C.QCalendarWidget_SetCalendar(this.h, calendar.cPointer())
 }
 
-func (this *QCalendarWidget) SelectionMode() uintptr {
+func (this *QCalendarWidget) SelectionMode() QCalendarWidget__SelectionMode {
 	ret := C.QCalendarWidget_SelectionMode(this.h)
-	return (uintptr)(ret)
+	return (QCalendarWidget__SelectionMode)(ret)
 }
 
-func (this *QCalendarWidget) SetSelectionMode(mode uintptr) {
+func (this *QCalendarWidget) SetSelectionMode(mode QCalendarWidget__SelectionMode) {
 	C.QCalendarWidget_SetSelectionMode(this.h, (C.uintptr_t)(mode))
 }
 
-func (this *QCalendarWidget) HorizontalHeaderFormat() uintptr {
+func (this *QCalendarWidget) HorizontalHeaderFormat() QCalendarWidget__HorizontalHeaderFormat {
 	ret := C.QCalendarWidget_HorizontalHeaderFormat(this.h)
-	return (uintptr)(ret)
+	return (QCalendarWidget__HorizontalHeaderFormat)(ret)
 }
 
-func (this *QCalendarWidget) SetHorizontalHeaderFormat(format uintptr) {
+func (this *QCalendarWidget) SetHorizontalHeaderFormat(format QCalendarWidget__HorizontalHeaderFormat) {
 	C.QCalendarWidget_SetHorizontalHeaderFormat(this.h, (C.uintptr_t)(format))
 }
 
-func (this *QCalendarWidget) VerticalHeaderFormat() uintptr {
+func (this *QCalendarWidget) VerticalHeaderFormat() QCalendarWidget__VerticalHeaderFormat {
 	ret := C.QCalendarWidget_VerticalHeaderFormat(this.h)
-	return (uintptr)(ret)
+	return (QCalendarWidget__VerticalHeaderFormat)(ret)
 }
 
-func (this *QCalendarWidget) SetVerticalHeaderFormat(format uintptr) {
+func (this *QCalendarWidget) SetVerticalHeaderFormat(format QCalendarWidget__VerticalHeaderFormat) {
 	C.QCalendarWidget_SetVerticalHeaderFormat(this.h, (C.uintptr_t)(format))
 }
 
@@ -225,7 +248,7 @@ func (this *QCalendarWidget) SetHeaderTextFormat(format *QTextCharFormat) {
 	C.QCalendarWidget_SetHeaderTextFormat(this.h, format.cPointer())
 }
 
-func (this *QCalendarWidget) WeekdayTextFormat(dayOfWeek uintptr) *QTextCharFormat {
+func (this *QCalendarWidget) WeekdayTextFormat(dayOfWeek DayOfWeek) *QTextCharFormat {
 	ret := C.QCalendarWidget_WeekdayTextFormat(this.h, (C.uintptr_t)(dayOfWeek))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQTextCharFormat(ret)
@@ -236,7 +259,7 @@ func (this *QCalendarWidget) WeekdayTextFormat(dayOfWeek uintptr) *QTextCharForm
 	return ret1
 }
 
-func (this *QCalendarWidget) SetWeekdayTextFormat(dayOfWeek uintptr, format *QTextCharFormat) {
+func (this *QCalendarWidget) SetWeekdayTextFormat(dayOfWeek DayOfWeek, format *QTextCharFormat) {
 	C.QCalendarWidget_SetWeekdayTextFormat(this.h, (C.uintptr_t)(dayOfWeek), format.cPointer())
 }
 

qt/gen_qcborcommon.go

@@ -12,6 +12,63 @@ import (
 	"unsafe"
 )
 
+type QCborSimpleType int
+
+const (
+	QCborSimpleType__False     QCborSimpleType = 20
+	QCborSimpleType__True      QCborSimpleType = 21
+	QCborSimpleType__Null      QCborSimpleType = 22
+	QCborSimpleType__Undefined QCborSimpleType = 23
+)
+
+type QCborKnownTags int
+
+const (
+	QCborKnownTags__DateTimeString    QCborKnownTags = 0
+	QCborKnownTags__UnixTime_t        QCborKnownTags = 1
+	QCborKnownTags__PositiveBignum    QCborKnownTags = 2
+	QCborKnownTags__NegativeBignum    QCborKnownTags = 3
+	QCborKnownTags__Decimal           QCborKnownTags = 4
+	QCborKnownTags__Bigfloat          QCborKnownTags = 5
+	QCborKnownTags__COSE_Encrypt0     QCborKnownTags = 16
+	QCborKnownTags__COSE_Mac0         QCborKnownTags = 17
+	QCborKnownTags__COSE_Sign1        QCborKnownTags = 18
+	QCborKnownTags__ExpectedBase64url QCborKnownTags = 21
+	QCborKnownTags__ExpectedBase64    QCborKnownTags = 22
+	QCborKnownTags__ExpectedBase16    QCborKnownTags = 23
+	QCborKnownTags__EncodedCbor       QCborKnownTags = 24
+	QCborKnownTags__Url               QCborKnownTags = 32
+	QCborKnownTags__Base64url         QCborKnownTags = 33
+	QCborKnownTags__Base64            QCborKnownTags = 34
+	QCborKnownTags__RegularExpression QCborKnownTags = 35
+	QCborKnownTags__MimeMessage       QCborKnownTags = 36
+	QCborKnownTags__Uuid              QCborKnownTags = 37
+	QCborKnownTags__COSE_Encrypt      QCborKnownTags = 96
+	QCborKnownTags__COSE_Mac          QCborKnownTags = 97
+	QCborKnownTags__COSE_Sign         QCborKnownTags = 98
+	QCborKnownTags__Signature         QCborKnownTags = 55799
+)
+
+type QCborError__Code int
+
+const (
+	QCborError__Code__UnknownError      QCborError__Code = 1
+	QCborError__Code__AdvancePastEnd    QCborError__Code = 3
+	QCborError__Code__InputOutputError  QCborError__Code = 4
+	QCborError__Code__GarbageAtEnd      QCborError__Code = 256
+	QCborError__Code__EndOfFile         QCborError__Code = 257
+	QCborError__Code__UnexpectedBreak   QCborError__Code = 258
+	QCborError__Code__UnknownType       QCborError__Code = 259
+	QCborError__Code__IllegalType       QCborError__Code = 260
+	QCborError__Code__IllegalNumber     QCborError__Code = 261
+	QCborError__Code__IllegalSimpleType QCborError__Code = 262
+	QCborError__Code__InvalidUtf8String QCborError__Code = 516
+	QCborError__Code__DataTooLarge      QCborError__Code = 1024
+	QCborError__Code__NestingTooDeep    QCborError__Code = 1025
+	QCborError__Code__UnsupportedType   QCborError__Code = 1026
+	QCborError__Code__NoError           QCborError__Code = 0
+)
+
 type QCborError struct {
 	h *C.QCborError
 }

qt/gen_qcborstreamreader.go

@@ -13,6 +13,34 @@ import (
 	"unsafe"
 )
 
+type QCborStreamReader__Type int
+
+const (
+	QCborStreamReader__Type__UnsignedInteger QCborStreamReader__Type = 0
+	QCborStreamReader__Type__NegativeInteger QCborStreamReader__Type = 32
+	QCborStreamReader__Type__ByteString      QCborStreamReader__Type = 64
+	QCborStreamReader__Type__ByteArray       QCborStreamReader__Type = 64
+	QCborStreamReader__Type__TextString      QCborStreamReader__Type = 96
+	QCborStreamReader__Type__String          QCborStreamReader__Type = 96
+	QCborStreamReader__Type__Array           QCborStreamReader__Type = 128
+	QCborStreamReader__Type__Map             QCborStreamReader__Type = 160
+	QCborStreamReader__Type__Tag             QCborStreamReader__Type = 192
+	QCborStreamReader__Type__SimpleType      QCborStreamReader__Type = 224
+	QCborStreamReader__Type__HalfFloat       QCborStreamReader__Type = 249
+	QCborStreamReader__Type__Float16         QCborStreamReader__Type = 249
+	QCborStreamReader__Type__Float           QCborStreamReader__Type = 250
+	QCborStreamReader__Type__Double          QCborStreamReader__Type = 251
+	QCborStreamReader__Type__Invalid         QCborStreamReader__Type = 255
+)
+
+type QCborStreamReader__StringResultCode int
+
+const (
+	QCborStreamReader__StringResultCode__EndOfString QCborStreamReader__StringResultCode = 0
+	QCborStreamReader__StringResultCode__Ok          QCborStreamReader__StringResultCode = 1
+	QCborStreamReader__StringResultCode__Error       QCborStreamReader__StringResultCode = -1
+)
+
 type QCborStreamReader struct {
 	h *C.QCborStreamReader
 }
@@ -128,9 +156,9 @@ func (this *QCborStreamReader) ContainerDepth() int {
 	return (int)(ret)
 }
 
-func (this *QCborStreamReader) ParentContainerType() uintptr {
+func (this *QCborStreamReader) ParentContainerType() QCborStreamReader__Type {
 	ret := C.QCborStreamReader_ParentContainerType(this.h)
-	return (uintptr)(ret)
+	return (QCborStreamReader__Type)(ret)
 }
 
 func (this *QCborStreamReader) HasNext() bool {
@@ -143,9 +171,9 @@ func (this *QCborStreamReader) Next() bool {
 	return (bool)(ret)
 }
 
-func (this *QCborStreamReader) Type() uintptr {
+func (this *QCborStreamReader) Type() QCborStreamReader__Type {
 	ret := C.QCborStreamReader_Type(this.h)
-	return (uintptr)(ret)
+	return (QCborStreamReader__Type)(ret)
 }
 
 func (this *QCborStreamReader) IsUnsignedInteger() bool {

qt/gen_qcborvalue.go

@@ -13,6 +13,46 @@ import (
 	"unsafe"
 )
 
+type QCborValue__EncodingOption int
+
+const (
+	QCborValue__EncodingOption__SortKeysInMaps   QCborValue__EncodingOption = 1
+	QCborValue__EncodingOption__UseFloat         QCborValue__EncodingOption = 2
+	QCborValue__EncodingOption__UseFloat16       QCborValue__EncodingOption = 6
+	QCborValue__EncodingOption__UseIntegers      QCborValue__EncodingOption = 8
+	QCborValue__EncodingOption__NoTransformation QCborValue__EncodingOption = 0
+)
+
+type QCborValue__DiagnosticNotationOption int
+
+const (
+	QCborValue__DiagnosticNotationOption__Compact        QCborValue__DiagnosticNotationOption = 0
+	QCborValue__DiagnosticNotationOption__LineWrapped    QCborValue__DiagnosticNotationOption = 1
+	QCborValue__DiagnosticNotationOption__ExtendedFormat QCborValue__DiagnosticNotationOption = 2
+)
+
+type QCborValue__Type int
+
+const (
+	QCborValue__Type__Integer           QCborValue__Type = 0
+	QCborValue__Type__ByteArray         QCborValue__Type = 64
+	QCborValue__Type__String            QCborValue__Type = 96
+	QCborValue__Type__Array             QCborValue__Type = 128
+	QCborValue__Type__Map               QCborValue__Type = 160
+	QCborValue__Type__Tag               QCborValue__Type = 192
+	QCborValue__Type__SimpleType        QCborValue__Type = 256
+	QCborValue__Type__False             QCborValue__Type = 276
+	QCborValue__Type__True              QCborValue__Type = 277
+	QCborValue__Type__Null              QCborValue__Type = 278
+	QCborValue__Type__Undefined         QCborValue__Type = 279
+	QCborValue__Type__Double            QCborValue__Type = 514
+	QCborValue__Type__DateTime          QCborValue__Type = 65536
+	QCborValue__Type__Url               QCborValue__Type = 65568
+	QCborValue__Type__RegularExpression QCborValue__Type = 65571
+	QCborValue__Type__Uuid              QCborValue__Type = 65573
+	QCborValue__Type__Invalid           QCborValue__Type = -1
+)
+
 type QCborParserError struct {
 	h *C.QCborParserError
 }
@@ -77,7 +117,7 @@ func NewQCborValue() *QCborValue {
 }
 
 // NewQCborValue2 constructs a new QCborValue object.
-func NewQCborValue2(t_ uintptr) *QCborValue {
+func NewQCborValue2(t_ QCborValue__Type) *QCborValue {
 	ret := C.QCborValue_new2((C.uintptr_t)(t_))
 	return newQCborValue(ret)
 }
@@ -184,9 +224,9 @@ func (this *QCborValue) Swap(other *QCborValue) {
 	C.QCborValue_Swap(this.h, other.cPointer())
 }
 
-func (this *QCborValue) Type() uintptr {
+func (this *QCborValue) Type() QCborValue__Type {
 	ret := C.QCborValue_Type(this.h)
-	return (uintptr)(ret)
+	return (QCborValue__Type)(ret)
 }
 
 func (this *QCborValue) IsInteger() bool {
@@ -791,9 +831,9 @@ func (this *QCborValueRef) OperatorAssignWithOther(other *QCborValueRef) {
 	C.QCborValueRef_OperatorAssignWithOther(this.h, other.cPointer())
 }
 
-func (this *QCborValueRef) Type() uintptr {
+func (this *QCborValueRef) Type() QCborValue__Type {
 	ret := C.QCborValueRef_Type(this.h)
-	return (uintptr)(ret)
+	return (QCborValue__Type)(ret)
 }
 
 func (this *QCborValueRef) IsInteger() bool {

qt/gen_qchar.go

@@ -13,6 +13,348 @@ import (
 	"unsafe"
 )
 
+type QChar__SpecialCharacter int
+
+const (
+	QChar__SpecialCharacter__Null                       QChar__SpecialCharacter = 0
+	QChar__SpecialCharacter__Tabulation                 QChar__SpecialCharacter = 9
+	QChar__SpecialCharacter__LineFeed                   QChar__SpecialCharacter = 10
+	QChar__SpecialCharacter__FormFeed                   QChar__SpecialCharacter = 12
+	QChar__SpecialCharacter__CarriageReturn             QChar__SpecialCharacter = 13
+	QChar__SpecialCharacter__Space                      QChar__SpecialCharacter = 32
+	QChar__SpecialCharacter__Nbsp                       QChar__SpecialCharacter = 160
+	QChar__SpecialCharacter__SoftHyphen                 QChar__SpecialCharacter = 173
+	QChar__SpecialCharacter__ReplacementCharacter       QChar__SpecialCharacter = 65533
+	QChar__SpecialCharacter__ObjectReplacementCharacter QChar__SpecialCharacter = 65532
+	QChar__SpecialCharacter__ByteOrderMark              QChar__SpecialCharacter = 65279
+	QChar__SpecialCharacter__ByteOrderSwapped           QChar__SpecialCharacter = 65534
+	QChar__SpecialCharacter__ParagraphSeparator         QChar__SpecialCharacter = 8233
+	QChar__SpecialCharacter__LineSeparator              QChar__SpecialCharacter = 8232
+	QChar__SpecialCharacter__LastValidCodePoint         QChar__SpecialCharacter = 1114111
+)
+
+type QChar__Category int
+
+const (
+	QChar__Category__Mark_NonSpacing          QChar__Category = 0
+	QChar__Category__Mark_SpacingCombining    QChar__Category = 1
+	QChar__Category__Mark_Enclosing           QChar__Category = 2
+	QChar__Category__Number_DecimalDigit      QChar__Category = 3
+	QChar__Category__Number_Letter            QChar__Category = 4
+	QChar__Category__Number_Other             QChar__Category = 5
+	QChar__Category__Separator_Space          QChar__Category = 6
+	QChar__Category__Separator_Line           QChar__Category = 7
+	QChar__Category__Separator_Paragraph      QChar__Category = 8
+	QChar__Category__Other_Control            QChar__Category = 9
+	QChar__Category__Other_Format             QChar__Category = 10
+	QChar__Category__Other_Surrogate          QChar__Category = 11
+	QChar__Category__Other_PrivateUse         QChar__Category = 12
+	QChar__Category__Other_NotAssigned        QChar__Category = 13
+	QChar__Category__Letter_Uppercase         QChar__Category = 14
+	QChar__Category__Letter_Lowercase         QChar__Category = 15
+	QChar__Category__Letter_Titlecase         QChar__Category = 16
+	QChar__Category__Letter_Modifier          QChar__Category = 17
+	QChar__Category__Letter_Other             QChar__Category = 18
+	QChar__Category__Punctuation_Connector    QChar__Category = 19
+	QChar__Category__Punctuation_Dash         QChar__Category = 20
+	QChar__Category__Punctuation_Open         QChar__Category = 21
+	QChar__Category__Punctuation_Close        QChar__Category = 22
+	QChar__Category__Punctuation_InitialQuote QChar__Category = 23
+	QChar__Category__Punctuation_FinalQuote   QChar__Category = 24
+	QChar__Category__Punctuation_Other        QChar__Category = 25
+	QChar__Category__Symbol_Math              QChar__Category = 26
+	QChar__Category__Symbol_Currency          QChar__Category = 27
+	QChar__Category__Symbol_Modifier          QChar__Category = 28
+	QChar__Category__Symbol_Other             QChar__Category = 29
+)
+
+type QChar__Script int
+
+const (
+	QChar__Script__Script_Unknown               QChar__Script = 0
+	QChar__Script__Script_Inherited             QChar__Script = 1
+	QChar__Script__Script_Common                QChar__Script = 2
+	QChar__Script__Script_Latin                 QChar__Script = 3
+	QChar__Script__Script_Greek                 QChar__Script = 4
+	QChar__Script__Script_Cyrillic              QChar__Script = 5
+	QChar__Script__Script_Armenian              QChar__Script = 6
+	QChar__Script__Script_Hebrew                QChar__Script = 7
+	QChar__Script__Script_Arabic                QChar__Script = 8
+	QChar__Script__Script_Syriac                QChar__Script = 9
+	QChar__Script__Script_Thaana                QChar__Script = 10
+	QChar__Script__Script_Devanagari            QChar__Script = 11
+	QChar__Script__Script_Bengali               QChar__Script = 12
+	QChar__Script__Script_Gurmukhi              QChar__Script = 13
+	QChar__Script__Script_Gujarati              QChar__Script = 14
+	QChar__Script__Script_Oriya                 QChar__Script = 15
+	QChar__Script__Script_Tamil                 QChar__Script = 16
+	QChar__Script__Script_Telugu                QChar__Script = 17
+	QChar__Script__Script_Kannada               QChar__Script = 18
+	QChar__Script__Script_Malayalam             QChar__Script = 19
+	QChar__Script__Script_Sinhala               QChar__Script = 20
+	QChar__Script__Script_Thai                  QChar__Script = 21
+	QChar__Script__Script_Lao                   QChar__Script = 22
+	QChar__Script__Script_Tibetan               QChar__Script = 23
+	QChar__Script__Script_Myanmar               QChar__Script = 24
+	QChar__Script__Script_Georgian              QChar__Script = 25
+	QChar__Script__Script_Hangul                QChar__Script = 26
+	QChar__Script__Script_Ethiopic              QChar__Script = 27
+	QChar__Script__Script_Cherokee              QChar__Script = 28
+	QChar__Script__Script_CanadianAboriginal    QChar__Script = 29
+	QChar__Script__Script_Ogham                 QChar__Script = 30
+	QChar__Script__Script_Runic                 QChar__Script = 31
+	QChar__Script__Script_Khmer                 QChar__Script = 32
+	QChar__Script__Script_Mongolian             QChar__Script = 33
+	QChar__Script__Script_Hiragana              QChar__Script = 34
+	QChar__Script__Script_Katakana              QChar__Script = 35
+	QChar__Script__Script_Bopomofo              QChar__Script = 36
+	QChar__Script__Script_Han                   QChar__Script = 37
+	QChar__Script__Script_Yi                    QChar__Script = 38
+	QChar__Script__Script_OldItalic             QChar__Script = 39
+	QChar__Script__Script_Gothic                QChar__Script = 40
+	QChar__Script__Script_Deseret               QChar__Script = 41
+	QChar__Script__Script_Tagalog               QChar__Script = 42
+	QChar__Script__Script_Hanunoo               QChar__Script = 43
+	QChar__Script__Script_Buhid                 QChar__Script = 44
+	QChar__Script__Script_Tagbanwa              QChar__Script = 45
+	QChar__Script__Script_Coptic                QChar__Script = 46
+	QChar__Script__Script_Limbu                 QChar__Script = 47
+	QChar__Script__Script_TaiLe                 QChar__Script = 48
+	QChar__Script__Script_LinearB               QChar__Script = 49
+	QChar__Script__Script_Ugaritic              QChar__Script = 50
+	QChar__Script__Script_Shavian               QChar__Script = 51
+	QChar__Script__Script_Osmanya               QChar__Script = 52
+	QChar__Script__Script_Cypriot               QChar__Script = 53
+	QChar__Script__Script_Braille               QChar__Script = 54
+	QChar__Script__Script_Buginese              QChar__Script = 55
+	QChar__Script__Script_NewTaiLue             QChar__Script = 56
+	QChar__Script__Script_Glagolitic            QChar__Script = 57
+	QChar__Script__Script_Tifinagh              QChar__Script = 58
+	QChar__Script__Script_SylotiNagri           QChar__Script = 59
+	QChar__Script__Script_OldPersian            QChar__Script = 60
+	QChar__Script__Script_Kharoshthi            QChar__Script = 61
+	QChar__Script__Script_Balinese              QChar__Script = 62
+	QChar__Script__Script_Cuneiform             QChar__Script = 63
+	QChar__Script__Script_Phoenician            QChar__Script = 64
+	QChar__Script__Script_PhagsPa               QChar__Script = 65
+	QChar__Script__Script_Nko                   QChar__Script = 66
+	QChar__Script__Script_Sundanese             QChar__Script = 67
+	QChar__Script__Script_Lepcha                QChar__Script = 68
+	QChar__Script__Script_OlChiki               QChar__Script = 69
+	QChar__Script__Script_Vai                   QChar__Script = 70
+	QChar__Script__Script_Saurashtra            QChar__Script = 71
+	QChar__Script__Script_KayahLi               QChar__Script = 72
+	QChar__Script__Script_Rejang                QChar__Script = 73
+	QChar__Script__Script_Lycian                QChar__Script = 74
+	QChar__Script__Script_Carian                QChar__Script = 75
+	QChar__Script__Script_Lydian                QChar__Script = 76
+	QChar__Script__Script_Cham                  QChar__Script = 77
+	QChar__Script__Script_TaiTham               QChar__Script = 78
+	QChar__Script__Script_TaiViet               QChar__Script = 79
+	QChar__Script__Script_Avestan               QChar__Script = 80
+	QChar__Script__Script_EgyptianHieroglyphs   QChar__Script = 81
+	QChar__Script__Script_Samaritan             QChar__Script = 82
+	QChar__Script__Script_Lisu                  QChar__Script = 83
+	QChar__Script__Script_Bamum                 QChar__Script = 84
+	QChar__Script__Script_Javanese              QChar__Script = 85
+	QChar__Script__Script_MeeteiMayek           QChar__Script = 86
+	QChar__Script__Script_ImperialAramaic       QChar__Script = 87
+	QChar__Script__Script_OldSouthArabian       QChar__Script = 88
+	QChar__Script__Script_InscriptionalParthian QChar__Script = 89
+	QChar__Script__Script_InscriptionalPahlavi  QChar__Script = 90
+	QChar__Script__Script_OldTurkic             QChar__Script = 91
+	QChar__Script__Script_Kaithi                QChar__Script = 92
+	QChar__Script__Script_Batak                 QChar__Script = 93
+	QChar__Script__Script_Brahmi                QChar__Script = 94
+	QChar__Script__Script_Mandaic               QChar__Script = 95
+	QChar__Script__Script_Chakma                QChar__Script = 96
+	QChar__Script__Script_MeroiticCursive       QChar__Script = 97
+	QChar__Script__Script_MeroiticHieroglyphs   QChar__Script = 98
+	QChar__Script__Script_Miao                  QChar__Script = 99
+	QChar__Script__Script_Sharada               QChar__Script = 100
+	QChar__Script__Script_SoraSompeng           QChar__Script = 101
+	QChar__Script__Script_Takri                 QChar__Script = 102
+	QChar__Script__Script_CaucasianAlbanian     QChar__Script = 103
+	QChar__Script__Script_BassaVah              QChar__Script = 104
+	QChar__Script__Script_Duployan              QChar__Script = 105
+	QChar__Script__Script_Elbasan               QChar__Script = 106
+	QChar__Script__Script_Grantha               QChar__Script = 107
+	QChar__Script__Script_PahawhHmong           QChar__Script = 108
+	QChar__Script__Script_Khojki                QChar__Script = 109
+	QChar__Script__Script_LinearA               QChar__Script = 110
+	QChar__Script__Script_Mahajani              QChar__Script = 111
+	QChar__Script__Script_Manichaean            QChar__Script = 112
+	QChar__Script__Script_MendeKikakui          QChar__Script = 113
+	QChar__Script__Script_Modi                  QChar__Script = 114
+	QChar__Script__Script_Mro                   QChar__Script = 115
+	QChar__Script__Script_OldNorthArabian       QChar__Script = 116
+	QChar__Script__Script_Nabataean             QChar__Script = 117
+	QChar__Script__Script_Palmyrene             QChar__Script = 118
+	QChar__Script__Script_PauCinHau             QChar__Script = 119
+	QChar__Script__Script_OldPermic             QChar__Script = 120
+	QChar__Script__Script_PsalterPahlavi        QChar__Script = 121
+	QChar__Script__Script_Siddham               QChar__Script = 122
+	QChar__Script__Script_Khudawadi             QChar__Script = 123
+	QChar__Script__Script_Tirhuta               QChar__Script = 124
+	QChar__Script__Script_WarangCiti            QChar__Script = 125
+	QChar__Script__Script_Ahom                  QChar__Script = 126
+	QChar__Script__Script_AnatolianHieroglyphs  QChar__Script = 127
+	QChar__Script__Script_Hatran                QChar__Script = 128
+	QChar__Script__Script_Multani               QChar__Script = 129
+	QChar__Script__Script_OldHungarian          QChar__Script = 130
+	QChar__Script__Script_SignWriting           QChar__Script = 131
+	QChar__Script__Script_Adlam                 QChar__Script = 132
+	QChar__Script__Script_Bhaiksuki             QChar__Script = 133
+	QChar__Script__Script_Marchen               QChar__Script = 134
+	QChar__Script__Script_Newa                  QChar__Script = 135
+	QChar__Script__Script_Osage                 QChar__Script = 136
+	QChar__Script__Script_Tangut                QChar__Script = 137
+	QChar__Script__Script_MasaramGondi          QChar__Script = 138
+	QChar__Script__Script_Nushu                 QChar__Script = 139
+	QChar__Script__Script_Soyombo               QChar__Script = 140
+	QChar__Script__Script_ZanabazarSquare       QChar__Script = 141
+	QChar__Script__Script_Dogra                 QChar__Script = 142
+	QChar__Script__Script_GunjalaGondi          QChar__Script = 143
+	QChar__Script__Script_HanifiRohingya        QChar__Script = 144
+	QChar__Script__Script_Makasar               QChar__Script = 145
+	QChar__Script__Script_Medefaidrin           QChar__Script = 146
+	QChar__Script__Script_OldSogdian            QChar__Script = 147
+	QChar__Script__Script_Sogdian               QChar__Script = 148
+	QChar__Script__Script_Elymaic               QChar__Script = 149
+	QChar__Script__Script_Nandinagari           QChar__Script = 150
+	QChar__Script__Script_NyiakengPuachueHmong  QChar__Script = 151
+	QChar__Script__Script_Wancho                QChar__Script = 152
+	QChar__Script__Script_Chorasmian            QChar__Script = 153
+	QChar__Script__Script_DivesAkuru            QChar__Script = 154
+	QChar__Script__Script_KhitanSmallScript     QChar__Script = 155
+	QChar__Script__Script_Yezidi                QChar__Script = 156
+	QChar__Script__ScriptCount                  QChar__Script = 157
+)
+
+type QChar__Direction int
+
+const (
+	QChar__Direction__DirL   QChar__Direction = 0
+	QChar__Direction__DirR   QChar__Direction = 1
+	QChar__Direction__DirEN  QChar__Direction = 2
+	QChar__Direction__DirES  QChar__Direction = 3
+	QChar__Direction__DirET  QChar__Direction = 4
+	QChar__Direction__DirAN  QChar__Direction = 5
+	QChar__Direction__DirCS  QChar__Direction = 6
+	QChar__Direction__DirB   QChar__Direction = 7
+	QChar__Direction__DirS   QChar__Direction = 8
+	QChar__Direction__DirWS  QChar__Direction = 9
+	QChar__Direction__DirON  QChar__Direction = 10
+	QChar__Direction__DirLRE QChar__Direction = 11
+	QChar__Direction__DirLRO QChar__Direction = 12
+	QChar__Direction__DirAL  QChar__Direction = 13
+	QChar__Direction__DirRLE QChar__Direction = 14
+	QChar__Direction__DirRLO QChar__Direction = 15
+	QChar__Direction__DirPDF QChar__Direction = 16
+	QChar__Direction__DirNSM QChar__Direction = 17
+	QChar__Direction__DirBN  QChar__Direction = 18
+	QChar__Direction__DirLRI QChar__Direction = 19
+	QChar__Direction__DirRLI QChar__Direction = 20
+	QChar__Direction__DirFSI QChar__Direction = 21
+	QChar__Direction__DirPDI QChar__Direction = 22
+)
+
+type QChar__Decomposition int
+
+const (
+	QChar__Decomposition__NoDecomposition QChar__Decomposition = 0
+	QChar__Decomposition__Canonical       QChar__Decomposition = 1
+	QChar__Decomposition__Font            QChar__Decomposition = 2
+	QChar__Decomposition__NoBreak         QChar__Decomposition = 3
+	QChar__Decomposition__Initial         QChar__Decomposition = 4
+	QChar__Decomposition__Medial          QChar__Decomposition = 5
+	QChar__Decomposition__Final           QChar__Decomposition = 6
+	QChar__Decomposition__Isolated        QChar__Decomposition = 7
+	QChar__Decomposition__Circle          QChar__Decomposition = 8
+	QChar__Decomposition__Super           QChar__Decomposition = 9
+	QChar__Decomposition__Sub             QChar__Decomposition = 10
+	QChar__Decomposition__Vertical        QChar__Decomposition = 11
+	QChar__Decomposition__Wide            QChar__Decomposition = 12
+	QChar__Decomposition__Narrow          QChar__Decomposition = 13
+	QChar__Decomposition__Small           QChar__Decomposition = 14
+	QChar__Decomposition__Square          QChar__Decomposition = 15
+	QChar__Decomposition__Compat          QChar__Decomposition = 16
+	QChar__Decomposition__Fraction        QChar__Decomposition = 17
+)
+
+type QChar__JoiningType int
+
+const (
+	QChar__JoiningType__Joining_None        QChar__JoiningType = 0
+	QChar__JoiningType__Joining_Causing     QChar__JoiningType = 1
+	QChar__JoiningType__Joining_Dual        QChar__JoiningType = 2
+	QChar__JoiningType__Joining_Right       QChar__JoiningType = 3
+	QChar__JoiningType__Joining_Left        QChar__JoiningType = 4
+	QChar__JoiningType__Joining_Transparent QChar__JoiningType = 5
+)
+
+type QChar__Joining int
+
+const (
+	QChar__Joining__OtherJoining QChar__Joining = 0
+	QChar__Joining__Dual         QChar__Joining = 1
+	QChar__Joining__Right        QChar__Joining = 2
+	QChar__Joining__Center       QChar__Joining = 3
+)
+
+type QChar__CombiningClass int
+
+const (
+	QChar__CombiningClass__Combining_BelowLeftAttached  QChar__CombiningClass = 200
+	QChar__CombiningClass__Combining_BelowAttached      QChar__CombiningClass = 202
+	QChar__CombiningClass__Combining_BelowRightAttached QChar__CombiningClass = 204
+	QChar__CombiningClass__Combining_LeftAttached       QChar__CombiningClass = 208
+	QChar__CombiningClass__Combining_RightAttached      QChar__CombiningClass = 210
+	QChar__CombiningClass__Combining_AboveLeftAttached  QChar__CombiningClass = 212
+	QChar__CombiningClass__Combining_AboveAttached      QChar__CombiningClass = 214
+	QChar__CombiningClass__Combining_AboveRightAttached QChar__CombiningClass = 216
+	QChar__CombiningClass__Combining_BelowLeft          QChar__CombiningClass = 218
+	QChar__CombiningClass__Combining_Below              QChar__CombiningClass = 220
+	QChar__CombiningClass__Combining_BelowRight         QChar__CombiningClass = 222
+	QChar__CombiningClass__Combining_Left               QChar__CombiningClass = 224
+	QChar__CombiningClass__Combining_Right              QChar__CombiningClass = 226
+	QChar__CombiningClass__Combining_AboveLeft          QChar__CombiningClass = 228
+	QChar__CombiningClass__Combining_Above              QChar__CombiningClass = 230
+	QChar__CombiningClass__Combining_AboveRight         QChar__CombiningClass = 232
+	QChar__CombiningClass__Combining_DoubleBelow        QChar__CombiningClass = 233
+	QChar__CombiningClass__Combining_DoubleAbove        QChar__CombiningClass = 234
+	QChar__CombiningClass__Combining_IotaSubscript      QChar__CombiningClass = 240
+)
+
+type QChar__UnicodeVersion int
+
+const (
+	QChar__UnicodeVersion__Unicode_Unassigned QChar__UnicodeVersion = 0
+	QChar__UnicodeVersion__Unicode_1_1        QChar__UnicodeVersion = 1
+	QChar__UnicodeVersion__Unicode_2_0        QChar__UnicodeVersion = 2
+	QChar__UnicodeVersion__Unicode_2_1_2      QChar__UnicodeVersion = 3
+	QChar__UnicodeVersion__Unicode_3_0        QChar__UnicodeVersion = 4
+	QChar__UnicodeVersion__Unicode_3_1        QChar__UnicodeVersion = 5
+	QChar__UnicodeVersion__Unicode_3_2        QChar__UnicodeVersion = 6
+	QChar__UnicodeVersion__Unicode_4_0        QChar__UnicodeVersion = 7
+	QChar__UnicodeVersion__Unicode_4_1        QChar__UnicodeVersion = 8
+	QChar__UnicodeVersion__Unicode_5_0        QChar__UnicodeVersion = 9
+	QChar__UnicodeVersion__Unicode_5_1        QChar__UnicodeVersion = 10
+	QChar__UnicodeVersion__Unicode_5_2        QChar__UnicodeVersion = 11
+	QChar__UnicodeVersion__Unicode_6_0        QChar__UnicodeVersion = 12
+	QChar__UnicodeVersion__Unicode_6_1        QChar__UnicodeVersion = 13
+	QChar__UnicodeVersion__Unicode_6_2        QChar__UnicodeVersion = 14
+	QChar__UnicodeVersion__Unicode_6_3        QChar__UnicodeVersion = 15
+	QChar__UnicodeVersion__Unicode_7_0        QChar__UnicodeVersion = 16
+	QChar__UnicodeVersion__Unicode_8_0        QChar__UnicodeVersion = 17
+	QChar__UnicodeVersion__Unicode_9_0        QChar__UnicodeVersion = 18
+	QChar__UnicodeVersion__Unicode_10_0       QChar__UnicodeVersion = 19
+	QChar__UnicodeVersion__Unicode_11_0       QChar__UnicodeVersion = 20
+	QChar__UnicodeVersion__Unicode_12_0       QChar__UnicodeVersion = 21
+	QChar__UnicodeVersion__Unicode_12_1       QChar__UnicodeVersion = 22
+	QChar__UnicodeVersion__Unicode_13_0       QChar__UnicodeVersion = 23
+)
+
 type QLatin1Char struct {
 	h *C.QLatin1Char
 }
@@ -120,7 +462,7 @@ func NewQChar6(rc int) *QChar {
 }
 
 // NewQChar7 constructs a new QChar object.
-func NewQChar7(s uintptr) *QChar {
+func NewQChar7(s QChar__SpecialCharacter) *QChar {
 	ret := C.QChar_new7((C.uintptr_t)(s))
 	return newQChar(ret)
 }
@@ -149,24 +491,24 @@ func NewQChar11(param1 *QChar) *QChar {
 	return newQChar(ret)
 }
 
-func (this *QChar) Category() uintptr {
+func (this *QChar) Category() QChar__Category {
 	ret := C.QChar_Category(this.h)
-	return (uintptr)(ret)
+	return (QChar__Category)(ret)
 }
 
-func (this *QChar) Direction() uintptr {
+func (this *QChar) Direction() QChar__Direction {
 	ret := C.QChar_Direction(this.h)
-	return (uintptr)(ret)
+	return (QChar__Direction)(ret)
 }
 
-func (this *QChar) JoiningType() uintptr {
+func (this *QChar) JoiningType() QChar__JoiningType {
 	ret := C.QChar_JoiningType(this.h)
-	return (uintptr)(ret)
+	return (QChar__JoiningType)(ret)
 }
 
-func (this *QChar) Joining() uintptr {
+func (this *QChar) Joining() QChar__Joining {
 	ret := C.QChar_Joining(this.h)
-	return (uintptr)(ret)
+	return (QChar__Joining)(ret)
 }
 
 func (this *QChar) CombiningClass() byte {
@@ -199,9 +541,9 @@ func (this *QChar) Decomposition() string {
 	return ret
 }
 
-func (this *QChar) DecompositionTag() uintptr {
+func (this *QChar) DecompositionTag() QChar__Decomposition {
 	ret := C.QChar_DecompositionTag(this.h)
-	return (uintptr)(ret)
+	return (QChar__Decomposition)(ret)
 }
 
 func (this *QChar) DigitValue() int {
@@ -253,14 +595,14 @@ func (this *QChar) ToCaseFolded() *QChar {
 	return ret1
 }
 
-func (this *QChar) Script() uintptr {
+func (this *QChar) Script() QChar__Script {
 	ret := C.QChar_Script(this.h)
-	return (uintptr)(ret)
+	return (QChar__Script)(ret)
 }
 
-func (this *QChar) UnicodeVersion() uintptr {
+func (this *QChar) UnicodeVersion() QChar__UnicodeVersion {
 	ret := C.QChar_UnicodeVersion(this.h)
-	return (uintptr)(ret)
+	return (QChar__UnicodeVersion)(ret)
 }
 
 func (this *QChar) ToLatin1() byte {
@@ -432,24 +774,24 @@ func QChar_LowSurrogate(ucs4 uint) uint16 {
 	return (uint16)(ret)
 }
 
-func QChar_CategoryWithUcs4(ucs4 uint) uintptr {
+func QChar_CategoryWithUcs4(ucs4 uint) QChar__Category {
 	ret := C.QChar_CategoryWithUcs4((C.uint)(ucs4))
-	return (uintptr)(ret)
+	return (QChar__Category)(ret)
 }
 
-func QChar_DirectionWithUcs4(ucs4 uint) uintptr {
+func QChar_DirectionWithUcs4(ucs4 uint) QChar__Direction {
 	ret := C.QChar_DirectionWithUcs4((C.uint)(ucs4))
-	return (uintptr)(ret)
+	return (QChar__Direction)(ret)
 }
 
-func QChar_JoiningTypeWithUcs4(ucs4 uint) uintptr {
+func QChar_JoiningTypeWithUcs4(ucs4 uint) QChar__JoiningType {
 	ret := C.QChar_JoiningTypeWithUcs4((C.uint)(ucs4))
-	return (uintptr)(ret)
+	return (QChar__JoiningType)(ret)
 }
 
-func QChar_JoiningWithUcs4(ucs4 uint) uintptr {
+func QChar_JoiningWithUcs4(ucs4 uint) QChar__Joining {
 	ret := C.QChar_JoiningWithUcs4((C.uint)(ucs4))
-	return (uintptr)(ret)
+	return (QChar__Joining)(ret)
 }
 
 func QChar_CombiningClassWithUcs4(ucs4 uint) byte {
@@ -476,9 +818,9 @@ func QChar_DecompositionWithUcs4(ucs4 uint) string {
 	return ret
 }
 
-func QChar_DecompositionTagWithUcs4(ucs4 uint) uintptr {
+func QChar_DecompositionTagWithUcs4(ucs4 uint) QChar__Decomposition {
 	ret := C.QChar_DecompositionTagWithUcs4((C.uint)(ucs4))
-	return (uintptr)(ret)
+	return (QChar__Decomposition)(ret)
 }
 
 func QChar_DigitValueWithUcs4(ucs4 uint) int {
@@ -506,19 +848,19 @@ func QChar_ToCaseFoldedWithUcs4(ucs4 uint) uint {
 	return (uint)(ret)
 }
 
-func QChar_ScriptWithUcs4(ucs4 uint) uintptr {
+func QChar_ScriptWithUcs4(ucs4 uint) QChar__Script {
 	ret := C.QChar_ScriptWithUcs4((C.uint)(ucs4))
-	return (uintptr)(ret)
+	return (QChar__Script)(ret)
 }
 
-func QChar_UnicodeVersionWithUcs4(ucs4 uint) uintptr {
+func QChar_UnicodeVersionWithUcs4(ucs4 uint) QChar__UnicodeVersion {
 	ret := C.QChar_UnicodeVersionWithUcs4((C.uint)(ucs4))
-	return (uintptr)(ret)
+	return (QChar__UnicodeVersion)(ret)
 }
 
-func QChar_CurrentUnicodeVersion() uintptr {
+func QChar_CurrentUnicodeVersion() QChar__UnicodeVersion {
 	ret := C.QChar_CurrentUnicodeVersion()
-	return (uintptr)(ret)
+	return (QChar__UnicodeVersion)(ret)
 }
 
 func QChar_IsPrintWithUcs4(ucs4 uint) bool {

qt/gen_qcheckbox.go

@@ -123,12 +123,12 @@ func (this *QCheckBox) IsTristate() bool {
 	return (bool)(ret)
 }
 
-func (this *QCheckBox) CheckState() uintptr {
+func (this *QCheckBox) CheckState() CheckState {
 	ret := C.QCheckBox_CheckState(this.h)
-	return (uintptr)(ret)
+	return (CheckState)(ret)
 }
 
-func (this *QCheckBox) SetCheckState(state uintptr) {
+func (this *QCheckBox) SetCheckState(state CheckState) {
 	C.QCheckBox_SetCheckState(this.h, (C.uintptr_t)(state))
 }
 

qt/gen_qclipboard.go

@@ -14,6 +14,15 @@ import (
 	"unsafe"
 )
 
+type QClipboard__Mode int
+
+const (
+	QClipboard__Mode__Clipboard  QClipboard__Mode = 0
+	QClipboard__Mode__Selection  QClipboard__Mode = 1
+	QClipboard__Mode__FindBuffer QClipboard__Mode = 2
+	QClipboard__Mode__LastMode   QClipboard__Mode = 2
+)
+
 type QClipboard struct {
 	h *C.QClipboard
 	*QObject
@@ -158,7 +167,7 @@ func (this *QClipboard) SetPixmap(param1 *QPixmap) {
 	C.QClipboard_SetPixmap(this.h, param1.cPointer())
 }
 
-func (this *QClipboard) Changed(mode uintptr) {
+func (this *QClipboard) Changed(mode QClipboard__Mode) {
 	C.QClipboard_Changed(this.h, (C.uintptr_t)(mode))
 }
 
@@ -258,11 +267,11 @@ func QClipboard_TrUtf83(s string, c string, n int) string {
 	return ret
 }
 
-func (this *QClipboard) Clear1(mode uintptr) {
+func (this *QClipboard) Clear1(mode QClipboard__Mode) {
 	C.QClipboard_Clear1(this.h, (C.uintptr_t)(mode))
 }
 
-func (this *QClipboard) Text1(mode uintptr) string {
+func (this *QClipboard) Text1(mode QClipboard__Mode) string {
 	var _out *C.char = nil
 	var _out_Strlen C.int = 0
 	C.QClipboard_Text1(this.h, (C.uintptr_t)(mode), &_out, &_out_Strlen)
@@ -271,7 +280,7 @@ func (this *QClipboard) Text1(mode uintptr) string {
 	return ret
 }
 
-func (this *QClipboard) Text2(subtype string, mode uintptr) string {
+func (this *QClipboard) Text2(subtype string, mode QClipboard__Mode) string {
 	subtype_Cstring := C.CString(subtype)
 	defer C.free(unsafe.Pointer(subtype_Cstring))
 	var _out *C.char = nil
@@ -282,22 +291,22 @@ func (this *QClipboard) Text2(subtype string, mode uintptr) string {
 	return ret
 }
 
-func (this *QClipboard) SetText2(param1 string, mode uintptr) {
+func (this *QClipboard) SetText2(param1 string, mode QClipboard__Mode) {
 	param1_Cstring := C.CString(param1)
 	defer C.free(unsafe.Pointer(param1_Cstring))
 	C.QClipboard_SetText2(this.h, param1_Cstring, C.size_t(len(param1)), (C.uintptr_t)(mode))
 }
 
-func (this *QClipboard) MimeData1(mode uintptr) *QMimeData {
+func (this *QClipboard) MimeData1(mode QClipboard__Mode) *QMimeData {
 	ret := C.QClipboard_MimeData1(this.h, (C.uintptr_t)(mode))
 	return newQMimeData_U(unsafe.Pointer(ret))
 }
 
-func (this *QClipboard) SetMimeData2(data *QMimeData, mode uintptr) {
+func (this *QClipboard) SetMimeData2(data *QMimeData, mode QClipboard__Mode) {
 	C.QClipboard_SetMimeData2(this.h, data.cPointer(), (C.uintptr_t)(mode))
 }
 
-func (this *QClipboard) Image1(mode uintptr) *QImage {
+func (this *QClipboard) Image1(mode QClipboard__Mode) *QImage {
 	ret := C.QClipboard_Image1(this.h, (C.uintptr_t)(mode))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQImage(ret)
@@ -308,7 +317,7 @@ func (this *QClipboard) Image1(mode uintptr) *QImage {
 	return ret1
 }
 
-func (this *QClipboard) Pixmap1(mode uintptr) *QPixmap {
+func (this *QClipboard) Pixmap1(mode QClipboard__Mode) *QPixmap {
 	ret := C.QClipboard_Pixmap1(this.h, (C.uintptr_t)(mode))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQPixmap(ret)
@@ -319,10 +328,10 @@ func (this *QClipboard) Pixmap1(mode uintptr) *QPixmap {
 	return ret1
 }
 
-func (this *QClipboard) SetImage2(param1 *QImage, mode uintptr) {
+func (this *QClipboard) SetImage2(param1 *QImage, mode QClipboard__Mode) {
 	C.QClipboard_SetImage2(this.h, param1.cPointer(), (C.uintptr_t)(mode))
 }
 
-func (this *QClipboard) SetPixmap2(param1 *QPixmap, mode uintptr) {
+func (this *QClipboard) SetPixmap2(param1 *QPixmap, mode QClipboard__Mode) {
 	C.QClipboard_SetPixmap2(this.h, param1.cPointer(), (C.uintptr_t)(mode))
 }

qt/gen_qcollator.go

@@ -121,12 +121,12 @@ func (this *QCollator) Locale() *QLocale {
 	return ret1
 }
 
-func (this *QCollator) CaseSensitivity() uintptr {
+func (this *QCollator) CaseSensitivity() CaseSensitivity {
 	ret := C.QCollator_CaseSensitivity(this.h)
-	return (uintptr)(ret)
+	return (CaseSensitivity)(ret)
 }
 
-func (this *QCollator) SetCaseSensitivity(cs uintptr) {
+func (this *QCollator) SetCaseSensitivity(cs CaseSensitivity) {
 	C.QCollator_SetCaseSensitivity(this.h, (C.uintptr_t)(cs))
 }
 

qt/gen_qcolor.go

@@ -13,6 +13,24 @@ import (
 	"unsafe"
 )
 
+type QColor__Spec int
+
+const (
+	QColor__Spec__Invalid     QColor__Spec = 0
+	QColor__Spec__Rgb         QColor__Spec = 1
+	QColor__Spec__Hsv         QColor__Spec = 2
+	QColor__Spec__Cmyk        QColor__Spec = 3
+	QColor__Spec__Hsl         QColor__Spec = 4
+	QColor__Spec__ExtendedRgb QColor__Spec = 5
+)
+
+type QColor__NameFormat int
+
+const (
+	QColor__NameFormat__HexRgb  QColor__NameFormat = 0
+	QColor__NameFormat__HexArgb QColor__NameFormat = 1
+)
+
 type QColor struct {
 	h *C.QColor
 }
@@ -42,7 +60,7 @@ func NewQColor() *QColor {
 }
 
 // NewQColor2 constructs a new QColor object.
-func NewQColor2(color uintptr) *QColor {
+func NewQColor2(color GlobalColor) *QColor {
 	ret := C.QColor_new2((C.uintptr_t)(color))
 	return newQColor(ret)
 }
@@ -82,7 +100,7 @@ func NewQColor7(aname string) *QColor {
 }
 
 // NewQColor8 constructs a new QColor object.
-func NewQColor8(spec uintptr) *QColor {
+func NewQColor8(spec QColor__Spec) *QColor {
 	ret := C.QColor_new8((C.uintptr_t)(spec))
 	return newQColor(ret)
 }
@@ -94,7 +112,7 @@ func NewQColor9(color *QColor) *QColor {
 }
 
 // NewQColor10 constructs a new QColor object.
-func NewQColor10(spec uintptr, a1 uint16, a2 uint16, a3 uint16, a4 uint16) *QColor {
+func NewQColor10(spec QColor__Spec, a1 uint16, a2 uint16, a3 uint16, a4 uint16) *QColor {
 	ret := C.QColor_new10((C.uintptr_t)(spec), (C.uint16_t)(a1), (C.uint16_t)(a2), (C.uint16_t)(a3), (C.uint16_t)(a4))
 	return newQColor(ret)
 }
@@ -106,7 +124,7 @@ func NewQColor11(r int, g int, b int, a int) *QColor {
 }
 
 // NewQColor12 constructs a new QColor object.
-func NewQColor12(spec uintptr, a1 uint16, a2 uint16, a3 uint16, a4 uint16, a5 uint16) *QColor {
+func NewQColor12(spec QColor__Spec, a1 uint16, a2 uint16, a3 uint16, a4 uint16, a5 uint16) *QColor {
 	ret := C.QColor_new12((C.uintptr_t)(spec), (C.uint16_t)(a1), (C.uint16_t)(a2), (C.uint16_t)(a3), (C.uint16_t)(a4), (C.uint16_t)(a5))
 	return newQColor(ret)
 }
@@ -115,7 +133,7 @@ func (this *QColor) OperatorAssign(param1 *QColor) {
 	C.QColor_OperatorAssign(this.h, param1.cPointer())
 }
 
-func (this *QColor) OperatorAssignWithColor(color uintptr) {
+func (this *QColor) OperatorAssignWithColor(color GlobalColor) {
 	C.QColor_OperatorAssignWithColor(this.h, (C.uintptr_t)(color))
 }
 
@@ -133,7 +151,7 @@ func (this *QColor) Name() string {
 	return ret
 }
 
-func (this *QColor) NameWithFormat(format uintptr) string {
+func (this *QColor) NameWithFormat(format QColor__NameFormat) string {
 	var _out *C.char = nil
 	var _out_Strlen C.int = 0
 	C.QColor_NameWithFormat(this.h, (C.uintptr_t)(format), &_out, &_out_Strlen)
@@ -163,9 +181,9 @@ func QColor_ColorNames() []string {
 	return ret
 }
 
-func (this *QColor) Spec() uintptr {
+func (this *QColor) Spec() QColor__Spec {
 	ret := C.QColor_Spec(this.h)
-	return (uintptr)(ret)
+	return (QColor__Spec)(ret)
 }
 
 func (this *QColor) Alpha() int {
@@ -520,7 +538,7 @@ func (this *QColor) ToExtendedRgb() *QColor {
 	return ret1
 }
 
-func (this *QColor) ConvertTo(colorSpec uintptr) *QColor {
+func (this *QColor) ConvertTo(colorSpec QColor__Spec) *QColor {
 	ret := C.QColor_ConvertTo(this.h, (C.uintptr_t)(colorSpec))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQColor(ret)

qt/gen_qcolordialog.go

@@ -14,6 +14,14 @@ import (
 	"unsafe"
 )
 
+type QColorDialog__ColorDialogOption int
+
+const (
+	QColorDialog__ColorDialogOption__ShowAlphaChannel    QColorDialog__ColorDialogOption = 1
+	QColorDialog__ColorDialogOption__NoButtons           QColorDialog__ColorDialogOption = 2
+	QColorDialog__ColorDialogOption__DontUseNativeDialog QColorDialog__ColorDialogOption = 4
+)
+
 type QColorDialog struct {
 	h *C.QColorDialog
 	*QDialog
@@ -114,11 +122,11 @@ func (this *QColorDialog) SelectedColor() *QColor {
 	return ret1
 }
 
-func (this *QColorDialog) SetOption(option uintptr) {
+func (this *QColorDialog) SetOption(option QColorDialog__ColorDialogOption) {
 	C.QColorDialog_SetOption(this.h, (C.uintptr_t)(option))
 }
 
-func (this *QColorDialog) TestOption(option uintptr) bool {
+func (this *QColorDialog) TestOption(option QColorDialog__ColorDialogOption) bool {
 	ret := C.QColorDialog_TestOption(this.h, (C.uintptr_t)(option))
 	return (bool)(ret)
 }
@@ -263,7 +271,7 @@ func QColorDialog_TrUtf83(s string, c string, n int) string {
 	return ret
 }
 
-func (this *QColorDialog) SetOption2(option uintptr, on bool) {
+func (this *QColorDialog) SetOption2(option QColorDialog__ColorDialogOption, on bool) {
 	C.QColorDialog_SetOption2(this.h, (C.uintptr_t)(option), (C.bool)(on))
 }
 

qt/gen_qcolormap.go

@@ -13,6 +13,14 @@ import (
 	"unsafe"
 )
 
+type QColormap__Mode int
+
+const (
+	QColormap__Mode__Direct  QColormap__Mode = 0
+	QColormap__Mode__Indexed QColormap__Mode = 1
+	QColormap__Mode__Gray    QColormap__Mode = 2
+)
+
 type QColormap struct {
 	h *C.QColormap
 }
@@ -64,9 +72,9 @@ func (this *QColormap) OperatorAssign(colormap *QColormap) {
 	C.QColormap_OperatorAssign(this.h, colormap.cPointer())
 }
 
-func (this *QColormap) Mode() uintptr {
+func (this *QColormap) Mode() QColormap__Mode {
 	ret := C.QColormap_Mode(this.h)
-	return (uintptr)(ret)
+	return (QColormap__Mode)(ret)
 }
 
 func (this *QColormap) Depth() int {

qt/gen_qcolorspace.go

@@ -13,6 +13,36 @@ import (
 	"unsafe"
 )
 
+type QColorSpace__NamedColorSpace int
+
+const (
+	QColorSpace__NamedColorSpace__SRgb        QColorSpace__NamedColorSpace = 1
+	QColorSpace__NamedColorSpace__SRgbLinear  QColorSpace__NamedColorSpace = 2
+	QColorSpace__NamedColorSpace__AdobeRgb    QColorSpace__NamedColorSpace = 3
+	QColorSpace__NamedColorSpace__DisplayP3   QColorSpace__NamedColorSpace = 4
+	QColorSpace__NamedColorSpace__ProPhotoRgb QColorSpace__NamedColorSpace = 5
+)
+
+type QColorSpace__Primaries int
+
+const (
+	QColorSpace__Primaries__Custom      QColorSpace__Primaries = 0
+	QColorSpace__Primaries__SRgb        QColorSpace__Primaries = 1
+	QColorSpace__Primaries__AdobeRgb    QColorSpace__Primaries = 2
+	QColorSpace__Primaries__DciP3D65    QColorSpace__Primaries = 3
+	QColorSpace__Primaries__ProPhotoRgb QColorSpace__Primaries = 4
+)
+
+type QColorSpace__TransferFunction int
+
+const (
+	QColorSpace__TransferFunction__Custom      QColorSpace__TransferFunction = 0
+	QColorSpace__TransferFunction__Linear      QColorSpace__TransferFunction = 1
+	QColorSpace__TransferFunction__Gamma       QColorSpace__TransferFunction = 2
+	QColorSpace__TransferFunction__SRgb        QColorSpace__TransferFunction = 3
+	QColorSpace__TransferFunction__ProPhotoRgb QColorSpace__TransferFunction = 4
+)
+
 type QColorSpace struct {
 	h *C.QColorSpace
 }
@@ -42,25 +72,25 @@ func NewQColorSpace() *QColorSpace {
 }
 
 // NewQColorSpace2 constructs a new QColorSpace object.
-func NewQColorSpace2(namedColorSpace uintptr) *QColorSpace {
+func NewQColorSpace2(namedColorSpace QColorSpace__NamedColorSpace) *QColorSpace {
 	ret := C.QColorSpace_new2((C.uintptr_t)(namedColorSpace))
 	return newQColorSpace(ret)
 }
 
 // NewQColorSpace3 constructs a new QColorSpace object.
-func NewQColorSpace3(primaries uintptr, transferFunction uintptr) *QColorSpace {
+func NewQColorSpace3(primaries QColorSpace__Primaries, transferFunction QColorSpace__TransferFunction) *QColorSpace {
 	ret := C.QColorSpace_new3((C.uintptr_t)(primaries), (C.uintptr_t)(transferFunction))
 	return newQColorSpace(ret)
 }
 
 // NewQColorSpace4 constructs a new QColorSpace object.
-func NewQColorSpace4(primaries uintptr, gamma float32) *QColorSpace {
+func NewQColorSpace4(primaries QColorSpace__Primaries, gamma float32) *QColorSpace {
 	ret := C.QColorSpace_new4((C.uintptr_t)(primaries), (C.float)(gamma))
 	return newQColorSpace(ret)
 }
 
 // NewQColorSpace5 constructs a new QColorSpace object.
-func NewQColorSpace5(whitePoint *QPointF, redPoint *QPointF, greenPoint *QPointF, bluePoint *QPointF, transferFunction uintptr) *QColorSpace {
+func NewQColorSpace5(whitePoint *QPointF, redPoint *QPointF, greenPoint *QPointF, bluePoint *QPointF, transferFunction QColorSpace__TransferFunction) *QColorSpace {
 	ret := C.QColorSpace_new5(whitePoint.cPointer(), redPoint.cPointer(), greenPoint.cPointer(), bluePoint.cPointer(), (C.uintptr_t)(transferFunction))
 	return newQColorSpace(ret)
 }
@@ -72,13 +102,13 @@ func NewQColorSpace6(colorSpace *QColorSpace) *QColorSpace {
 }
 
 // NewQColorSpace7 constructs a new QColorSpace object.
-func NewQColorSpace7(primaries uintptr, transferFunction uintptr, gamma float32) *QColorSpace {
+func NewQColorSpace7(primaries QColorSpace__Primaries, transferFunction QColorSpace__TransferFunction, gamma float32) *QColorSpace {
 	ret := C.QColorSpace_new7((C.uintptr_t)(primaries), (C.uintptr_t)(transferFunction), (C.float)(gamma))
 	return newQColorSpace(ret)
 }
 
 // NewQColorSpace8 constructs a new QColorSpace object.
-func NewQColorSpace8(whitePoint *QPointF, redPoint *QPointF, greenPoint *QPointF, bluePoint *QPointF, transferFunction uintptr, gamma float32) *QColorSpace {
+func NewQColorSpace8(whitePoint *QPointF, redPoint *QPointF, greenPoint *QPointF, bluePoint *QPointF, transferFunction QColorSpace__TransferFunction, gamma float32) *QColorSpace {
 	ret := C.QColorSpace_new8(whitePoint.cPointer(), redPoint.cPointer(), greenPoint.cPointer(), bluePoint.cPointer(), (C.uintptr_t)(transferFunction), (C.float)(gamma))
 	return newQColorSpace(ret)
 }
@@ -91,14 +121,14 @@ func (this *QColorSpace) Swap(colorSpace *QColorSpace) {
 	C.QColorSpace_Swap(this.h, colorSpace.cPointer())
 }
 
-func (this *QColorSpace) Primaries() uintptr {
+func (this *QColorSpace) Primaries() QColorSpace__Primaries {
 	ret := C.QColorSpace_Primaries(this.h)
-	return (uintptr)(ret)
+	return (QColorSpace__Primaries)(ret)
 }
 
-func (this *QColorSpace) TransferFunction() uintptr {
+func (this *QColorSpace) TransferFunction() QColorSpace__TransferFunction {
 	ret := C.QColorSpace_TransferFunction(this.h)
-	return (uintptr)(ret)
+	return (QColorSpace__TransferFunction)(ret)
 }
 
 func (this *QColorSpace) Gamma() float32 {
@@ -106,11 +136,11 @@ func (this *QColorSpace) Gamma() float32 {
 	return (float32)(ret)
 }
 
-func (this *QColorSpace) SetTransferFunction(transferFunction uintptr) {
+func (this *QColorSpace) SetTransferFunction(transferFunction QColorSpace__TransferFunction) {
 	C.QColorSpace_SetTransferFunction(this.h, (C.uintptr_t)(transferFunction))
 }
 
-func (this *QColorSpace) WithTransferFunction(transferFunction uintptr) *QColorSpace {
+func (this *QColorSpace) WithTransferFunction(transferFunction QColorSpace__TransferFunction) *QColorSpace {
 	ret := C.QColorSpace_WithTransferFunction(this.h, (C.uintptr_t)(transferFunction))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQColorSpace(ret)
@@ -121,7 +151,7 @@ func (this *QColorSpace) WithTransferFunction(transferFunction uintptr) *QColorS
 	return ret1
 }
 
-func (this *QColorSpace) SetPrimaries(primariesId uintptr) {
+func (this *QColorSpace) SetPrimaries(primariesId QColorSpace__Primaries) {
 	C.QColorSpace_SetPrimaries(this.h, (C.uintptr_t)(primariesId))
 }
 
@@ -167,11 +197,11 @@ func (this *QColorSpace) TransformationToColorSpace(colorspace *QColorSpace) *QC
 	return ret1
 }
 
-func (this *QColorSpace) SetTransferFunction2(transferFunction uintptr, gamma float32) {
+func (this *QColorSpace) SetTransferFunction2(transferFunction QColorSpace__TransferFunction, gamma float32) {
 	C.QColorSpace_SetTransferFunction2(this.h, (C.uintptr_t)(transferFunction), (C.float)(gamma))
 }
 
-func (this *QColorSpace) WithTransferFunction2(transferFunction uintptr, gamma float32) *QColorSpace {
+func (this *QColorSpace) WithTransferFunction2(transferFunction QColorSpace__TransferFunction, gamma float32) *QColorSpace {
 	ret := C.QColorSpace_WithTransferFunction2(this.h, (C.uintptr_t)(transferFunction), (C.float)(gamma))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQColorSpace(ret)

qt/gen_qcolumnview.go

@@ -234,7 +234,7 @@ func QColumnView_TrUtf83(s string, c string, n int) string {
 	return ret
 }
 
-func (this *QColumnView) ScrollTo2(index *QModelIndex, hint uintptr) {
+func (this *QColumnView) ScrollTo2(index *QModelIndex, hint QAbstractItemView__ScrollHint) {
 	C.QColumnView_ScrollTo2(this.h, index.cPointer(), (C.uintptr_t)(hint))
 }
 

qt/gen_qcombobox.go

@@ -14,6 +14,27 @@ import (
 	"unsafe"
 )
 
+type QComboBox__InsertPolicy int
+
+const (
+	QComboBox__InsertPolicy__NoInsert             QComboBox__InsertPolicy = 0
+	QComboBox__InsertPolicy__InsertAtTop          QComboBox__InsertPolicy = 1
+	QComboBox__InsertPolicy__InsertAtCurrent      QComboBox__InsertPolicy = 2
+	QComboBox__InsertPolicy__InsertAtBottom       QComboBox__InsertPolicy = 3
+	QComboBox__InsertPolicy__InsertAfterCurrent   QComboBox__InsertPolicy = 4
+	QComboBox__InsertPolicy__InsertBeforeCurrent  QComboBox__InsertPolicy = 5
+	QComboBox__InsertPolicy__InsertAlphabetically QComboBox__InsertPolicy = 6
+)
+
+type QComboBox__SizeAdjustPolicy int
+
+const (
+	QComboBox__SizeAdjustPolicy__AdjustToContents                      QComboBox__SizeAdjustPolicy = 0
+	QComboBox__SizeAdjustPolicy__AdjustToContentsOnFirstShow           QComboBox__SizeAdjustPolicy = 1
+	QComboBox__SizeAdjustPolicy__AdjustToMinimumContentsLength         QComboBox__SizeAdjustPolicy = 2
+	QComboBox__SizeAdjustPolicy__AdjustToMinimumContentsLengthWithIcon QComboBox__SizeAdjustPolicy = 3
+)
+
 type QComboBox struct {
 	h *C.QComboBox
 	*QWidget
@@ -108,12 +129,12 @@ func (this *QComboBox) SetAutoCompletion(enable bool) {
 	C.QComboBox_SetAutoCompletion(this.h, (C.bool)(enable))
 }
 
-func (this *QComboBox) AutoCompletionCaseSensitivity() uintptr {
+func (this *QComboBox) AutoCompletionCaseSensitivity() CaseSensitivity {
 	ret := C.QComboBox_AutoCompletionCaseSensitivity(this.h)
-	return (uintptr)(ret)
+	return (CaseSensitivity)(ret)
 }
 
-func (this *QComboBox) SetAutoCompletionCaseSensitivity(sensitivity uintptr) {
+func (this *QComboBox) SetAutoCompletionCaseSensitivity(sensitivity CaseSensitivity) {
 	C.QComboBox_SetAutoCompletionCaseSensitivity(this.h, (C.uintptr_t)(sensitivity))
 }
 
@@ -147,21 +168,21 @@ func (this *QComboBox) FindData(data *QVariant) int {
 	return (int)(ret)
 }
 
-func (this *QComboBox) InsertPolicy() uintptr {
+func (this *QComboBox) InsertPolicy() QComboBox__InsertPolicy {
 	ret := C.QComboBox_InsertPolicy(this.h)
-	return (uintptr)(ret)
+	return (QComboBox__InsertPolicy)(ret)
 }
 
-func (this *QComboBox) SetInsertPolicy(policy uintptr) {
+func (this *QComboBox) SetInsertPolicy(policy QComboBox__InsertPolicy) {
 	C.QComboBox_SetInsertPolicy(this.h, (C.uintptr_t)(policy))
 }
 
-func (this *QComboBox) SizeAdjustPolicy() uintptr {
+func (this *QComboBox) SizeAdjustPolicy() QComboBox__SizeAdjustPolicy {
 	ret := C.QComboBox_SizeAdjustPolicy(this.h)
-	return (uintptr)(ret)
+	return (QComboBox__SizeAdjustPolicy)(ret)
 }
 
-func (this *QComboBox) SetSizeAdjustPolicy(policy uintptr) {
+func (this *QComboBox) SetSizeAdjustPolicy(policy QComboBox__SizeAdjustPolicy) {
 	C.QComboBox_SetSizeAdjustPolicy(this.h, (C.uintptr_t)(policy))
 }
 
@@ -458,7 +479,7 @@ func (this *QComboBox) Event(event *QEvent) bool {
 	return (bool)(ret)
 }
 
-func (this *QComboBox) InputMethodQuery(param1 uintptr) *QVariant {
+func (this *QComboBox) InputMethodQuery(param1 InputMethodQuery) *QVariant {
 	ret := C.QComboBox_InputMethodQuery(this.h, (C.uintptr_t)(param1))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQVariant(ret)
@@ -469,7 +490,7 @@ func (this *QComboBox) InputMethodQuery(param1 uintptr) *QVariant {
 	return ret1
 }
 
-func (this *QComboBox) InputMethodQuery2(query uintptr, argument *QVariant) *QVariant {
+func (this *QComboBox) InputMethodQuery2(query InputMethodQuery, argument *QVariant) *QVariant {
 	ret := C.QComboBox_InputMethodQuery2(this.h, (C.uintptr_t)(query), argument.cPointer())
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQVariant(ret)

qt/gen_qcommandlineoption.go

@@ -12,6 +12,13 @@ import (
 	"unsafe"
 )
 
+type QCommandLineOption__Flag int
+
+const (
+	QCommandLineOption__Flag__HiddenFromHelp   QCommandLineOption__Flag = 1
+	QCommandLineOption__Flag__ShortOptionStyle QCommandLineOption__Flag = 2
+)
+
 type QCommandLineOption struct {
 	h *C.QCommandLineOption
 }

qt/gen_qcommandlineparser.go

@@ -13,6 +13,20 @@ import (
 	"unsafe"
 )
 
+type QCommandLineParser__SingleDashWordOptionMode int
+
+const (
+	QCommandLineParser__SingleDashWordOptionMode__ParseAsCompactedShortOptions QCommandLineParser__SingleDashWordOptionMode = 0
+	QCommandLineParser__SingleDashWordOptionMode__ParseAsLongOptions           QCommandLineParser__SingleDashWordOptionMode = 1
+)
+
+type QCommandLineParser__OptionsAfterPositionalArgumentsMode int
+
+const (
+	QCommandLineParser__OptionsAfterPositionalArgumentsMode__ParseAsOptions             QCommandLineParser__OptionsAfterPositionalArgumentsMode = 0
+	QCommandLineParser__OptionsAfterPositionalArgumentsMode__ParseAsPositionalArguments QCommandLineParser__OptionsAfterPositionalArgumentsMode = 1
+)
+
 type QCommandLineParser struct {
 	h *C.QCommandLineParser
 }
@@ -63,11 +77,11 @@ func QCommandLineParser_TrUtf8(sourceText string) string {
 	return ret
 }
 
-func (this *QCommandLineParser) SetSingleDashWordOptionMode(parsingMode uintptr) {
+func (this *QCommandLineParser) SetSingleDashWordOptionMode(parsingMode QCommandLineParser__SingleDashWordOptionMode) {
 	C.QCommandLineParser_SetSingleDashWordOptionMode(this.h, (C.uintptr_t)(parsingMode))
 }
 
-func (this *QCommandLineParser) SetOptionsAfterPositionalArgumentsMode(mode uintptr) {
+func (this *QCommandLineParser) SetOptionsAfterPositionalArgumentsMode(mode QCommandLineParser__OptionsAfterPositionalArgumentsMode) {
 	C.QCommandLineParser_SetOptionsAfterPositionalArgumentsMode(this.h, (C.uintptr_t)(mode))
 }
 

qt/gen_qcommonstyle.go

@@ -69,15 +69,15 @@ func QCommonStyle_TrUtf8(s string) string {
 	return ret
 }
 
-func (this *QCommonStyle) DrawPrimitive(pe uintptr, opt *QStyleOption, p *QPainter) {
+func (this *QCommonStyle) DrawPrimitive(pe QStyle__PrimitiveElement, opt *QStyleOption, p *QPainter) {
 	C.QCommonStyle_DrawPrimitive(this.h, (C.uintptr_t)(pe), opt.cPointer(), p.cPointer())
 }
 
-func (this *QCommonStyle) DrawControl(element uintptr, opt *QStyleOption, p *QPainter) {
+func (this *QCommonStyle) DrawControl(element QStyle__ControlElement, opt *QStyleOption, p *QPainter) {
 	C.QCommonStyle_DrawControl(this.h, (C.uintptr_t)(element), opt.cPointer(), p.cPointer())
 }
 
-func (this *QCommonStyle) SubElementRect(r uintptr, opt *QStyleOption) *QRect {
+func (this *QCommonStyle) SubElementRect(r QStyle__SubElement, opt *QStyleOption) *QRect {
 	ret := C.QCommonStyle_SubElementRect(this.h, (C.uintptr_t)(r), opt.cPointer())
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQRect(ret)
@@ -88,16 +88,16 @@ func (this *QCommonStyle) SubElementRect(r uintptr, opt *QStyleOption) *QRect {
 	return ret1
 }
 
-func (this *QCommonStyle) DrawComplexControl(cc uintptr, opt *QStyleOptionComplex, p *QPainter) {
+func (this *QCommonStyle) DrawComplexControl(cc QStyle__ComplexControl, opt *QStyleOptionComplex, p *QPainter) {
 	C.QCommonStyle_DrawComplexControl(this.h, (C.uintptr_t)(cc), opt.cPointer(), p.cPointer())
 }
 
-func (this *QCommonStyle) HitTestComplexControl(cc uintptr, opt *QStyleOptionComplex, pt *QPoint) uintptr {
+func (this *QCommonStyle) HitTestComplexControl(cc QStyle__ComplexControl, opt *QStyleOptionComplex, pt *QPoint) QStyle__SubControl {
 	ret := C.QCommonStyle_HitTestComplexControl(this.h, (C.uintptr_t)(cc), opt.cPointer(), pt.cPointer())
-	return (uintptr)(ret)
+	return (QStyle__SubControl)(ret)
 }
 
-func (this *QCommonStyle) SubControlRect(cc uintptr, opt *QStyleOptionComplex, sc uintptr) *QRect {
+func (this *QCommonStyle) SubControlRect(cc QStyle__ComplexControl, opt *QStyleOptionComplex, sc QStyle__SubControl) *QRect {
 	ret := C.QCommonStyle_SubControlRect(this.h, (C.uintptr_t)(cc), opt.cPointer(), (C.uintptr_t)(sc))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQRect(ret)
@@ -108,7 +108,7 @@ func (this *QCommonStyle) SubControlRect(cc uintptr, opt *QStyleOptionComplex, s
 	return ret1
 }
 
-func (this *QCommonStyle) SizeFromContents(ct uintptr, opt *QStyleOption, contentsSize *QSize) *QSize {
+func (this *QCommonStyle) SizeFromContents(ct QStyle__ContentsType, opt *QStyleOption, contentsSize *QSize) *QSize {
 	ret := C.QCommonStyle_SizeFromContents(this.h, (C.uintptr_t)(ct), opt.cPointer(), contentsSize.cPointer())
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQSize(ret)
@@ -119,17 +119,17 @@ func (this *QCommonStyle) SizeFromContents(ct uintptr, opt *QStyleOption, conten
 	return ret1
 }
 
-func (this *QCommonStyle) PixelMetric(m uintptr) int {
+func (this *QCommonStyle) PixelMetric(m QStyle__PixelMetric) int {
 	ret := C.QCommonStyle_PixelMetric(this.h, (C.uintptr_t)(m))
 	return (int)(ret)
 }
 
-func (this *QCommonStyle) StyleHint(sh uintptr) int {
+func (this *QCommonStyle) StyleHint(sh QStyle__StyleHint) int {
 	ret := C.QCommonStyle_StyleHint(this.h, (C.uintptr_t)(sh))
 	return (int)(ret)
 }
 
-func (this *QCommonStyle) StandardIcon(standardIcon uintptr) *QIcon {
+func (this *QCommonStyle) StandardIcon(standardIcon QStyle__StandardPixmap) *QIcon {
 	ret := C.QCommonStyle_StandardIcon(this.h, (C.uintptr_t)(standardIcon))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQIcon(ret)
@@ -140,7 +140,7 @@ func (this *QCommonStyle) StandardIcon(standardIcon uintptr) *QIcon {
 	return ret1
 }
 
-func (this *QCommonStyle) StandardPixmap(sp uintptr) *QPixmap {
+func (this *QCommonStyle) StandardPixmap(sp QStyle__StandardPixmap) *QPixmap {
 	ret := C.QCommonStyle_StandardPixmap(this.h, (C.uintptr_t)(sp))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQPixmap(ret)
@@ -151,7 +151,7 @@ func (this *QCommonStyle) StandardPixmap(sp uintptr) *QPixmap {
 	return ret1
 }
 
-func (this *QCommonStyle) GeneratedIconPixmap(iconMode uintptr, pixmap *QPixmap, opt *QStyleOption) *QPixmap {
+func (this *QCommonStyle) GeneratedIconPixmap(iconMode QIcon__Mode, pixmap *QPixmap, opt *QStyleOption) *QPixmap {
 	ret := C.QCommonStyle_GeneratedIconPixmap(this.h, (C.uintptr_t)(iconMode), pixmap.cPointer(), opt.cPointer())
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQPixmap(ret)
@@ -162,7 +162,7 @@ func (this *QCommonStyle) GeneratedIconPixmap(iconMode uintptr, pixmap *QPixmap,
 	return ret1
 }
 
-func (this *QCommonStyle) LayoutSpacing(control1 uintptr, control2 uintptr, orientation uintptr) int {
+func (this *QCommonStyle) LayoutSpacing(control1 QSizePolicy__ControlType, control2 QSizePolicy__ControlType, orientation Orientation) int {
 	ret := C.QCommonStyle_LayoutSpacing(this.h, (C.uintptr_t)(control1), (C.uintptr_t)(control2), (C.uintptr_t)(orientation))
 	return (int)(ret)
 }
@@ -239,15 +239,15 @@ func QCommonStyle_TrUtf83(s string, c string, n int) string {
 	return ret
 }
 
-func (this *QCommonStyle) DrawPrimitive4(pe uintptr, opt *QStyleOption, p *QPainter, w *QWidget) {
+func (this *QCommonStyle) DrawPrimitive4(pe QStyle__PrimitiveElement, opt *QStyleOption, p *QPainter, w *QWidget) {
 	C.QCommonStyle_DrawPrimitive4(this.h, (C.uintptr_t)(pe), opt.cPointer(), p.cPointer(), w.cPointer())
 }
 
-func (this *QCommonStyle) DrawControl4(element uintptr, opt *QStyleOption, p *QPainter, w *QWidget) {
+func (this *QCommonStyle) DrawControl4(element QStyle__ControlElement, opt *QStyleOption, p *QPainter, w *QWidget) {
 	C.QCommonStyle_DrawControl4(this.h, (C.uintptr_t)(element), opt.cPointer(), p.cPointer(), w.cPointer())
 }
 
-func (this *QCommonStyle) SubElementRect3(r uintptr, opt *QStyleOption, widget *QWidget) *QRect {
+func (this *QCommonStyle) SubElementRect3(r QStyle__SubElement, opt *QStyleOption, widget *QWidget) *QRect {
 	ret := C.QCommonStyle_SubElementRect3(this.h, (C.uintptr_t)(r), opt.cPointer(), widget.cPointer())
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQRect(ret)
@@ -258,16 +258,16 @@ func (this *QCommonStyle) SubElementRect3(r uintptr, opt *QStyleOption, widget *
 	return ret1
 }
 
-func (this *QCommonStyle) DrawComplexControl4(cc uintptr, opt *QStyleOptionComplex, p *QPainter, w *QWidget) {
+func (this *QCommonStyle) DrawComplexControl4(cc QStyle__ComplexControl, opt *QStyleOptionComplex, p *QPainter, w *QWidget) {
 	C.QCommonStyle_DrawComplexControl4(this.h, (C.uintptr_t)(cc), opt.cPointer(), p.cPointer(), w.cPointer())
 }
 
-func (this *QCommonStyle) HitTestComplexControl4(cc uintptr, opt *QStyleOptionComplex, pt *QPoint, w *QWidget) uintptr {
+func (this *QCommonStyle) HitTestComplexControl4(cc QStyle__ComplexControl, opt *QStyleOptionComplex, pt *QPoint, w *QWidget) QStyle__SubControl {
 	ret := C.QCommonStyle_HitTestComplexControl4(this.h, (C.uintptr_t)(cc), opt.cPointer(), pt.cPointer(), w.cPointer())
-	return (uintptr)(ret)
+	return (QStyle__SubControl)(ret)
 }
 
-func (this *QCommonStyle) SubControlRect4(cc uintptr, opt *QStyleOptionComplex, sc uintptr, w *QWidget) *QRect {
+func (this *QCommonStyle) SubControlRect4(cc QStyle__ComplexControl, opt *QStyleOptionComplex, sc QStyle__SubControl, w *QWidget) *QRect {
 	ret := C.QCommonStyle_SubControlRect4(this.h, (C.uintptr_t)(cc), opt.cPointer(), (C.uintptr_t)(sc), w.cPointer())
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQRect(ret)
@@ -278,7 +278,7 @@ func (this *QCommonStyle) SubControlRect4(cc uintptr, opt *QStyleOptionComplex,
 	return ret1
 }
 
-func (this *QCommonStyle) SizeFromContents4(ct uintptr, opt *QStyleOption, contentsSize *QSize, widget *QWidget) *QSize {
+func (this *QCommonStyle) SizeFromContents4(ct QStyle__ContentsType, opt *QStyleOption, contentsSize *QSize, widget *QWidget) *QSize {
 	ret := C.QCommonStyle_SizeFromContents4(this.h, (C.uintptr_t)(ct), opt.cPointer(), contentsSize.cPointer(), widget.cPointer())
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQSize(ret)
@@ -289,32 +289,32 @@ func (this *QCommonStyle) SizeFromContents4(ct uintptr, opt *QStyleOption, conte
 	return ret1
 }
 
-func (this *QCommonStyle) PixelMetric2(m uintptr, opt *QStyleOption) int {
+func (this *QCommonStyle) PixelMetric2(m QStyle__PixelMetric, opt *QStyleOption) int {
 	ret := C.QCommonStyle_PixelMetric2(this.h, (C.uintptr_t)(m), opt.cPointer())
 	return (int)(ret)
 }
 
-func (this *QCommonStyle) PixelMetric3(m uintptr, opt *QStyleOption, widget *QWidget) int {
+func (this *QCommonStyle) PixelMetric3(m QStyle__PixelMetric, opt *QStyleOption, widget *QWidget) int {
 	ret := C.QCommonStyle_PixelMetric3(this.h, (C.uintptr_t)(m), opt.cPointer(), widget.cPointer())
 	return (int)(ret)
 }
 
-func (this *QCommonStyle) StyleHint2(sh uintptr, opt *QStyleOption) int {
+func (this *QCommonStyle) StyleHint2(sh QStyle__StyleHint, opt *QStyleOption) int {
 	ret := C.QCommonStyle_StyleHint2(this.h, (C.uintptr_t)(sh), opt.cPointer())
 	return (int)(ret)
 }
 
-func (this *QCommonStyle) StyleHint3(sh uintptr, opt *QStyleOption, w *QWidget) int {
+func (this *QCommonStyle) StyleHint3(sh QStyle__StyleHint, opt *QStyleOption, w *QWidget) int {
 	ret := C.QCommonStyle_StyleHint3(this.h, (C.uintptr_t)(sh), opt.cPointer(), w.cPointer())
 	return (int)(ret)
 }
 
-func (this *QCommonStyle) StyleHint4(sh uintptr, opt *QStyleOption, w *QWidget, shret *QStyleHintReturn) int {
+func (this *QCommonStyle) StyleHint4(sh QStyle__StyleHint, opt *QStyleOption, w *QWidget, shret *QStyleHintReturn) int {
 	ret := C.QCommonStyle_StyleHint4(this.h, (C.uintptr_t)(sh), opt.cPointer(), w.cPointer(), shret.cPointer())
 	return (int)(ret)
 }
 
-func (this *QCommonStyle) StandardIcon2(standardIcon uintptr, opt *QStyleOption) *QIcon {
+func (this *QCommonStyle) StandardIcon2(standardIcon QStyle__StandardPixmap, opt *QStyleOption) *QIcon {
 	ret := C.QCommonStyle_StandardIcon2(this.h, (C.uintptr_t)(standardIcon), opt.cPointer())
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQIcon(ret)
@@ -325,7 +325,7 @@ func (this *QCommonStyle) StandardIcon2(standardIcon uintptr, opt *QStyleOption)
 	return ret1
 }
 
-func (this *QCommonStyle) StandardIcon3(standardIcon uintptr, opt *QStyleOption, widget *QWidget) *QIcon {
+func (this *QCommonStyle) StandardIcon3(standardIcon QStyle__StandardPixmap, opt *QStyleOption, widget *QWidget) *QIcon {
 	ret := C.QCommonStyle_StandardIcon3(this.h, (C.uintptr_t)(standardIcon), opt.cPointer(), widget.cPointer())
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQIcon(ret)
@@ -336,7 +336,7 @@ func (this *QCommonStyle) StandardIcon3(standardIcon uintptr, opt *QStyleOption,
 	return ret1
 }
 
-func (this *QCommonStyle) StandardPixmap2(sp uintptr, opt *QStyleOption) *QPixmap {
+func (this *QCommonStyle) StandardPixmap2(sp QStyle__StandardPixmap, opt *QStyleOption) *QPixmap {
 	ret := C.QCommonStyle_StandardPixmap2(this.h, (C.uintptr_t)(sp), opt.cPointer())
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQPixmap(ret)
@@ -347,7 +347,7 @@ func (this *QCommonStyle) StandardPixmap2(sp uintptr, opt *QStyleOption) *QPixma
 	return ret1
 }
 
-func (this *QCommonStyle) StandardPixmap3(sp uintptr, opt *QStyleOption, widget *QWidget) *QPixmap {
+func (this *QCommonStyle) StandardPixmap3(sp QStyle__StandardPixmap, opt *QStyleOption, widget *QWidget) *QPixmap {
 	ret := C.QCommonStyle_StandardPixmap3(this.h, (C.uintptr_t)(sp), opt.cPointer(), widget.cPointer())
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQPixmap(ret)
@@ -358,12 +358,12 @@ func (this *QCommonStyle) StandardPixmap3(sp uintptr, opt *QStyleOption, widget
 	return ret1
 }
 
-func (this *QCommonStyle) LayoutSpacing4(control1 uintptr, control2 uintptr, orientation uintptr, option *QStyleOption) int {
+func (this *QCommonStyle) LayoutSpacing4(control1 QSizePolicy__ControlType, control2 QSizePolicy__ControlType, orientation Orientation, option *QStyleOption) int {
 	ret := C.QCommonStyle_LayoutSpacing4(this.h, (C.uintptr_t)(control1), (C.uintptr_t)(control2), (C.uintptr_t)(orientation), option.cPointer())
 	return (int)(ret)
 }
 
-func (this *QCommonStyle) LayoutSpacing5(control1 uintptr, control2 uintptr, orientation uintptr, option *QStyleOption, widget *QWidget) int {
+func (this *QCommonStyle) LayoutSpacing5(control1 QSizePolicy__ControlType, control2 QSizePolicy__ControlType, orientation Orientation, option *QStyleOption, widget *QWidget) int {
 	ret := C.QCommonStyle_LayoutSpacing5(this.h, (C.uintptr_t)(control1), (C.uintptr_t)(control2), (C.uintptr_t)(orientation), option.cPointer(), widget.cPointer())
 	return (int)(ret)
 }

qt/gen_qcompleter.go

@@ -14,6 +14,22 @@ import (
 	"unsafe"
 )
 
+type QCompleter__CompletionMode int
+
+const (
+	QCompleter__CompletionMode__PopupCompletion           QCompleter__CompletionMode = 0
+	QCompleter__CompletionMode__UnfilteredPopupCompletion QCompleter__CompletionMode = 1
+	QCompleter__CompletionMode__InlineCompletion          QCompleter__CompletionMode = 2
+)
+
+type QCompleter__ModelSorting int
+
+const (
+	QCompleter__ModelSorting__UnsortedModel                QCompleter__ModelSorting = 0
+	QCompleter__ModelSorting__CaseSensitivelySortedModel   QCompleter__ModelSorting = 1
+	QCompleter__ModelSorting__CaseInsensitivelySortedModel QCompleter__ModelSorting = 2
+)
+
 type QCompleter struct {
 	h *C.QCompleter
 	*QObject
@@ -140,13 +156,13 @@ func (this *QCompleter) Model() *QAbstractItemModel {
 	return newQAbstractItemModel_U(unsafe.Pointer(ret))
 }
 
-func (this *QCompleter) SetCompletionMode(mode uintptr) {
+func (this *QCompleter) SetCompletionMode(mode QCompleter__CompletionMode) {
 	C.QCompleter_SetCompletionMode(this.h, (C.uintptr_t)(mode))
 }
 
-func (this *QCompleter) CompletionMode() uintptr {
+func (this *QCompleter) CompletionMode() QCompleter__CompletionMode {
 	ret := C.QCompleter_CompletionMode(this.h)
-	return (uintptr)(ret)
+	return (QCompleter__CompletionMode)(ret)
 }
 
 func (this *QCompleter) SetFilterMode(filterMode int) {
@@ -167,22 +183,22 @@ func (this *QCompleter) SetPopup(popup *QAbstractItemView) {
 	C.QCompleter_SetPopup(this.h, popup.cPointer())
 }
 
-func (this *QCompleter) SetCaseSensitivity(caseSensitivity uintptr) {
+func (this *QCompleter) SetCaseSensitivity(caseSensitivity CaseSensitivity) {
 	C.QCompleter_SetCaseSensitivity(this.h, (C.uintptr_t)(caseSensitivity))
 }
 
-func (this *QCompleter) CaseSensitivity() uintptr {
+func (this *QCompleter) CaseSensitivity() CaseSensitivity {
 	ret := C.QCompleter_CaseSensitivity(this.h)
-	return (uintptr)(ret)
+	return (CaseSensitivity)(ret)
 }
 
-func (this *QCompleter) SetModelSorting(sorting uintptr) {
+func (this *QCompleter) SetModelSorting(sorting QCompleter__ModelSorting) {
 	C.QCompleter_SetModelSorting(this.h, (C.uintptr_t)(sorting))
 }
 
-func (this *QCompleter) ModelSorting() uintptr {
+func (this *QCompleter) ModelSorting() QCompleter__ModelSorting {
 	ret := C.QCompleter_ModelSorting(this.h)
-	return (uintptr)(ret)
+	return (QCompleter__ModelSorting)(ret)
 }
 
 func (this *QCompleter) SetCompletionColumn(column int) {

qt/gen_qconcatenatetablesproxymodel.go

@@ -166,7 +166,7 @@ func (this *QConcatenateTablesProxyModel) RowCount() int {
 	return (int)(ret)
 }
 
-func (this *QConcatenateTablesProxyModel) HeaderData(section int, orientation uintptr) *QVariant {
+func (this *QConcatenateTablesProxyModel) HeaderData(section int, orientation Orientation) *QVariant {
 	ret := C.QConcatenateTablesProxyModel_HeaderData(this.h, (C.int)(section), (C.uintptr_t)(orientation))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQVariant(ret)
@@ -208,12 +208,12 @@ func (this *QConcatenateTablesProxyModel) MimeData(indexes []QModelIndex) *QMime
 	return newQMimeData_U(unsafe.Pointer(ret))
 }
 
-func (this *QConcatenateTablesProxyModel) CanDropMimeData(data *QMimeData, action uintptr, row int, column int, parent *QModelIndex) bool {
+func (this *QConcatenateTablesProxyModel) CanDropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool {
 	ret := C.QConcatenateTablesProxyModel_CanDropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer())
 	return (bool)(ret)
 }
 
-func (this *QConcatenateTablesProxyModel) DropMimeData(data *QMimeData, action uintptr, row int, column int, parent *QModelIndex) bool {
+func (this *QConcatenateTablesProxyModel) DropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool {
 	ret := C.QConcatenateTablesProxyModel_DropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer())
 	return (bool)(ret)
 }
@@ -313,7 +313,7 @@ func (this *QConcatenateTablesProxyModel) RowCount1(parent *QModelIndex) int {
 	return (int)(ret)
 }
 
-func (this *QConcatenateTablesProxyModel) HeaderData3(section int, orientation uintptr, role int) *QVariant {
+func (this *QConcatenateTablesProxyModel) HeaderData3(section int, orientation Orientation, role int) *QVariant {
 	ret := C.QConcatenateTablesProxyModel_HeaderData3(this.h, (C.int)(section), (C.uintptr_t)(orientation), (C.int)(role))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQVariant(ret)

qt/gen_qcoreapplication.go

@@ -13,6 +13,12 @@ import (
 	"unsafe"
 )
 
+type QCoreApplication__ int
+
+const (
+	QCoreApplication____ApplicationFlags QCoreApplication__ = 331528
+)
+
 type QCoreApplication struct {
 	h *C.QCoreApplication
 	*QObject
@@ -104,11 +110,11 @@ func QCoreApplication_Arguments() []string {
 	return ret
 }
 
-func QCoreApplication_SetAttribute(attribute uintptr) {
+func QCoreApplication_SetAttribute(attribute ApplicationAttribute) {
 	C.QCoreApplication_SetAttribute((C.uintptr_t)(attribute))
 }
 
-func QCoreApplication_TestAttribute(attribute uintptr) bool {
+func QCoreApplication_TestAttribute(attribute ApplicationAttribute) bool {
 	ret := C.QCoreApplication_TestAttribute((C.uintptr_t)(attribute))
 	return (bool)(ret)
 }
@@ -463,7 +469,7 @@ func QCoreApplication_TrUtf83(s string, c string, n int) string {
 	return ret
 }
 
-func QCoreApplication_SetAttribute2(attribute uintptr, on bool) {
+func QCoreApplication_SetAttribute2(attribute ApplicationAttribute, on bool) {
 	C.QCoreApplication_SetAttribute2((C.uintptr_t)(attribute), (C.bool)(on))
 }
 

qt/gen_qcoreevent.go

@@ -13,6 +13,183 @@ import (
 	"unsafe"
 )
 
+type QEvent__Type int
+
+const (
+	QEvent__Type__None                             QEvent__Type = 0
+	QEvent__Type__Timer                            QEvent__Type = 1
+	QEvent__Type__MouseButtonPress                 QEvent__Type = 2
+	QEvent__Type__MouseButtonRelease               QEvent__Type = 3
+	QEvent__Type__MouseButtonDblClick              QEvent__Type = 4
+	QEvent__Type__MouseMove                        QEvent__Type = 5
+	QEvent__Type__KeyPress                         QEvent__Type = 6
+	QEvent__Type__KeyRelease                       QEvent__Type = 7
+	QEvent__Type__FocusIn                          QEvent__Type = 8
+	QEvent__Type__FocusOut                         QEvent__Type = 9
+	QEvent__Type__FocusAboutToChange               QEvent__Type = 23
+	QEvent__Type__Enter                            QEvent__Type = 10
+	QEvent__Type__Leave                            QEvent__Type = 11
+	QEvent__Type__Paint                            QEvent__Type = 12
+	QEvent__Type__Move                             QEvent__Type = 13
+	QEvent__Type__Resize                           QEvent__Type = 14
+	QEvent__Type__Create                           QEvent__Type = 15
+	QEvent__Type__Destroy                          QEvent__Type = 16
+	QEvent__Type__Show                             QEvent__Type = 17
+	QEvent__Type__Hide                             QEvent__Type = 18
+	QEvent__Type__Close                            QEvent__Type = 19
+	QEvent__Type__Quit                             QEvent__Type = 20
+	QEvent__Type__ParentChange                     QEvent__Type = 21
+	QEvent__Type__ParentAboutToChange              QEvent__Type = 131
+	QEvent__Type__ThreadChange                     QEvent__Type = 22
+	QEvent__Type__WindowActivate                   QEvent__Type = 24
+	QEvent__Type__WindowDeactivate                 QEvent__Type = 25
+	QEvent__Type__ShowToParent                     QEvent__Type = 26
+	QEvent__Type__HideToParent                     QEvent__Type = 27
+	QEvent__Type__Wheel                            QEvent__Type = 31
+	QEvent__Type__WindowTitleChange                QEvent__Type = 33
+	QEvent__Type__WindowIconChange                 QEvent__Type = 34
+	QEvent__Type__ApplicationWindowIconChange      QEvent__Type = 35
+	QEvent__Type__ApplicationFontChange            QEvent__Type = 36
+	QEvent__Type__ApplicationLayoutDirectionChange QEvent__Type = 37
+	QEvent__Type__ApplicationPaletteChange         QEvent__Type = 38
+	QEvent__Type__PaletteChange                    QEvent__Type = 39
+	QEvent__Type__Clipboard                        QEvent__Type = 40
+	QEvent__Type__Speech                           QEvent__Type = 42
+	QEvent__Type__MetaCall                         QEvent__Type = 43
+	QEvent__Type__SockAct                          QEvent__Type = 50
+	QEvent__Type__WinEventAct                      QEvent__Type = 132
+	QEvent__Type__DeferredDelete                   QEvent__Type = 52
+	QEvent__Type__DragEnter                        QEvent__Type = 60
+	QEvent__Type__DragMove                         QEvent__Type = 61
+	QEvent__Type__DragLeave                        QEvent__Type = 62
+	QEvent__Type__Drop                             QEvent__Type = 63
+	QEvent__Type__DragResponse                     QEvent__Type = 64
+	QEvent__Type__ChildAdded                       QEvent__Type = 68
+	QEvent__Type__ChildPolished                    QEvent__Type = 69
+	QEvent__Type__ChildRemoved                     QEvent__Type = 71
+	QEvent__Type__ShowWindowRequest                QEvent__Type = 73
+	QEvent__Type__PolishRequest                    QEvent__Type = 74
+	QEvent__Type__Polish                           QEvent__Type = 75
+	QEvent__Type__LayoutRequest                    QEvent__Type = 76
+	QEvent__Type__UpdateRequest                    QEvent__Type = 77
+	QEvent__Type__UpdateLater                      QEvent__Type = 78
+	QEvent__Type__EmbeddingControl                 QEvent__Type = 79
+	QEvent__Type__ActivateControl                  QEvent__Type = 80
+	QEvent__Type__DeactivateControl                QEvent__Type = 81
+	QEvent__Type__ContextMenu                      QEvent__Type = 82
+	QEvent__Type__InputMethod                      QEvent__Type = 83
+	QEvent__Type__TabletMove                       QEvent__Type = 87
+	QEvent__Type__LocaleChange                     QEvent__Type = 88
+	QEvent__Type__LanguageChange                   QEvent__Type = 89
+	QEvent__Type__LayoutDirectionChange            QEvent__Type = 90
+	QEvent__Type__Style                            QEvent__Type = 91
+	QEvent__Type__TabletPress                      QEvent__Type = 92
+	QEvent__Type__TabletRelease                    QEvent__Type = 93
+	QEvent__Type__OkRequest                        QEvent__Type = 94
+	QEvent__Type__HelpRequest                      QEvent__Type = 95
+	QEvent__Type__IconDrag                         QEvent__Type = 96
+	QEvent__Type__FontChange                       QEvent__Type = 97
+	QEvent__Type__EnabledChange                    QEvent__Type = 98
+	QEvent__Type__ActivationChange                 QEvent__Type = 99
+	QEvent__Type__StyleChange                      QEvent__Type = 100
+	QEvent__Type__IconTextChange                   QEvent__Type = 101
+	QEvent__Type__ModifiedChange                   QEvent__Type = 102
+	QEvent__Type__MouseTrackingChange              QEvent__Type = 109
+	QEvent__Type__WindowBlocked                    QEvent__Type = 103
+	QEvent__Type__WindowUnblocked                  QEvent__Type = 104
+	QEvent__Type__WindowStateChange                QEvent__Type = 105
+	QEvent__Type__ReadOnlyChange                   QEvent__Type = 106
+	QEvent__Type__ToolTip                          QEvent__Type = 110
+	QEvent__Type__WhatsThis                        QEvent__Type = 111
+	QEvent__Type__StatusTip                        QEvent__Type = 112
+	QEvent__Type__ActionChanged                    QEvent__Type = 113
+	QEvent__Type__ActionAdded                      QEvent__Type = 114
+	QEvent__Type__ActionRemoved                    QEvent__Type = 115
+	QEvent__Type__FileOpen                         QEvent__Type = 116
+	QEvent__Type__Shortcut                         QEvent__Type = 117
+	QEvent__Type__ShortcutOverride                 QEvent__Type = 51
+	QEvent__Type__WhatsThisClicked                 QEvent__Type = 118
+	QEvent__Type__ToolBarChange                    QEvent__Type = 120
+	QEvent__Type__ApplicationActivate              QEvent__Type = 121
+	QEvent__Type__ApplicationActivated             QEvent__Type = 121
+	QEvent__Type__ApplicationDeactivate            QEvent__Type = 122
+	QEvent__Type__ApplicationDeactivated           QEvent__Type = 122
+	QEvent__Type__QueryWhatsThis                   QEvent__Type = 123
+	QEvent__Type__EnterWhatsThisMode               QEvent__Type = 124
+	QEvent__Type__LeaveWhatsThisMode               QEvent__Type = 125
+	QEvent__Type__ZOrderChange                     QEvent__Type = 126
+	QEvent__Type__HoverEnter                       QEvent__Type = 127
+	QEvent__Type__HoverLeave                       QEvent__Type = 128
+	QEvent__Type__HoverMove                        QEvent__Type = 129
+	QEvent__Type__AcceptDropsChange                QEvent__Type = 152
+	QEvent__Type__ZeroTimerEvent                   QEvent__Type = 154
+	QEvent__Type__GraphicsSceneMouseMove           QEvent__Type = 155
+	QEvent__Type__GraphicsSceneMousePress          QEvent__Type = 156
+	QEvent__Type__GraphicsSceneMouseRelease        QEvent__Type = 157
+	QEvent__Type__GraphicsSceneMouseDoubleClick    QEvent__Type = 158
+	QEvent__Type__GraphicsSceneContextMenu         QEvent__Type = 159
+	QEvent__Type__GraphicsSceneHoverEnter          QEvent__Type = 160
+	QEvent__Type__GraphicsSceneHoverMove           QEvent__Type = 161
+	QEvent__Type__GraphicsSceneHoverLeave          QEvent__Type = 162
+	QEvent__Type__GraphicsSceneHelp                QEvent__Type = 163
+	QEvent__Type__GraphicsSceneDragEnter           QEvent__Type = 164
+	QEvent__Type__GraphicsSceneDragMove            QEvent__Type = 165
+	QEvent__Type__GraphicsSceneDragLeave           QEvent__Type = 166
+	QEvent__Type__GraphicsSceneDrop                QEvent__Type = 167
+	QEvent__Type__GraphicsSceneWheel               QEvent__Type = 168
+	QEvent__Type__KeyboardLayoutChange             QEvent__Type = 169
+	QEvent__Type__DynamicPropertyChange            QEvent__Type = 170
+	QEvent__Type__TabletEnterProximity             QEvent__Type = 171
+	QEvent__Type__TabletLeaveProximity             QEvent__Type = 172
+	QEvent__Type__NonClientAreaMouseMove           QEvent__Type = 173
+	QEvent__Type__NonClientAreaMouseButtonPress    QEvent__Type = 174
+	QEvent__Type__NonClientAreaMouseButtonRelease  QEvent__Type = 175
+	QEvent__Type__NonClientAreaMouseButtonDblClick QEvent__Type = 176
+	QEvent__Type__MacSizeChange                    QEvent__Type = 177
+	QEvent__Type__ContentsRectChange               QEvent__Type = 178
+	QEvent__Type__MacGLWindowChange                QEvent__Type = 179
+	QEvent__Type__FutureCallOut                    QEvent__Type = 180
+	QEvent__Type__GraphicsSceneResize              QEvent__Type = 181
+	QEvent__Type__GraphicsSceneMove                QEvent__Type = 182
+	QEvent__Type__CursorChange                     QEvent__Type = 183
+	QEvent__Type__ToolTipChange                    QEvent__Type = 184
+	QEvent__Type__NetworkReplyUpdated              QEvent__Type = 185
+	QEvent__Type__GrabMouse                        QEvent__Type = 186
+	QEvent__Type__UngrabMouse                      QEvent__Type = 187
+	QEvent__Type__GrabKeyboard                     QEvent__Type = 188
+	QEvent__Type__UngrabKeyboard                   QEvent__Type = 189
+	QEvent__Type__MacGLClearDrawable               QEvent__Type = 191
+	QEvent__Type__StateMachineSignal               QEvent__Type = 192
+	QEvent__Type__StateMachineWrapped              QEvent__Type = 193
+	QEvent__Type__TouchBegin                       QEvent__Type = 194
+	QEvent__Type__TouchUpdate                      QEvent__Type = 195
+	QEvent__Type__TouchEnd                         QEvent__Type = 196
+	QEvent__Type__NativeGesture                    QEvent__Type = 197
+	QEvent__Type__RequestSoftwareInputPanel        QEvent__Type = 199
+	QEvent__Type__CloseSoftwareInputPanel          QEvent__Type = 200
+	QEvent__Type__WinIdChange                      QEvent__Type = 203
+	QEvent__Type__Gesture                          QEvent__Type = 198
+	QEvent__Type__GestureOverride                  QEvent__Type = 202
+	QEvent__Type__ScrollPrepare                    QEvent__Type = 204
+	QEvent__Type__Scroll                           QEvent__Type = 205
+	QEvent__Type__Expose                           QEvent__Type = 206
+	QEvent__Type__InputMethodQuery                 QEvent__Type = 207
+	QEvent__Type__OrientationChange                QEvent__Type = 208
+	QEvent__Type__TouchCancel                      QEvent__Type = 209
+	QEvent__Type__ThemeChange                      QEvent__Type = 210
+	QEvent__Type__SockClose                        QEvent__Type = 211
+	QEvent__Type__PlatformPanel                    QEvent__Type = 212
+	QEvent__Type__StyleAnimationUpdate             QEvent__Type = 213
+	QEvent__Type__ApplicationStateChange           QEvent__Type = 214
+	QEvent__Type__WindowChangeInternal             QEvent__Type = 215
+	QEvent__Type__ScreenChangeInternal             QEvent__Type = 216
+	QEvent__Type__PlatformSurface                  QEvent__Type = 217
+	QEvent__Type__Pointer                          QEvent__Type = 218
+	QEvent__Type__TabletTrackingChange             QEvent__Type = 219
+	QEvent__Type__User                             QEvent__Type = 1000
+	QEvent__Type__MaxUser                          QEvent__Type = 65535
+)
+
 type QEvent struct {
 	h *C.QEvent
 }
@@ -36,7 +213,7 @@ func newQEvent_U(h unsafe.Pointer) *QEvent {
 }
 
 // NewQEvent constructs a new QEvent object.
-func NewQEvent(typeVal uintptr) *QEvent {
+func NewQEvent(typeVal QEvent__Type) *QEvent {
 	ret := C.QEvent_new((C.uintptr_t)(typeVal))
 	return newQEvent(ret)
 }
@@ -51,9 +228,9 @@ func (this *QEvent) OperatorAssign(other *QEvent) {
 	C.QEvent_OperatorAssign(this.h, other.cPointer())
 }
 
-func (this *QEvent) Type() uintptr {
+func (this *QEvent) Type() QEvent__Type {
 	ret := C.QEvent_Type(this.h)
-	return (uintptr)(ret)
+	return (QEvent__Type)(ret)
 }
 
 func (this *QEvent) Spontaneous() bool {
@@ -160,7 +337,7 @@ func newQChildEvent_U(h unsafe.Pointer) *QChildEvent {
 }
 
 // NewQChildEvent constructs a new QChildEvent object.
-func NewQChildEvent(typeVal uintptr, child *QObject) *QChildEvent {
+func NewQChildEvent(typeVal QEvent__Type, child *QObject) *QChildEvent {
 	ret := C.QChildEvent_new((C.uintptr_t)(typeVal), child.cPointer())
 	return newQChildEvent(ret)
 }

qt/gen_qcryptographichash.go

@@ -13,6 +13,30 @@ import (
 	"unsafe"
 )
 
+type QCryptographicHash__Algorithm int
+
+const (
+	QCryptographicHash__Algorithm__Md4          QCryptographicHash__Algorithm = 0
+	QCryptographicHash__Algorithm__Md5          QCryptographicHash__Algorithm = 1
+	QCryptographicHash__Algorithm__Sha1         QCryptographicHash__Algorithm = 2
+	QCryptographicHash__Algorithm__Sha224       QCryptographicHash__Algorithm = 3
+	QCryptographicHash__Algorithm__Sha256       QCryptographicHash__Algorithm = 4
+	QCryptographicHash__Algorithm__Sha384       QCryptographicHash__Algorithm = 5
+	QCryptographicHash__Algorithm__Sha512       QCryptographicHash__Algorithm = 6
+	QCryptographicHash__Algorithm__Keccak_224   QCryptographicHash__Algorithm = 7
+	QCryptographicHash__Algorithm__Keccak_256   QCryptographicHash__Algorithm = 8
+	QCryptographicHash__Algorithm__Keccak_384   QCryptographicHash__Algorithm = 9
+	QCryptographicHash__Algorithm__Keccak_512   QCryptographicHash__Algorithm = 10
+	QCryptographicHash__Algorithm__RealSha3_224 QCryptographicHash__Algorithm = 11
+	QCryptographicHash__Algorithm__RealSha3_256 QCryptographicHash__Algorithm = 12
+	QCryptographicHash__Algorithm__RealSha3_384 QCryptographicHash__Algorithm = 13
+	QCryptographicHash__Algorithm__RealSha3_512 QCryptographicHash__Algorithm = 14
+	QCryptographicHash__Algorithm__Sha3_224     QCryptographicHash__Algorithm = 11
+	QCryptographicHash__Algorithm__Sha3_256     QCryptographicHash__Algorithm = 12
+	QCryptographicHash__Algorithm__Sha3_384     QCryptographicHash__Algorithm = 13
+	QCryptographicHash__Algorithm__Sha3_512     QCryptographicHash__Algorithm = 14
+)
+
 type QCryptographicHash struct {
 	h *C.QCryptographicHash
 }
@@ -36,7 +60,7 @@ func newQCryptographicHash_U(h unsafe.Pointer) *QCryptographicHash {
 }
 
 // NewQCryptographicHash constructs a new QCryptographicHash object.
-func NewQCryptographicHash(method uintptr) *QCryptographicHash {
+func NewQCryptographicHash(method QCryptographicHash__Algorithm) *QCryptographicHash {
 	ret := C.QCryptographicHash_new((C.uintptr_t)(method))
 	return newQCryptographicHash(ret)
 }
@@ -71,7 +95,7 @@ func (this *QCryptographicHash) Result() *QByteArray {
 	return ret1
 }
 
-func QCryptographicHash_Hash(data *QByteArray, method uintptr) *QByteArray {
+func QCryptographicHash_Hash(data *QByteArray, method QCryptographicHash__Algorithm) *QByteArray {
 	ret := C.QCryptographicHash_Hash(data.cPointer(), (C.uintptr_t)(method))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQByteArray(ret)
@@ -82,7 +106,7 @@ func QCryptographicHash_Hash(data *QByteArray, method uintptr) *QByteArray {
 	return ret1
 }
 
-func QCryptographicHash_HashLength(method uintptr) int {
+func QCryptographicHash_HashLength(method QCryptographicHash__Algorithm) int {
 	ret := C.QCryptographicHash_HashLength((C.uintptr_t)(method))
 	return (int)(ret)
 }

qt/gen_qcursor.go

@@ -42,7 +42,7 @@ func NewQCursor() *QCursor {
 }
 
 // NewQCursor2 constructs a new QCursor object.
-func NewQCursor2(shape uintptr) *QCursor {
+func NewQCursor2(shape CursorShape) *QCursor {
 	ret := C.QCursor_new2((C.uintptr_t)(shape))
 	return newQCursor(ret)
 }
@@ -97,12 +97,12 @@ func (this *QCursor) Swap(other *QCursor) {
 	C.QCursor_Swap(this.h, other.cPointer())
 }
 
-func (this *QCursor) Shape() uintptr {
+func (this *QCursor) Shape() CursorShape {
 	ret := C.QCursor_Shape(this.h)
-	return (uintptr)(ret)
+	return (CursorShape)(ret)
 }
 
-func (this *QCursor) SetShape(newShape uintptr) {
+func (this *QCursor) SetShape(newShape CursorShape) {
 	C.QCursor_SetShape(this.h, (C.uintptr_t)(newShape))
 }
 
@@ -116,7 +116,7 @@ func (this *QCursor) Mask() *QBitmap {
 	return newQBitmap_U(unsafe.Pointer(ret))
 }
 
-func (this *QCursor) BitmapWithQtReturnByValueConstant(param1 uintptr) *QBitmap {
+func (this *QCursor) BitmapWithQtReturnByValueConstant(param1 ReturnByValueConstant) *QBitmap {
 	ret := C.QCursor_BitmapWithQtReturnByValueConstant(this.h, (C.uintptr_t)(param1))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQBitmap(ret)
@@ -127,7 +127,7 @@ func (this *QCursor) BitmapWithQtReturnByValueConstant(param1 uintptr) *QBitmap
 	return ret1
 }
 
-func (this *QCursor) MaskWithQtReturnByValueConstant(param1 uintptr) *QBitmap {
+func (this *QCursor) MaskWithQtReturnByValueConstant(param1 ReturnByValueConstant) *QBitmap {
 	ret := C.QCursor_MaskWithQtReturnByValueConstant(this.h, (C.uintptr_t)(param1))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQBitmap(ret)

qt/gen_qdatastream.go

@@ -12,6 +12,67 @@ import (
 	"unsafe"
 )
 
+type QDataStream__Version int
+
+const (
+	QDataStream__Version__Qt_1_0                    QDataStream__Version = 1
+	QDataStream__Version__Qt_2_0                    QDataStream__Version = 2
+	QDataStream__Version__Qt_2_1                    QDataStream__Version = 3
+	QDataStream__Version__Qt_3_0                    QDataStream__Version = 4
+	QDataStream__Version__Qt_3_1                    QDataStream__Version = 5
+	QDataStream__Version__Qt_3_3                    QDataStream__Version = 6
+	QDataStream__Version__Qt_4_0                    QDataStream__Version = 7
+	QDataStream__Version__Qt_4_1                    QDataStream__Version = 7
+	QDataStream__Version__Qt_4_2                    QDataStream__Version = 8
+	QDataStream__Version__Qt_4_3                    QDataStream__Version = 9
+	QDataStream__Version__Qt_4_4                    QDataStream__Version = 10
+	QDataStream__Version__Qt_4_5                    QDataStream__Version = 11
+	QDataStream__Version__Qt_4_6                    QDataStream__Version = 12
+	QDataStream__Version__Qt_4_7                    QDataStream__Version = 12
+	QDataStream__Version__Qt_4_8                    QDataStream__Version = 12
+	QDataStream__Version__Qt_4_9                    QDataStream__Version = 12
+	QDataStream__Version__Qt_5_0                    QDataStream__Version = 13
+	QDataStream__Version__Qt_5_1                    QDataStream__Version = 14
+	QDataStream__Version__Qt_5_2                    QDataStream__Version = 15
+	QDataStream__Version__Qt_5_3                    QDataStream__Version = 15
+	QDataStream__Version__Qt_5_4                    QDataStream__Version = 16
+	QDataStream__Version__Qt_5_5                    QDataStream__Version = 16
+	QDataStream__Version__Qt_5_6                    QDataStream__Version = 17
+	QDataStream__Version__Qt_5_7                    QDataStream__Version = 17
+	QDataStream__Version__Qt_5_8                    QDataStream__Version = 17
+	QDataStream__Version__Qt_5_9                    QDataStream__Version = 17
+	QDataStream__Version__Qt_5_10                   QDataStream__Version = 17
+	QDataStream__Version__Qt_5_11                   QDataStream__Version = 17
+	QDataStream__Version__Qt_5_12                   QDataStream__Version = 18
+	QDataStream__Version__Qt_5_13                   QDataStream__Version = 19
+	QDataStream__Version__Qt_5_14                   QDataStream__Version = 19
+	QDataStream__Version__Qt_5_15                   QDataStream__Version = 19
+	QDataStream__Version__Qt_DefaultCompiledVersion QDataStream__Version = 19
+)
+
+type QDataStream__ByteOrder int
+
+const (
+	QDataStream__ByteOrder__BigEndian    QDataStream__ByteOrder = 0
+	QDataStream__ByteOrder__LittleEndian QDataStream__ByteOrder = 1
+)
+
+type QDataStream__Status int
+
+const (
+	QDataStream__Status__Ok              QDataStream__Status = 0
+	QDataStream__Status__ReadPastEnd     QDataStream__Status = 1
+	QDataStream__Status__ReadCorruptData QDataStream__Status = 2
+	QDataStream__Status__WriteFailed     QDataStream__Status = 3
+)
+
+type QDataStream__FloatingPointPrecision int
+
+const (
+	QDataStream__FloatingPointPrecision__SinglePrecision QDataStream__FloatingPointPrecision = 0
+	QDataStream__FloatingPointPrecision__DoublePrecision QDataStream__FloatingPointPrecision = 1
+)
+
 type QDataStream struct {
 	h *C.QDataStream
 }
@@ -76,12 +137,12 @@ func (this *QDataStream) AtEnd() bool {
 	return (bool)(ret)
 }
 
-func (this *QDataStream) Status() uintptr {
+func (this *QDataStream) Status() QDataStream__Status {
 	ret := C.QDataStream_Status(this.h)
-	return (uintptr)(ret)
+	return (QDataStream__Status)(ret)
 }
 
-func (this *QDataStream) SetStatus(status uintptr) {
+func (this *QDataStream) SetStatus(status QDataStream__Status) {
 	C.QDataStream_SetStatus(this.h, (C.uintptr_t)(status))
 }
 
@@ -89,21 +150,21 @@ func (this *QDataStream) ResetStatus() {
 	C.QDataStream_ResetStatus(this.h)
 }
 
-func (this *QDataStream) FloatingPointPrecision() uintptr {
+func (this *QDataStream) FloatingPointPrecision() QDataStream__FloatingPointPrecision {
 	ret := C.QDataStream_FloatingPointPrecision(this.h)
-	return (uintptr)(ret)
+	return (QDataStream__FloatingPointPrecision)(ret)
 }
 
-func (this *QDataStream) SetFloatingPointPrecision(precision uintptr) {
+func (this *QDataStream) SetFloatingPointPrecision(precision QDataStream__FloatingPointPrecision) {
 	C.QDataStream_SetFloatingPointPrecision(this.h, (C.uintptr_t)(precision))
 }
 
-func (this *QDataStream) ByteOrder() uintptr {
+func (this *QDataStream) ByteOrder() QDataStream__ByteOrder {
 	ret := C.QDataStream_ByteOrder(this.h)
-	return (uintptr)(ret)
+	return (QDataStream__ByteOrder)(ret)
 }
 
-func (this *QDataStream) SetByteOrder(byteOrder uintptr) {
+func (this *QDataStream) SetByteOrder(byteOrder QDataStream__ByteOrder) {
 	C.QDataStream_SetByteOrder(this.h, (C.uintptr_t)(byteOrder))
 }
 

qt/gen_qdatawidgetmapper.go

@@ -14,6 +14,13 @@ import (
 	"unsafe"
 )
 
+type QDataWidgetMapper__SubmitPolicy int
+
+const (
+	QDataWidgetMapper__SubmitPolicy__AutoSubmit   QDataWidgetMapper__SubmitPolicy = 0
+	QDataWidgetMapper__SubmitPolicy__ManualSubmit QDataWidgetMapper__SubmitPolicy = 1
+)
+
 type QDataWidgetMapper struct {
 	h *C.QDataWidgetMapper
 	*QObject
@@ -109,22 +116,22 @@ func (this *QDataWidgetMapper) RootIndex() *QModelIndex {
 	return ret1
 }
 
-func (this *QDataWidgetMapper) SetOrientation(aOrientation uintptr) {
+func (this *QDataWidgetMapper) SetOrientation(aOrientation Orientation) {
 	C.QDataWidgetMapper_SetOrientation(this.h, (C.uintptr_t)(aOrientation))
 }
 
-func (this *QDataWidgetMapper) Orientation() uintptr {
+func (this *QDataWidgetMapper) Orientation() Orientation {
 	ret := C.QDataWidgetMapper_Orientation(this.h)
-	return (uintptr)(ret)
+	return (Orientation)(ret)
 }
 
-func (this *QDataWidgetMapper) SetSubmitPolicy(policy uintptr) {
+func (this *QDataWidgetMapper) SetSubmitPolicy(policy QDataWidgetMapper__SubmitPolicy) {
 	C.QDataWidgetMapper_SetSubmitPolicy(this.h, (C.uintptr_t)(policy))
 }
 
-func (this *QDataWidgetMapper) SubmitPolicy() uintptr {
+func (this *QDataWidgetMapper) SubmitPolicy() QDataWidgetMapper__SubmitPolicy {
 	ret := C.QDataWidgetMapper_SubmitPolicy(this.h)
-	return (uintptr)(ret)
+	return (QDataWidgetMapper__SubmitPolicy)(ret)
 }
 
 func (this *QDataWidgetMapper) AddMapping(widget *QWidget, section int) {

qt/gen_qdatetime.go

@@ -13,6 +13,20 @@ import (
 	"unsafe"
 )
 
+type QDate__MonthNameType int
+
+const (
+	QDate__MonthNameType__DateFormat       QDate__MonthNameType = 0
+	QDate__MonthNameType__StandaloneFormat QDate__MonthNameType = 1
+)
+
+type QDateTime__YearRange int
+
+const (
+	QDateTime__YearRange__First QDateTime__YearRange = -292275056
+	QDateTime__YearRange__Last  QDateTime__YearRange = 292278994
+)
+
 type QDate struct {
 	h *C.QDate
 }
@@ -233,7 +247,7 @@ func (this *QDate) ToString() string {
 	return ret
 }
 
-func (this *QDate) ToString2(format uintptr, cal QCalendar) string {
+func (this *QDate) ToString2(format DateFormat, cal QCalendar) string {
 	var _out *C.char = nil
 	var _out_Strlen C.int = 0
 	C.QDate_ToString2(this.h, (C.uintptr_t)(format), cal.cPointer(), &_out, &_out_Strlen)
@@ -457,7 +471,7 @@ func (this *QDate) WeekNumber1(yearNum *int) int {
 	return (int)(ret)
 }
 
-func (this *QDate) StartOfDay1(spec uintptr) *QDateTime {
+func (this *QDate) StartOfDay1(spec TimeSpec) *QDateTime {
 	ret := C.QDate_StartOfDay1(this.h, (C.uintptr_t)(spec))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQDateTime(ret)
@@ -468,7 +482,7 @@ func (this *QDate) StartOfDay1(spec uintptr) *QDateTime {
 	return ret1
 }
 
-func (this *QDate) StartOfDay2(spec uintptr, offsetSeconds int) *QDateTime {
+func (this *QDate) StartOfDay2(spec TimeSpec, offsetSeconds int) *QDateTime {
 	ret := C.QDate_StartOfDay2(this.h, (C.uintptr_t)(spec), (C.int)(offsetSeconds))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQDateTime(ret)
@@ -479,7 +493,7 @@ func (this *QDate) StartOfDay2(spec uintptr, offsetSeconds int) *QDateTime {
 	return ret1
 }
 
-func (this *QDate) EndOfDay1(spec uintptr) *QDateTime {
+func (this *QDate) EndOfDay1(spec TimeSpec) *QDateTime {
 	ret := C.QDate_EndOfDay1(this.h, (C.uintptr_t)(spec))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQDateTime(ret)
@@ -490,7 +504,7 @@ func (this *QDate) EndOfDay1(spec uintptr) *QDateTime {
 	return ret1
 }
 
-func (this *QDate) EndOfDay2(spec uintptr, offsetSeconds int) *QDateTime {
+func (this *QDate) EndOfDay2(spec TimeSpec, offsetSeconds int) *QDateTime {
 	ret := C.QDate_EndOfDay2(this.h, (C.uintptr_t)(spec), (C.int)(offsetSeconds))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQDateTime(ret)
@@ -501,7 +515,7 @@ func (this *QDate) EndOfDay2(spec uintptr, offsetSeconds int) *QDateTime {
 	return ret1
 }
 
-func QDate_ShortMonthName2(month int, typeVal uintptr) string {
+func QDate_ShortMonthName2(month int, typeVal QDate__MonthNameType) string {
 	var _out *C.char = nil
 	var _out_Strlen C.int = 0
 	C.QDate_ShortMonthName2((C.int)(month), (C.uintptr_t)(typeVal), &_out, &_out_Strlen)
@@ -510,7 +524,7 @@ func QDate_ShortMonthName2(month int, typeVal uintptr) string {
 	return ret
 }
 
-func QDate_ShortDayName2(weekday int, typeVal uintptr) string {
+func QDate_ShortDayName2(weekday int, typeVal QDate__MonthNameType) string {
 	var _out *C.char = nil
 	var _out_Strlen C.int = 0
 	C.QDate_ShortDayName2((C.int)(weekday), (C.uintptr_t)(typeVal), &_out, &_out_Strlen)
@@ -519,7 +533,7 @@ func QDate_ShortDayName2(weekday int, typeVal uintptr) string {
 	return ret
 }
 
-func QDate_LongMonthName2(month int, typeVal uintptr) string {
+func QDate_LongMonthName2(month int, typeVal QDate__MonthNameType) string {
 	var _out *C.char = nil
 	var _out_Strlen C.int = 0
 	C.QDate_LongMonthName2((C.int)(month), (C.uintptr_t)(typeVal), &_out, &_out_Strlen)
@@ -528,7 +542,7 @@ func QDate_LongMonthName2(month int, typeVal uintptr) string {
 	return ret
 }
 
-func QDate_LongDayName2(weekday int, typeVal uintptr) string {
+func QDate_LongDayName2(weekday int, typeVal QDate__MonthNameType) string {
 	var _out *C.char = nil
 	var _out_Strlen C.int = 0
 	C.QDate_LongDayName2((C.int)(weekday), (C.uintptr_t)(typeVal), &_out, &_out_Strlen)
@@ -537,7 +551,7 @@ func QDate_LongDayName2(weekday int, typeVal uintptr) string {
 	return ret
 }
 
-func (this *QDate) ToString1(format uintptr) string {
+func (this *QDate) ToString1(format DateFormat) string {
 	var _out *C.char = nil
 	var _out_Strlen C.int = 0
 	C.QDate_ToString1(this.h, (C.uintptr_t)(format), &_out, &_out_Strlen)
@@ -546,7 +560,7 @@ func (this *QDate) ToString1(format uintptr) string {
 	return ret
 }
 
-func QDate_FromString22(s string, f uintptr) *QDate {
+func QDate_FromString22(s string, f DateFormat) *QDate {
 	s_Cstring := C.CString(s)
 	defer C.free(unsafe.Pointer(s_Cstring))
 	ret := C.QDate_FromString22(s_Cstring, C.size_t(len(s)), (C.uintptr_t)(f))
@@ -806,7 +820,7 @@ func (this *QTime) Elapsed() int {
 	return (int)(ret)
 }
 
-func (this *QTime) ToString1(f uintptr) string {
+func (this *QTime) ToString1(f DateFormat) string {
 	var _out *C.char = nil
 	var _out_Strlen C.int = 0
 	C.QTime_ToString1(this.h, (C.uintptr_t)(f), &_out, &_out_Strlen)
@@ -820,7 +834,7 @@ func (this *QTime) SetHMS4(h int, m int, s int, ms int) bool {
 	return (bool)(ret)
 }
 
-func QTime_FromString22(s string, f uintptr) *QTime {
+func QTime_FromString22(s string, f DateFormat) *QTime {
 	s_Cstring := C.CString(s)
 	defer C.free(unsafe.Pointer(s_Cstring))
 	ret := C.QTime_FromString22(s_Cstring, C.size_t(len(s)), (C.uintptr_t)(f))
@@ -877,7 +891,7 @@ func NewQDateTime2(param1 *QDate, param2 *QTime) *QDateTime {
 }
 
 // NewQDateTime3 constructs a new QDateTime object.
-func NewQDateTime3(date *QDate, time *QTime, spec uintptr, offsetSeconds int) *QDateTime {
+func NewQDateTime3(date *QDate, time *QTime, spec TimeSpec, offsetSeconds int) *QDateTime {
 	ret := C.QDateTime_new3(date.cPointer(), time.cPointer(), (C.uintptr_t)(spec), (C.int)(offsetSeconds))
 	return newQDateTime(ret)
 }
@@ -895,7 +909,7 @@ func NewQDateTime5(other *QDateTime) *QDateTime {
 }
 
 // NewQDateTime6 constructs a new QDateTime object.
-func NewQDateTime6(param1 *QDate, param2 *QTime, spec uintptr) *QDateTime {
+func NewQDateTime6(param1 *QDate, param2 *QTime, spec TimeSpec) *QDateTime {
 	ret := C.QDateTime_new6(param1.cPointer(), param2.cPointer(), (C.uintptr_t)(spec))
 	return newQDateTime(ret)
 }
@@ -940,9 +954,9 @@ func (this *QDateTime) Time() *QTime {
 	return ret1
 }
 
-func (this *QDateTime) TimeSpec() uintptr {
+func (this *QDateTime) TimeSpec() TimeSpec {
 	ret := C.QDateTime_TimeSpec(this.h)
-	return (uintptr)(ret)
+	return (TimeSpec)(ret)
 }
 
 func (this *QDateTime) OffsetFromUtc() int {
@@ -993,7 +1007,7 @@ func (this *QDateTime) SetTime(time *QTime) {
 	C.QDateTime_SetTime(this.h, time.cPointer())
 }
 
-func (this *QDateTime) SetTimeSpec(spec uintptr) {
+func (this *QDateTime) SetTimeSpec(spec TimeSpec) {
 	C.QDateTime_SetTimeSpec(this.h, (C.uintptr_t)(spec))
 }
 
@@ -1099,7 +1113,7 @@ func (this *QDateTime) AddMSecs(msecs int64) *QDateTime {
 	return ret1
 }
 
-func (this *QDateTime) ToTimeSpec(spec uintptr) *QDateTime {
+func (this *QDateTime) ToTimeSpec(spec TimeSpec) *QDateTime {
 	ret := C.QDateTime_ToTimeSpec(this.h, (C.uintptr_t)(spec))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQDateTime(ret)
@@ -1293,7 +1307,7 @@ func QDateTime_FromTimeT(secsSince1Jan1970UTC uint) *QDateTime {
 	return ret1
 }
 
-func QDateTime_FromTimeT2(secsSince1Jan1970UTC uint, spec uintptr) *QDateTime {
+func QDateTime_FromTimeT2(secsSince1Jan1970UTC uint, spec TimeSpec) *QDateTime {
 	ret := C.QDateTime_FromTimeT2((C.uint)(secsSince1Jan1970UTC), (C.uintptr_t)(spec))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQDateTime(ret)
@@ -1326,7 +1340,7 @@ func QDateTime_FromMSecsSinceEpoch(msecs int64) *QDateTime {
 	return ret1
 }
 
-func QDateTime_FromMSecsSinceEpoch2(msecs int64, spec uintptr) *QDateTime {
+func QDateTime_FromMSecsSinceEpoch2(msecs int64, spec TimeSpec) *QDateTime {
 	ret := C.QDateTime_FromMSecsSinceEpoch2((C.longlong)(msecs), (C.uintptr_t)(spec))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQDateTime(ret)
@@ -1380,7 +1394,7 @@ func QDateTime_CurrentSecsSinceEpoch() int64 {
 	return (int64)(ret)
 }
 
-func (this *QDateTime) ToString1(format uintptr) string {
+func (this *QDateTime) ToString1(format DateFormat) string {
 	var _out *C.char = nil
 	var _out_Strlen C.int = 0
 	C.QDateTime_ToString1(this.h, (C.uintptr_t)(format), &_out, &_out_Strlen)
@@ -1389,7 +1403,7 @@ func (this *QDateTime) ToString1(format uintptr) string {
 	return ret
 }
 
-func QDateTime_FromString22(s string, f uintptr) *QDateTime {
+func QDateTime_FromString22(s string, f DateFormat) *QDateTime {
 	s_Cstring := C.CString(s)
 	defer C.free(unsafe.Pointer(s_Cstring))
 	ret := C.QDateTime_FromString22(s_Cstring, C.size_t(len(s)), (C.uintptr_t)(f))
@@ -1402,7 +1416,7 @@ func QDateTime_FromString22(s string, f uintptr) *QDateTime {
 	return ret1
 }
 
-func QDateTime_FromTimeT32(secsSince1Jan1970UTC uint, spec uintptr, offsetFromUtc int) *QDateTime {
+func QDateTime_FromTimeT32(secsSince1Jan1970UTC uint, spec TimeSpec, offsetFromUtc int) *QDateTime {
 	ret := C.QDateTime_FromTimeT32((C.uint)(secsSince1Jan1970UTC), (C.uintptr_t)(spec), (C.int)(offsetFromUtc))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQDateTime(ret)
@@ -1413,7 +1427,7 @@ func QDateTime_FromTimeT32(secsSince1Jan1970UTC uint, spec uintptr, offsetFromUt
 	return ret1
 }
 
-func QDateTime_FromMSecsSinceEpoch32(msecs int64, spec uintptr, offsetFromUtc int) *QDateTime {
+func QDateTime_FromMSecsSinceEpoch32(msecs int64, spec TimeSpec, offsetFromUtc int) *QDateTime {
 	ret := C.QDateTime_FromMSecsSinceEpoch32((C.longlong)(msecs), (C.uintptr_t)(spec), (C.int)(offsetFromUtc))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQDateTime(ret)
@@ -1424,7 +1438,7 @@ func QDateTime_FromMSecsSinceEpoch32(msecs int64, spec uintptr, offsetFromUtc in
 	return ret1
 }
 
-func QDateTime_FromSecsSinceEpoch22(secs int64, spe uintptr) *QDateTime {
+func QDateTime_FromSecsSinceEpoch22(secs int64, spe TimeSpec) *QDateTime {
 	ret := C.QDateTime_FromSecsSinceEpoch22((C.longlong)(secs), (C.uintptr_t)(spe))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQDateTime(ret)
@@ -1435,7 +1449,7 @@ func QDateTime_FromSecsSinceEpoch22(secs int64, spe uintptr) *QDateTime {
 	return ret1
 }
 
-func QDateTime_FromSecsSinceEpoch3(secs int64, spe uintptr, offsetFromUtc int) *QDateTime {
+func QDateTime_FromSecsSinceEpoch3(secs int64, spe TimeSpec, offsetFromUtc int) *QDateTime {
 	ret := C.QDateTime_FromSecsSinceEpoch3((C.longlong)(secs), (C.uintptr_t)(spe), (C.int)(offsetFromUtc))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQDateTime(ret)

qt/gen_qdatetimeedit.go

@@ -14,6 +14,22 @@ import (
 	"unsafe"
 )
 
+type QDateTimeEdit__Section int
+
+const (
+	QDateTimeEdit__Section__NoSection         QDateTimeEdit__Section = 0
+	QDateTimeEdit__Section__AmPmSection       QDateTimeEdit__Section = 1
+	QDateTimeEdit__Section__MSecSection       QDateTimeEdit__Section = 2
+	QDateTimeEdit__Section__SecondSection     QDateTimeEdit__Section = 4
+	QDateTimeEdit__Section__MinuteSection     QDateTimeEdit__Section = 8
+	QDateTimeEdit__Section__HourSection       QDateTimeEdit__Section = 16
+	QDateTimeEdit__Section__DaySection        QDateTimeEdit__Section = 256
+	QDateTimeEdit__Section__MonthSection      QDateTimeEdit__Section = 512
+	QDateTimeEdit__Section__YearSection       QDateTimeEdit__Section = 1024
+	QDateTimeEdit__Section__TimeSections_Mask QDateTimeEdit__Section = 31
+	QDateTimeEdit__Section__DateSections_Mask QDateTimeEdit__Section = 1792
+)
+
 type QDateTimeEdit struct {
 	h *C.QDateTimeEdit
 	*QAbstractSpinBox
@@ -291,17 +307,17 @@ func (this *QDateTimeEdit) DisplayedSections() int {
 	return (int)(ret)
 }
 
-func (this *QDateTimeEdit) CurrentSection() uintptr {
+func (this *QDateTimeEdit) CurrentSection() QDateTimeEdit__Section {
 	ret := C.QDateTimeEdit_CurrentSection(this.h)
-	return (uintptr)(ret)
+	return (QDateTimeEdit__Section)(ret)
 }
 
-func (this *QDateTimeEdit) SectionAt(index int) uintptr {
+func (this *QDateTimeEdit) SectionAt(index int) QDateTimeEdit__Section {
 	ret := C.QDateTimeEdit_SectionAt(this.h, (C.int)(index))
-	return (uintptr)(ret)
+	return (QDateTimeEdit__Section)(ret)
 }
 
-func (this *QDateTimeEdit) SetCurrentSection(section uintptr) {
+func (this *QDateTimeEdit) SetCurrentSection(section QDateTimeEdit__Section) {
 	C.QDateTimeEdit_SetCurrentSection(this.h, (C.uintptr_t)(section))
 }
 
@@ -328,11 +344,11 @@ func (this *QDateTimeEdit) SectionCount() int {
 	return (int)(ret)
 }
 
-func (this *QDateTimeEdit) SetSelectedSection(section uintptr) {
+func (this *QDateTimeEdit) SetSelectedSection(section QDateTimeEdit__Section) {
 	C.QDateTimeEdit_SetSelectedSection(this.h, (C.uintptr_t)(section))
 }
 
-func (this *QDateTimeEdit) SectionText(section uintptr) string {
+func (this *QDateTimeEdit) SectionText(section QDateTimeEdit__Section) string {
 	var _out *C.char = nil
 	var _out_Strlen C.int = 0
 	C.QDateTimeEdit_SectionText(this.h, (C.uintptr_t)(section), &_out, &_out_Strlen)
@@ -365,12 +381,12 @@ func (this *QDateTimeEdit) SetCalendarPopup(enable bool) {
 	C.QDateTimeEdit_SetCalendarPopup(this.h, (C.bool)(enable))
 }
 
-func (this *QDateTimeEdit) TimeSpec() uintptr {
+func (this *QDateTimeEdit) TimeSpec() TimeSpec {
 	ret := C.QDateTimeEdit_TimeSpec(this.h)
-	return (uintptr)(ret)
+	return (TimeSpec)(ret)
 }
 
-func (this *QDateTimeEdit) SetTimeSpec(spec uintptr) {
+func (this *QDateTimeEdit) SetTimeSpec(spec TimeSpec) {
 	C.QDateTimeEdit_SetTimeSpec(this.h, (C.uintptr_t)(spec))
 }
 

qt/gen_qdeadlinetimer.go

@@ -13,6 +13,12 @@ import (
 	"unsafe"
 )
 
+type QDeadlineTimer__ForeverConstant int
+
+const (
+	QDeadlineTimer__ForeverConstant__Forever QDeadlineTimer__ForeverConstant = 0
+)
+
 type QDeadlineTimer struct {
 	h *C.QDeadlineTimer
 }
@@ -42,7 +48,7 @@ func NewQDeadlineTimer() *QDeadlineTimer {
 }
 
 // NewQDeadlineTimer2 constructs a new QDeadlineTimer object.
-func NewQDeadlineTimer2(param1 uintptr) *QDeadlineTimer {
+func NewQDeadlineTimer2(param1 QDeadlineTimer__ForeverConstant) *QDeadlineTimer {
 	ret := C.QDeadlineTimer_new2((C.uintptr_t)(param1))
 	return newQDeadlineTimer(ret)
 }
@@ -60,19 +66,19 @@ func NewQDeadlineTimer4(param1 *QDeadlineTimer) *QDeadlineTimer {
 }
 
 // NewQDeadlineTimer5 constructs a new QDeadlineTimer object.
-func NewQDeadlineTimer5(type_ uintptr) *QDeadlineTimer {
+func NewQDeadlineTimer5(type_ TimerType) *QDeadlineTimer {
 	ret := C.QDeadlineTimer_new5((C.uintptr_t)(type_))
 	return newQDeadlineTimer(ret)
 }
 
 // NewQDeadlineTimer6 constructs a new QDeadlineTimer object.
-func NewQDeadlineTimer6(param1 uintptr, type_ uintptr) *QDeadlineTimer {
+func NewQDeadlineTimer6(param1 QDeadlineTimer__ForeverConstant, type_ TimerType) *QDeadlineTimer {
 	ret := C.QDeadlineTimer_new6((C.uintptr_t)(param1), (C.uintptr_t)(type_))
 	return newQDeadlineTimer(ret)
 }
 
 // NewQDeadlineTimer7 constructs a new QDeadlineTimer object.
-func NewQDeadlineTimer7(msecs int64, typeVal uintptr) *QDeadlineTimer {
+func NewQDeadlineTimer7(msecs int64, typeVal TimerType) *QDeadlineTimer {
 	ret := C.QDeadlineTimer_new7((C.longlong)(msecs), (C.uintptr_t)(typeVal))
 	return newQDeadlineTimer(ret)
 }
@@ -91,12 +97,12 @@ func (this *QDeadlineTimer) HasExpired() bool {
 	return (bool)(ret)
 }
 
-func (this *QDeadlineTimer) TimerType() uintptr {
+func (this *QDeadlineTimer) TimerType() TimerType {
 	ret := C.QDeadlineTimer_TimerType(this.h)
-	return (uintptr)(ret)
+	return (TimerType)(ret)
 }
 
-func (this *QDeadlineTimer) SetTimerType(typeVal uintptr) {
+func (this *QDeadlineTimer) SetTimerType(typeVal TimerType) {
 	C.QDeadlineTimer_SetTimerType(this.h, (C.uintptr_t)(typeVal))
 }
 
@@ -172,7 +178,7 @@ func (this *QDeadlineTimer) OperatorAssign(param1 *QDeadlineTimer) {
 	C.QDeadlineTimer_OperatorAssign(this.h, param1.cPointer())
 }
 
-func (this *QDeadlineTimer) SetRemainingTime2(msecs int64, typeVal uintptr) {
+func (this *QDeadlineTimer) SetRemainingTime2(msecs int64, typeVal TimerType) {
 	C.QDeadlineTimer_SetRemainingTime2(this.h, (C.longlong)(msecs), (C.uintptr_t)(typeVal))
 }
 
@@ -180,11 +186,11 @@ func (this *QDeadlineTimer) SetPreciseRemainingTime2(secs int64, nsecs int64) {
 	C.QDeadlineTimer_SetPreciseRemainingTime2(this.h, (C.longlong)(secs), (C.longlong)(nsecs))
 }
 
-func (this *QDeadlineTimer) SetPreciseRemainingTime3(secs int64, nsecs int64, typeVal uintptr) {
+func (this *QDeadlineTimer) SetPreciseRemainingTime3(secs int64, nsecs int64, typeVal TimerType) {
 	C.QDeadlineTimer_SetPreciseRemainingTime3(this.h, (C.longlong)(secs), (C.longlong)(nsecs), (C.uintptr_t)(typeVal))
 }
 
-func (this *QDeadlineTimer) SetDeadline2(msecs int64, timerType uintptr) {
+func (this *QDeadlineTimer) SetDeadline2(msecs int64, timerType TimerType) {
 	C.QDeadlineTimer_SetDeadline2(this.h, (C.longlong)(msecs), (C.uintptr_t)(timerType))
 }
 
@@ -192,11 +198,11 @@ func (this *QDeadlineTimer) SetPreciseDeadline2(secs int64, nsecs int64) {
 	C.QDeadlineTimer_SetPreciseDeadline2(this.h, (C.longlong)(secs), (C.longlong)(nsecs))
 }
 
-func (this *QDeadlineTimer) SetPreciseDeadline3(secs int64, nsecs int64, typeVal uintptr) {
+func (this *QDeadlineTimer) SetPreciseDeadline3(secs int64, nsecs int64, typeVal TimerType) {
 	C.QDeadlineTimer_SetPreciseDeadline3(this.h, (C.longlong)(secs), (C.longlong)(nsecs), (C.uintptr_t)(typeVal))
 }
 
-func QDeadlineTimer_Current1(timerType uintptr) *QDeadlineTimer {
+func QDeadlineTimer_Current1(timerType TimerType) *QDeadlineTimer {
 	ret := C.QDeadlineTimer_Current1((C.uintptr_t)(timerType))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQDeadlineTimer(ret)

qt/gen_qdebug.go

@@ -12,6 +12,14 @@ import (
 	"unsafe"
 )
 
+type QDebug__VerbosityLevel int
+
+const (
+	QDebug__VerbosityLevel__MinimumVerbosity QDebug__VerbosityLevel = 0
+	QDebug__VerbosityLevel__DefaultVerbosity QDebug__VerbosityLevel = 2
+	QDebug__VerbosityLevel__MaximumVerbosity QDebug__VerbosityLevel = 7
+)
+
 type QDebug struct {
 	h *C.QDebug
 }

qt/gen_qdialog.go

@@ -14,6 +14,13 @@ import (
 	"unsafe"
 )
 
+type QDialog__DialogCode int
+
+const (
+	QDialog__DialogCode__Rejected QDialog__DialogCode = 0
+	QDialog__DialogCode__Accepted QDialog__DialogCode = 1
+)
+
 type QDialog struct {
 	h *C.QDialog
 	*QWidget
@@ -91,13 +98,13 @@ func (this *QDialog) SetVisible(visible bool) {
 	C.QDialog_SetVisible(this.h, (C.bool)(visible))
 }
 
-func (this *QDialog) SetOrientation(orientation uintptr) {
+func (this *QDialog) SetOrientation(orientation Orientation) {
 	C.QDialog_SetOrientation(this.h, (C.uintptr_t)(orientation))
 }
 
-func (this *QDialog) Orientation() uintptr {
+func (this *QDialog) Orientation() Orientation {
 	ret := C.QDialog_Orientation(this.h)
-	return (uintptr)(ret)
+	return (Orientation)(ret)
 }
 
 func (this *QDialog) SetExtension(extension *QWidget) {

qt/gen_qdialogbuttonbox.go

@@ -13,6 +13,58 @@ import (
 	"unsafe"
 )
 
+type QDialogButtonBox__ButtonRole int
+
+const (
+	QDialogButtonBox__ButtonRole__InvalidRole     QDialogButtonBox__ButtonRole = -1
+	QDialogButtonBox__ButtonRole__AcceptRole      QDialogButtonBox__ButtonRole = 0
+	QDialogButtonBox__ButtonRole__RejectRole      QDialogButtonBox__ButtonRole = 1
+	QDialogButtonBox__ButtonRole__DestructiveRole QDialogButtonBox__ButtonRole = 2
+	QDialogButtonBox__ButtonRole__ActionRole      QDialogButtonBox__ButtonRole = 3
+	QDialogButtonBox__ButtonRole__HelpRole        QDialogButtonBox__ButtonRole = 4
+	QDialogButtonBox__ButtonRole__YesRole         QDialogButtonBox__ButtonRole = 5
+	QDialogButtonBox__ButtonRole__NoRole          QDialogButtonBox__ButtonRole = 6
+	QDialogButtonBox__ButtonRole__ResetRole       QDialogButtonBox__ButtonRole = 7
+	QDialogButtonBox__ButtonRole__ApplyRole       QDialogButtonBox__ButtonRole = 8
+	QDialogButtonBox__ButtonRole__NRoles          QDialogButtonBox__ButtonRole = 9
+)
+
+type QDialogButtonBox__StandardButton int
+
+const (
+	QDialogButtonBox__StandardButton__NoButton        QDialogButtonBox__StandardButton = 0
+	QDialogButtonBox__StandardButton__Ok              QDialogButtonBox__StandardButton = 1024
+	QDialogButtonBox__StandardButton__Save            QDialogButtonBox__StandardButton = 2048
+	QDialogButtonBox__StandardButton__SaveAll         QDialogButtonBox__StandardButton = 4096
+	QDialogButtonBox__StandardButton__Open            QDialogButtonBox__StandardButton = 8192
+	QDialogButtonBox__StandardButton__Yes             QDialogButtonBox__StandardButton = 16384
+	QDialogButtonBox__StandardButton__YesToAll        QDialogButtonBox__StandardButton = 32768
+	QDialogButtonBox__StandardButton__No              QDialogButtonBox__StandardButton = 65536
+	QDialogButtonBox__StandardButton__NoToAll         QDialogButtonBox__StandardButton = 131072
+	QDialogButtonBox__StandardButton__Abort           QDialogButtonBox__StandardButton = 262144
+	QDialogButtonBox__StandardButton__Retry           QDialogButtonBox__StandardButton = 524288
+	QDialogButtonBox__StandardButton__Ignore          QDialogButtonBox__StandardButton = 1048576
+	QDialogButtonBox__StandardButton__Close           QDialogButtonBox__StandardButton = 2097152
+	QDialogButtonBox__StandardButton__Cancel          QDialogButtonBox__StandardButton = 4194304
+	QDialogButtonBox__StandardButton__Discard         QDialogButtonBox__StandardButton = 8388608
+	QDialogButtonBox__StandardButton__Help            QDialogButtonBox__StandardButton = 16777216
+	QDialogButtonBox__StandardButton__Apply           QDialogButtonBox__StandardButton = 33554432
+	QDialogButtonBox__StandardButton__Reset           QDialogButtonBox__StandardButton = 67108864
+	QDialogButtonBox__StandardButton__RestoreDefaults QDialogButtonBox__StandardButton = 134217728
+	QDialogButtonBox__StandardButton__FirstButton     QDialogButtonBox__StandardButton = 1024
+	QDialogButtonBox__StandardButton__LastButton      QDialogButtonBox__StandardButton = 134217728
+)
+
+type QDialogButtonBox__ButtonLayout int
+
+const (
+	QDialogButtonBox__ButtonLayout__WinLayout     QDialogButtonBox__ButtonLayout = 0
+	QDialogButtonBox__ButtonLayout__MacLayout     QDialogButtonBox__ButtonLayout = 1
+	QDialogButtonBox__ButtonLayout__KdeLayout     QDialogButtonBox__ButtonLayout = 2
+	QDialogButtonBox__ButtonLayout__GnomeLayout   QDialogButtonBox__ButtonLayout = 3
+	QDialogButtonBox__ButtonLayout__AndroidLayout QDialogButtonBox__ButtonLayout = 5
+)
+
 type QDialogButtonBox struct {
 	h *C.QDialogButtonBox
 	*QWidget
@@ -43,7 +95,7 @@ func NewQDialogButtonBox() *QDialogButtonBox {
 }
 
 // NewQDialogButtonBox2 constructs a new QDialogButtonBox object.
-func NewQDialogButtonBox2(orientation uintptr) *QDialogButtonBox {
+func NewQDialogButtonBox2(orientation Orientation) *QDialogButtonBox {
 	ret := C.QDialogButtonBox_new2((C.uintptr_t)(orientation))
 	return newQDialogButtonBox(ret)
 }
@@ -55,7 +107,7 @@ func NewQDialogButtonBox3(buttons int) *QDialogButtonBox {
 }
 
 // NewQDialogButtonBox4 constructs a new QDialogButtonBox object.
-func NewQDialogButtonBox4(buttons int, orientation uintptr) *QDialogButtonBox {
+func NewQDialogButtonBox4(buttons int, orientation Orientation) *QDialogButtonBox {
 	ret := C.QDialogButtonBox_new4((C.int)(buttons), (C.uintptr_t)(orientation))
 	return newQDialogButtonBox(ret)
 }
@@ -67,7 +119,7 @@ func NewQDialogButtonBox5(parent *QWidget) *QDialogButtonBox {
 }
 
 // NewQDialogButtonBox6 constructs a new QDialogButtonBox object.
-func NewQDialogButtonBox6(orientation uintptr, parent *QWidget) *QDialogButtonBox {
+func NewQDialogButtonBox6(orientation Orientation, parent *QWidget) *QDialogButtonBox {
 	ret := C.QDialogButtonBox_new6((C.uintptr_t)(orientation), parent.cPointer())
 	return newQDialogButtonBox(ret)
 }
@@ -79,7 +131,7 @@ func NewQDialogButtonBox7(buttons int, parent *QWidget) *QDialogButtonBox {
 }
 
 // NewQDialogButtonBox8 constructs a new QDialogButtonBox object.
-func NewQDialogButtonBox8(buttons int, orientation uintptr, parent *QWidget) *QDialogButtonBox {
+func NewQDialogButtonBox8(buttons int, orientation Orientation, parent *QWidget) *QDialogButtonBox {
 	ret := C.QDialogButtonBox_new8((C.int)(buttons), (C.uintptr_t)(orientation), parent.cPointer())
 	return newQDialogButtonBox(ret)
 }
@@ -111,27 +163,27 @@ func QDialogButtonBox_TrUtf8(s string) string {
 	return ret
 }
 
-func (this *QDialogButtonBox) SetOrientation(orientation uintptr) {
+func (this *QDialogButtonBox) SetOrientation(orientation Orientation) {
 	C.QDialogButtonBox_SetOrientation(this.h, (C.uintptr_t)(orientation))
 }
 
-func (this *QDialogButtonBox) Orientation() uintptr {
+func (this *QDialogButtonBox) Orientation() Orientation {
 	ret := C.QDialogButtonBox_Orientation(this.h)
-	return (uintptr)(ret)
+	return (Orientation)(ret)
 }
 
-func (this *QDialogButtonBox) AddButton(button *QAbstractButton, role uintptr) {
+func (this *QDialogButtonBox) AddButton(button *QAbstractButton, role QDialogButtonBox__ButtonRole) {
 	C.QDialogButtonBox_AddButton(this.h, button.cPointer(), (C.uintptr_t)(role))
 }
 
-func (this *QDialogButtonBox) AddButton2(text string, role uintptr) *QPushButton {
+func (this *QDialogButtonBox) AddButton2(text string, role QDialogButtonBox__ButtonRole) *QPushButton {
 	text_Cstring := C.CString(text)
 	defer C.free(unsafe.Pointer(text_Cstring))
 	ret := C.QDialogButtonBox_AddButton2(this.h, text_Cstring, C.size_t(len(text)), (C.uintptr_t)(role))
 	return newQPushButton_U(unsafe.Pointer(ret))
 }
 
-func (this *QDialogButtonBox) AddButtonWithButton(button uintptr) *QPushButton {
+func (this *QDialogButtonBox) AddButtonWithButton(button QDialogButtonBox__StandardButton) *QPushButton {
 	ret := C.QDialogButtonBox_AddButtonWithButton(this.h, (C.uintptr_t)(button))
 	return newQPushButton_U(unsafe.Pointer(ret))
 }
@@ -157,9 +209,9 @@ func (this *QDialogButtonBox) Buttons() []*QAbstractButton {
 	return ret
 }
 
-func (this *QDialogButtonBox) ButtonRole(button *QAbstractButton) uintptr {
+func (this *QDialogButtonBox) ButtonRole(button *QAbstractButton) QDialogButtonBox__ButtonRole {
 	ret := C.QDialogButtonBox_ButtonRole(this.h, button.cPointer())
-	return (uintptr)(ret)
+	return (QDialogButtonBox__ButtonRole)(ret)
 }
 
 func (this *QDialogButtonBox) SetStandardButtons(buttons int) {
@@ -171,12 +223,12 @@ func (this *QDialogButtonBox) StandardButtons() int {
 	return (int)(ret)
 }
 
-func (this *QDialogButtonBox) StandardButton(button *QAbstractButton) uintptr {
+func (this *QDialogButtonBox) StandardButton(button *QAbstractButton) QDialogButtonBox__StandardButton {
 	ret := C.QDialogButtonBox_StandardButton(this.h, button.cPointer())
-	return (uintptr)(ret)
+	return (QDialogButtonBox__StandardButton)(ret)
 }
 
-func (this *QDialogButtonBox) Button(which uintptr) *QPushButton {
+func (this *QDialogButtonBox) Button(which QDialogButtonBox__StandardButton) *QPushButton {
 	ret := C.QDialogButtonBox_Button(this.h, (C.uintptr_t)(which))
 	return newQPushButton_U(unsafe.Pointer(ret))
 }

qt/gen_qdir.go

@@ -13,6 +13,48 @@ import (
 	"unsafe"
 )
 
+type QDir__Filter int
+
+const (
+	QDir__Filter__Dirs           QDir__Filter = 1
+	QDir__Filter__Files          QDir__Filter = 2
+	QDir__Filter__Drives         QDir__Filter = 4
+	QDir__Filter__NoSymLinks     QDir__Filter = 8
+	QDir__Filter__AllEntries     QDir__Filter = 7
+	QDir__Filter__TypeMask       QDir__Filter = 15
+	QDir__Filter__Readable       QDir__Filter = 16
+	QDir__Filter__Writable       QDir__Filter = 32
+	QDir__Filter__Executable     QDir__Filter = 64
+	QDir__Filter__PermissionMask QDir__Filter = 112
+	QDir__Filter__Modified       QDir__Filter = 128
+	QDir__Filter__Hidden         QDir__Filter = 256
+	QDir__Filter__System         QDir__Filter = 512
+	QDir__Filter__AccessMask     QDir__Filter = 1008
+	QDir__Filter__AllDirs        QDir__Filter = 1024
+	QDir__Filter__CaseSensitive  QDir__Filter = 2048
+	QDir__Filter__NoDot          QDir__Filter = 8192
+	QDir__Filter__NoDotDot       QDir__Filter = 16384
+	QDir__Filter__NoDotAndDotDot QDir__Filter = 24576
+	QDir__Filter__NoFilter       QDir__Filter = -1
+)
+
+type QDir__SortFlag int
+
+const (
+	QDir__SortFlag__Name        QDir__SortFlag = 0
+	QDir__SortFlag__Time        QDir__SortFlag = 1
+	QDir__SortFlag__Size        QDir__SortFlag = 2
+	QDir__SortFlag__Unsorted    QDir__SortFlag = 3
+	QDir__SortFlag__SortByMask  QDir__SortFlag = 3
+	QDir__SortFlag__DirsFirst   QDir__SortFlag = 4
+	QDir__SortFlag__Reversed    QDir__SortFlag = 8
+	QDir__SortFlag__IgnoreCase  QDir__SortFlag = 16
+	QDir__SortFlag__DirsLast    QDir__SortFlag = 32
+	QDir__SortFlag__LocaleAware QDir__SortFlag = 64
+	QDir__SortFlag__Type        QDir__SortFlag = 128
+	QDir__SortFlag__NoSort      QDir__SortFlag = -1
+)
+
 type QDir struct {
 	h *C.QDir
 }

qt/gen_qdiriterator.go

@@ -13,6 +13,14 @@ import (
 	"unsafe"
 )
 
+type QDirIterator__IteratorFlag int
+
+const (
+	QDirIterator__IteratorFlag__NoIteratorFlags QDirIterator__IteratorFlag = 0
+	QDirIterator__IteratorFlag__FollowSymlinks  QDirIterator__IteratorFlag = 1
+	QDirIterator__IteratorFlag__Subdirectories  QDirIterator__IteratorFlag = 2
+)
+
 type QDirIterator struct {
 	h *C.QDirIterator
 }

qt/gen_qdirmodel.go

@@ -13,6 +13,14 @@ import (
 	"unsafe"
 )
 
+type QDirModel__Roles int
+
+const (
+	QDirModel__Roles__FileIconRole QDirModel__Roles = 1
+	QDirModel__Roles__FilePathRole QDirModel__Roles = 257
+	QDirModel__Roles__FileNameRole QDirModel__Roles = 258
+)
+
 type QDirModel struct {
 	h *C.QDirModel
 	*QAbstractItemModel
@@ -157,7 +165,7 @@ func (this *QDirModel) SetData(index *QModelIndex, value *QVariant) bool {
 	return (bool)(ret)
 }
 
-func (this *QDirModel) HeaderData(section int, orientation uintptr) *QVariant {
+func (this *QDirModel) HeaderData(section int, orientation Orientation) *QVariant {
 	ret := C.QDirModel_HeaderData(this.h, (C.int)(section), (C.uintptr_t)(orientation))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQVariant(ret)
@@ -208,7 +216,7 @@ func (this *QDirModel) MimeData(indexes []QModelIndex) *QMimeData {
 	return newQMimeData_U(unsafe.Pointer(ret))
 }
 
-func (this *QDirModel) DropMimeData(data *QMimeData, action uintptr, row int, column int, parent *QModelIndex) bool {
+func (this *QDirModel) DropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool {
 	ret := C.QDirModel_DropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer())
 	return (bool)(ret)
 }
@@ -476,7 +484,7 @@ func (this *QDirModel) SetData3(index *QModelIndex, value *QVariant, role int) b
 	return (bool)(ret)
 }
 
-func (this *QDirModel) HeaderData3(section int, orientation uintptr, role int) *QVariant {
+func (this *QDirModel) HeaderData3(section int, orientation Orientation, role int) *QVariant {
 	ret := C.QDirModel_HeaderData3(this.h, (C.int)(section), (C.uintptr_t)(orientation), (C.int)(role))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQVariant(ret)
@@ -492,7 +500,7 @@ func (this *QDirModel) HasChildren1(index *QModelIndex) bool {
 	return (bool)(ret)
 }
 
-func (this *QDirModel) Sort2(column int, order uintptr) {
+func (this *QDirModel) Sort2(column int, order SortOrder) {
 	C.QDirModel_Sort2(this.h, (C.int)(column), (C.uintptr_t)(order))
 }
 

qt/gen_qdockwidget.go

@@ -13,6 +13,19 @@ import (
 	"unsafe"
 )
 
+type QDockWidget__DockWidgetFeature int
+
+const (
+	QDockWidget__DockWidgetFeature__DockWidgetClosable         QDockWidget__DockWidgetFeature = 1
+	QDockWidget__DockWidgetFeature__DockWidgetMovable          QDockWidget__DockWidgetFeature = 2
+	QDockWidget__DockWidgetFeature__DockWidgetFloatable        QDockWidget__DockWidgetFeature = 4
+	QDockWidget__DockWidgetFeature__DockWidgetVerticalTitleBar QDockWidget__DockWidgetFeature = 8
+	QDockWidget__DockWidgetFeature__DockWidgetFeatureMask      QDockWidget__DockWidgetFeature = 15
+	QDockWidget__DockWidgetFeature__AllDockWidgetFeatures      QDockWidget__DockWidgetFeature = 7
+	QDockWidget__DockWidgetFeature__NoDockWidgetFeatures       QDockWidget__DockWidgetFeature = 0
+	QDockWidget__DockWidgetFeature__Reserved                   QDockWidget__DockWidgetFeature = 255
+)
+
 type QDockWidget struct {
 	h *C.QDockWidget
 	*QWidget
@@ -150,7 +163,7 @@ func (this *QDockWidget) TitleBarWidget() *QWidget {
 	return newQWidget_U(unsafe.Pointer(ret))
 }
 
-func (this *QDockWidget) IsAreaAllowed(area uintptr) bool {
+func (this *QDockWidget) IsAreaAllowed(area DockWidgetArea) bool {
 	ret := C.QDockWidget_IsAreaAllowed(this.h, (C.uintptr_t)(area))
 	return (bool)(ret)
 }
@@ -208,7 +221,7 @@ func (this *QDockWidget) OnVisibilityChanged(slot func()) {
 	C.QDockWidget_connect_VisibilityChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slotWrapper))))
 }
 
-func (this *QDockWidget) DockLocationChanged(area uintptr) {
+func (this *QDockWidget) DockLocationChanged(area DockWidgetArea) {
 	C.QDockWidget_DockLocationChanged(this.h, (C.uintptr_t)(area))
 }
 

qt/gen_qdrag.go

@@ -119,26 +119,26 @@ func (this *QDrag) Target() *QObject {
 	return newQObject_U(unsafe.Pointer(ret))
 }
 
-func (this *QDrag) Start() uintptr {
+func (this *QDrag) Start() DropAction {
 	ret := C.QDrag_Start(this.h)
-	return (uintptr)(ret)
+	return (DropAction)(ret)
 }
 
-func (this *QDrag) Exec() uintptr {
+func (this *QDrag) Exec() DropAction {
 	ret := C.QDrag_Exec(this.h)
-	return (uintptr)(ret)
+	return (DropAction)(ret)
 }
 
-func (this *QDrag) Exec2(supportedActions int, defaultAction uintptr) uintptr {
+func (this *QDrag) Exec2(supportedActions int, defaultAction DropAction) DropAction {
 	ret := C.QDrag_Exec2(this.h, (C.int)(supportedActions), (C.uintptr_t)(defaultAction))
-	return (uintptr)(ret)
+	return (DropAction)(ret)
 }
 
-func (this *QDrag) SetDragCursor(cursor *QPixmap, action uintptr) {
+func (this *QDrag) SetDragCursor(cursor *QPixmap, action DropAction) {
 	C.QDrag_SetDragCursor(this.h, cursor.cPointer(), (C.uintptr_t)(action))
 }
 
-func (this *QDrag) DragCursor(action uintptr) *QPixmap {
+func (this *QDrag) DragCursor(action DropAction) *QPixmap {
 	ret := C.QDrag_DragCursor(this.h, (C.uintptr_t)(action))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQPixmap(ret)
@@ -154,16 +154,16 @@ func (this *QDrag) SupportedActions() int {
 	return (int)(ret)
 }
 
-func (this *QDrag) DefaultAction() uintptr {
+func (this *QDrag) DefaultAction() DropAction {
 	ret := C.QDrag_DefaultAction(this.h)
-	return (uintptr)(ret)
+	return (DropAction)(ret)
 }
 
 func QDrag_Cancel() {
 	C.QDrag_Cancel()
 }
 
-func (this *QDrag) ActionChanged(action uintptr) {
+func (this *QDrag) ActionChanged(action DropAction) {
 	C.QDrag_ActionChanged(this.h, (C.uintptr_t)(action))
 }
 
@@ -239,14 +239,14 @@ func QDrag_TrUtf83(s string, c string, n int) string {
 	return ret
 }
 
-func (this *QDrag) Start1(supportedActions int) uintptr {
+func (this *QDrag) Start1(supportedActions int) DropAction {
 	ret := C.QDrag_Start1(this.h, (C.int)(supportedActions))
-	return (uintptr)(ret)
+	return (DropAction)(ret)
 }
 
-func (this *QDrag) Exec1(supportedActions int) uintptr {
+func (this *QDrag) Exec1(supportedActions int) DropAction {
 	ret := C.QDrag_Exec1(this.h, (C.int)(supportedActions))
-	return (uintptr)(ret)
+	return (DropAction)(ret)
 }
 
 func (this *QDrag) Delete() {

qt/gen_qdrawutil.go

@@ -12,6 +12,24 @@ import (
 	"unsafe"
 )
 
+type QDrawBorderPixmap__DrawingHint int
+
+const (
+	QDrawBorderPixmap__DrawingHint__OpaqueTopLeft     QDrawBorderPixmap__DrawingHint = 1
+	QDrawBorderPixmap__DrawingHint__OpaqueTop         QDrawBorderPixmap__DrawingHint = 2
+	QDrawBorderPixmap__DrawingHint__OpaqueTopRight    QDrawBorderPixmap__DrawingHint = 4
+	QDrawBorderPixmap__DrawingHint__OpaqueLeft        QDrawBorderPixmap__DrawingHint = 8
+	QDrawBorderPixmap__DrawingHint__OpaqueCenter      QDrawBorderPixmap__DrawingHint = 16
+	QDrawBorderPixmap__DrawingHint__OpaqueRight       QDrawBorderPixmap__DrawingHint = 32
+	QDrawBorderPixmap__DrawingHint__OpaqueBottomLeft  QDrawBorderPixmap__DrawingHint = 64
+	QDrawBorderPixmap__DrawingHint__OpaqueBottom      QDrawBorderPixmap__DrawingHint = 128
+	QDrawBorderPixmap__DrawingHint__OpaqueBottomRight QDrawBorderPixmap__DrawingHint = 256
+	QDrawBorderPixmap__DrawingHint__OpaqueCorners     QDrawBorderPixmap__DrawingHint = 325
+	QDrawBorderPixmap__DrawingHint__OpaqueEdges       QDrawBorderPixmap__DrawingHint = 170
+	QDrawBorderPixmap__DrawingHint__OpaqueFrame       QDrawBorderPixmap__DrawingHint = 495
+	QDrawBorderPixmap__DrawingHint__OpaqueAll         QDrawBorderPixmap__DrawingHint = 511
+)
+
 type QTileRules struct {
 	h *C.QTileRules
 }
@@ -35,7 +53,7 @@ func newQTileRules_U(h unsafe.Pointer) *QTileRules {
 }
 
 // NewQTileRules constructs a new QTileRules object.
-func NewQTileRules(horizontalRule uintptr, verticalRule uintptr) *QTileRules {
+func NewQTileRules(horizontalRule TileRule, verticalRule TileRule) *QTileRules {
 	ret := C.QTileRules_new((C.uintptr_t)(horizontalRule), (C.uintptr_t)(verticalRule))
 	return newQTileRules(ret)
 }
@@ -53,7 +71,7 @@ func NewQTileRules3(param1 *QTileRules) *QTileRules {
 }
 
 // NewQTileRules4 constructs a new QTileRules object.
-func NewQTileRules4(rule uintptr) *QTileRules {
+func NewQTileRules4(rule TileRule) *QTileRules {
 	ret := C.QTileRules_new4((C.uintptr_t)(rule))
 	return newQTileRules(ret)
 }

qt/gen_qeasingcurve.go

@@ -12,6 +12,60 @@ import (
 	"unsafe"
 )
 
+type QEasingCurve__Type int
+
+const (
+	QEasingCurve__Type__Linear       QEasingCurve__Type = 0
+	QEasingCurve__Type__InQuad       QEasingCurve__Type = 1
+	QEasingCurve__Type__OutQuad      QEasingCurve__Type = 2
+	QEasingCurve__Type__InOutQuad    QEasingCurve__Type = 3
+	QEasingCurve__Type__OutInQuad    QEasingCurve__Type = 4
+	QEasingCurve__Type__InCubic      QEasingCurve__Type = 5
+	QEasingCurve__Type__OutCubic     QEasingCurve__Type = 6
+	QEasingCurve__Type__InOutCubic   QEasingCurve__Type = 7
+	QEasingCurve__Type__OutInCubic   QEasingCurve__Type = 8
+	QEasingCurve__Type__InQuart      QEasingCurve__Type = 9
+	QEasingCurve__Type__OutQuart     QEasingCurve__Type = 10
+	QEasingCurve__Type__InOutQuart   QEasingCurve__Type = 11
+	QEasingCurve__Type__OutInQuart   QEasingCurve__Type = 12
+	QEasingCurve__Type__InQuint      QEasingCurve__Type = 13
+	QEasingCurve__Type__OutQuint     QEasingCurve__Type = 14
+	QEasingCurve__Type__InOutQuint   QEasingCurve__Type = 15
+	QEasingCurve__Type__OutInQuint   QEasingCurve__Type = 16
+	QEasingCurve__Type__InSine       QEasingCurve__Type = 17
+	QEasingCurve__Type__OutSine      QEasingCurve__Type = 18
+	QEasingCurve__Type__InOutSine    QEasingCurve__Type = 19
+	QEasingCurve__Type__OutInSine    QEasingCurve__Type = 20
+	QEasingCurve__Type__InExpo       QEasingCurve__Type = 21
+	QEasingCurve__Type__OutExpo      QEasingCurve__Type = 22
+	QEasingCurve__Type__InOutExpo    QEasingCurve__Type = 23
+	QEasingCurve__Type__OutInExpo    QEasingCurve__Type = 24
+	QEasingCurve__Type__InCirc       QEasingCurve__Type = 25
+	QEasingCurve__Type__OutCirc      QEasingCurve__Type = 26
+	QEasingCurve__Type__InOutCirc    QEasingCurve__Type = 27
+	QEasingCurve__Type__OutInCirc    QEasingCurve__Type = 28
+	QEasingCurve__Type__InElastic    QEasingCurve__Type = 29
+	QEasingCurve__Type__OutElastic   QEasingCurve__Type = 30
+	QEasingCurve__Type__InOutElastic QEasingCurve__Type = 31
+	QEasingCurve__Type__OutInElastic QEasingCurve__Type = 32
+	QEasingCurve__Type__InBack       QEasingCurve__Type = 33
+	QEasingCurve__Type__OutBack      QEasingCurve__Type = 34
+	QEasingCurve__Type__InOutBack    QEasingCurve__Type = 35
+	QEasingCurve__Type__OutInBack    QEasingCurve__Type = 36
+	QEasingCurve__Type__InBounce     QEasingCurve__Type = 37
+	QEasingCurve__Type__OutBounce    QEasingCurve__Type = 38
+	QEasingCurve__Type__InOutBounce  QEasingCurve__Type = 39
+	QEasingCurve__Type__OutInBounce  QEasingCurve__Type = 40
+	QEasingCurve__Type__InCurve      QEasingCurve__Type = 41
+	QEasingCurve__Type__OutCurve     QEasingCurve__Type = 42
+	QEasingCurve__Type__SineCurve    QEasingCurve__Type = 43
+	QEasingCurve__Type__CosineCurve  QEasingCurve__Type = 44
+	QEasingCurve__Type__BezierSpline QEasingCurve__Type = 45
+	QEasingCurve__Type__TCBSpline    QEasingCurve__Type = 46
+	QEasingCurve__Type__Custom       QEasingCurve__Type = 47
+	QEasingCurve__Type__NCurveTypes  QEasingCurve__Type = 48
+)
+
 type QEasingCurve struct {
 	h *C.QEasingCurve
 }
@@ -47,7 +101,7 @@ func NewQEasingCurve2(other *QEasingCurve) *QEasingCurve {
 }
 
 // NewQEasingCurve3 constructs a new QEasingCurve object.
-func NewQEasingCurve3(typeVal uintptr) *QEasingCurve {
+func NewQEasingCurve3(typeVal QEasingCurve__Type) *QEasingCurve {
 	ret := C.QEasingCurve_new3((C.uintptr_t)(typeVal))
 	return newQEasingCurve(ret)
 }
@@ -118,12 +172,12 @@ func (this *QEasingCurve) ToCubicSpline() []QPointF {
 	return ret
 }
 
-func (this *QEasingCurve) Type() uintptr {
+func (this *QEasingCurve) Type() QEasingCurve__Type {
 	ret := C.QEasingCurve_Type(this.h)
-	return (uintptr)(ret)
+	return (QEasingCurve__Type)(ret)
 }
 
-func (this *QEasingCurve) SetType(typeVal uintptr) {
+func (this *QEasingCurve) SetType(typeVal QEasingCurve__Type) {
 	C.QEasingCurve_SetType(this.h, (C.uintptr_t)(typeVal))
 }
 

qt/gen_qelapsedtimer.go

@@ -12,6 +12,16 @@ import (
 	"unsafe"
 )
 
+type QElapsedTimer__ClockType int
+
+const (
+	QElapsedTimer__ClockType__SystemTime         QElapsedTimer__ClockType = 0
+	QElapsedTimer__ClockType__MonotonicClock     QElapsedTimer__ClockType = 1
+	QElapsedTimer__ClockType__TickCounter        QElapsedTimer__ClockType = 2
+	QElapsedTimer__ClockType__MachAbsoluteTime   QElapsedTimer__ClockType = 3
+	QElapsedTimer__ClockType__PerformanceCounter QElapsedTimer__ClockType = 4
+)
+
 type QElapsedTimer struct {
 	h *C.QElapsedTimer
 }
@@ -40,9 +50,9 @@ func NewQElapsedTimer() *QElapsedTimer {
 	return newQElapsedTimer(ret)
 }
 
-func QElapsedTimer_ClockType() uintptr {
+func QElapsedTimer_ClockType() QElapsedTimer__ClockType {
 	ret := C.QElapsedTimer_ClockType()
-	return (uintptr)(ret)
+	return (QElapsedTimer__ClockType)(ret)
 }
 
 func QElapsedTimer_IsMonotonic() bool {

qt/gen_qevent.go

@@ -13,6 +13,66 @@ import (
 	"unsafe"
 )
 
+type QWheelEvent__ int
+
+const (
+	QWheelEvent____DefaultDeltasPerStep QWheelEvent__ = 120
+)
+
+type QTabletEvent__TabletDevice int
+
+const (
+	QTabletEvent__TabletDevice__NoDevice       QTabletEvent__TabletDevice = 0
+	QTabletEvent__TabletDevice__Puck           QTabletEvent__TabletDevice = 1
+	QTabletEvent__TabletDevice__Stylus         QTabletEvent__TabletDevice = 2
+	QTabletEvent__TabletDevice__Airbrush       QTabletEvent__TabletDevice = 3
+	QTabletEvent__TabletDevice__FourDMouse     QTabletEvent__TabletDevice = 4
+	QTabletEvent__TabletDevice__XFreeEraser    QTabletEvent__TabletDevice = 5
+	QTabletEvent__TabletDevice__RotationStylus QTabletEvent__TabletDevice = 6
+)
+
+type QTabletEvent__PointerType int
+
+const (
+	QTabletEvent__PointerType__UnknownPointer QTabletEvent__PointerType = 0
+	QTabletEvent__PointerType__Pen            QTabletEvent__PointerType = 1
+	QTabletEvent__PointerType__Cursor         QTabletEvent__PointerType = 2
+	QTabletEvent__PointerType__Eraser         QTabletEvent__PointerType = 3
+)
+
+type QPlatformSurfaceEvent__SurfaceEventType int
+
+const (
+	QPlatformSurfaceEvent__SurfaceEventType__SurfaceCreated            QPlatformSurfaceEvent__SurfaceEventType = 0
+	QPlatformSurfaceEvent__SurfaceEventType__SurfaceAboutToBeDestroyed QPlatformSurfaceEvent__SurfaceEventType = 1
+)
+
+type QContextMenuEvent__Reason int
+
+const (
+	QContextMenuEvent__Reason__Mouse    QContextMenuEvent__Reason = 0
+	QContextMenuEvent__Reason__Keyboard QContextMenuEvent__Reason = 1
+	QContextMenuEvent__Reason__Other    QContextMenuEvent__Reason = 2
+)
+
+type QInputMethodEvent__AttributeType int
+
+const (
+	QInputMethodEvent__AttributeType__TextFormat QInputMethodEvent__AttributeType = 0
+	QInputMethodEvent__AttributeType__Cursor     QInputMethodEvent__AttributeType = 1
+	QInputMethodEvent__AttributeType__Language   QInputMethodEvent__AttributeType = 2
+	QInputMethodEvent__AttributeType__Ruby       QInputMethodEvent__AttributeType = 3
+	QInputMethodEvent__AttributeType__Selection  QInputMethodEvent__AttributeType = 4
+)
+
+type QScrollEvent__ScrollState int
+
+const (
+	QScrollEvent__ScrollState__ScrollStarted  QScrollEvent__ScrollState = 0
+	QScrollEvent__ScrollState__ScrollUpdated  QScrollEvent__ScrollState = 1
+	QScrollEvent__ScrollState__ScrollFinished QScrollEvent__ScrollState = 2
+)
+
 type QInputEvent struct {
 	h *C.QInputEvent
 	*QEvent
@@ -37,7 +97,7 @@ func newQInputEvent_U(h unsafe.Pointer) *QInputEvent {
 }
 
 // NewQInputEvent constructs a new QInputEvent object.
-func NewQInputEvent(typeVal uintptr) *QInputEvent {
+func NewQInputEvent(typeVal QEvent__Type) *QInputEvent {
 	ret := C.QInputEvent_new((C.uintptr_t)(typeVal))
 	return newQInputEvent(ret)
 }
@@ -49,7 +109,7 @@ func NewQInputEvent2(param1 *QInputEvent) *QInputEvent {
 }
 
 // NewQInputEvent3 constructs a new QInputEvent object.
-func NewQInputEvent3(typeVal uintptr, modifiers int) *QInputEvent {
+func NewQInputEvent3(typeVal QEvent__Type, modifiers int) *QInputEvent {
 	ret := C.QInputEvent_new3((C.uintptr_t)(typeVal), (C.int)(modifiers))
 	return newQInputEvent(ret)
 }
@@ -196,25 +256,25 @@ func newQMouseEvent_U(h unsafe.Pointer) *QMouseEvent {
 }
 
 // NewQMouseEvent constructs a new QMouseEvent object.
-func NewQMouseEvent(typeVal uintptr, localPos *QPointF, button uintptr, buttons int, modifiers int) *QMouseEvent {
+func NewQMouseEvent(typeVal QEvent__Type, localPos *QPointF, button MouseButton, buttons int, modifiers int) *QMouseEvent {
 	ret := C.QMouseEvent_new((C.uintptr_t)(typeVal), localPos.cPointer(), (C.uintptr_t)(button), (C.int)(buttons), (C.int)(modifiers))
 	return newQMouseEvent(ret)
 }
 
 // NewQMouseEvent2 constructs a new QMouseEvent object.
-func NewQMouseEvent2(typeVal uintptr, localPos *QPointF, screenPos *QPointF, button uintptr, buttons int, modifiers int) *QMouseEvent {
+func NewQMouseEvent2(typeVal QEvent__Type, localPos *QPointF, screenPos *QPointF, button MouseButton, buttons int, modifiers int) *QMouseEvent {
 	ret := C.QMouseEvent_new2((C.uintptr_t)(typeVal), localPos.cPointer(), screenPos.cPointer(), (C.uintptr_t)(button), (C.int)(buttons), (C.int)(modifiers))
 	return newQMouseEvent(ret)
 }
 
 // NewQMouseEvent3 constructs a new QMouseEvent object.
-func NewQMouseEvent3(typeVal uintptr, localPos *QPointF, windowPos *QPointF, screenPos *QPointF, button uintptr, buttons int, modifiers int) *QMouseEvent {
+func NewQMouseEvent3(typeVal QEvent__Type, localPos *QPointF, windowPos *QPointF, screenPos *QPointF, button MouseButton, buttons int, modifiers int) *QMouseEvent {
 	ret := C.QMouseEvent_new3((C.uintptr_t)(typeVal), localPos.cPointer(), windowPos.cPointer(), screenPos.cPointer(), (C.uintptr_t)(button), (C.int)(buttons), (C.int)(modifiers))
 	return newQMouseEvent(ret)
 }
 
 // NewQMouseEvent4 constructs a new QMouseEvent object.
-func NewQMouseEvent4(typeVal uintptr, localPos *QPointF, windowPos *QPointF, screenPos *QPointF, button uintptr, buttons int, modifiers int, source uintptr) *QMouseEvent {
+func NewQMouseEvent4(typeVal QEvent__Type, localPos *QPointF, windowPos *QPointF, screenPos *QPointF, button MouseButton, buttons int, modifiers int, source MouseEventSource) *QMouseEvent {
 	ret := C.QMouseEvent_new4((C.uintptr_t)(typeVal), localPos.cPointer(), windowPos.cPointer(), screenPos.cPointer(), (C.uintptr_t)(button), (C.int)(buttons), (C.int)(modifiers), (C.uintptr_t)(source))
 	return newQMouseEvent(ret)
 }
@@ -282,9 +342,9 @@ func (this *QMouseEvent) ScreenPos() *QPointF {
 	return newQPointF_U(unsafe.Pointer(ret))
 }
 
-func (this *QMouseEvent) Button() uintptr {
+func (this *QMouseEvent) Button() MouseButton {
 	ret := C.QMouseEvent_Button(this.h)
-	return (uintptr)(ret)
+	return (MouseButton)(ret)
 }
 
 func (this *QMouseEvent) Buttons() int {
@@ -296,9 +356,9 @@ func (this *QMouseEvent) SetLocalPos(localPosition *QPointF) {
 	C.QMouseEvent_SetLocalPos(this.h, localPosition.cPointer())
 }
 
-func (this *QMouseEvent) Source() uintptr {
+func (this *QMouseEvent) Source() MouseEventSource {
 	ret := C.QMouseEvent_Source(this.h)
-	return (uintptr)(ret)
+	return (MouseEventSource)(ret)
 }
 
 func (this *QMouseEvent) Flags() int {
@@ -334,7 +394,7 @@ func newQHoverEvent_U(h unsafe.Pointer) *QHoverEvent {
 }
 
 // NewQHoverEvent constructs a new QHoverEvent object.
-func NewQHoverEvent(typeVal uintptr, pos *QPointF, oldPos *QPointF) *QHoverEvent {
+func NewQHoverEvent(typeVal QEvent__Type, pos *QPointF, oldPos *QPointF) *QHoverEvent {
 	ret := C.QHoverEvent_new((C.uintptr_t)(typeVal), pos.cPointer(), oldPos.cPointer())
 	return newQHoverEvent(ret)
 }
@@ -346,7 +406,7 @@ func NewQHoverEvent2(param1 *QHoverEvent) *QHoverEvent {
 }
 
 // NewQHoverEvent3 constructs a new QHoverEvent object.
-func NewQHoverEvent3(typeVal uintptr, pos *QPointF, oldPos *QPointF, modifiers int) *QHoverEvent {
+func NewQHoverEvent3(typeVal QEvent__Type, pos *QPointF, oldPos *QPointF, modifiers int) *QHoverEvent {
 	ret := C.QHoverEvent_new3((C.uintptr_t)(typeVal), pos.cPointer(), oldPos.cPointer(), (C.int)(modifiers))
 	return newQHoverEvent(ret)
 }
@@ -423,31 +483,31 @@ func NewQWheelEvent2(pos *QPointF, globalPos *QPointF, delta int, buttons int, m
 }
 
 // NewQWheelEvent3 constructs a new QWheelEvent object.
-func NewQWheelEvent3(pos *QPointF, globalPos *QPointF, pixelDelta QPoint, angleDelta QPoint, qt4Delta int, qt4Orientation uintptr, buttons int, modifiers int) *QWheelEvent {
+func NewQWheelEvent3(pos *QPointF, globalPos *QPointF, pixelDelta QPoint, angleDelta QPoint, qt4Delta int, qt4Orientation Orientation, buttons int, modifiers int) *QWheelEvent {
 	ret := C.QWheelEvent_new3(pos.cPointer(), globalPos.cPointer(), pixelDelta.cPointer(), angleDelta.cPointer(), (C.int)(qt4Delta), (C.uintptr_t)(qt4Orientation), (C.int)(buttons), (C.int)(modifiers))
 	return newQWheelEvent(ret)
 }
 
 // NewQWheelEvent4 constructs a new QWheelEvent object.
-func NewQWheelEvent4(pos *QPointF, globalPos *QPointF, pixelDelta QPoint, angleDelta QPoint, qt4Delta int, qt4Orientation uintptr, buttons int, modifiers int, phase uintptr) *QWheelEvent {
+func NewQWheelEvent4(pos *QPointF, globalPos *QPointF, pixelDelta QPoint, angleDelta QPoint, qt4Delta int, qt4Orientation Orientation, buttons int, modifiers int, phase ScrollPhase) *QWheelEvent {
 	ret := C.QWheelEvent_new4(pos.cPointer(), globalPos.cPointer(), pixelDelta.cPointer(), angleDelta.cPointer(), (C.int)(qt4Delta), (C.uintptr_t)(qt4Orientation), (C.int)(buttons), (C.int)(modifiers), (C.uintptr_t)(phase))
 	return newQWheelEvent(ret)
 }
 
 // NewQWheelEvent5 constructs a new QWheelEvent object.
-func NewQWheelEvent5(pos *QPointF, globalPos *QPointF, pixelDelta QPoint, angleDelta QPoint, qt4Delta int, qt4Orientation uintptr, buttons int, modifiers int, phase uintptr, source uintptr) *QWheelEvent {
+func NewQWheelEvent5(pos *QPointF, globalPos *QPointF, pixelDelta QPoint, angleDelta QPoint, qt4Delta int, qt4Orientation Orientation, buttons int, modifiers int, phase ScrollPhase, source MouseEventSource) *QWheelEvent {
 	ret := C.QWheelEvent_new5(pos.cPointer(), globalPos.cPointer(), pixelDelta.cPointer(), angleDelta.cPointer(), (C.int)(qt4Delta), (C.uintptr_t)(qt4Orientation), (C.int)(buttons), (C.int)(modifiers), (C.uintptr_t)(phase), (C.uintptr_t)(source))
 	return newQWheelEvent(ret)
 }
 
 // NewQWheelEvent6 constructs a new QWheelEvent object.
-func NewQWheelEvent6(pos *QPointF, globalPos *QPointF, pixelDelta QPoint, angleDelta QPoint, qt4Delta int, qt4Orientation uintptr, buttons int, modifiers int, phase uintptr, source uintptr, inverted bool) *QWheelEvent {
+func NewQWheelEvent6(pos *QPointF, globalPos *QPointF, pixelDelta QPoint, angleDelta QPoint, qt4Delta int, qt4Orientation Orientation, buttons int, modifiers int, phase ScrollPhase, source MouseEventSource, inverted bool) *QWheelEvent {
 	ret := C.QWheelEvent_new6(pos.cPointer(), globalPos.cPointer(), pixelDelta.cPointer(), angleDelta.cPointer(), (C.int)(qt4Delta), (C.uintptr_t)(qt4Orientation), (C.int)(buttons), (C.int)(modifiers), (C.uintptr_t)(phase), (C.uintptr_t)(source), (C.bool)(inverted))
 	return newQWheelEvent(ret)
 }
 
 // NewQWheelEvent7 constructs a new QWheelEvent object.
-func NewQWheelEvent7(pos QPointF, globalPos QPointF, pixelDelta QPoint, angleDelta QPoint, buttons int, modifiers int, phase uintptr, inverted bool) *QWheelEvent {
+func NewQWheelEvent7(pos QPointF, globalPos QPointF, pixelDelta QPoint, angleDelta QPoint, buttons int, modifiers int, phase ScrollPhase, inverted bool) *QWheelEvent {
 	ret := C.QWheelEvent_new7(pos.cPointer(), globalPos.cPointer(), pixelDelta.cPointer(), angleDelta.cPointer(), (C.int)(buttons), (C.int)(modifiers), (C.uintptr_t)(phase), (C.bool)(inverted))
 	return newQWheelEvent(ret)
 }
@@ -459,19 +519,19 @@ func NewQWheelEvent8(param1 *QWheelEvent) *QWheelEvent {
 }
 
 // NewQWheelEvent9 constructs a new QWheelEvent object.
-func NewQWheelEvent9(pos *QPointF, delta int, buttons int, modifiers int, orient uintptr) *QWheelEvent {
+func NewQWheelEvent9(pos *QPointF, delta int, buttons int, modifiers int, orient Orientation) *QWheelEvent {
 	ret := C.QWheelEvent_new9(pos.cPointer(), (C.int)(delta), (C.int)(buttons), (C.int)(modifiers), (C.uintptr_t)(orient))
 	return newQWheelEvent(ret)
 }
 
 // NewQWheelEvent10 constructs a new QWheelEvent object.
-func NewQWheelEvent10(pos *QPointF, globalPos *QPointF, delta int, buttons int, modifiers int, orient uintptr) *QWheelEvent {
+func NewQWheelEvent10(pos *QPointF, globalPos *QPointF, delta int, buttons int, modifiers int, orient Orientation) *QWheelEvent {
 	ret := C.QWheelEvent_new10(pos.cPointer(), globalPos.cPointer(), (C.int)(delta), (C.int)(buttons), (C.int)(modifiers), (C.uintptr_t)(orient))
 	return newQWheelEvent(ret)
 }
 
 // NewQWheelEvent11 constructs a new QWheelEvent object.
-func NewQWheelEvent11(pos QPointF, globalPos QPointF, pixelDelta QPoint, angleDelta QPoint, buttons int, modifiers int, phase uintptr, inverted bool, source uintptr) *QWheelEvent {
+func NewQWheelEvent11(pos QPointF, globalPos QPointF, pixelDelta QPoint, angleDelta QPoint, buttons int, modifiers int, phase ScrollPhase, inverted bool, source MouseEventSource) *QWheelEvent {
 	ret := C.QWheelEvent_new11(pos.cPointer(), globalPos.cPointer(), pixelDelta.cPointer(), angleDelta.cPointer(), (C.int)(buttons), (C.int)(modifiers), (C.uintptr_t)(phase), (C.bool)(inverted), (C.uintptr_t)(source))
 	return newQWheelEvent(ret)
 }
@@ -503,9 +563,9 @@ func (this *QWheelEvent) Delta() int {
 	return (int)(ret)
 }
 
-func (this *QWheelEvent) Orientation() uintptr {
+func (this *QWheelEvent) Orientation() Orientation {
 	ret := C.QWheelEvent_Orientation(this.h)
-	return (uintptr)(ret)
+	return (Orientation)(ret)
 }
 
 func (this *QWheelEvent) Pos() *QPoint {
@@ -587,9 +647,9 @@ func (this *QWheelEvent) Buttons() int {
 	return (int)(ret)
 }
 
-func (this *QWheelEvent) Phase() uintptr {
+func (this *QWheelEvent) Phase() ScrollPhase {
 	ret := C.QWheelEvent_Phase(this.h)
-	return (uintptr)(ret)
+	return (ScrollPhase)(ret)
 }
 
 func (this *QWheelEvent) Inverted() bool {
@@ -597,9 +657,9 @@ func (this *QWheelEvent) Inverted() bool {
 	return (bool)(ret)
 }
 
-func (this *QWheelEvent) Source() uintptr {
+func (this *QWheelEvent) Source() MouseEventSource {
 	ret := C.QWheelEvent_Source(this.h)
-	return (uintptr)(ret)
+	return (MouseEventSource)(ret)
 }
 
 func (this *QWheelEvent) Delete() {
@@ -630,13 +690,13 @@ func newQTabletEvent_U(h unsafe.Pointer) *QTabletEvent {
 }
 
 // NewQTabletEvent constructs a new QTabletEvent object.
-func NewQTabletEvent(t uintptr, pos *QPointF, globalPos *QPointF, device int, pointerType int, pressure float64, xTilt int, yTilt int, tangentialPressure float64, rotation float64, z int, keyState int, uniqueID int64) *QTabletEvent {
+func NewQTabletEvent(t QEvent__Type, pos *QPointF, globalPos *QPointF, device int, pointerType int, pressure float64, xTilt int, yTilt int, tangentialPressure float64, rotation float64, z int, keyState int, uniqueID int64) *QTabletEvent {
 	ret := C.QTabletEvent_new((C.uintptr_t)(t), pos.cPointer(), globalPos.cPointer(), (C.int)(device), (C.int)(pointerType), (C.double)(pressure), (C.int)(xTilt), (C.int)(yTilt), (C.double)(tangentialPressure), (C.double)(rotation), (C.int)(z), (C.int)(keyState), (C.longlong)(uniqueID))
 	return newQTabletEvent(ret)
 }
 
 // NewQTabletEvent2 constructs a new QTabletEvent object.
-func NewQTabletEvent2(t uintptr, pos *QPointF, globalPos *QPointF, device int, pointerType int, pressure float64, xTilt int, yTilt int, tangentialPressure float64, rotation float64, z int, keyState int, uniqueID int64, button uintptr, buttons int) *QTabletEvent {
+func NewQTabletEvent2(t QEvent__Type, pos *QPointF, globalPos *QPointF, device int, pointerType int, pressure float64, xTilt int, yTilt int, tangentialPressure float64, rotation float64, z int, keyState int, uniqueID int64, button MouseButton, buttons int) *QTabletEvent {
 	ret := C.QTabletEvent_new2((C.uintptr_t)(t), pos.cPointer(), globalPos.cPointer(), (C.int)(device), (C.int)(pointerType), (C.double)(pressure), (C.int)(xTilt), (C.int)(yTilt), (C.double)(tangentialPressure), (C.double)(rotation), (C.int)(z), (C.int)(keyState), (C.longlong)(uniqueID), (C.uintptr_t)(button), (C.int)(buttons))
 	return newQTabletEvent(ret)
 }
@@ -709,19 +769,19 @@ func (this *QTabletEvent) HiResGlobalY() float64 {
 	return (float64)(ret)
 }
 
-func (this *QTabletEvent) Device() uintptr {
+func (this *QTabletEvent) Device() QTabletEvent__TabletDevice {
 	ret := C.QTabletEvent_Device(this.h)
-	return (uintptr)(ret)
+	return (QTabletEvent__TabletDevice)(ret)
 }
 
-func (this *QTabletEvent) DeviceType() uintptr {
+func (this *QTabletEvent) DeviceType() QTabletEvent__TabletDevice {
 	ret := C.QTabletEvent_DeviceType(this.h)
-	return (uintptr)(ret)
+	return (QTabletEvent__TabletDevice)(ret)
 }
 
-func (this *QTabletEvent) PointerType() uintptr {
+func (this *QTabletEvent) PointerType() QTabletEvent__PointerType {
 	ret := C.QTabletEvent_PointerType(this.h)
-	return (uintptr)(ret)
+	return (QTabletEvent__PointerType)(ret)
 }
 
 func (this *QTabletEvent) UniqueId() int64 {
@@ -759,9 +819,9 @@ func (this *QTabletEvent) YTilt() int {
 	return (int)(ret)
 }
 
-func (this *QTabletEvent) Button() uintptr {
+func (this *QTabletEvent) Button() MouseButton {
 	ret := C.QTabletEvent_Button(this.h)
-	return (uintptr)(ret)
+	return (MouseButton)(ret)
 }
 
 func (this *QTabletEvent) Buttons() int {
@@ -797,13 +857,13 @@ func newQNativeGestureEvent_U(h unsafe.Pointer) *QNativeGestureEvent {
 }
 
 // NewQNativeGestureEvent constructs a new QNativeGestureEvent object.
-func NewQNativeGestureEvent(typeVal uintptr, localPos *QPointF, windowPos *QPointF, screenPos *QPointF, value float64, sequenceId uint64, intArgument uint64) *QNativeGestureEvent {
+func NewQNativeGestureEvent(typeVal NativeGestureType, localPos *QPointF, windowPos *QPointF, screenPos *QPointF, value float64, sequenceId uint64, intArgument uint64) *QNativeGestureEvent {
 	ret := C.QNativeGestureEvent_new((C.uintptr_t)(typeVal), localPos.cPointer(), windowPos.cPointer(), screenPos.cPointer(), (C.double)(value), (C.ulong)(sequenceId), (C.ulonglong)(intArgument))
 	return newQNativeGestureEvent(ret)
 }
 
 // NewQNativeGestureEvent2 constructs a new QNativeGestureEvent object.
-func NewQNativeGestureEvent2(typeVal uintptr, dev *QTouchDevice, localPos *QPointF, windowPos *QPointF, screenPos *QPointF, value float64, sequenceId uint64, intArgument uint64) *QNativeGestureEvent {
+func NewQNativeGestureEvent2(typeVal NativeGestureType, dev *QTouchDevice, localPos *QPointF, windowPos *QPointF, screenPos *QPointF, value float64, sequenceId uint64, intArgument uint64) *QNativeGestureEvent {
 	ret := C.QNativeGestureEvent_new2((C.uintptr_t)(typeVal), dev.cPointer(), localPos.cPointer(), windowPos.cPointer(), screenPos.cPointer(), (C.double)(value), (C.ulong)(sequenceId), (C.ulonglong)(intArgument))
 	return newQNativeGestureEvent(ret)
 }
@@ -814,9 +874,9 @@ func NewQNativeGestureEvent3(param1 *QNativeGestureEvent) *QNativeGestureEvent {
 	return newQNativeGestureEvent(ret)
 }
 
-func (this *QNativeGestureEvent) GestureType() uintptr {
+func (this *QNativeGestureEvent) GestureType() NativeGestureType {
 	ret := C.QNativeGestureEvent_GestureType(this.h)
-	return (uintptr)(ret)
+	return (NativeGestureType)(ret)
 }
 
 func (this *QNativeGestureEvent) Value() float64 {
@@ -894,13 +954,13 @@ func newQKeyEvent_U(h unsafe.Pointer) *QKeyEvent {
 }
 
 // NewQKeyEvent constructs a new QKeyEvent object.
-func NewQKeyEvent(typeVal uintptr, key int, modifiers int) *QKeyEvent {
+func NewQKeyEvent(typeVal QEvent__Type, key int, modifiers int) *QKeyEvent {
 	ret := C.QKeyEvent_new((C.uintptr_t)(typeVal), (C.int)(key), (C.int)(modifiers))
 	return newQKeyEvent(ret)
 }
 
 // NewQKeyEvent2 constructs a new QKeyEvent object.
-func NewQKeyEvent2(typeVal uintptr, key int, modifiers int, nativeScanCode uint, nativeVirtualKey uint, nativeModifiers uint) *QKeyEvent {
+func NewQKeyEvent2(typeVal QEvent__Type, key int, modifiers int, nativeScanCode uint, nativeVirtualKey uint, nativeModifiers uint) *QKeyEvent {
 	ret := C.QKeyEvent_new2((C.uintptr_t)(typeVal), (C.int)(key), (C.int)(modifiers), (C.uint)(nativeScanCode), (C.uint)(nativeVirtualKey), (C.uint)(nativeModifiers))
 	return newQKeyEvent(ret)
 }
@@ -912,7 +972,7 @@ func NewQKeyEvent3(param1 *QKeyEvent) *QKeyEvent {
 }
 
 // NewQKeyEvent4 constructs a new QKeyEvent object.
-func NewQKeyEvent4(typeVal uintptr, key int, modifiers int, text string) *QKeyEvent {
+func NewQKeyEvent4(typeVal QEvent__Type, key int, modifiers int, text string) *QKeyEvent {
 	text_Cstring := C.CString(text)
 	defer C.free(unsafe.Pointer(text_Cstring))
 	ret := C.QKeyEvent_new4((C.uintptr_t)(typeVal), (C.int)(key), (C.int)(modifiers), text_Cstring, C.size_t(len(text)))
@@ -920,7 +980,7 @@ func NewQKeyEvent4(typeVal uintptr, key int, modifiers int, text string) *QKeyEv
 }
 
 // NewQKeyEvent5 constructs a new QKeyEvent object.
-func NewQKeyEvent5(typeVal uintptr, key int, modifiers int, text string, autorep bool) *QKeyEvent {
+func NewQKeyEvent5(typeVal QEvent__Type, key int, modifiers int, text string, autorep bool) *QKeyEvent {
 	text_Cstring := C.CString(text)
 	defer C.free(unsafe.Pointer(text_Cstring))
 	ret := C.QKeyEvent_new5((C.uintptr_t)(typeVal), (C.int)(key), (C.int)(modifiers), text_Cstring, C.size_t(len(text)), (C.bool)(autorep))
@@ -928,7 +988,7 @@ func NewQKeyEvent5(typeVal uintptr, key int, modifiers int, text string, autorep
 }
 
 // NewQKeyEvent6 constructs a new QKeyEvent object.
-func NewQKeyEvent6(typeVal uintptr, key int, modifiers int, text string, autorep bool, count uint16) *QKeyEvent {
+func NewQKeyEvent6(typeVal QEvent__Type, key int, modifiers int, text string, autorep bool, count uint16) *QKeyEvent {
 	text_Cstring := C.CString(text)
 	defer C.free(unsafe.Pointer(text_Cstring))
 	ret := C.QKeyEvent_new6((C.uintptr_t)(typeVal), (C.int)(key), (C.int)(modifiers), text_Cstring, C.size_t(len(text)), (C.bool)(autorep), (C.uint16_t)(count))
@@ -936,7 +996,7 @@ func NewQKeyEvent6(typeVal uintptr, key int, modifiers int, text string, autorep
 }
 
 // NewQKeyEvent7 constructs a new QKeyEvent object.
-func NewQKeyEvent7(typeVal uintptr, key int, modifiers int, nativeScanCode uint, nativeVirtualKey uint, nativeModifiers uint, text string) *QKeyEvent {
+func NewQKeyEvent7(typeVal QEvent__Type, key int, modifiers int, nativeScanCode uint, nativeVirtualKey uint, nativeModifiers uint, text string) *QKeyEvent {
 	text_Cstring := C.CString(text)
 	defer C.free(unsafe.Pointer(text_Cstring))
 	ret := C.QKeyEvent_new7((C.uintptr_t)(typeVal), (C.int)(key), (C.int)(modifiers), (C.uint)(nativeScanCode), (C.uint)(nativeVirtualKey), (C.uint)(nativeModifiers), text_Cstring, C.size_t(len(text)))
@@ -944,7 +1004,7 @@ func NewQKeyEvent7(typeVal uintptr, key int, modifiers int, nativeScanCode uint,
 }
 
 // NewQKeyEvent8 constructs a new QKeyEvent object.
-func NewQKeyEvent8(typeVal uintptr, key int, modifiers int, nativeScanCode uint, nativeVirtualKey uint, nativeModifiers uint, text string, autorep bool) *QKeyEvent {
+func NewQKeyEvent8(typeVal QEvent__Type, key int, modifiers int, nativeScanCode uint, nativeVirtualKey uint, nativeModifiers uint, text string, autorep bool) *QKeyEvent {
 	text_Cstring := C.CString(text)
 	defer C.free(unsafe.Pointer(text_Cstring))
 	ret := C.QKeyEvent_new8((C.uintptr_t)(typeVal), (C.int)(key), (C.int)(modifiers), (C.uint)(nativeScanCode), (C.uint)(nativeVirtualKey), (C.uint)(nativeModifiers), text_Cstring, C.size_t(len(text)), (C.bool)(autorep))
@@ -952,7 +1012,7 @@ func NewQKeyEvent8(typeVal uintptr, key int, modifiers int, nativeScanCode uint,
 }
 
 // NewQKeyEvent9 constructs a new QKeyEvent object.
-func NewQKeyEvent9(typeVal uintptr, key int, modifiers int, nativeScanCode uint, nativeVirtualKey uint, nativeModifiers uint, text string, autorep bool, count uint16) *QKeyEvent {
+func NewQKeyEvent9(typeVal QEvent__Type, key int, modifiers int, nativeScanCode uint, nativeVirtualKey uint, nativeModifiers uint, text string, autorep bool, count uint16) *QKeyEvent {
 	text_Cstring := C.CString(text)
 	defer C.free(unsafe.Pointer(text_Cstring))
 	ret := C.QKeyEvent_new9((C.uintptr_t)(typeVal), (C.int)(key), (C.int)(modifiers), (C.uint)(nativeScanCode), (C.uint)(nativeVirtualKey), (C.uint)(nativeModifiers), text_Cstring, C.size_t(len(text)), (C.bool)(autorep), (C.uint16_t)(count))
@@ -964,7 +1024,7 @@ func (this *QKeyEvent) Key() int {
 	return (int)(ret)
 }
 
-func (this *QKeyEvent) Matches(key uintptr) bool {
+func (this *QKeyEvent) Matches(key QKeySequence__StandardKey) bool {
 	ret := C.QKeyEvent_Matches(this.h, (C.uintptr_t)(key))
 	return (bool)(ret)
 }
@@ -1036,7 +1096,7 @@ func newQFocusEvent_U(h unsafe.Pointer) *QFocusEvent {
 }
 
 // NewQFocusEvent constructs a new QFocusEvent object.
-func NewQFocusEvent(typeVal uintptr) *QFocusEvent {
+func NewQFocusEvent(typeVal QEvent__Type) *QFocusEvent {
 	ret := C.QFocusEvent_new((C.uintptr_t)(typeVal))
 	return newQFocusEvent(ret)
 }
@@ -1048,7 +1108,7 @@ func NewQFocusEvent2(param1 *QFocusEvent) *QFocusEvent {
 }
 
 // NewQFocusEvent3 constructs a new QFocusEvent object.
-func NewQFocusEvent3(typeVal uintptr, reason uintptr) *QFocusEvent {
+func NewQFocusEvent3(typeVal QEvent__Type, reason FocusReason) *QFocusEvent {
 	ret := C.QFocusEvent_new3((C.uintptr_t)(typeVal), (C.uintptr_t)(reason))
 	return newQFocusEvent(ret)
 }
@@ -1063,9 +1123,9 @@ func (this *QFocusEvent) LostFocus() bool {
 	return (bool)(ret)
 }
 
-func (this *QFocusEvent) Reason() uintptr {
+func (this *QFocusEvent) Reason() FocusReason {
 	ret := C.QFocusEvent_Reason(this.h)
-	return (uintptr)(ret)
+	return (FocusReason)(ret)
 }
 
 func (this *QFocusEvent) Delete() {
@@ -1244,7 +1304,7 @@ func newQPlatformSurfaceEvent_U(h unsafe.Pointer) *QPlatformSurfaceEvent {
 }
 
 // NewQPlatformSurfaceEvent constructs a new QPlatformSurfaceEvent object.
-func NewQPlatformSurfaceEvent(surfaceEventType uintptr) *QPlatformSurfaceEvent {
+func NewQPlatformSurfaceEvent(surfaceEventType QPlatformSurfaceEvent__SurfaceEventType) *QPlatformSurfaceEvent {
 	ret := C.QPlatformSurfaceEvent_new((C.uintptr_t)(surfaceEventType))
 	return newQPlatformSurfaceEvent(ret)
 }
@@ -1255,9 +1315,9 @@ func NewQPlatformSurfaceEvent2(param1 *QPlatformSurfaceEvent) *QPlatformSurfaceE
 	return newQPlatformSurfaceEvent(ret)
 }
 
-func (this *QPlatformSurfaceEvent) SurfaceEventType() uintptr {
+func (this *QPlatformSurfaceEvent) SurfaceEventType() QPlatformSurfaceEvent__SurfaceEventType {
 	ret := C.QPlatformSurfaceEvent_SurfaceEventType(this.h)
-	return (uintptr)(ret)
+	return (QPlatformSurfaceEvent__SurfaceEventType)(ret)
 }
 
 func (this *QPlatformSurfaceEvent) Delete() {
@@ -1509,19 +1569,19 @@ func newQContextMenuEvent_U(h unsafe.Pointer) *QContextMenuEvent {
 }
 
 // NewQContextMenuEvent constructs a new QContextMenuEvent object.
-func NewQContextMenuEvent(reason uintptr, pos *QPoint, globalPos *QPoint, modifiers int) *QContextMenuEvent {
+func NewQContextMenuEvent(reason QContextMenuEvent__Reason, pos *QPoint, globalPos *QPoint, modifiers int) *QContextMenuEvent {
 	ret := C.QContextMenuEvent_new((C.uintptr_t)(reason), pos.cPointer(), globalPos.cPointer(), (C.int)(modifiers))
 	return newQContextMenuEvent(ret)
 }
 
 // NewQContextMenuEvent2 constructs a new QContextMenuEvent object.
-func NewQContextMenuEvent2(reason uintptr, pos *QPoint, globalPos *QPoint) *QContextMenuEvent {
+func NewQContextMenuEvent2(reason QContextMenuEvent__Reason, pos *QPoint, globalPos *QPoint) *QContextMenuEvent {
 	ret := C.QContextMenuEvent_new2((C.uintptr_t)(reason), pos.cPointer(), globalPos.cPointer())
 	return newQContextMenuEvent(ret)
 }
 
 // NewQContextMenuEvent3 constructs a new QContextMenuEvent object.
-func NewQContextMenuEvent3(reason uintptr, pos *QPoint) *QContextMenuEvent {
+func NewQContextMenuEvent3(reason QContextMenuEvent__Reason, pos *QPoint) *QContextMenuEvent {
 	ret := C.QContextMenuEvent_new3((C.uintptr_t)(reason), pos.cPointer())
 	return newQContextMenuEvent(ret)
 }
@@ -1562,9 +1622,9 @@ func (this *QContextMenuEvent) GlobalPos() *QPoint {
 	return newQPoint_U(unsafe.Pointer(ret))
 }
 
-func (this *QContextMenuEvent) Reason() uintptr {
+func (this *QContextMenuEvent) Reason() QContextMenuEvent__Reason {
 	ret := C.QContextMenuEvent_Reason(this.h)
-	return (uintptr)(ret)
+	return (QContextMenuEvent__Reason)(ret)
 }
 
 func (this *QContextMenuEvent) Delete() {
@@ -1710,11 +1770,11 @@ func (this *QInputMethodQueryEvent) Queries() int {
 	return (int)(ret)
 }
 
-func (this *QInputMethodQueryEvent) SetValue(query uintptr, value *QVariant) {
+func (this *QInputMethodQueryEvent) SetValue(query InputMethodQuery, value *QVariant) {
 	C.QInputMethodQueryEvent_SetValue(this.h, (C.uintptr_t)(query), value.cPointer())
 }
 
-func (this *QInputMethodQueryEvent) Value(query uintptr) *QVariant {
+func (this *QInputMethodQueryEvent) Value(query InputMethodQuery) *QVariant {
 	ret := C.QInputMethodQueryEvent_Value(this.h, (C.uintptr_t)(query))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQVariant(ret)
@@ -1765,7 +1825,7 @@ func NewQDropEvent2(param1 *QDropEvent) *QDropEvent {
 }
 
 // NewQDropEvent3 constructs a new QDropEvent object.
-func NewQDropEvent3(pos *QPointF, actions int, data *QMimeData, buttons int, modifiers int, typeVal uintptr) *QDropEvent {
+func NewQDropEvent3(pos *QPointF, actions int, data *QMimeData, buttons int, modifiers int, typeVal QEvent__Type) *QDropEvent {
 	ret := C.QDropEvent_new3(pos.cPointer(), (C.int)(actions), data.cPointer(), (C.int)(buttons), (C.int)(modifiers), (C.uintptr_t)(typeVal))
 	return newQDropEvent(ret)
 }
@@ -1801,21 +1861,21 @@ func (this *QDropEvent) PossibleActions() int {
 	return (int)(ret)
 }
 
-func (this *QDropEvent) ProposedAction() uintptr {
+func (this *QDropEvent) ProposedAction() DropAction {
 	ret := C.QDropEvent_ProposedAction(this.h)
-	return (uintptr)(ret)
+	return (DropAction)(ret)
 }
 
 func (this *QDropEvent) AcceptProposedAction() {
 	C.QDropEvent_AcceptProposedAction(this.h)
 }
 
-func (this *QDropEvent) DropAction() uintptr {
+func (this *QDropEvent) DropAction() DropAction {
 	ret := C.QDropEvent_DropAction(this.h)
-	return (uintptr)(ret)
+	return (DropAction)(ret)
 }
 
-func (this *QDropEvent) SetDropAction(action uintptr) {
+func (this *QDropEvent) SetDropAction(action DropAction) {
 	C.QDropEvent_SetDropAction(this.h, (C.uintptr_t)(action))
 }
 
@@ -1869,7 +1929,7 @@ func NewQDragMoveEvent2(param1 *QDragMoveEvent) *QDragMoveEvent {
 }
 
 // NewQDragMoveEvent3 constructs a new QDragMoveEvent object.
-func NewQDragMoveEvent3(pos *QPoint, actions int, data *QMimeData, buttons int, modifiers int, typeVal uintptr) *QDragMoveEvent {
+func NewQDragMoveEvent3(pos *QPoint, actions int, data *QMimeData, buttons int, modifiers int, typeVal QEvent__Type) *QDragMoveEvent {
 	ret := C.QDragMoveEvent_new3(pos.cPointer(), (C.int)(actions), data.cPointer(), (C.int)(buttons), (C.int)(modifiers), (C.uintptr_t)(typeVal))
 	return newQDragMoveEvent(ret)
 }
@@ -2015,7 +2075,7 @@ func newQHelpEvent_U(h unsafe.Pointer) *QHelpEvent {
 }
 
 // NewQHelpEvent constructs a new QHelpEvent object.
-func NewQHelpEvent(typeVal uintptr, pos *QPoint, globalPos *QPoint) *QHelpEvent {
+func NewQHelpEvent(typeVal QEvent__Type, pos *QPoint, globalPos *QPoint) *QHelpEvent {
 	ret := C.QHelpEvent_new((C.uintptr_t)(typeVal), pos.cPointer(), globalPos.cPointer())
 	return newQHelpEvent(ret)
 }
@@ -2533,7 +2593,7 @@ func newQTouchEvent_U(h unsafe.Pointer) *QTouchEvent {
 }
 
 // NewQTouchEvent constructs a new QTouchEvent object.
-func NewQTouchEvent(eventType uintptr) *QTouchEvent {
+func NewQTouchEvent(eventType QEvent__Type) *QTouchEvent {
 	ret := C.QTouchEvent_new((C.uintptr_t)(eventType))
 	return newQTouchEvent(ret)
 }
@@ -2545,25 +2605,25 @@ func NewQTouchEvent2(param1 *QTouchEvent) *QTouchEvent {
 }
 
 // NewQTouchEvent3 constructs a new QTouchEvent object.
-func NewQTouchEvent3(eventType uintptr, device *QTouchDevice) *QTouchEvent {
+func NewQTouchEvent3(eventType QEvent__Type, device *QTouchDevice) *QTouchEvent {
 	ret := C.QTouchEvent_new3((C.uintptr_t)(eventType), device.cPointer())
 	return newQTouchEvent(ret)
 }
 
 // NewQTouchEvent4 constructs a new QTouchEvent object.
-func NewQTouchEvent4(eventType uintptr, device *QTouchDevice, modifiers int) *QTouchEvent {
+func NewQTouchEvent4(eventType QEvent__Type, device *QTouchDevice, modifiers int) *QTouchEvent {
 	ret := C.QTouchEvent_new4((C.uintptr_t)(eventType), device.cPointer(), (C.int)(modifiers))
 	return newQTouchEvent(ret)
 }
 
 // NewQTouchEvent5 constructs a new QTouchEvent object.
-func NewQTouchEvent5(eventType uintptr, device *QTouchDevice, modifiers int, touchPointStates int) *QTouchEvent {
+func NewQTouchEvent5(eventType QEvent__Type, device *QTouchDevice, modifiers int, touchPointStates int) *QTouchEvent {
 	ret := C.QTouchEvent_new5((C.uintptr_t)(eventType), device.cPointer(), (C.int)(modifiers), (C.int)(touchPointStates))
 	return newQTouchEvent(ret)
 }
 
 // NewQTouchEvent6 constructs a new QTouchEvent object.
-func NewQTouchEvent6(eventType uintptr, device *QTouchDevice, modifiers int, touchPointStates int, touchPoints []QTouchEvent__TouchPoint) *QTouchEvent {
+func NewQTouchEvent6(eventType QEvent__Type, device *QTouchDevice, modifiers int, touchPointStates int, touchPoints []QTouchEvent__TouchPoint) *QTouchEvent {
 	// For the C ABI, malloc a C array of raw pointers
 	touchPoints_CArray := (*[0xffff]*C.QTouchEvent__TouchPoint)(C.malloc(C.size_t(8 * len(touchPoints))))
 	defer C.free(unsafe.Pointer(touchPoints_CArray))
@@ -2743,7 +2803,7 @@ func newQScrollEvent_U(h unsafe.Pointer) *QScrollEvent {
 }
 
 // NewQScrollEvent constructs a new QScrollEvent object.
-func NewQScrollEvent(contentPos *QPointF, overshoot *QPointF, scrollState uintptr) *QScrollEvent {
+func NewQScrollEvent(contentPos *QPointF, overshoot *QPointF, scrollState QScrollEvent__ScrollState) *QScrollEvent {
 	ret := C.QScrollEvent_new(contentPos.cPointer(), overshoot.cPointer(), (C.uintptr_t)(scrollState))
 	return newQScrollEvent(ret)
 }
@@ -2776,9 +2836,9 @@ func (this *QScrollEvent) OvershootDistance() *QPointF {
 	return ret1
 }
 
-func (this *QScrollEvent) ScrollState() uintptr {
+func (this *QScrollEvent) ScrollState() QScrollEvent__ScrollState {
 	ret := C.QScrollEvent_ScrollState(this.h)
-	return (uintptr)(ret)
+	return (QScrollEvent__ScrollState)(ret)
 }
 
 func (this *QScrollEvent) Delete() {
@@ -2809,7 +2869,7 @@ func newQScreenOrientationChangeEvent_U(h unsafe.Pointer) *QScreenOrientationCha
 }
 
 // NewQScreenOrientationChangeEvent constructs a new QScreenOrientationChangeEvent object.
-func NewQScreenOrientationChangeEvent(screen *QScreen, orientation uintptr) *QScreenOrientationChangeEvent {
+func NewQScreenOrientationChangeEvent(screen *QScreen, orientation ScreenOrientation) *QScreenOrientationChangeEvent {
 	ret := C.QScreenOrientationChangeEvent_new(screen.cPointer(), (C.uintptr_t)(orientation))
 	return newQScreenOrientationChangeEvent(ret)
 }
@@ -2825,9 +2885,9 @@ func (this *QScreenOrientationChangeEvent) Screen() *QScreen {
 	return newQScreen_U(unsafe.Pointer(ret))
 }
 
-func (this *QScreenOrientationChangeEvent) Orientation() uintptr {
+func (this *QScreenOrientationChangeEvent) Orientation() ScreenOrientation {
 	ret := C.QScreenOrientationChangeEvent_Orientation(this.h)
-	return (uintptr)(ret)
+	return (ScreenOrientation)(ret)
 }
 
 func (this *QScreenOrientationChangeEvent) Delete() {
@@ -2858,7 +2918,7 @@ func newQApplicationStateChangeEvent_U(h unsafe.Pointer) *QApplicationStateChang
 }
 
 // NewQApplicationStateChangeEvent constructs a new QApplicationStateChangeEvent object.
-func NewQApplicationStateChangeEvent(state uintptr) *QApplicationStateChangeEvent {
+func NewQApplicationStateChangeEvent(state ApplicationState) *QApplicationStateChangeEvent {
 	ret := C.QApplicationStateChangeEvent_new((C.uintptr_t)(state))
 	return newQApplicationStateChangeEvent(ret)
 }
@@ -2869,9 +2929,9 @@ func NewQApplicationStateChangeEvent2(param1 *QApplicationStateChangeEvent) *QAp
 	return newQApplicationStateChangeEvent(ret)
 }
 
-func (this *QApplicationStateChangeEvent) ApplicationState() uintptr {
+func (this *QApplicationStateChangeEvent) ApplicationState() ApplicationState {
 	ret := C.QApplicationStateChangeEvent_ApplicationState(this.h)
-	return (uintptr)(ret)
+	return (ApplicationState)(ret)
 }
 
 func (this *QApplicationStateChangeEvent) Delete() {
@@ -2901,13 +2961,13 @@ func newQInputMethodEvent__Attribute_U(h unsafe.Pointer) *QInputMethodEvent__Att
 }
 
 // NewQInputMethodEvent__Attribute constructs a new QInputMethodEvent::Attribute object.
-func NewQInputMethodEvent__Attribute(typ uintptr, s int, l int, val QVariant) *QInputMethodEvent__Attribute {
+func NewQInputMethodEvent__Attribute(typ QInputMethodEvent__AttributeType, s int, l int, val QVariant) *QInputMethodEvent__Attribute {
 	ret := C.QInputMethodEvent__Attribute_new((C.uintptr_t)(typ), (C.int)(s), (C.int)(l), val.cPointer())
 	return newQInputMethodEvent__Attribute(ret)
 }
 
 // NewQInputMethodEvent__Attribute2 constructs a new QInputMethodEvent::Attribute object.
-func NewQInputMethodEvent__Attribute2(typ uintptr, s int, l int) *QInputMethodEvent__Attribute {
+func NewQInputMethodEvent__Attribute2(typ QInputMethodEvent__AttributeType, s int, l int) *QInputMethodEvent__Attribute {
 	ret := C.QInputMethodEvent__Attribute_new2((C.uintptr_t)(typ), (C.int)(s), (C.int)(l))
 	return newQInputMethodEvent__Attribute(ret)
 }
@@ -2982,9 +3042,9 @@ func (this *QTouchEvent__TouchPoint) UniqueId() *QPointingDeviceUniqueId {
 	return ret1
 }
 
-func (this *QTouchEvent__TouchPoint) State() uintptr {
+func (this *QTouchEvent__TouchPoint) State() TouchPointState {
 	ret := C.QTouchEvent__TouchPoint_State(this.h)
-	return (uintptr)(ret)
+	return (TouchPointState)(ret)
 }
 
 func (this *QTouchEvent__TouchPoint) Pos() *QPointF {

qt/gen_qeventloop.go

@@ -12,6 +12,18 @@ import (
 	"unsafe"
 )
 
+type QEventLoop__ProcessEventsFlag int
+
+const (
+	QEventLoop__ProcessEventsFlag__AllEvents              QEventLoop__ProcessEventsFlag = 0
+	QEventLoop__ProcessEventsFlag__ExcludeUserInputEvents QEventLoop__ProcessEventsFlag = 1
+	QEventLoop__ProcessEventsFlag__ExcludeSocketNotifiers QEventLoop__ProcessEventsFlag = 2
+	QEventLoop__ProcessEventsFlag__WaitForMoreEvents      QEventLoop__ProcessEventsFlag = 4
+	QEventLoop__ProcessEventsFlag__X11ExcludeTimers       QEventLoop__ProcessEventsFlag = 8
+	QEventLoop__ProcessEventsFlag__EventLoopExec          QEventLoop__ProcessEventsFlag = 32
+	QEventLoop__ProcessEventsFlag__DialogExec             QEventLoop__ProcessEventsFlag = 64
+)
+
 type QEventLoop struct {
 	h *C.QEventLoop
 	*QObject

qt/gen_qeventtransition.go

@@ -42,7 +42,7 @@ func NewQEventTransition() *QEventTransition {
 }
 
 // NewQEventTransition2 constructs a new QEventTransition object.
-func NewQEventTransition2(object *QObject, typeVal uintptr) *QEventTransition {
+func NewQEventTransition2(object *QObject, typeVal QEvent__Type) *QEventTransition {
 	ret := C.QEventTransition_new2(object.cPointer(), (C.uintptr_t)(typeVal))
 	return newQEventTransition(ret)
 }
@@ -54,7 +54,7 @@ func NewQEventTransition3(sourceState *QState) *QEventTransition {
 }
 
 // NewQEventTransition4 constructs a new QEventTransition object.
-func NewQEventTransition4(object *QObject, typeVal uintptr, sourceState *QState) *QEventTransition {
+func NewQEventTransition4(object *QObject, typeVal QEvent__Type, sourceState *QState) *QEventTransition {
 	ret := C.QEventTransition_new4(object.cPointer(), (C.uintptr_t)(typeVal), sourceState.cPointer())
 	return newQEventTransition(ret)
 }
@@ -95,12 +95,12 @@ func (this *QEventTransition) SetEventSource(object *QObject) {
 	C.QEventTransition_SetEventSource(this.h, object.cPointer())
 }
 
-func (this *QEventTransition) EventType() uintptr {
+func (this *QEventTransition) EventType() QEvent__Type {
 	ret := C.QEventTransition_EventType(this.h)
-	return (uintptr)(ret)
+	return (QEvent__Type)(ret)
 }
 
-func (this *QEventTransition) SetEventType(typeVal uintptr) {
+func (this *QEventTransition) SetEventType(typeVal QEvent__Type) {
 	C.QEventTransition_SetEventType(this.h, (C.uintptr_t)(typeVal))
 }
 

qt/gen_qfiledevice.go

@@ -13,6 +13,66 @@ import (
 	"unsafe"
 )
 
+type QFileDevice__FileError int
+
+const (
+	QFileDevice__FileError__NoError          QFileDevice__FileError = 0
+	QFileDevice__FileError__ReadError        QFileDevice__FileError = 1
+	QFileDevice__FileError__WriteError       QFileDevice__FileError = 2
+	QFileDevice__FileError__FatalError       QFileDevice__FileError = 3
+	QFileDevice__FileError__ResourceError    QFileDevice__FileError = 4
+	QFileDevice__FileError__OpenError        QFileDevice__FileError = 5
+	QFileDevice__FileError__AbortError       QFileDevice__FileError = 6
+	QFileDevice__FileError__TimeOutError     QFileDevice__FileError = 7
+	QFileDevice__FileError__UnspecifiedError QFileDevice__FileError = 8
+	QFileDevice__FileError__RemoveError      QFileDevice__FileError = 9
+	QFileDevice__FileError__RenameError      QFileDevice__FileError = 10
+	QFileDevice__FileError__PositionError    QFileDevice__FileError = 11
+	QFileDevice__FileError__ResizeError      QFileDevice__FileError = 12
+	QFileDevice__FileError__PermissionsError QFileDevice__FileError = 13
+	QFileDevice__FileError__CopyError        QFileDevice__FileError = 14
+)
+
+type QFileDevice__FileTime int
+
+const (
+	QFileDevice__FileTime__FileAccessTime         QFileDevice__FileTime = 0
+	QFileDevice__FileTime__FileBirthTime          QFileDevice__FileTime = 1
+	QFileDevice__FileTime__FileMetadataChangeTime QFileDevice__FileTime = 2
+	QFileDevice__FileTime__FileModificationTime   QFileDevice__FileTime = 3
+)
+
+type QFileDevice__Permission int
+
+const (
+	QFileDevice__Permission__ReadOwner  QFileDevice__Permission = 16384
+	QFileDevice__Permission__WriteOwner QFileDevice__Permission = 8192
+	QFileDevice__Permission__ExeOwner   QFileDevice__Permission = 4096
+	QFileDevice__Permission__ReadUser   QFileDevice__Permission = 1024
+	QFileDevice__Permission__WriteUser  QFileDevice__Permission = 512
+	QFileDevice__Permission__ExeUser    QFileDevice__Permission = 256
+	QFileDevice__Permission__ReadGroup  QFileDevice__Permission = 64
+	QFileDevice__Permission__WriteGroup QFileDevice__Permission = 32
+	QFileDevice__Permission__ExeGroup   QFileDevice__Permission = 16
+	QFileDevice__Permission__ReadOther  QFileDevice__Permission = 4
+	QFileDevice__Permission__WriteOther QFileDevice__Permission = 2
+	QFileDevice__Permission__ExeOther   QFileDevice__Permission = 1
+)
+
+type QFileDevice__FileHandleFlag int
+
+const (
+	QFileDevice__FileHandleFlag__AutoCloseHandle QFileDevice__FileHandleFlag = 1
+	QFileDevice__FileHandleFlag__DontCloseHandle QFileDevice__FileHandleFlag = 0
+)
+
+type QFileDevice__MemoryMapFlags int
+
+const (
+	QFileDevice__MemoryMapFlags__NoOptions        QFileDevice__MemoryMapFlags = 0
+	QFileDevice__MemoryMapFlags__MapPrivateOption QFileDevice__MemoryMapFlags = 1
+)
+
 type QFileDevice struct {
 	h *C.QFileDevice
 	*QIODevice
@@ -63,9 +123,9 @@ func QFileDevice_TrUtf8(s string) string {
 	return ret
 }
 
-func (this *QFileDevice) Error() uintptr {
+func (this *QFileDevice) Error() QFileDevice__FileError {
 	ret := C.QFileDevice_Error(this.h)
-	return (uintptr)(ret)
+	return (QFileDevice__FileError)(ret)
 }
 
 func (this *QFileDevice) UnsetError() {
@@ -145,7 +205,7 @@ func (this *QFileDevice) Unmap(address *byte) bool {
 	return (bool)(ret)
 }
 
-func (this *QFileDevice) FileTime(time uintptr) *QDateTime {
+func (this *QFileDevice) FileTime(time QFileDevice__FileTime) *QDateTime {
 	ret := C.QFileDevice_FileTime(this.h, (C.uintptr_t)(time))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQDateTime(ret)
@@ -156,7 +216,7 @@ func (this *QFileDevice) FileTime(time uintptr) *QDateTime {
 	return ret1
 }
 
-func (this *QFileDevice) SetFileTime(newDate *QDateTime, fileTime uintptr) bool {
+func (this *QFileDevice) SetFileTime(newDate *QDateTime, fileTime QFileDevice__FileTime) bool {
 	ret := C.QFileDevice_SetFileTime(this.h, newDate.cPointer(), (C.uintptr_t)(fileTime))
 	return (bool)(ret)
 }
@@ -213,7 +273,7 @@ func QFileDevice_TrUtf83(s string, c string, n int) string {
 	return ret
 }
 
-func (this *QFileDevice) Map3(offset int64, size int64, flags uintptr) *byte {
+func (this *QFileDevice) Map3(offset int64, size int64, flags QFileDevice__MemoryMapFlags) *byte {
 	ret := C.QFileDevice_Map3(this.h, (C.longlong)(offset), (C.longlong)(size), (C.uintptr_t)(flags))
 	return (*byte)(ret)
 }

qt/gen_qfiledialog.go

@@ -14,6 +14,53 @@ import (
 	"unsafe"
 )
 
+type QFileDialog__ViewMode int
+
+const (
+	QFileDialog__ViewMode__Detail QFileDialog__ViewMode = 0
+	QFileDialog__ViewMode__List   QFileDialog__ViewMode = 1
+)
+
+type QFileDialog__FileMode int
+
+const (
+	QFileDialog__FileMode__AnyFile       QFileDialog__FileMode = 0
+	QFileDialog__FileMode__ExistingFile  QFileDialog__FileMode = 1
+	QFileDialog__FileMode__Directory     QFileDialog__FileMode = 2
+	QFileDialog__FileMode__ExistingFiles QFileDialog__FileMode = 3
+	QFileDialog__FileMode__DirectoryOnly QFileDialog__FileMode = 4
+)
+
+type QFileDialog__AcceptMode int
+
+const (
+	QFileDialog__AcceptMode__AcceptOpen QFileDialog__AcceptMode = 0
+	QFileDialog__AcceptMode__AcceptSave QFileDialog__AcceptMode = 1
+)
+
+type QFileDialog__DialogLabel int
+
+const (
+	QFileDialog__DialogLabel__LookIn   QFileDialog__DialogLabel = 0
+	QFileDialog__DialogLabel__FileName QFileDialog__DialogLabel = 1
+	QFileDialog__DialogLabel__FileType QFileDialog__DialogLabel = 2
+	QFileDialog__DialogLabel__Accept   QFileDialog__DialogLabel = 3
+	QFileDialog__DialogLabel__Reject   QFileDialog__DialogLabel = 4
+)
+
+type QFileDialog__Option int
+
+const (
+	QFileDialog__Option__ShowDirsOnly                QFileDialog__Option = 1
+	QFileDialog__Option__DontResolveSymlinks         QFileDialog__Option = 2
+	QFileDialog__Option__DontConfirmOverwrite        QFileDialog__Option = 4
+	QFileDialog__Option__DontUseSheet                QFileDialog__Option = 8
+	QFileDialog__Option__DontUseNativeDialog         QFileDialog__Option = 16
+	QFileDialog__Option__ReadOnly                    QFileDialog__Option = 32
+	QFileDialog__Option__HideNameFilterDetails       QFileDialog__Option = 64
+	QFileDialog__Option__DontUseCustomDirectoryIcons QFileDialog__Option = 128
+)
+
 type QFileDialog struct {
 	h *C.QFileDialog
 	*QDialog
@@ -300,31 +347,31 @@ func (this *QFileDialog) SetFilter(filters int) {
 	C.QFileDialog_SetFilter(this.h, (C.int)(filters))
 }
 
-func (this *QFileDialog) SetViewMode(mode uintptr) {
+func (this *QFileDialog) SetViewMode(mode QFileDialog__ViewMode) {
 	C.QFileDialog_SetViewMode(this.h, (C.uintptr_t)(mode))
 }
 
-func (this *QFileDialog) ViewMode() uintptr {
+func (this *QFileDialog) ViewMode() QFileDialog__ViewMode {
 	ret := C.QFileDialog_ViewMode(this.h)
-	return (uintptr)(ret)
+	return (QFileDialog__ViewMode)(ret)
 }
 
-func (this *QFileDialog) SetFileMode(mode uintptr) {
+func (this *QFileDialog) SetFileMode(mode QFileDialog__FileMode) {
 	C.QFileDialog_SetFileMode(this.h, (C.uintptr_t)(mode))
 }
 
-func (this *QFileDialog) FileMode() uintptr {
+func (this *QFileDialog) FileMode() QFileDialog__FileMode {
 	ret := C.QFileDialog_FileMode(this.h)
-	return (uintptr)(ret)
+	return (QFileDialog__FileMode)(ret)
 }
 
-func (this *QFileDialog) SetAcceptMode(mode uintptr) {
+func (this *QFileDialog) SetAcceptMode(mode QFileDialog__AcceptMode) {
 	C.QFileDialog_SetAcceptMode(this.h, (C.uintptr_t)(mode))
 }
 
-func (this *QFileDialog) AcceptMode() uintptr {
+func (this *QFileDialog) AcceptMode() QFileDialog__AcceptMode {
 	ret := C.QFileDialog_AcceptMode(this.h)
-	return (uintptr)(ret)
+	return (QFileDialog__AcceptMode)(ret)
 }
 
 func (this *QFileDialog) SetReadOnly(enabled bool) {
@@ -456,13 +503,13 @@ func (this *QFileDialog) IconProvider() *QFileIconProvider {
 	return newQFileIconProvider_U(unsafe.Pointer(ret))
 }
 
-func (this *QFileDialog) SetLabelText(label uintptr, text string) {
+func (this *QFileDialog) SetLabelText(label QFileDialog__DialogLabel, text string) {
 	text_Cstring := C.CString(text)
 	defer C.free(unsafe.Pointer(text_Cstring))
 	C.QFileDialog_SetLabelText(this.h, (C.uintptr_t)(label), text_Cstring, C.size_t(len(text)))
 }
 
-func (this *QFileDialog) LabelText(label uintptr) string {
+func (this *QFileDialog) LabelText(label QFileDialog__DialogLabel) string {
 	var _out *C.char = nil
 	var _out_Strlen C.int = 0
 	C.QFileDialog_LabelText(this.h, (C.uintptr_t)(label), &_out, &_out_Strlen)
@@ -510,11 +557,11 @@ func (this *QFileDialog) ProxyModel() *QAbstractProxyModel {
 	return newQAbstractProxyModel_U(unsafe.Pointer(ret))
 }
 
-func (this *QFileDialog) SetOption(option uintptr) {
+func (this *QFileDialog) SetOption(option QFileDialog__Option) {
 	C.QFileDialog_SetOption(this.h, (C.uintptr_t)(option))
 }
 
-func (this *QFileDialog) TestOption(option uintptr) bool {
+func (this *QFileDialog) TestOption(option QFileDialog__Option) bool {
 	ret := C.QFileDialog_TestOption(this.h, (C.uintptr_t)(option))
 	return (bool)(ret)
 }
@@ -809,7 +856,7 @@ func QFileDialog_TrUtf83(s string, c string, n int) string {
 	return ret
 }
 
-func (this *QFileDialog) SetOption2(option uintptr, on bool) {
+func (this *QFileDialog) SetOption2(option QFileDialog__Option, on bool) {
 	C.QFileDialog_SetOption2(this.h, (C.uintptr_t)(option), (C.bool)(on))
 }
 

qt/gen_qfileiconprovider.go

@@ -13,6 +13,24 @@ import (
 	"unsafe"
 )
 
+type QFileIconProvider__IconType int
+
+const (
+	QFileIconProvider__IconType__Computer QFileIconProvider__IconType = 0
+	QFileIconProvider__IconType__Desktop  QFileIconProvider__IconType = 1
+	QFileIconProvider__IconType__Trashcan QFileIconProvider__IconType = 2
+	QFileIconProvider__IconType__Network  QFileIconProvider__IconType = 3
+	QFileIconProvider__IconType__Drive    QFileIconProvider__IconType = 4
+	QFileIconProvider__IconType__Folder   QFileIconProvider__IconType = 5
+	QFileIconProvider__IconType__File     QFileIconProvider__IconType = 6
+)
+
+type QFileIconProvider__Option int
+
+const (
+	QFileIconProvider__Option__DontUseCustomDirectoryIcons QFileIconProvider__Option = 1
+)
+
 type QFileIconProvider struct {
 	h *C.QFileIconProvider
 }
@@ -41,7 +59,7 @@ func NewQFileIconProvider() *QFileIconProvider {
 	return newQFileIconProvider(ret)
 }
 
-func (this *QFileIconProvider) Icon(typeVal uintptr) *QIcon {
+func (this *QFileIconProvider) Icon(typeVal QFileIconProvider__IconType) *QIcon {
 	ret := C.QFileIconProvider_Icon(this.h, (C.uintptr_t)(typeVal))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQIcon(ret)

qt/gen_qfilesystemmodel.go

@@ -14,6 +14,23 @@ import (
 	"unsafe"
 )
 
+type QFileSystemModel__Roles int
+
+const (
+	QFileSystemModel__Roles__FileIconRole    QFileSystemModel__Roles = 1
+	QFileSystemModel__Roles__FilePathRole    QFileSystemModel__Roles = 257
+	QFileSystemModel__Roles__FileNameRole    QFileSystemModel__Roles = 258
+	QFileSystemModel__Roles__FilePermissions QFileSystemModel__Roles = 259
+)
+
+type QFileSystemModel__Option int
+
+const (
+	QFileSystemModel__Option__DontWatchForChanges         QFileSystemModel__Option = 1
+	QFileSystemModel__Option__DontResolveSymlinks         QFileSystemModel__Option = 2
+	QFileSystemModel__Option__DontUseCustomDirectoryIcons QFileSystemModel__Option = 4
+)
+
 type QFileSystemModel struct {
 	h *C.QFileSystemModel
 	*QAbstractItemModel
@@ -219,7 +236,7 @@ func (this *QFileSystemModel) SetData(index *QModelIndex, value *QVariant) bool
 	return (bool)(ret)
 }
 
-func (this *QFileSystemModel) HeaderData(section int, orientation uintptr) *QVariant {
+func (this *QFileSystemModel) HeaderData(section int, orientation Orientation) *QVariant {
 	ret := C.QFileSystemModel_HeaderData(this.h, (C.int)(section), (C.uintptr_t)(orientation))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQVariant(ret)
@@ -265,7 +282,7 @@ func (this *QFileSystemModel) MimeData(indexes []QModelIndex) *QMimeData {
 	return newQMimeData_U(unsafe.Pointer(ret))
 }
 
-func (this *QFileSystemModel) DropMimeData(data *QMimeData, action uintptr, row int, column int, parent *QModelIndex) bool {
+func (this *QFileSystemModel) DropMimeData(data *QMimeData, action DropAction, row int, column int, parent *QModelIndex) bool {
 	ret := C.QFileSystemModel_DropMimeData(this.h, data.cPointer(), (C.uintptr_t)(action), (C.int)(row), (C.int)(column), parent.cPointer())
 	return (bool)(ret)
 }
@@ -383,11 +400,11 @@ func (this *QFileSystemModel) NameFilters() []string {
 	return ret
 }
 
-func (this *QFileSystemModel) SetOption(option uintptr) {
+func (this *QFileSystemModel) SetOption(option QFileSystemModel__Option) {
 	C.QFileSystemModel_SetOption(this.h, (C.uintptr_t)(option))
 }
 
-func (this *QFileSystemModel) TestOption(option uintptr) bool {
+func (this *QFileSystemModel) TestOption(option QFileSystemModel__Option) bool {
 	ret := C.QFileSystemModel_TestOption(this.h, (C.uintptr_t)(option))
 	return (bool)(ret)
 }
@@ -617,7 +634,7 @@ func (this *QFileSystemModel) SetData3(index *QModelIndex, value *QVariant, role
 	return (bool)(ret)
 }
 
-func (this *QFileSystemModel) HeaderData3(section int, orientation uintptr, role int) *QVariant {
+func (this *QFileSystemModel) HeaderData3(section int, orientation Orientation, role int) *QVariant {
 	ret := C.QFileSystemModel_HeaderData3(this.h, (C.int)(section), (C.uintptr_t)(orientation), (C.int)(role))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQVariant(ret)
@@ -628,11 +645,11 @@ func (this *QFileSystemModel) HeaderData3(section int, orientation uintptr, role
 	return ret1
 }
 
-func (this *QFileSystemModel) Sort2(column int, order uintptr) {
+func (this *QFileSystemModel) Sort2(column int, order SortOrder) {
 	C.QFileSystemModel_Sort2(this.h, (C.int)(column), (C.uintptr_t)(order))
 }
 
-func (this *QFileSystemModel) SetOption2(option uintptr, on bool) {
+func (this *QFileSystemModel) SetOption2(option QFileSystemModel__Option, on bool) {
 	C.QFileSystemModel_SetOption2(this.h, (C.uintptr_t)(option), (C.bool)(on))
 }
 

qt/gen_qfont.go

@@ -13,6 +13,131 @@ import (
 	"unsafe"
 )
 
+type QFont__StyleHint int
+
+const (
+	QFont__StyleHint__Helvetica  QFont__StyleHint = 0
+	QFont__StyleHint__SansSerif  QFont__StyleHint = 0
+	QFont__StyleHint__Times      QFont__StyleHint = 1
+	QFont__StyleHint__Serif      QFont__StyleHint = 1
+	QFont__StyleHint__Courier    QFont__StyleHint = 2
+	QFont__StyleHint__TypeWriter QFont__StyleHint = 2
+	QFont__StyleHint__OldEnglish QFont__StyleHint = 3
+	QFont__StyleHint__Decorative QFont__StyleHint = 3
+	QFont__StyleHint__System     QFont__StyleHint = 4
+	QFont__StyleHint__AnyStyle   QFont__StyleHint = 5
+	QFont__StyleHint__Cursive    QFont__StyleHint = 6
+	QFont__StyleHint__Monospace  QFont__StyleHint = 7
+	QFont__StyleHint__Fantasy    QFont__StyleHint = 8
+)
+
+type QFont__StyleStrategy int
+
+const (
+	QFont__StyleStrategy__PreferDefault       QFont__StyleStrategy = 1
+	QFont__StyleStrategy__PreferBitmap        QFont__StyleStrategy = 2
+	QFont__StyleStrategy__PreferDevice        QFont__StyleStrategy = 4
+	QFont__StyleStrategy__PreferOutline       QFont__StyleStrategy = 8
+	QFont__StyleStrategy__ForceOutline        QFont__StyleStrategy = 16
+	QFont__StyleStrategy__PreferMatch         QFont__StyleStrategy = 32
+	QFont__StyleStrategy__PreferQuality       QFont__StyleStrategy = 64
+	QFont__StyleStrategy__PreferAntialias     QFont__StyleStrategy = 128
+	QFont__StyleStrategy__NoAntialias         QFont__StyleStrategy = 256
+	QFont__StyleStrategy__OpenGLCompatible    QFont__StyleStrategy = 512
+	QFont__StyleStrategy__ForceIntegerMetrics QFont__StyleStrategy = 1024
+	QFont__StyleStrategy__NoSubpixelAntialias QFont__StyleStrategy = 2048
+	QFont__StyleStrategy__PreferNoShaping     QFont__StyleStrategy = 4096
+	QFont__StyleStrategy__NoFontMerging       QFont__StyleStrategy = 32768
+)
+
+type QFont__HintingPreference int
+
+const (
+	QFont__HintingPreference__PreferDefaultHinting  QFont__HintingPreference = 0
+	QFont__HintingPreference__PreferNoHinting       QFont__HintingPreference = 1
+	QFont__HintingPreference__PreferVerticalHinting QFont__HintingPreference = 2
+	QFont__HintingPreference__PreferFullHinting     QFont__HintingPreference = 3
+)
+
+type QFont__Weight int
+
+const (
+	QFont__Weight__Thin       QFont__Weight = 0
+	QFont__Weight__ExtraLight QFont__Weight = 12
+	QFont__Weight__Light      QFont__Weight = 25
+	QFont__Weight__Normal     QFont__Weight = 50
+	QFont__Weight__Medium     QFont__Weight = 57
+	QFont__Weight__DemiBold   QFont__Weight = 63
+	QFont__Weight__Bold       QFont__Weight = 75
+	QFont__Weight__ExtraBold  QFont__Weight = 81
+	QFont__Weight__Black      QFont__Weight = 87
+)
+
+type QFont__Style int
+
+const (
+	QFont__Style__StyleNormal  QFont__Style = 0
+	QFont__Style__StyleItalic  QFont__Style = 1
+	QFont__Style__StyleOblique QFont__Style = 2
+)
+
+type QFont__Stretch int
+
+const (
+	QFont__Stretch__AnyStretch     QFont__Stretch = 0
+	QFont__Stretch__UltraCondensed QFont__Stretch = 50
+	QFont__Stretch__ExtraCondensed QFont__Stretch = 62
+	QFont__Stretch__Condensed      QFont__Stretch = 75
+	QFont__Stretch__SemiCondensed  QFont__Stretch = 87
+	QFont__Stretch__Unstretched    QFont__Stretch = 100
+	QFont__Stretch__SemiExpanded   QFont__Stretch = 112
+	QFont__Stretch__Expanded       QFont__Stretch = 125
+	QFont__Stretch__ExtraExpanded  QFont__Stretch = 150
+	QFont__Stretch__UltraExpanded  QFont__Stretch = 200
+)
+
+type QFont__Capitalization int
+
+const (
+	QFont__Capitalization__MixedCase    QFont__Capitalization = 0
+	QFont__Capitalization__AllUppercase QFont__Capitalization = 1
+	QFont__Capitalization__AllLowercase QFont__Capitalization = 2
+	QFont__Capitalization__SmallCaps    QFont__Capitalization = 3
+	QFont__Capitalization__Capitalize   QFont__Capitalization = 4
+)
+
+type QFont__SpacingType int
+
+const (
+	QFont__SpacingType__PercentageSpacing QFont__SpacingType = 0
+	QFont__SpacingType__AbsoluteSpacing   QFont__SpacingType = 1
+)
+
+type QFont__ResolveProperties int
+
+const (
+	QFont__ResolveProperties__NoPropertiesResolved      QFont__ResolveProperties = 0
+	QFont__ResolveProperties__FamilyResolved            QFont__ResolveProperties = 1
+	QFont__ResolveProperties__SizeResolved              QFont__ResolveProperties = 2
+	QFont__ResolveProperties__StyleHintResolved         QFont__ResolveProperties = 4
+	QFont__ResolveProperties__StyleStrategyResolved     QFont__ResolveProperties = 8
+	QFont__ResolveProperties__WeightResolved            QFont__ResolveProperties = 16
+	QFont__ResolveProperties__StyleResolved             QFont__ResolveProperties = 32
+	QFont__ResolveProperties__UnderlineResolved         QFont__ResolveProperties = 64
+	QFont__ResolveProperties__OverlineResolved          QFont__ResolveProperties = 128
+	QFont__ResolveProperties__StrikeOutResolved         QFont__ResolveProperties = 256
+	QFont__ResolveProperties__FixedPitchResolved        QFont__ResolveProperties = 512
+	QFont__ResolveProperties__StretchResolved           QFont__ResolveProperties = 1024
+	QFont__ResolveProperties__KerningResolved           QFont__ResolveProperties = 2048
+	QFont__ResolveProperties__CapitalizationResolved    QFont__ResolveProperties = 4096
+	QFont__ResolveProperties__LetterSpacingResolved     QFont__ResolveProperties = 8192
+	QFont__ResolveProperties__WordSpacingResolved       QFont__ResolveProperties = 16384
+	QFont__ResolveProperties__HintingPreferenceResolved QFont__ResolveProperties = 32768
+	QFont__ResolveProperties__StyleNameResolved         QFont__ResolveProperties = 65536
+	QFont__ResolveProperties__FamiliesResolved          QFont__ResolveProperties = 131072
+	QFont__ResolveProperties__AllPropertiesResolved     QFont__ResolveProperties = 262143
+)
+
 type QFont struct {
 	h *C.QFont
 }
@@ -200,13 +325,13 @@ func (this *QFont) SetBold(bold bool) {
 	C.QFont_SetBold(this.h, (C.bool)(bold))
 }
 
-func (this *QFont) SetStyle(style uintptr) {
+func (this *QFont) SetStyle(style QFont__Style) {
 	C.QFont_SetStyle(this.h, (C.uintptr_t)(style))
 }
 
-func (this *QFont) Style() uintptr {
+func (this *QFont) Style() QFont__Style {
 	ret := C.QFont_Style(this.h)
-	return (uintptr)(ret)
+	return (QFont__Style)(ret)
 }
 
 func (this *QFont) Italic() bool {
@@ -263,21 +388,21 @@ func (this *QFont) SetKerning(kerning bool) {
 	C.QFont_SetKerning(this.h, (C.bool)(kerning))
 }
 
-func (this *QFont) StyleHint() uintptr {
+func (this *QFont) StyleHint() QFont__StyleHint {
 	ret := C.QFont_StyleHint(this.h)
-	return (uintptr)(ret)
+	return (QFont__StyleHint)(ret)
 }
 
-func (this *QFont) StyleStrategy() uintptr {
+func (this *QFont) StyleStrategy() QFont__StyleStrategy {
 	ret := C.QFont_StyleStrategy(this.h)
-	return (uintptr)(ret)
+	return (QFont__StyleStrategy)(ret)
 }
 
-func (this *QFont) SetStyleHint(param1 uintptr) {
+func (this *QFont) SetStyleHint(param1 QFont__StyleHint) {
 	C.QFont_SetStyleHint(this.h, (C.uintptr_t)(param1))
 }
 
-func (this *QFont) SetStyleStrategy(s uintptr) {
+func (this *QFont) SetStyleStrategy(s QFont__StyleStrategy) {
 	C.QFont_SetStyleStrategy(this.h, (C.uintptr_t)(s))
 }
 
@@ -295,12 +420,12 @@ func (this *QFont) LetterSpacing() float64 {
 	return (float64)(ret)
 }
 
-func (this *QFont) LetterSpacingType() uintptr {
+func (this *QFont) LetterSpacingType() QFont__SpacingType {
 	ret := C.QFont_LetterSpacingType(this.h)
-	return (uintptr)(ret)
+	return (QFont__SpacingType)(ret)
 }
 
-func (this *QFont) SetLetterSpacing(typeVal uintptr, spacing float64) {
+func (this *QFont) SetLetterSpacing(typeVal QFont__SpacingType, spacing float64) {
 	C.QFont_SetLetterSpacing(this.h, (C.uintptr_t)(typeVal), (C.double)(spacing))
 }
 
@@ -313,22 +438,22 @@ func (this *QFont) SetWordSpacing(spacing float64) {
 	C.QFont_SetWordSpacing(this.h, (C.double)(spacing))
 }
 
-func (this *QFont) SetCapitalization(capitalization uintptr) {
+func (this *QFont) SetCapitalization(capitalization QFont__Capitalization) {
 	C.QFont_SetCapitalization(this.h, (C.uintptr_t)(capitalization))
 }
 
-func (this *QFont) Capitalization() uintptr {
+func (this *QFont) Capitalization() QFont__Capitalization {
 	ret := C.QFont_Capitalization(this.h)
-	return (uintptr)(ret)
+	return (QFont__Capitalization)(ret)
 }
 
-func (this *QFont) SetHintingPreference(hintingPreference uintptr) {
+func (this *QFont) SetHintingPreference(hintingPreference QFont__HintingPreference) {
 	C.QFont_SetHintingPreference(this.h, (C.uintptr_t)(hintingPreference))
 }
 
-func (this *QFont) HintingPreference() uintptr {
+func (this *QFont) HintingPreference() QFont__HintingPreference {
 	ret := C.QFont_HintingPreference(this.h)
-	return (uintptr)(ret)
+	return (QFont__HintingPreference)(ret)
 }
 
 func (this *QFont) RawMode() bool {
@@ -542,7 +667,7 @@ func (this *QFont) ResolveWithMask(mask uint) {
 	C.QFont_ResolveWithMask(this.h, (C.uint)(mask))
 }
 
-func (this *QFont) SetStyleHint2(param1 uintptr, param2 uintptr) {
+func (this *QFont) SetStyleHint2(param1 QFont__StyleHint, param2 QFont__StyleStrategy) {
 	C.QFont_SetStyleHint2(this.h, (C.uintptr_t)(param1), (C.uintptr_t)(param2))
 }
 

qt/gen_qfontcombobox.go

@@ -14,6 +14,16 @@ import (
 	"unsafe"
 )
 
+type QFontComboBox__FontFilter int
+
+const (
+	QFontComboBox__FontFilter__AllFonts          QFontComboBox__FontFilter = 0
+	QFontComboBox__FontFilter__ScalableFonts     QFontComboBox__FontFilter = 1
+	QFontComboBox__FontFilter__NonScalableFonts  QFontComboBox__FontFilter = 2
+	QFontComboBox__FontFilter__MonospacedFonts   QFontComboBox__FontFilter = 4
+	QFontComboBox__FontFilter__ProportionalFonts QFontComboBox__FontFilter = 8
+)
+
 type QFontComboBox struct {
 	h *C.QFontComboBox
 	*QComboBox
@@ -76,13 +86,13 @@ func QFontComboBox_TrUtf8(s string) string {
 	return ret
 }
 
-func (this *QFontComboBox) SetWritingSystem(writingSystem uintptr) {
+func (this *QFontComboBox) SetWritingSystem(writingSystem QFontDatabase__WritingSystem) {
 	C.QFontComboBox_SetWritingSystem(this.h, (C.uintptr_t)(writingSystem))
 }
 
-func (this *QFontComboBox) WritingSystem() uintptr {
+func (this *QFontComboBox) WritingSystem() QFontDatabase__WritingSystem {
 	ret := C.QFontComboBox_WritingSystem(this.h)
-	return (uintptr)(ret)
+	return (QFontDatabase__WritingSystem)(ret)
 }
 
 func (this *QFontComboBox) SetFontFilters(filters int) {

qt/gen_qfontdatabase.go

@@ -13,6 +13,56 @@ import (
 	"unsafe"
 )
 
+type QFontDatabase__WritingSystem int
+
+const (
+	QFontDatabase__WritingSystem__Any                 QFontDatabase__WritingSystem = 0
+	QFontDatabase__WritingSystem__Latin               QFontDatabase__WritingSystem = 1
+	QFontDatabase__WritingSystem__Greek               QFontDatabase__WritingSystem = 2
+	QFontDatabase__WritingSystem__Cyrillic            QFontDatabase__WritingSystem = 3
+	QFontDatabase__WritingSystem__Armenian            QFontDatabase__WritingSystem = 4
+	QFontDatabase__WritingSystem__Hebrew              QFontDatabase__WritingSystem = 5
+	QFontDatabase__WritingSystem__Arabic              QFontDatabase__WritingSystem = 6
+	QFontDatabase__WritingSystem__Syriac              QFontDatabase__WritingSystem = 7
+	QFontDatabase__WritingSystem__Thaana              QFontDatabase__WritingSystem = 8
+	QFontDatabase__WritingSystem__Devanagari          QFontDatabase__WritingSystem = 9
+	QFontDatabase__WritingSystem__Bengali             QFontDatabase__WritingSystem = 10
+	QFontDatabase__WritingSystem__Gurmukhi            QFontDatabase__WritingSystem = 11
+	QFontDatabase__WritingSystem__Gujarati            QFontDatabase__WritingSystem = 12
+	QFontDatabase__WritingSystem__Oriya               QFontDatabase__WritingSystem = 13
+	QFontDatabase__WritingSystem__Tamil               QFontDatabase__WritingSystem = 14
+	QFontDatabase__WritingSystem__Telugu              QFontDatabase__WritingSystem = 15
+	QFontDatabase__WritingSystem__Kannada             QFontDatabase__WritingSystem = 16
+	QFontDatabase__WritingSystem__Malayalam           QFontDatabase__WritingSystem = 17
+	QFontDatabase__WritingSystem__Sinhala             QFontDatabase__WritingSystem = 18
+	QFontDatabase__WritingSystem__Thai                QFontDatabase__WritingSystem = 19
+	QFontDatabase__WritingSystem__Lao                 QFontDatabase__WritingSystem = 20
+	QFontDatabase__WritingSystem__Tibetan             QFontDatabase__WritingSystem = 21
+	QFontDatabase__WritingSystem__Myanmar             QFontDatabase__WritingSystem = 22
+	QFontDatabase__WritingSystem__Georgian            QFontDatabase__WritingSystem = 23
+	QFontDatabase__WritingSystem__Khmer               QFontDatabase__WritingSystem = 24
+	QFontDatabase__WritingSystem__SimplifiedChinese   QFontDatabase__WritingSystem = 25
+	QFontDatabase__WritingSystem__TraditionalChinese  QFontDatabase__WritingSystem = 26
+	QFontDatabase__WritingSystem__Japanese            QFontDatabase__WritingSystem = 27
+	QFontDatabase__WritingSystem__Korean              QFontDatabase__WritingSystem = 28
+	QFontDatabase__WritingSystem__Vietnamese          QFontDatabase__WritingSystem = 29
+	QFontDatabase__WritingSystem__Symbol              QFontDatabase__WritingSystem = 30
+	QFontDatabase__WritingSystem__Other               QFontDatabase__WritingSystem = 30
+	QFontDatabase__WritingSystem__Ogham               QFontDatabase__WritingSystem = 31
+	QFontDatabase__WritingSystem__Runic               QFontDatabase__WritingSystem = 32
+	QFontDatabase__WritingSystem__Nko                 QFontDatabase__WritingSystem = 33
+	QFontDatabase__WritingSystem__WritingSystemsCount QFontDatabase__WritingSystem = 34
+)
+
+type QFontDatabase__SystemFont int
+
+const (
+	QFontDatabase__SystemFont__GeneralFont          QFontDatabase__SystemFont = 0
+	QFontDatabase__SystemFont__FixedFont            QFontDatabase__SystemFont = 1
+	QFontDatabase__SystemFont__TitleFont            QFontDatabase__SystemFont = 2
+	QFontDatabase__SystemFont__SmallestReadableFont QFontDatabase__SystemFont = 3
+)
+
 type QFontDatabase struct {
 	h *C.QFontDatabase
 }
@@ -54,29 +104,29 @@ func QFontDatabase_StandardSizes() []int {
 	return ret
 }
 
-func (this *QFontDatabase) WritingSystems() []uintptr {
+func (this *QFontDatabase) WritingSystems() []QFontDatabase__WritingSystem {
 	var _out *C.uintptr_t = nil
 	var _out_len C.size_t = 0
 	C.QFontDatabase_WritingSystems(this.h, &_out, &_out_len)
-	ret := make([]uintptr, int(_out_len))
+	ret := make([]QFontDatabase__WritingSystem, int(_out_len))
 	_outCast := (*[0xffff]C.uintptr_t)(unsafe.Pointer(_out)) // mrs jackson
 	for i := 0; i < int(_out_len); i++ {
-		ret[i] = (uintptr)(_outCast[i])
+		ret[i] = (QFontDatabase__WritingSystem)(_outCast[i])
 	}
 	C.free(unsafe.Pointer(_out))
 	return ret
 }
 
-func (this *QFontDatabase) WritingSystemsWithFamily(family string) []uintptr {
+func (this *QFontDatabase) WritingSystemsWithFamily(family string) []QFontDatabase__WritingSystem {
 	family_Cstring := C.CString(family)
 	defer C.free(unsafe.Pointer(family_Cstring))
 	var _out *C.uintptr_t = nil
 	var _out_len C.size_t = 0
 	C.QFontDatabase_WritingSystemsWithFamily(this.h, family_Cstring, C.size_t(len(family)), &_out, &_out_len)
-	ret := make([]uintptr, int(_out_len))
+	ret := make([]QFontDatabase__WritingSystem, int(_out_len))
 	_outCast := (*[0xffff]C.uintptr_t)(unsafe.Pointer(_out)) // mrs jackson
 	for i := 0; i < int(_out_len); i++ {
-		ret[i] = (uintptr)(_outCast[i])
+		ret[i] = (QFontDatabase__WritingSystem)(_outCast[i])
 	}
 	C.free(unsafe.Pointer(_out))
 	return ret
@@ -248,7 +298,7 @@ func (this *QFontDatabase) IsPrivateFamily(family string) bool {
 	return (bool)(ret)
 }
 
-func QFontDatabase_WritingSystemName(writingSystem uintptr) string {
+func QFontDatabase_WritingSystemName(writingSystem QFontDatabase__WritingSystem) string {
 	var _out *C.char = nil
 	var _out_Strlen C.int = 0
 	C.QFontDatabase_WritingSystemName((C.uintptr_t)(writingSystem), &_out, &_out_Strlen)
@@ -257,7 +307,7 @@ func QFontDatabase_WritingSystemName(writingSystem uintptr) string {
 	return ret
 }
 
-func QFontDatabase_WritingSystemSample(writingSystem uintptr) string {
+func QFontDatabase_WritingSystemSample(writingSystem QFontDatabase__WritingSystem) string {
 	var _out *C.char = nil
 	var _out_Strlen C.int = 0
 	C.QFontDatabase_WritingSystemSample((C.uintptr_t)(writingSystem), &_out, &_out_Strlen)
@@ -308,7 +358,7 @@ func QFontDatabase_SupportsThreadedFontRendering() bool {
 	return (bool)(ret)
 }
 
-func QFontDatabase_SystemFont(typeVal uintptr) *QFont {
+func QFontDatabase_SystemFont(typeVal QFontDatabase__SystemFont) *QFont {
 	ret := C.QFontDatabase_SystemFont((C.uintptr_t)(typeVal))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQFont(ret)
@@ -319,7 +369,7 @@ func QFontDatabase_SystemFont(typeVal uintptr) *QFont {
 	return ret1
 }
 
-func (this *QFontDatabase) Families1(writingSystem uintptr) []string {
+func (this *QFontDatabase) Families1(writingSystem QFontDatabase__WritingSystem) []string {
 	var _out **C.char = nil
 	var _out_Lengths *C.int = nil
 	var _out_len C.size_t = 0

qt/gen_qfontdialog.go

@@ -14,6 +14,17 @@ import (
 	"unsafe"
 )
 
+type QFontDialog__FontDialogOption int
+
+const (
+	QFontDialog__FontDialogOption__NoButtons           QFontDialog__FontDialogOption = 1
+	QFontDialog__FontDialogOption__DontUseNativeDialog QFontDialog__FontDialogOption = 2
+	QFontDialog__FontDialogOption__ScalableFonts       QFontDialog__FontDialogOption = 4
+	QFontDialog__FontDialogOption__NonScalableFonts    QFontDialog__FontDialogOption = 8
+	QFontDialog__FontDialogOption__MonospacedFonts     QFontDialog__FontDialogOption = 16
+	QFontDialog__FontDialogOption__ProportionalFonts   QFontDialog__FontDialogOption = 32
+)
+
 type QFontDialog struct {
 	h *C.QFontDialog
 	*QDialog
@@ -114,11 +125,11 @@ func (this *QFontDialog) SelectedFont() *QFont {
 	return ret1
 }
 
-func (this *QFontDialog) SetOption(option uintptr) {
+func (this *QFontDialog) SetOption(option QFontDialog__FontDialogOption) {
 	C.QFontDialog_SetOption(this.h, (C.uintptr_t)(option))
 }
 
-func (this *QFontDialog) TestOption(option uintptr) bool {
+func (this *QFontDialog) TestOption(option QFontDialog__FontDialogOption) bool {
 	ret := C.QFontDialog_TestOption(this.h, (C.uintptr_t)(option))
 	return (bool)(ret)
 }
@@ -234,7 +245,7 @@ func QFontDialog_TrUtf83(s string, c string, n int) string {
 	return ret
 }
 
-func (this *QFontDialog) SetOption2(option uintptr, on bool) {
+func (this *QFontDialog) SetOption2(option QFontDialog__FontDialogOption, on bool) {
 	C.QFontDialog_SetOption2(this.h, (C.uintptr_t)(option), (C.bool)(on))
 }
 

qt/gen_qfontinfo.go

@@ -92,9 +92,9 @@ func (this *QFontInfo) Italic() bool {
 	return (bool)(ret)
 }
 
-func (this *QFontInfo) Style() uintptr {
+func (this *QFontInfo) Style() QFont__Style {
 	ret := C.QFontInfo_Style(this.h)
-	return (uintptr)(ret)
+	return (QFont__Style)(ret)
 }
 
 func (this *QFontInfo) Weight() int {
@@ -127,9 +127,9 @@ func (this *QFontInfo) FixedPitch() bool {
 	return (bool)(ret)
 }
 
-func (this *QFontInfo) StyleHint() uintptr {
+func (this *QFontInfo) StyleHint() QFont__StyleHint {
 	ret := C.QFontInfo_StyleHint(this.h)
-	return (uintptr)(ret)
+	return (QFont__StyleHint)(ret)
 }
 
 func (this *QFontInfo) RawMode() bool {

qt/gen_qfontmetrics.go

@@ -250,7 +250,7 @@ func (this *QFontMetrics) TightBoundingRect(text string) *QRect {
 	return ret1
 }
 
-func (this *QFontMetrics) ElidedText(text string, mode uintptr, width int) string {
+func (this *QFontMetrics) ElidedText(text string, mode TextElideMode, width int) string {
 	text_Cstring := C.CString(text)
 	defer C.free(unsafe.Pointer(text_Cstring))
 	var _out *C.char = nil
@@ -388,7 +388,7 @@ func (this *QFontMetrics) Size4(flags int, str string, tabstops int, tabarray *i
 	return ret1
 }
 
-func (this *QFontMetrics) ElidedText4(text string, mode uintptr, width int, flags int) string {
+func (this *QFontMetrics) ElidedText4(text string, mode TextElideMode, width int, flags int) string {
 	text_Cstring := C.CString(text)
 	defer C.free(unsafe.Pointer(text_Cstring))
 	var _out *C.char = nil
@@ -623,7 +623,7 @@ func (this *QFontMetricsF) TightBoundingRect(text string) *QRectF {
 	return ret1
 }
 
-func (this *QFontMetricsF) ElidedText(text string, mode uintptr, width float64) string {
+func (this *QFontMetricsF) ElidedText(text string, mode TextElideMode, width float64) string {
 	text_Cstring := C.CString(text)
 	defer C.free(unsafe.Pointer(text_Cstring))
 	var _out *C.char = nil
@@ -728,7 +728,7 @@ func (this *QFontMetricsF) Size4(flags int, str string, tabstops int, tabarray *
 	return ret1
 }
 
-func (this *QFontMetricsF) ElidedText4(text string, mode uintptr, width float64, flags int) string {
+func (this *QFontMetricsF) ElidedText4(text string, mode TextElideMode, width float64, flags int) string {
 	text_Cstring := C.CString(text)
 	defer C.free(unsafe.Pointer(text_Cstring))
 	var _out *C.char = nil

qt/gen_qformlayout.go

@@ -13,6 +13,30 @@ import (
 	"unsafe"
 )
 
+type QFormLayout__FieldGrowthPolicy int
+
+const (
+	QFormLayout__FieldGrowthPolicy__FieldsStayAtSizeHint  QFormLayout__FieldGrowthPolicy = 0
+	QFormLayout__FieldGrowthPolicy__ExpandingFieldsGrow   QFormLayout__FieldGrowthPolicy = 1
+	QFormLayout__FieldGrowthPolicy__AllNonFixedFieldsGrow QFormLayout__FieldGrowthPolicy = 2
+)
+
+type QFormLayout__RowWrapPolicy int
+
+const (
+	QFormLayout__RowWrapPolicy__DontWrapRows QFormLayout__RowWrapPolicy = 0
+	QFormLayout__RowWrapPolicy__WrapLongRows QFormLayout__RowWrapPolicy = 1
+	QFormLayout__RowWrapPolicy__WrapAllRows  QFormLayout__RowWrapPolicy = 2
+)
+
+type QFormLayout__ItemRole int
+
+const (
+	QFormLayout__ItemRole__LabelRole    QFormLayout__ItemRole = 0
+	QFormLayout__ItemRole__FieldRole    QFormLayout__ItemRole = 1
+	QFormLayout__ItemRole__SpanningRole QFormLayout__ItemRole = 2
+)
+
 type QFormLayout struct {
 	h *C.QFormLayout
 	*QLayout
@@ -75,13 +99,13 @@ func QFormLayout_TrUtf8(s string) string {
 	return ret
 }
 
-func (this *QFormLayout) SetFieldGrowthPolicy(policy uintptr) {
+func (this *QFormLayout) SetFieldGrowthPolicy(policy QFormLayout__FieldGrowthPolicy) {
 	C.QFormLayout_SetFieldGrowthPolicy(this.h, (C.uintptr_t)(policy))
 }
 
-func (this *QFormLayout) FieldGrowthPolicy() uintptr {
+func (this *QFormLayout) FieldGrowthPolicy() QFormLayout__FieldGrowthPolicy {
 	ret := C.QFormLayout_FieldGrowthPolicy(this.h)
-	return (uintptr)(ret)
+	return (QFormLayout__FieldGrowthPolicy)(ret)
 }
 
 func (this *QFormLayout) SetRowWrapPolicy(policy int) {

qt/gen_qframe.go

@@ -13,6 +13,33 @@ import (
 	"unsafe"
 )
 
+type QFrame__Shape int
+
+const (
+	QFrame__Shape__NoFrame     QFrame__Shape = 0
+	QFrame__Shape__Box         QFrame__Shape = 1
+	QFrame__Shape__Panel       QFrame__Shape = 2
+	QFrame__Shape__WinPanel    QFrame__Shape = 3
+	QFrame__Shape__HLine       QFrame__Shape = 4
+	QFrame__Shape__VLine       QFrame__Shape = 5
+	QFrame__Shape__StyledPanel QFrame__Shape = 6
+)
+
+type QFrame__Shadow int
+
+const (
+	QFrame__Shadow__Plain  QFrame__Shadow = 16
+	QFrame__Shadow__Raised QFrame__Shadow = 32
+	QFrame__Shadow__Sunken QFrame__Shadow = 48
+)
+
+type QFrame__StyleMask int
+
+const (
+	QFrame__StyleMask__Shadow_Mask QFrame__StyleMask = 240
+	QFrame__StyleMask__Shape_Mask  QFrame__StyleMask = 15
+)
+
 type QFrame struct {
 	h *C.QFrame
 	*QWidget
@@ -106,21 +133,21 @@ func (this *QFrame) SizeHint() *QSize {
 	return ret1
 }
 
-func (this *QFrame) FrameShape() uintptr {
+func (this *QFrame) FrameShape() QFrame__Shape {
 	ret := C.QFrame_FrameShape(this.h)
-	return (uintptr)(ret)
+	return (QFrame__Shape)(ret)
 }
 
-func (this *QFrame) SetFrameShape(frameShape uintptr) {
+func (this *QFrame) SetFrameShape(frameShape QFrame__Shape) {
 	C.QFrame_SetFrameShape(this.h, (C.uintptr_t)(frameShape))
 }
 
-func (this *QFrame) FrameShadow() uintptr {
+func (this *QFrame) FrameShadow() QFrame__Shadow {
 	ret := C.QFrame_FrameShadow(this.h)
-	return (uintptr)(ret)
+	return (QFrame__Shadow)(ret)
 }
 
-func (this *QFrame) SetFrameShadow(frameShadow uintptr) {
+func (this *QFrame) SetFrameShadow(frameShadow QFrame__Shadow) {
 	C.QFrame_SetFrameShadow(this.h, (C.uintptr_t)(frameShadow))
 }
 

qt/gen_qfutureinterface.go

@@ -12,6 +12,18 @@ import (
 	"unsafe"
 )
 
+type QFutureInterfaceBase__State int
+
+const (
+	QFutureInterfaceBase__State__NoState   QFutureInterfaceBase__State = 0
+	QFutureInterfaceBase__State__Running   QFutureInterfaceBase__State = 1
+	QFutureInterfaceBase__State__Started   QFutureInterfaceBase__State = 2
+	QFutureInterfaceBase__State__Finished  QFutureInterfaceBase__State = 4
+	QFutureInterfaceBase__State__Canceled  QFutureInterfaceBase__State = 8
+	QFutureInterfaceBase__State__Paused    QFutureInterfaceBase__State = 16
+	QFutureInterfaceBase__State__Throttled QFutureInterfaceBase__State = 32
+)
+
 type QFutureInterfaceBase struct {
 	h *C.QFutureInterfaceBase
 }
@@ -47,7 +59,7 @@ func NewQFutureInterfaceBase2(other *QFutureInterfaceBase) *QFutureInterfaceBase
 }
 
 // NewQFutureInterfaceBase3 constructs a new QFutureInterfaceBase object.
-func NewQFutureInterfaceBase3(initialState uintptr) *QFutureInterfaceBase {
+func NewQFutureInterfaceBase3(initialState QFutureInterfaceBase__State) *QFutureInterfaceBase {
 	ret := C.QFutureInterfaceBase_new3((C.uintptr_t)(initialState))
 	return newQFutureInterfaceBase(ret)
 }
@@ -137,7 +149,7 @@ func (this *QFutureInterfaceBase) ResultCount() int {
 	return (int)(ret)
 }
 
-func (this *QFutureInterfaceBase) QueryState(state uintptr) bool {
+func (this *QFutureInterfaceBase) QueryState(state QFutureInterfaceBase__State) bool {
 	ret := C.QFutureInterfaceBase_QueryState(this.h, (C.uintptr_t)(state))
 	return (bool)(ret)
 }

qt/gen_qgesture.go

@@ -13,6 +13,31 @@ import (
 	"unsafe"
 )
 
+type QGesture__GestureCancelPolicy int
+
+const (
+	QGesture__GestureCancelPolicy__CancelNone         QGesture__GestureCancelPolicy = 0
+	QGesture__GestureCancelPolicy__CancelAllInContext QGesture__GestureCancelPolicy = 1
+)
+
+type QPinchGesture__ChangeFlag int
+
+const (
+	QPinchGesture__ChangeFlag__ScaleFactorChanged   QPinchGesture__ChangeFlag = 1
+	QPinchGesture__ChangeFlag__RotationAngleChanged QPinchGesture__ChangeFlag = 2
+	QPinchGesture__ChangeFlag__CenterPointChanged   QPinchGesture__ChangeFlag = 4
+)
+
+type QSwipeGesture__SwipeDirection int
+
+const (
+	QSwipeGesture__SwipeDirection__NoDirection QSwipeGesture__SwipeDirection = 0
+	QSwipeGesture__SwipeDirection__Left        QSwipeGesture__SwipeDirection = 1
+	QSwipeGesture__SwipeDirection__Right       QSwipeGesture__SwipeDirection = 2
+	QSwipeGesture__SwipeDirection__Up          QSwipeGesture__SwipeDirection = 3
+	QSwipeGesture__SwipeDirection__Down        QSwipeGesture__SwipeDirection = 4
+)
+
 type QGesture struct {
 	h *C.QGesture
 	*QObject
@@ -75,14 +100,14 @@ func QGesture_TrUtf8(s string) string {
 	return ret
 }
 
-func (this *QGesture) GestureType() uintptr {
+func (this *QGesture) GestureType() GestureType {
 	ret := C.QGesture_GestureType(this.h)
-	return (uintptr)(ret)
+	return (GestureType)(ret)
 }
 
-func (this *QGesture) State() uintptr {
+func (this *QGesture) State() GestureState {
 	ret := C.QGesture_State(this.h)
-	return (uintptr)(ret)
+	return (GestureState)(ret)
 }
 
 func (this *QGesture) HotSpot() *QPointF {
@@ -109,13 +134,13 @@ func (this *QGesture) UnsetHotSpot() {
 	C.QGesture_UnsetHotSpot(this.h)
 }
 
-func (this *QGesture) SetGestureCancelPolicy(policy uintptr) {
+func (this *QGesture) SetGestureCancelPolicy(policy QGesture__GestureCancelPolicy) {
 	C.QGesture_SetGestureCancelPolicy(this.h, (C.uintptr_t)(policy))
 }
 
-func (this *QGesture) GestureCancelPolicy() uintptr {
+func (this *QGesture) GestureCancelPolicy() QGesture__GestureCancelPolicy {
 	ret := C.QGesture_GestureCancelPolicy(this.h)
-	return (uintptr)(ret)
+	return (QGesture__GestureCancelPolicy)(ret)
 }
 
 func QGesture_Tr2(s string, c string) string {
@@ -639,14 +664,14 @@ func QSwipeGesture_TrUtf8(s string) string {
 	return ret
 }
 
-func (this *QSwipeGesture) HorizontalDirection() uintptr {
+func (this *QSwipeGesture) HorizontalDirection() QSwipeGesture__SwipeDirection {
 	ret := C.QSwipeGesture_HorizontalDirection(this.h)
-	return (uintptr)(ret)
+	return (QSwipeGesture__SwipeDirection)(ret)
 }
 
-func (this *QSwipeGesture) VerticalDirection() uintptr {
+func (this *QSwipeGesture) VerticalDirection() QSwipeGesture__SwipeDirection {
 	ret := C.QSwipeGesture_VerticalDirection(this.h)
-	return (uintptr)(ret)
+	return (QSwipeGesture__SwipeDirection)(ret)
 }
 
 func (this *QSwipeGesture) SwipeAngle() float64 {
@@ -1043,7 +1068,7 @@ func (this *QGestureEvent) Gestures() []*QGesture {
 	return ret
 }
 
-func (this *QGestureEvent) Gesture(typeVal uintptr) *QGesture {
+func (this *QGestureEvent) Gesture(typeVal GestureType) *QGesture {
 	ret := C.QGestureEvent_Gesture(this.h, (C.uintptr_t)(typeVal))
 	return newQGesture_U(unsafe.Pointer(ret))
 }
@@ -1091,19 +1116,19 @@ func (this *QGestureEvent) IsAccepted(param1 *QGesture) bool {
 	return (bool)(ret)
 }
 
-func (this *QGestureEvent) SetAccepted2(param1 uintptr, param2 bool) {
+func (this *QGestureEvent) SetAccepted2(param1 GestureType, param2 bool) {
 	C.QGestureEvent_SetAccepted2(this.h, (C.uintptr_t)(param1), (C.bool)(param2))
 }
 
-func (this *QGestureEvent) AcceptWithQtGestureType(param1 uintptr) {
+func (this *QGestureEvent) AcceptWithQtGestureType(param1 GestureType) {
 	C.QGestureEvent_AcceptWithQtGestureType(this.h, (C.uintptr_t)(param1))
 }
 
-func (this *QGestureEvent) IgnoreWithQtGestureType(param1 uintptr) {
+func (this *QGestureEvent) IgnoreWithQtGestureType(param1 GestureType) {
 	C.QGestureEvent_IgnoreWithQtGestureType(this.h, (C.uintptr_t)(param1))
 }
 
-func (this *QGestureEvent) IsAcceptedWithQtGestureType(param1 uintptr) bool {
+func (this *QGestureEvent) IsAcceptedWithQtGestureType(param1 GestureType) bool {
 	ret := C.QGestureEvent_IsAcceptedWithQtGestureType(this.h, (C.uintptr_t)(param1))
 	return (bool)(ret)
 }

qt/gen_qgesturerecognizer.go

@@ -12,6 +12,19 @@ import (
 	"unsafe"
 )
 
+type QGestureRecognizer__ResultFlag int
+
+const (
+	QGestureRecognizer__ResultFlag__Ignore           QGestureRecognizer__ResultFlag = 1
+	QGestureRecognizer__ResultFlag__MayBeGesture     QGestureRecognizer__ResultFlag = 2
+	QGestureRecognizer__ResultFlag__TriggerGesture   QGestureRecognizer__ResultFlag = 4
+	QGestureRecognizer__ResultFlag__FinishGesture    QGestureRecognizer__ResultFlag = 8
+	QGestureRecognizer__ResultFlag__CancelGesture    QGestureRecognizer__ResultFlag = 16
+	QGestureRecognizer__ResultFlag__ResultState_Mask QGestureRecognizer__ResultFlag = 255
+	QGestureRecognizer__ResultFlag__ConsumeEventHint QGestureRecognizer__ResultFlag = 256
+	QGestureRecognizer__ResultFlag__ResultHint_Mask  QGestureRecognizer__ResultFlag = 65280
+)
+
 type QGestureRecognizer struct {
 	h *C.QGestureRecognizer
 }
@@ -48,12 +61,12 @@ func (this *QGestureRecognizer) Reset(state *QGesture) {
 	C.QGestureRecognizer_Reset(this.h, state.cPointer())
 }
 
-func QGestureRecognizer_RegisterRecognizer(recognizer *QGestureRecognizer) uintptr {
+func QGestureRecognizer_RegisterRecognizer(recognizer *QGestureRecognizer) GestureType {
 	ret := C.QGestureRecognizer_RegisterRecognizer(recognizer.cPointer())
-	return (uintptr)(ret)
+	return (GestureType)(ret)
 }
 
-func QGestureRecognizer_UnregisterRecognizer(typeVal uintptr) {
+func QGestureRecognizer_UnregisterRecognizer(typeVal GestureType) {
 	C.QGestureRecognizer_UnregisterRecognizer((C.uintptr_t)(typeVal))
 }
 

qt/gen_qglyphrun.go

@@ -13,6 +13,16 @@ import (
 	"unsafe"
 )
 
+type QGlyphRun__GlyphRunFlag int
+
+const (
+	QGlyphRun__GlyphRunFlag__Overline      QGlyphRun__GlyphRunFlag = 1
+	QGlyphRun__GlyphRunFlag__Underline     QGlyphRun__GlyphRunFlag = 2
+	QGlyphRun__GlyphRunFlag__StrikeOut     QGlyphRun__GlyphRunFlag = 4
+	QGlyphRun__GlyphRunFlag__RightToLeft   QGlyphRun__GlyphRunFlag = 8
+	QGlyphRun__GlyphRunFlag__SplitLigature QGlyphRun__GlyphRunFlag = 16
+)
+
 type QGlyphRun struct {
 	h *C.QGlyphRun
 }
@@ -170,7 +180,7 @@ func (this *QGlyphRun) IsRightToLeft() bool {
 	return (bool)(ret)
 }
 
-func (this *QGlyphRun) SetFlag(flag uintptr) {
+func (this *QGlyphRun) SetFlag(flag QGlyphRun__GlyphRunFlag) {
 	C.QGlyphRun_SetFlag(this.h, (C.uintptr_t)(flag))
 }
 
@@ -203,7 +213,7 @@ func (this *QGlyphRun) IsEmpty() bool {
 	return (bool)(ret)
 }
 
-func (this *QGlyphRun) SetFlag2(flag uintptr, enabled bool) {
+func (this *QGlyphRun) SetFlag2(flag QGlyphRun__GlyphRunFlag, enabled bool) {
 	C.QGlyphRun_SetFlag2(this.h, (C.uintptr_t)(flag), (C.bool)(enabled))
 }
 

qt/gen_qgraphicsanchorlayout.go

@@ -75,13 +75,13 @@ func (this *QGraphicsAnchor) Spacing() float64 {
 	return (float64)(ret)
 }
 
-func (this *QGraphicsAnchor) SetSizePolicy(policy uintptr) {
+func (this *QGraphicsAnchor) SetSizePolicy(policy QSizePolicy__Policy) {
 	C.QGraphicsAnchor_SetSizePolicy(this.h, (C.uintptr_t)(policy))
 }
 
-func (this *QGraphicsAnchor) SizePolicy() uintptr {
+func (this *QGraphicsAnchor) SizePolicy() QSizePolicy__Policy {
 	ret := C.QGraphicsAnchor_SizePolicy(this.h)
-	return (uintptr)(ret)
+	return (QSizePolicy__Policy)(ret)
 }
 
 func QGraphicsAnchor_Tr2(s string, c string) string {
@@ -175,17 +175,17 @@ func NewQGraphicsAnchorLayout2(parent *QGraphicsLayoutItem) *QGraphicsAnchorLayo
 	return newQGraphicsAnchorLayout(ret)
 }
 
-func (this *QGraphicsAnchorLayout) AddAnchor(firstItem *QGraphicsLayoutItem, firstEdge uintptr, secondItem *QGraphicsLayoutItem, secondEdge uintptr) *QGraphicsAnchor {
+func (this *QGraphicsAnchorLayout) AddAnchor(firstItem *QGraphicsLayoutItem, firstEdge AnchorPoint, secondItem *QGraphicsLayoutItem, secondEdge AnchorPoint) *QGraphicsAnchor {
 	ret := C.QGraphicsAnchorLayout_AddAnchor(this.h, firstItem.cPointer(), (C.uintptr_t)(firstEdge), secondItem.cPointer(), (C.uintptr_t)(secondEdge))
 	return newQGraphicsAnchor_U(unsafe.Pointer(ret))
 }
 
-func (this *QGraphicsAnchorLayout) Anchor(firstItem *QGraphicsLayoutItem, firstEdge uintptr, secondItem *QGraphicsLayoutItem, secondEdge uintptr) *QGraphicsAnchor {
+func (this *QGraphicsAnchorLayout) Anchor(firstItem *QGraphicsLayoutItem, firstEdge AnchorPoint, secondItem *QGraphicsLayoutItem, secondEdge AnchorPoint) *QGraphicsAnchor {
 	ret := C.QGraphicsAnchorLayout_Anchor(this.h, firstItem.cPointer(), (C.uintptr_t)(firstEdge), secondItem.cPointer(), (C.uintptr_t)(secondEdge))
 	return newQGraphicsAnchor_U(unsafe.Pointer(ret))
 }
 
-func (this *QGraphicsAnchorLayout) AddCornerAnchors(firstItem *QGraphicsLayoutItem, firstCorner uintptr, secondItem *QGraphicsLayoutItem, secondCorner uintptr) {
+func (this *QGraphicsAnchorLayout) AddCornerAnchors(firstItem *QGraphicsLayoutItem, firstCorner Corner, secondItem *QGraphicsLayoutItem, secondCorner Corner) {
 	C.QGraphicsAnchorLayout_AddCornerAnchors(this.h, firstItem.cPointer(), (C.uintptr_t)(firstCorner), secondItem.cPointer(), (C.uintptr_t)(secondCorner))
 }
 

qt/gen_qgraphicseffect.go

@@ -14,6 +14,31 @@ import (
 	"unsafe"
 )
 
+type QGraphicsEffect__ChangeFlag int
+
+const (
+	QGraphicsEffect__ChangeFlag__SourceAttached            QGraphicsEffect__ChangeFlag = 1
+	QGraphicsEffect__ChangeFlag__SourceDetached            QGraphicsEffect__ChangeFlag = 2
+	QGraphicsEffect__ChangeFlag__SourceBoundingRectChanged QGraphicsEffect__ChangeFlag = 4
+	QGraphicsEffect__ChangeFlag__SourceInvalidated         QGraphicsEffect__ChangeFlag = 8
+)
+
+type QGraphicsEffect__PixmapPadMode int
+
+const (
+	QGraphicsEffect__PixmapPadMode__NoPad                      QGraphicsEffect__PixmapPadMode = 0
+	QGraphicsEffect__PixmapPadMode__PadToTransparentBorder     QGraphicsEffect__PixmapPadMode = 1
+	QGraphicsEffect__PixmapPadMode__PadToEffectiveBoundingRect QGraphicsEffect__PixmapPadMode = 2
+)
+
+type QGraphicsBlurEffect__BlurHint int
+
+const (
+	QGraphicsBlurEffect__BlurHint__PerformanceHint QGraphicsBlurEffect__BlurHint = 0
+	QGraphicsBlurEffect__BlurHint__QualityHint     QGraphicsBlurEffect__BlurHint = 1
+	QGraphicsBlurEffect__BlurHint__AnimationHint   QGraphicsBlurEffect__BlurHint = 2
+)
+
 type QGraphicsEffect struct {
 	h *C.QGraphicsEffect
 	*QObject

qt/gen_qgraphicsgridlayout.go

@@ -244,7 +244,7 @@ func (this *QGraphicsGridLayout) SetGeometry(rect *QRectF) {
 	C.QGraphicsGridLayout_SetGeometry(this.h, rect.cPointer())
 }
 
-func (this *QGraphicsGridLayout) SizeHint(which uintptr) *QSizeF {
+func (this *QGraphicsGridLayout) SizeHint(which SizeHint) *QSizeF {
 	ret := C.QGraphicsGridLayout_SizeHint(this.h, (C.uintptr_t)(which))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQSizeF(ret)
@@ -263,7 +263,7 @@ func (this *QGraphicsGridLayout) AddItem4(item *QGraphicsLayoutItem, row int, co
 	C.QGraphicsGridLayout_AddItem4(this.h, item.cPointer(), (C.int)(row), (C.int)(column), (C.int)(alignment))
 }
 
-func (this *QGraphicsGridLayout) SizeHint2(which uintptr, constraint *QSizeF) *QSizeF {
+func (this *QGraphicsGridLayout) SizeHint2(which SizeHint, constraint *QSizeF) *QSizeF {
 	ret := C.QGraphicsGridLayout_SizeHint2(this.h, (C.uintptr_t)(which), constraint.cPointer())
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQSizeF(ret)

qt/gen_qgraphicsitem.go

@@ -14,6 +14,155 @@ import (
 	"unsafe"
 )
 
+type QGraphicsItem__GraphicsItemFlag int
+
+const (
+	QGraphicsItem__GraphicsItemFlag__ItemIsMovable                        QGraphicsItem__GraphicsItemFlag = 1
+	QGraphicsItem__GraphicsItemFlag__ItemIsSelectable                     QGraphicsItem__GraphicsItemFlag = 2
+	QGraphicsItem__GraphicsItemFlag__ItemIsFocusable                      QGraphicsItem__GraphicsItemFlag = 4
+	QGraphicsItem__GraphicsItemFlag__ItemClipsToShape                     QGraphicsItem__GraphicsItemFlag = 8
+	QGraphicsItem__GraphicsItemFlag__ItemClipsChildrenToShape             QGraphicsItem__GraphicsItemFlag = 16
+	QGraphicsItem__GraphicsItemFlag__ItemIgnoresTransformations           QGraphicsItem__GraphicsItemFlag = 32
+	QGraphicsItem__GraphicsItemFlag__ItemIgnoresParentOpacity             QGraphicsItem__GraphicsItemFlag = 64
+	QGraphicsItem__GraphicsItemFlag__ItemDoesntPropagateOpacityToChildren QGraphicsItem__GraphicsItemFlag = 128
+	QGraphicsItem__GraphicsItemFlag__ItemStacksBehindParent               QGraphicsItem__GraphicsItemFlag = 256
+	QGraphicsItem__GraphicsItemFlag__ItemUsesExtendedStyleOption          QGraphicsItem__GraphicsItemFlag = 512
+	QGraphicsItem__GraphicsItemFlag__ItemHasNoContents                    QGraphicsItem__GraphicsItemFlag = 1024
+	QGraphicsItem__GraphicsItemFlag__ItemSendsGeometryChanges             QGraphicsItem__GraphicsItemFlag = 2048
+	QGraphicsItem__GraphicsItemFlag__ItemAcceptsInputMethod               QGraphicsItem__GraphicsItemFlag = 4096
+	QGraphicsItem__GraphicsItemFlag__ItemNegativeZStacksBehindParent      QGraphicsItem__GraphicsItemFlag = 8192
+	QGraphicsItem__GraphicsItemFlag__ItemIsPanel                          QGraphicsItem__GraphicsItemFlag = 16384
+	QGraphicsItem__GraphicsItemFlag__ItemIsFocusScope                     QGraphicsItem__GraphicsItemFlag = 32768
+	QGraphicsItem__GraphicsItemFlag__ItemSendsScenePositionChanges        QGraphicsItem__GraphicsItemFlag = 65536
+	QGraphicsItem__GraphicsItemFlag__ItemStopsClickFocusPropagation       QGraphicsItem__GraphicsItemFlag = 131072
+	QGraphicsItem__GraphicsItemFlag__ItemStopsFocusHandling               QGraphicsItem__GraphicsItemFlag = 262144
+	QGraphicsItem__GraphicsItemFlag__ItemContainsChildrenInShape          QGraphicsItem__GraphicsItemFlag = 524288
+)
+
+type QGraphicsItem__GraphicsItemChange int
+
+const (
+	QGraphicsItem__GraphicsItemChange__ItemPositionChange                 QGraphicsItem__GraphicsItemChange = 0
+	QGraphicsItem__GraphicsItemChange__ItemMatrixChange                   QGraphicsItem__GraphicsItemChange = 1
+	QGraphicsItem__GraphicsItemChange__ItemVisibleChange                  QGraphicsItem__GraphicsItemChange = 2
+	QGraphicsItem__GraphicsItemChange__ItemEnabledChange                  QGraphicsItem__GraphicsItemChange = 3
+	QGraphicsItem__GraphicsItemChange__ItemSelectedChange                 QGraphicsItem__GraphicsItemChange = 4
+	QGraphicsItem__GraphicsItemChange__ItemParentChange                   QGraphicsItem__GraphicsItemChange = 5
+	QGraphicsItem__GraphicsItemChange__ItemChildAddedChange               QGraphicsItem__GraphicsItemChange = 6
+	QGraphicsItem__GraphicsItemChange__ItemChildRemovedChange             QGraphicsItem__GraphicsItemChange = 7
+	QGraphicsItem__GraphicsItemChange__ItemTransformChange                QGraphicsItem__GraphicsItemChange = 8
+	QGraphicsItem__GraphicsItemChange__ItemPositionHasChanged             QGraphicsItem__GraphicsItemChange = 9
+	QGraphicsItem__GraphicsItemChange__ItemTransformHasChanged            QGraphicsItem__GraphicsItemChange = 10
+	QGraphicsItem__GraphicsItemChange__ItemSceneChange                    QGraphicsItem__GraphicsItemChange = 11
+	QGraphicsItem__GraphicsItemChange__ItemVisibleHasChanged              QGraphicsItem__GraphicsItemChange = 12
+	QGraphicsItem__GraphicsItemChange__ItemEnabledHasChanged              QGraphicsItem__GraphicsItemChange = 13
+	QGraphicsItem__GraphicsItemChange__ItemSelectedHasChanged             QGraphicsItem__GraphicsItemChange = 14
+	QGraphicsItem__GraphicsItemChange__ItemParentHasChanged               QGraphicsItem__GraphicsItemChange = 15
+	QGraphicsItem__GraphicsItemChange__ItemSceneHasChanged                QGraphicsItem__GraphicsItemChange = 16
+	QGraphicsItem__GraphicsItemChange__ItemCursorChange                   QGraphicsItem__GraphicsItemChange = 17
+	QGraphicsItem__GraphicsItemChange__ItemCursorHasChanged               QGraphicsItem__GraphicsItemChange = 18
+	QGraphicsItem__GraphicsItemChange__ItemToolTipChange                  QGraphicsItem__GraphicsItemChange = 19
+	QGraphicsItem__GraphicsItemChange__ItemToolTipHasChanged              QGraphicsItem__GraphicsItemChange = 20
+	QGraphicsItem__GraphicsItemChange__ItemFlagsChange                    QGraphicsItem__GraphicsItemChange = 21
+	QGraphicsItem__GraphicsItemChange__ItemFlagsHaveChanged               QGraphicsItem__GraphicsItemChange = 22
+	QGraphicsItem__GraphicsItemChange__ItemZValueChange                   QGraphicsItem__GraphicsItemChange = 23
+	QGraphicsItem__GraphicsItemChange__ItemZValueHasChanged               QGraphicsItem__GraphicsItemChange = 24
+	QGraphicsItem__GraphicsItemChange__ItemOpacityChange                  QGraphicsItem__GraphicsItemChange = 25
+	QGraphicsItem__GraphicsItemChange__ItemOpacityHasChanged              QGraphicsItem__GraphicsItemChange = 26
+	QGraphicsItem__GraphicsItemChange__ItemScenePositionHasChanged        QGraphicsItem__GraphicsItemChange = 27
+	QGraphicsItem__GraphicsItemChange__ItemRotationChange                 QGraphicsItem__GraphicsItemChange = 28
+	QGraphicsItem__GraphicsItemChange__ItemRotationHasChanged             QGraphicsItem__GraphicsItemChange = 29
+	QGraphicsItem__GraphicsItemChange__ItemScaleChange                    QGraphicsItem__GraphicsItemChange = 30
+	QGraphicsItem__GraphicsItemChange__ItemScaleHasChanged                QGraphicsItem__GraphicsItemChange = 31
+	QGraphicsItem__GraphicsItemChange__ItemTransformOriginPointChange     QGraphicsItem__GraphicsItemChange = 32
+	QGraphicsItem__GraphicsItemChange__ItemTransformOriginPointHasChanged QGraphicsItem__GraphicsItemChange = 33
+)
+
+type QGraphicsItem__CacheMode int
+
+const (
+	QGraphicsItem__CacheMode__NoCache               QGraphicsItem__CacheMode = 0
+	QGraphicsItem__CacheMode__ItemCoordinateCache   QGraphicsItem__CacheMode = 1
+	QGraphicsItem__CacheMode__DeviceCoordinateCache QGraphicsItem__CacheMode = 2
+)
+
+type QGraphicsItem__PanelModality int
+
+const (
+	QGraphicsItem__PanelModality__NonModal   QGraphicsItem__PanelModality = 0
+	QGraphicsItem__PanelModality__PanelModal QGraphicsItem__PanelModality = 1
+	QGraphicsItem__PanelModality__SceneModal QGraphicsItem__PanelModality = 2
+)
+
+type QGraphicsItem__ int
+
+const (
+	QGraphicsItem____Type     QGraphicsItem__ = 1
+	QGraphicsItem____UserType QGraphicsItem__ = 65536
+)
+
+type QGraphicsPathItem__ int
+
+const (
+	QGraphicsPathItem____Type QGraphicsPathItem__ = 2
+)
+
+type QGraphicsRectItem__ int
+
+const (
+	QGraphicsRectItem____Type QGraphicsRectItem__ = 3
+)
+
+type QGraphicsEllipseItem__ int
+
+const (
+	QGraphicsEllipseItem____Type QGraphicsEllipseItem__ = 4
+)
+
+type QGraphicsPolygonItem__ int
+
+const (
+	QGraphicsPolygonItem____Type QGraphicsPolygonItem__ = 5
+)
+
+type QGraphicsLineItem__ int
+
+const (
+	QGraphicsLineItem____Type QGraphicsLineItem__ = 6
+)
+
+type QGraphicsPixmapItem__ShapeMode int
+
+const (
+	QGraphicsPixmapItem__ShapeMode__MaskShape          QGraphicsPixmapItem__ShapeMode = 0
+	QGraphicsPixmapItem__ShapeMode__BoundingRectShape  QGraphicsPixmapItem__ShapeMode = 1
+	QGraphicsPixmapItem__ShapeMode__HeuristicMaskShape QGraphicsPixmapItem__ShapeMode = 2
+)
+
+type QGraphicsPixmapItem__ int
+
+const (
+	QGraphicsPixmapItem____Type QGraphicsPixmapItem__ = 7
+)
+
+type QGraphicsTextItem__ int
+
+const (
+	QGraphicsTextItem____Type QGraphicsTextItem__ = 8
+)
+
+type QGraphicsSimpleTextItem__ int
+
+const (
+	QGraphicsSimpleTextItem____Type QGraphicsSimpleTextItem__ = 9
+)
+
+type QGraphicsItemGroup__ int
+
+const (
+	QGraphicsItemGroup____Type QGraphicsItemGroup__ = 10
+)
+
 type QGraphicsItem struct {
 	h *C.QGraphicsItem
 }
@@ -132,7 +281,7 @@ func (this *QGraphicsItem) Flags() int {
 	return (int)(ret)
 }
 
-func (this *QGraphicsItem) SetFlag(flag uintptr) {
+func (this *QGraphicsItem) SetFlag(flag QGraphicsItem__GraphicsItemFlag) {
 	C.QGraphicsItem_SetFlag(this.h, (C.uintptr_t)(flag))
 }
 
@@ -140,21 +289,21 @@ func (this *QGraphicsItem) SetFlags(flags int) {
 	C.QGraphicsItem_SetFlags(this.h, (C.int)(flags))
 }
 
-func (this *QGraphicsItem) CacheMode() uintptr {
+func (this *QGraphicsItem) CacheMode() QGraphicsItem__CacheMode {
 	ret := C.QGraphicsItem_CacheMode(this.h)
-	return (uintptr)(ret)
+	return (QGraphicsItem__CacheMode)(ret)
 }
 
-func (this *QGraphicsItem) SetCacheMode(mode uintptr) {
+func (this *QGraphicsItem) SetCacheMode(mode QGraphicsItem__CacheMode) {
 	C.QGraphicsItem_SetCacheMode(this.h, (C.uintptr_t)(mode))
 }
 
-func (this *QGraphicsItem) PanelModality() uintptr {
+func (this *QGraphicsItem) PanelModality() QGraphicsItem__PanelModality {
 	ret := C.QGraphicsItem_PanelModality(this.h)
-	return (uintptr)(ret)
+	return (QGraphicsItem__PanelModality)(ret)
 }
 
-func (this *QGraphicsItem) SetPanelModality(panelModality uintptr) {
+func (this *QGraphicsItem) SetPanelModality(panelModality QGraphicsItem__PanelModality) {
 	C.QGraphicsItem_SetPanelModality(this.h, (C.uintptr_t)(panelModality))
 }
 
@@ -1127,15 +1276,15 @@ func (this *QGraphicsItem) RemoveSceneEventFilter(filterItem *QGraphicsItem) {
 	C.QGraphicsItem_RemoveSceneEventFilter(this.h, filterItem.cPointer())
 }
 
-func (this *QGraphicsItem) SetFlag2(flag uintptr, enabled bool) {
+func (this *QGraphicsItem) SetFlag2(flag QGraphicsItem__GraphicsItemFlag, enabled bool) {
 	C.QGraphicsItem_SetFlag2(this.h, (C.uintptr_t)(flag), (C.bool)(enabled))
 }
 
-func (this *QGraphicsItem) SetCacheMode2(mode uintptr, cacheSize *QSize) {
+func (this *QGraphicsItem) SetCacheMode2(mode QGraphicsItem__CacheMode, cacheSize *QSize) {
 	C.QGraphicsItem_SetCacheMode2(this.h, (C.uintptr_t)(mode), cacheSize.cPointer())
 }
 
-func (this *QGraphicsItem) SetFocus1(focusReason uintptr) {
+func (this *QGraphicsItem) SetFocus1(focusReason FocusReason) {
 	C.QGraphicsItem_SetFocus1(this.h, (C.uintptr_t)(focusReason))
 }
 
@@ -1178,17 +1327,17 @@ func (this *QGraphicsItem) SetTransform2(matrix *QTransform, combine bool) {
 	C.QGraphicsItem_SetTransform2(this.h, matrix.cPointer(), (C.bool)(combine))
 }
 
-func (this *QGraphicsItem) CollidesWithItem2(other *QGraphicsItem, mode uintptr) bool {
+func (this *QGraphicsItem) CollidesWithItem2(other *QGraphicsItem, mode ItemSelectionMode) bool {
 	ret := C.QGraphicsItem_CollidesWithItem2(this.h, other.cPointer(), (C.uintptr_t)(mode))
 	return (bool)(ret)
 }
 
-func (this *QGraphicsItem) CollidesWithPath2(path *QPainterPath, mode uintptr) bool {
+func (this *QGraphicsItem) CollidesWithPath2(path *QPainterPath, mode ItemSelectionMode) bool {
 	ret := C.QGraphicsItem_CollidesWithPath2(this.h, path.cPointer(), (C.uintptr_t)(mode))
 	return (bool)(ret)
 }
 
-func (this *QGraphicsItem) CollidingItems1(mode uintptr) []*QGraphicsItem {
+func (this *QGraphicsItem) CollidingItems1(mode ItemSelectionMode) []*QGraphicsItem {
 	var _out **C.QGraphicsItem = nil
 	var _out_len C.size_t = 0
 	C.QGraphicsItem_CollidingItems1(this.h, (C.uintptr_t)(mode), &_out, &_out_len)
@@ -1273,11 +1422,11 @@ func QGraphicsObject_TrUtf8(s string) string {
 	return ret
 }
 
-func (this *QGraphicsObject) GrabGesture(typeVal uintptr) {
+func (this *QGraphicsObject) GrabGesture(typeVal GestureType) {
 	C.QGraphicsObject_GrabGesture(this.h, (C.uintptr_t)(typeVal))
 }
 
-func (this *QGraphicsObject) UngrabGesture(typeVal uintptr) {
+func (this *QGraphicsObject) UngrabGesture(typeVal GestureType) {
 	C.QGraphicsObject_UngrabGesture(this.h, (C.uintptr_t)(typeVal))
 }
 
@@ -1477,7 +1626,7 @@ func QGraphicsObject_TrUtf83(s string, c string, n int) string {
 	return ret
 }
 
-func (this *QGraphicsObject) GrabGesture2(typeVal uintptr, flags int) {
+func (this *QGraphicsObject) GrabGesture2(typeVal GestureType, flags int) {
 	C.QGraphicsObject_GrabGesture2(this.h, (C.uintptr_t)(typeVal), (C.int)(flags))
 }
 
@@ -2009,12 +2158,12 @@ func NewQGraphicsPolygonItem2(parent *QGraphicsItem) *QGraphicsPolygonItem {
 	return newQGraphicsPolygonItem(ret)
 }
 
-func (this *QGraphicsPolygonItem) FillRule() uintptr {
+func (this *QGraphicsPolygonItem) FillRule() FillRule {
 	ret := C.QGraphicsPolygonItem_FillRule(this.h)
-	return (uintptr)(ret)
+	return (FillRule)(ret)
 }
 
-func (this *QGraphicsPolygonItem) SetFillRule(rule uintptr) {
+func (this *QGraphicsPolygonItem) SetFillRule(rule FillRule) {
 	C.QGraphicsPolygonItem_SetFillRule(this.h, (C.uintptr_t)(rule))
 }
 
@@ -2293,12 +2442,12 @@ func (this *QGraphicsPixmapItem) SetPixmap(pixmap *QPixmap) {
 	C.QGraphicsPixmapItem_SetPixmap(this.h, pixmap.cPointer())
 }
 
-func (this *QGraphicsPixmapItem) TransformationMode() uintptr {
+func (this *QGraphicsPixmapItem) TransformationMode() TransformationMode {
 	ret := C.QGraphicsPixmapItem_TransformationMode(this.h)
-	return (uintptr)(ret)
+	return (TransformationMode)(ret)
 }
 
-func (this *QGraphicsPixmapItem) SetTransformationMode(mode uintptr) {
+func (this *QGraphicsPixmapItem) SetTransformationMode(mode TransformationMode) {
 	C.QGraphicsPixmapItem_SetTransformationMode(this.h, (C.uintptr_t)(mode))
 }
 
@@ -2373,12 +2522,12 @@ func (this *QGraphicsPixmapItem) Type() int {
 	return (int)(ret)
 }
 
-func (this *QGraphicsPixmapItem) ShapeMode() uintptr {
+func (this *QGraphicsPixmapItem) ShapeMode() QGraphicsPixmapItem__ShapeMode {
 	ret := C.QGraphicsPixmapItem_ShapeMode(this.h)
-	return (uintptr)(ret)
+	return (QGraphicsPixmapItem__ShapeMode)(ret)
 }
 
-func (this *QGraphicsPixmapItem) SetShapeMode(mode uintptr) {
+func (this *QGraphicsPixmapItem) SetShapeMode(mode QGraphicsPixmapItem__ShapeMode) {
 	C.QGraphicsPixmapItem_SetShapeMode(this.h, (C.uintptr_t)(mode))
 }
 

qt/gen_qgraphicslayoutitem.go

@@ -39,7 +39,7 @@ func (this *QGraphicsLayoutItem) SetSizePolicy(policy *QSizePolicy) {
 	C.QGraphicsLayoutItem_SetSizePolicy(this.h, policy.cPointer())
 }
 
-func (this *QGraphicsLayoutItem) SetSizePolicy2(hPolicy uintptr, vPolicy uintptr) {
+func (this *QGraphicsLayoutItem) SetSizePolicy2(hPolicy QSizePolicy__Policy, vPolicy QSizePolicy__Policy) {
 	C.QGraphicsLayoutItem_SetSizePolicy2(this.h, (C.uintptr_t)(hPolicy), (C.uintptr_t)(vPolicy))
 }
 
@@ -195,7 +195,7 @@ func (this *QGraphicsLayoutItem) ContentsRect() *QRectF {
 	return ret1
 }
 
-func (this *QGraphicsLayoutItem) EffectiveSizeHint(which uintptr) *QSizeF {
+func (this *QGraphicsLayoutItem) EffectiveSizeHint(which SizeHint) *QSizeF {
 	ret := C.QGraphicsLayoutItem_EffectiveSizeHint(this.h, (C.uintptr_t)(which))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQSizeF(ret)
@@ -234,11 +234,11 @@ func (this *QGraphicsLayoutItem) OwnedByLayout() bool {
 	return (bool)(ret)
 }
 
-func (this *QGraphicsLayoutItem) SetSizePolicy3(hPolicy uintptr, vPolicy uintptr, controlType uintptr) {
+func (this *QGraphicsLayoutItem) SetSizePolicy3(hPolicy QSizePolicy__Policy, vPolicy QSizePolicy__Policy, controlType QSizePolicy__ControlType) {
 	C.QGraphicsLayoutItem_SetSizePolicy3(this.h, (C.uintptr_t)(hPolicy), (C.uintptr_t)(vPolicy), (C.uintptr_t)(controlType))
 }
 
-func (this *QGraphicsLayoutItem) EffectiveSizeHint2(which uintptr, constraint *QSizeF) *QSizeF {
+func (this *QGraphicsLayoutItem) EffectiveSizeHint2(which SizeHint, constraint *QSizeF) *QSizeF {
 	ret := C.QGraphicsLayoutItem_EffectiveSizeHint2(this.h, (C.uintptr_t)(which), constraint.cPointer())
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQSizeF(ret)

qt/gen_qgraphicslinearlayout.go

@@ -43,7 +43,7 @@ func NewQGraphicsLinearLayout() *QGraphicsLinearLayout {
 }
 
 // NewQGraphicsLinearLayout2 constructs a new QGraphicsLinearLayout object.
-func NewQGraphicsLinearLayout2(orientation uintptr) *QGraphicsLinearLayout {
+func NewQGraphicsLinearLayout2(orientation Orientation) *QGraphicsLinearLayout {
 	ret := C.QGraphicsLinearLayout_new2((C.uintptr_t)(orientation))
 	return newQGraphicsLinearLayout(ret)
 }
@@ -55,18 +55,18 @@ func NewQGraphicsLinearLayout3(parent *QGraphicsLayoutItem) *QGraphicsLinearLayo
 }
 
 // NewQGraphicsLinearLayout4 constructs a new QGraphicsLinearLayout object.
-func NewQGraphicsLinearLayout4(orientation uintptr, parent *QGraphicsLayoutItem) *QGraphicsLinearLayout {
+func NewQGraphicsLinearLayout4(orientation Orientation, parent *QGraphicsLayoutItem) *QGraphicsLinearLayout {
 	ret := C.QGraphicsLinearLayout_new4((C.uintptr_t)(orientation), parent.cPointer())
 	return newQGraphicsLinearLayout(ret)
 }
 
-func (this *QGraphicsLinearLayout) SetOrientation(orientation uintptr) {
+func (this *QGraphicsLinearLayout) SetOrientation(orientation Orientation) {
 	C.QGraphicsLinearLayout_SetOrientation(this.h, (C.uintptr_t)(orientation))
 }
 
-func (this *QGraphicsLinearLayout) Orientation() uintptr {
+func (this *QGraphicsLinearLayout) Orientation() Orientation {
 	ret := C.QGraphicsLinearLayout_Orientation(this.h)
-	return (uintptr)(ret)
+	return (Orientation)(ret)
 }
 
 func (this *QGraphicsLinearLayout) AddItem(item *QGraphicsLayoutItem) {
@@ -147,7 +147,7 @@ func (this *QGraphicsLinearLayout) Invalidate() {
 	C.QGraphicsLinearLayout_Invalidate(this.h)
 }
 
-func (this *QGraphicsLinearLayout) SizeHint(which uintptr) *QSizeF {
+func (this *QGraphicsLinearLayout) SizeHint(which SizeHint) *QSizeF {
 	ret := C.QGraphicsLinearLayout_SizeHint(this.h, (C.uintptr_t)(which))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQSizeF(ret)
@@ -170,7 +170,7 @@ func (this *QGraphicsLinearLayout) InsertStretch2(index int, stretch int) {
 	C.QGraphicsLinearLayout_InsertStretch2(this.h, (C.int)(index), (C.int)(stretch))
 }
 
-func (this *QGraphicsLinearLayout) SizeHint2(which uintptr, constraint *QSizeF) *QSizeF {
+func (this *QGraphicsLinearLayout) SizeHint2(which SizeHint, constraint *QSizeF) *QSizeF {
 	ret := C.QGraphicsLinearLayout_SizeHint2(this.h, (C.uintptr_t)(which), constraint.cPointer())
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQSizeF(ret)

qt/gen_qgraphicsproxywidget.go

@@ -13,6 +13,12 @@ import (
 	"unsafe"
 )
 
+type QGraphicsProxyWidget__ int
+
+const (
+	QGraphicsProxyWidget____Type QGraphicsProxyWidget__ = 12
+)
+
 type QGraphicsProxyWidget struct {
 	h *C.QGraphicsProxyWidget
 	*QGraphicsWidget

qt/gen_qgraphicsscene.go

@@ -14,6 +14,22 @@ import (
 	"unsafe"
 )
 
+type QGraphicsScene__ItemIndexMethod int
+
+const (
+	QGraphicsScene__ItemIndexMethod__BspTreeIndex QGraphicsScene__ItemIndexMethod = 0
+	QGraphicsScene__ItemIndexMethod__NoIndex      QGraphicsScene__ItemIndexMethod = -1
+)
+
+type QGraphicsScene__SceneLayer int
+
+const (
+	QGraphicsScene__SceneLayer__ItemLayer       QGraphicsScene__SceneLayer = 1
+	QGraphicsScene__SceneLayer__BackgroundLayer QGraphicsScene__SceneLayer = 2
+	QGraphicsScene__SceneLayer__ForegroundLayer QGraphicsScene__SceneLayer = 4
+	QGraphicsScene__SceneLayer__AllLayers       QGraphicsScene__SceneLayer = 65535
+)
+
 type QGraphicsScene struct {
 	h *C.QGraphicsScene
 	*QObject
@@ -133,12 +149,12 @@ func (this *QGraphicsScene) Render(painter *QPainter) {
 	C.QGraphicsScene_Render(this.h, painter.cPointer())
 }
 
-func (this *QGraphicsScene) ItemIndexMethod() uintptr {
+func (this *QGraphicsScene) ItemIndexMethod() QGraphicsScene__ItemIndexMethod {
 	ret := C.QGraphicsScene_ItemIndexMethod(this.h)
-	return (uintptr)(ret)
+	return (QGraphicsScene__ItemIndexMethod)(ret)
 }
 
-func (this *QGraphicsScene) SetItemIndexMethod(method uintptr) {
+func (this *QGraphicsScene) SetItemIndexMethod(method QGraphicsScene__ItemIndexMethod) {
 	C.QGraphicsScene_SetItemIndexMethod(this.h, (C.uintptr_t)(method))
 }
 
@@ -241,7 +257,7 @@ func (this *QGraphicsScene) ItemAt(pos *QPointF, deviceTransform *QTransform) *Q
 	return newQGraphicsItem_U(unsafe.Pointer(ret))
 }
 
-func (this *QGraphicsScene) Items2(x float64, y float64, w float64, h float64, mode uintptr, order uintptr) []*QGraphicsItem {
+func (this *QGraphicsScene) Items2(x float64, y float64, w float64, h float64, mode ItemSelectionMode, order SortOrder) []*QGraphicsItem {
 	var _out **C.QGraphicsItem = nil
 	var _out_len C.size_t = 0
 	C.QGraphicsScene_Items2(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.uintptr_t)(mode), (C.uintptr_t)(order), &_out, &_out_len)
@@ -291,7 +307,7 @@ func (this *QGraphicsScene) SetSelectionAreaWithPath(path *QPainterPath) {
 	C.QGraphicsScene_SetSelectionAreaWithPath(this.h, path.cPointer())
 }
 
-func (this *QGraphicsScene) SetSelectionArea2(path *QPainterPath, selectionOperation uintptr) {
+func (this *QGraphicsScene) SetSelectionArea2(path *QPainterPath, selectionOperation ItemSelectionOperation) {
 	C.QGraphicsScene_SetSelectionArea2(this.h, path.cPointer(), (C.uintptr_t)(selectionOperation))
 }
 
@@ -443,7 +459,7 @@ func (this *QGraphicsScene) SetForegroundBrush(brush *QBrush) {
 	C.QGraphicsScene_SetForegroundBrush(this.h, brush.cPointer())
 }
 
-func (this *QGraphicsScene) InputMethodQuery(query uintptr) *QVariant {
+func (this *QGraphicsScene) InputMethodQuery(query InputMethodQuery) *QVariant {
 	ret := C.QGraphicsScene_InputMethodQuery(this.h, (C.uintptr_t)(query))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQVariant(ret)
@@ -622,7 +638,7 @@ func (this *QGraphicsScene) OnSelectionChanged(slot func()) {
 	C.QGraphicsScene_connect_SelectionChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slotWrapper))))
 }
 
-func (this *QGraphicsScene) FocusItemChanged(newFocus *QGraphicsItem, oldFocus *QGraphicsItem, reason uintptr) {
+func (this *QGraphicsScene) FocusItemChanged(newFocus *QGraphicsItem, oldFocus *QGraphicsItem, reason FocusReason) {
 	C.QGraphicsScene_FocusItemChanged(this.h, newFocus.cPointer(), oldFocus.cPointer(), (C.uintptr_t)(reason))
 }
 
@@ -694,11 +710,11 @@ func (this *QGraphicsScene) Render3(painter *QPainter, target *QRectF, source *Q
 	C.QGraphicsScene_Render3(this.h, painter.cPointer(), target.cPointer(), source.cPointer())
 }
 
-func (this *QGraphicsScene) Render4(painter *QPainter, target *QRectF, source *QRectF, aspectRatioMode uintptr) {
+func (this *QGraphicsScene) Render4(painter *QPainter, target *QRectF, source *QRectF, aspectRatioMode AspectRatioMode) {
 	C.QGraphicsScene_Render4(this.h, painter.cPointer(), target.cPointer(), source.cPointer(), (C.uintptr_t)(aspectRatioMode))
 }
 
-func (this *QGraphicsScene) Items1(order uintptr) []*QGraphicsItem {
+func (this *QGraphicsScene) Items1(order SortOrder) []*QGraphicsItem {
 	var _out **C.QGraphicsItem = nil
 	var _out_len C.size_t = 0
 	C.QGraphicsScene_Items1(this.h, (C.uintptr_t)(order), &_out, &_out_len)
@@ -711,7 +727,7 @@ func (this *QGraphicsScene) Items1(order uintptr) []*QGraphicsItem {
 	return ret
 }
 
-func (this *QGraphicsScene) Items22(pos *QPointF, mode uintptr) []*QGraphicsItem {
+func (this *QGraphicsScene) Items22(pos *QPointF, mode ItemSelectionMode) []*QGraphicsItem {
 	var _out **C.QGraphicsItem = nil
 	var _out_len C.size_t = 0
 	C.QGraphicsScene_Items22(this.h, pos.cPointer(), (C.uintptr_t)(mode), &_out, &_out_len)
@@ -724,7 +740,7 @@ func (this *QGraphicsScene) Items22(pos *QPointF, mode uintptr) []*QGraphicsItem
 	return ret
 }
 
-func (this *QGraphicsScene) Items3(pos *QPointF, mode uintptr, order uintptr) []*QGraphicsItem {
+func (this *QGraphicsScene) Items3(pos *QPointF, mode ItemSelectionMode, order SortOrder) []*QGraphicsItem {
 	var _out **C.QGraphicsItem = nil
 	var _out_len C.size_t = 0
 	C.QGraphicsScene_Items3(this.h, pos.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(order), &_out, &_out_len)
@@ -737,7 +753,7 @@ func (this *QGraphicsScene) Items3(pos *QPointF, mode uintptr, order uintptr) []
 	return ret
 }
 
-func (this *QGraphicsScene) Items4(pos *QPointF, mode uintptr, order uintptr, deviceTransform *QTransform) []*QGraphicsItem {
+func (this *QGraphicsScene) Items4(pos *QPointF, mode ItemSelectionMode, order SortOrder, deviceTransform *QTransform) []*QGraphicsItem {
 	var _out **C.QGraphicsItem = nil
 	var _out_len C.size_t = 0
 	C.QGraphicsScene_Items4(this.h, pos.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(order), deviceTransform.cPointer(), &_out, &_out_len)
@@ -750,7 +766,7 @@ func (this *QGraphicsScene) Items4(pos *QPointF, mode uintptr, order uintptr, de
 	return ret
 }
 
-func (this *QGraphicsScene) Items23(rect *QRectF, mode uintptr) []*QGraphicsItem {
+func (this *QGraphicsScene) Items23(rect *QRectF, mode ItemSelectionMode) []*QGraphicsItem {
 	var _out **C.QGraphicsItem = nil
 	var _out_len C.size_t = 0
 	C.QGraphicsScene_Items23(this.h, rect.cPointer(), (C.uintptr_t)(mode), &_out, &_out_len)
@@ -763,7 +779,7 @@ func (this *QGraphicsScene) Items23(rect *QRectF, mode uintptr) []*QGraphicsItem
 	return ret
 }
 
-func (this *QGraphicsScene) Items32(rect *QRectF, mode uintptr, order uintptr) []*QGraphicsItem {
+func (this *QGraphicsScene) Items32(rect *QRectF, mode ItemSelectionMode, order SortOrder) []*QGraphicsItem {
 	var _out **C.QGraphicsItem = nil
 	var _out_len C.size_t = 0
 	C.QGraphicsScene_Items32(this.h, rect.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(order), &_out, &_out_len)
@@ -776,7 +792,7 @@ func (this *QGraphicsScene) Items32(rect *QRectF, mode uintptr, order uintptr) [
 	return ret
 }
 
-func (this *QGraphicsScene) Items42(rect *QRectF, mode uintptr, order uintptr, deviceTransform *QTransform) []*QGraphicsItem {
+func (this *QGraphicsScene) Items42(rect *QRectF, mode ItemSelectionMode, order SortOrder, deviceTransform *QTransform) []*QGraphicsItem {
 	var _out **C.QGraphicsItem = nil
 	var _out_len C.size_t = 0
 	C.QGraphicsScene_Items42(this.h, rect.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(order), deviceTransform.cPointer(), &_out, &_out_len)
@@ -789,7 +805,7 @@ func (this *QGraphicsScene) Items42(rect *QRectF, mode uintptr, order uintptr, d
 	return ret
 }
 
-func (this *QGraphicsScene) Items25(path *QPainterPath, mode uintptr) []*QGraphicsItem {
+func (this *QGraphicsScene) Items25(path *QPainterPath, mode ItemSelectionMode) []*QGraphicsItem {
 	var _out **C.QGraphicsItem = nil
 	var _out_len C.size_t = 0
 	C.QGraphicsScene_Items25(this.h, path.cPointer(), (C.uintptr_t)(mode), &_out, &_out_len)
@@ -802,7 +818,7 @@ func (this *QGraphicsScene) Items25(path *QPainterPath, mode uintptr) []*QGraphi
 	return ret
 }
 
-func (this *QGraphicsScene) Items34(path *QPainterPath, mode uintptr, order uintptr) []*QGraphicsItem {
+func (this *QGraphicsScene) Items34(path *QPainterPath, mode ItemSelectionMode, order SortOrder) []*QGraphicsItem {
 	var _out **C.QGraphicsItem = nil
 	var _out_len C.size_t = 0
 	C.QGraphicsScene_Items34(this.h, path.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(order), &_out, &_out_len)
@@ -815,7 +831,7 @@ func (this *QGraphicsScene) Items34(path *QPainterPath, mode uintptr, order uint
 	return ret
 }
 
-func (this *QGraphicsScene) Items44(path *QPainterPath, mode uintptr, order uintptr, deviceTransform *QTransform) []*QGraphicsItem {
+func (this *QGraphicsScene) Items44(path *QPainterPath, mode ItemSelectionMode, order SortOrder, deviceTransform *QTransform) []*QGraphicsItem {
 	var _out **C.QGraphicsItem = nil
 	var _out_len C.size_t = 0
 	C.QGraphicsScene_Items44(this.h, path.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(order), deviceTransform.cPointer(), &_out, &_out_len)
@@ -828,7 +844,7 @@ func (this *QGraphicsScene) Items44(path *QPainterPath, mode uintptr, order uint
 	return ret
 }
 
-func (this *QGraphicsScene) CollidingItems2(item *QGraphicsItem, mode uintptr) []*QGraphicsItem {
+func (this *QGraphicsScene) CollidingItems2(item *QGraphicsItem, mode ItemSelectionMode) []*QGraphicsItem {
 	var _out **C.QGraphicsItem = nil
 	var _out_len C.size_t = 0
 	C.QGraphicsScene_CollidingItems2(this.h, item.cPointer(), (C.uintptr_t)(mode), &_out, &_out_len)
@@ -841,7 +857,7 @@ func (this *QGraphicsScene) CollidingItems2(item *QGraphicsItem, mode uintptr) [
 	return ret
 }
 
-func (this *QGraphicsScene) Items7(x float64, y float64, w float64, h float64, mode uintptr, order uintptr, deviceTransform *QTransform) []*QGraphicsItem {
+func (this *QGraphicsScene) Items7(x float64, y float64, w float64, h float64, mode ItemSelectionMode, order SortOrder, deviceTransform *QTransform) []*QGraphicsItem {
 	var _out **C.QGraphicsItem = nil
 	var _out_len C.size_t = 0
 	C.QGraphicsScene_Items7(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.uintptr_t)(mode), (C.uintptr_t)(order), deviceTransform.cPointer(), &_out, &_out_len)
@@ -854,19 +870,19 @@ func (this *QGraphicsScene) Items7(x float64, y float64, w float64, h float64, m
 	return ret
 }
 
-func (this *QGraphicsScene) SetSelectionArea22(path *QPainterPath, mode uintptr) {
+func (this *QGraphicsScene) SetSelectionArea22(path *QPainterPath, mode ItemSelectionMode) {
 	C.QGraphicsScene_SetSelectionArea22(this.h, path.cPointer(), (C.uintptr_t)(mode))
 }
 
-func (this *QGraphicsScene) SetSelectionArea3(path *QPainterPath, mode uintptr, deviceTransform *QTransform) {
+func (this *QGraphicsScene) SetSelectionArea3(path *QPainterPath, mode ItemSelectionMode, deviceTransform *QTransform) {
 	C.QGraphicsScene_SetSelectionArea3(this.h, path.cPointer(), (C.uintptr_t)(mode), deviceTransform.cPointer())
 }
 
-func (this *QGraphicsScene) SetSelectionArea32(path *QPainterPath, selectionOperation uintptr, mode uintptr) {
+func (this *QGraphicsScene) SetSelectionArea32(path *QPainterPath, selectionOperation ItemSelectionOperation, mode ItemSelectionMode) {
 	C.QGraphicsScene_SetSelectionArea32(this.h, path.cPointer(), (C.uintptr_t)(selectionOperation), (C.uintptr_t)(mode))
 }
 
-func (this *QGraphicsScene) SetSelectionArea4(path *QPainterPath, selectionOperation uintptr, mode uintptr, deviceTransform *QTransform) {
+func (this *QGraphicsScene) SetSelectionArea4(path *QPainterPath, selectionOperation ItemSelectionOperation, mode ItemSelectionMode, deviceTransform *QTransform) {
 	C.QGraphicsScene_SetSelectionArea4(this.h, path.cPointer(), (C.uintptr_t)(selectionOperation), (C.uintptr_t)(mode), deviceTransform.cPointer())
 }
 
@@ -949,11 +965,11 @@ func (this *QGraphicsScene) AddRect6(x float64, y float64, w float64, h float64,
 	return newQGraphicsRectItem_U(unsafe.Pointer(ret))
 }
 
-func (this *QGraphicsScene) SetFocusItem2(item *QGraphicsItem, focusReason uintptr) {
+func (this *QGraphicsScene) SetFocusItem2(item *QGraphicsItem, focusReason FocusReason) {
 	C.QGraphicsScene_SetFocusItem2(this.h, item.cPointer(), (C.uintptr_t)(focusReason))
 }
 
-func (this *QGraphicsScene) SetFocus1(focusReason uintptr) {
+func (this *QGraphicsScene) SetFocus1(focusReason FocusReason) {
 	C.QGraphicsScene_SetFocus1(this.h, (C.uintptr_t)(focusReason))
 }
 

qt/gen_qgraphicssceneevent.go

@@ -13,6 +13,14 @@ import (
 	"unsafe"
 )
 
+type QGraphicsSceneContextMenuEvent__Reason int
+
+const (
+	QGraphicsSceneContextMenuEvent__Reason__Mouse    QGraphicsSceneContextMenuEvent__Reason = 0
+	QGraphicsSceneContextMenuEvent__Reason__Keyboard QGraphicsSceneContextMenuEvent__Reason = 1
+	QGraphicsSceneContextMenuEvent__Reason__Other    QGraphicsSceneContextMenuEvent__Reason = 2
+)
+
 type QGraphicsSceneEvent struct {
 	h *C.QGraphicsSceneEvent
 	*QEvent
@@ -37,7 +45,7 @@ func newQGraphicsSceneEvent_U(h unsafe.Pointer) *QGraphicsSceneEvent {
 }
 
 // NewQGraphicsSceneEvent constructs a new QGraphicsSceneEvent object.
-func NewQGraphicsSceneEvent(typeVal uintptr) *QGraphicsSceneEvent {
+func NewQGraphicsSceneEvent(typeVal QEvent__Type) *QGraphicsSceneEvent {
 	ret := C.QGraphicsSceneEvent_new((C.uintptr_t)(typeVal))
 	return newQGraphicsSceneEvent(ret)
 }
@@ -85,7 +93,7 @@ func NewQGraphicsSceneMouseEvent() *QGraphicsSceneMouseEvent {
 }
 
 // NewQGraphicsSceneMouseEvent2 constructs a new QGraphicsSceneMouseEvent object.
-func NewQGraphicsSceneMouseEvent2(typeVal uintptr) *QGraphicsSceneMouseEvent {
+func NewQGraphicsSceneMouseEvent2(typeVal QEvent__Type) *QGraphicsSceneMouseEvent {
 	ret := C.QGraphicsSceneMouseEvent_new2((C.uintptr_t)(typeVal))
 	return newQGraphicsSceneMouseEvent(ret)
 }
@@ -135,7 +143,7 @@ func (this *QGraphicsSceneMouseEvent) SetScreenPos(pos *QPoint) {
 	C.QGraphicsSceneMouseEvent_SetScreenPos(this.h, pos.cPointer())
 }
 
-func (this *QGraphicsSceneMouseEvent) ButtonDownPos(button uintptr) *QPointF {
+func (this *QGraphicsSceneMouseEvent) ButtonDownPos(button MouseButton) *QPointF {
 	ret := C.QGraphicsSceneMouseEvent_ButtonDownPos(this.h, (C.uintptr_t)(button))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQPointF(ret)
@@ -146,11 +154,11 @@ func (this *QGraphicsSceneMouseEvent) ButtonDownPos(button uintptr) *QPointF {
 	return ret1
 }
 
-func (this *QGraphicsSceneMouseEvent) SetButtonDownPos(button uintptr, pos *QPointF) {
+func (this *QGraphicsSceneMouseEvent) SetButtonDownPos(button MouseButton, pos *QPointF) {
 	C.QGraphicsSceneMouseEvent_SetButtonDownPos(this.h, (C.uintptr_t)(button), pos.cPointer())
 }
 
-func (this *QGraphicsSceneMouseEvent) ButtonDownScenePos(button uintptr) *QPointF {
+func (this *QGraphicsSceneMouseEvent) ButtonDownScenePos(button MouseButton) *QPointF {
 	ret := C.QGraphicsSceneMouseEvent_ButtonDownScenePos(this.h, (C.uintptr_t)(button))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQPointF(ret)
@@ -161,11 +169,11 @@ func (this *QGraphicsSceneMouseEvent) ButtonDownScenePos(button uintptr) *QPoint
 	return ret1
 }
 
-func (this *QGraphicsSceneMouseEvent) SetButtonDownScenePos(button uintptr, pos *QPointF) {
+func (this *QGraphicsSceneMouseEvent) SetButtonDownScenePos(button MouseButton, pos *QPointF) {
 	C.QGraphicsSceneMouseEvent_SetButtonDownScenePos(this.h, (C.uintptr_t)(button), pos.cPointer())
 }
 
-func (this *QGraphicsSceneMouseEvent) ButtonDownScreenPos(button uintptr) *QPoint {
+func (this *QGraphicsSceneMouseEvent) ButtonDownScreenPos(button MouseButton) *QPoint {
 	ret := C.QGraphicsSceneMouseEvent_ButtonDownScreenPos(this.h, (C.uintptr_t)(button))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQPoint(ret)
@@ -176,7 +184,7 @@ func (this *QGraphicsSceneMouseEvent) ButtonDownScreenPos(button uintptr) *QPoin
 	return ret1
 }
 
-func (this *QGraphicsSceneMouseEvent) SetButtonDownScreenPos(button uintptr, pos *QPoint) {
+func (this *QGraphicsSceneMouseEvent) SetButtonDownScreenPos(button MouseButton, pos *QPoint) {
 	C.QGraphicsSceneMouseEvent_SetButtonDownScreenPos(this.h, (C.uintptr_t)(button), pos.cPointer())
 }
 
@@ -234,12 +242,12 @@ func (this *QGraphicsSceneMouseEvent) SetButtons(buttons int) {
 	C.QGraphicsSceneMouseEvent_SetButtons(this.h, (C.int)(buttons))
 }
 
-func (this *QGraphicsSceneMouseEvent) Button() uintptr {
+func (this *QGraphicsSceneMouseEvent) Button() MouseButton {
 	ret := C.QGraphicsSceneMouseEvent_Button(this.h)
-	return (uintptr)(ret)
+	return (MouseButton)(ret)
 }
 
-func (this *QGraphicsSceneMouseEvent) SetButton(button uintptr) {
+func (this *QGraphicsSceneMouseEvent) SetButton(button MouseButton) {
 	C.QGraphicsSceneMouseEvent_SetButton(this.h, (C.uintptr_t)(button))
 }
 
@@ -252,12 +260,12 @@ func (this *QGraphicsSceneMouseEvent) SetModifiers(modifiers int) {
 	C.QGraphicsSceneMouseEvent_SetModifiers(this.h, (C.int)(modifiers))
 }
 
-func (this *QGraphicsSceneMouseEvent) Source() uintptr {
+func (this *QGraphicsSceneMouseEvent) Source() MouseEventSource {
 	ret := C.QGraphicsSceneMouseEvent_Source(this.h)
-	return (uintptr)(ret)
+	return (MouseEventSource)(ret)
 }
 
-func (this *QGraphicsSceneMouseEvent) SetSource(source uintptr) {
+func (this *QGraphicsSceneMouseEvent) SetSource(source MouseEventSource) {
 	C.QGraphicsSceneMouseEvent_SetSource(this.h, (C.uintptr_t)(source))
 }
 
@@ -304,7 +312,7 @@ func NewQGraphicsSceneWheelEvent() *QGraphicsSceneWheelEvent {
 }
 
 // NewQGraphicsSceneWheelEvent2 constructs a new QGraphicsSceneWheelEvent object.
-func NewQGraphicsSceneWheelEvent2(typeVal uintptr) *QGraphicsSceneWheelEvent {
+func NewQGraphicsSceneWheelEvent2(typeVal QEvent__Type) *QGraphicsSceneWheelEvent {
 	ret := C.QGraphicsSceneWheelEvent_new2((C.uintptr_t)(typeVal))
 	return newQGraphicsSceneWheelEvent(ret)
 }
@@ -381,12 +389,12 @@ func (this *QGraphicsSceneWheelEvent) SetDelta(delta int) {
 	C.QGraphicsSceneWheelEvent_SetDelta(this.h, (C.int)(delta))
 }
 
-func (this *QGraphicsSceneWheelEvent) Orientation() uintptr {
+func (this *QGraphicsSceneWheelEvent) Orientation() Orientation {
 	ret := C.QGraphicsSceneWheelEvent_Orientation(this.h)
-	return (uintptr)(ret)
+	return (Orientation)(ret)
 }
 
-func (this *QGraphicsSceneWheelEvent) SetOrientation(orientation uintptr) {
+func (this *QGraphicsSceneWheelEvent) SetOrientation(orientation Orientation) {
 	C.QGraphicsSceneWheelEvent_SetOrientation(this.h, (C.uintptr_t)(orientation))
 }
 
@@ -424,7 +432,7 @@ func NewQGraphicsSceneContextMenuEvent() *QGraphicsSceneContextMenuEvent {
 }
 
 // NewQGraphicsSceneContextMenuEvent2 constructs a new QGraphicsSceneContextMenuEvent object.
-func NewQGraphicsSceneContextMenuEvent2(typeVal uintptr) *QGraphicsSceneContextMenuEvent {
+func NewQGraphicsSceneContextMenuEvent2(typeVal QEvent__Type) *QGraphicsSceneContextMenuEvent {
 	ret := C.QGraphicsSceneContextMenuEvent_new2((C.uintptr_t)(typeVal))
 	return newQGraphicsSceneContextMenuEvent(ret)
 }
@@ -483,12 +491,12 @@ func (this *QGraphicsSceneContextMenuEvent) SetModifiers(modifiers int) {
 	C.QGraphicsSceneContextMenuEvent_SetModifiers(this.h, (C.int)(modifiers))
 }
 
-func (this *QGraphicsSceneContextMenuEvent) Reason() uintptr {
+func (this *QGraphicsSceneContextMenuEvent) Reason() QGraphicsSceneContextMenuEvent__Reason {
 	ret := C.QGraphicsSceneContextMenuEvent_Reason(this.h)
-	return (uintptr)(ret)
+	return (QGraphicsSceneContextMenuEvent__Reason)(ret)
 }
 
-func (this *QGraphicsSceneContextMenuEvent) SetReason(reason uintptr) {
+func (this *QGraphicsSceneContextMenuEvent) SetReason(reason QGraphicsSceneContextMenuEvent__Reason) {
 	C.QGraphicsSceneContextMenuEvent_SetReason(this.h, (C.uintptr_t)(reason))
 }
 
@@ -526,7 +534,7 @@ func NewQGraphicsSceneHoverEvent() *QGraphicsSceneHoverEvent {
 }
 
 // NewQGraphicsSceneHoverEvent2 constructs a new QGraphicsSceneHoverEvent object.
-func NewQGraphicsSceneHoverEvent2(typeVal uintptr) *QGraphicsSceneHoverEvent {
+func NewQGraphicsSceneHoverEvent2(typeVal QEvent__Type) *QGraphicsSceneHoverEvent {
 	ret := C.QGraphicsSceneHoverEvent_new2((C.uintptr_t)(typeVal))
 	return newQGraphicsSceneHoverEvent(ret)
 }
@@ -664,7 +672,7 @@ func NewQGraphicsSceneHelpEvent() *QGraphicsSceneHelpEvent {
 }
 
 // NewQGraphicsSceneHelpEvent2 constructs a new QGraphicsSceneHelpEvent object.
-func NewQGraphicsSceneHelpEvent2(typeVal uintptr) *QGraphicsSceneHelpEvent {
+func NewQGraphicsSceneHelpEvent2(typeVal QEvent__Type) *QGraphicsSceneHelpEvent {
 	ret := C.QGraphicsSceneHelpEvent_new2((C.uintptr_t)(typeVal))
 	return newQGraphicsSceneHelpEvent(ret)
 }
@@ -733,7 +741,7 @@ func NewQGraphicsSceneDragDropEvent() *QGraphicsSceneDragDropEvent {
 }
 
 // NewQGraphicsSceneDragDropEvent2 constructs a new QGraphicsSceneDragDropEvent object.
-func NewQGraphicsSceneDragDropEvent2(typeVal uintptr) *QGraphicsSceneDragDropEvent {
+func NewQGraphicsSceneDragDropEvent2(typeVal QEvent__Type) *QGraphicsSceneDragDropEvent {
 	ret := C.QGraphicsSceneDragDropEvent_new2((C.uintptr_t)(typeVal))
 	return newQGraphicsSceneDragDropEvent(ret)
 }
@@ -810,12 +818,12 @@ func (this *QGraphicsSceneDragDropEvent) SetPossibleActions(actions int) {
 	C.QGraphicsSceneDragDropEvent_SetPossibleActions(this.h, (C.int)(actions))
 }
 
-func (this *QGraphicsSceneDragDropEvent) ProposedAction() uintptr {
+func (this *QGraphicsSceneDragDropEvent) ProposedAction() DropAction {
 	ret := C.QGraphicsSceneDragDropEvent_ProposedAction(this.h)
-	return (uintptr)(ret)
+	return (DropAction)(ret)
 }
 
-func (this *QGraphicsSceneDragDropEvent) SetProposedAction(action uintptr) {
+func (this *QGraphicsSceneDragDropEvent) SetProposedAction(action DropAction) {
 	C.QGraphicsSceneDragDropEvent_SetProposedAction(this.h, (C.uintptr_t)(action))
 }
 
@@ -823,12 +831,12 @@ func (this *QGraphicsSceneDragDropEvent) AcceptProposedAction() {
 	C.QGraphicsSceneDragDropEvent_AcceptProposedAction(this.h)
 }
 
-func (this *QGraphicsSceneDragDropEvent) DropAction() uintptr {
+func (this *QGraphicsSceneDragDropEvent) DropAction() DropAction {
 	ret := C.QGraphicsSceneDragDropEvent_DropAction(this.h)
-	return (uintptr)(ret)
+	return (DropAction)(ret)
 }
 
-func (this *QGraphicsSceneDragDropEvent) SetDropAction(action uintptr) {
+func (this *QGraphicsSceneDragDropEvent) SetDropAction(action DropAction) {
 	C.QGraphicsSceneDragDropEvent_SetDropAction(this.h, (C.uintptr_t)(action))
 }
 

qt/gen_qgraphicstransform.go

@@ -449,7 +449,7 @@ func (this *QGraphicsRotation) SetAxis(axis *QVector3D) {
 	C.QGraphicsRotation_SetAxis(this.h, axis.cPointer())
 }
 
-func (this *QGraphicsRotation) SetAxisWithAxis(axis uintptr) {
+func (this *QGraphicsRotation) SetAxisWithAxis(axis Axis) {
 	C.QGraphicsRotation_SetAxisWithAxis(this.h, (C.uintptr_t)(axis))
 }
 

qt/gen_qgraphicsview.go

@@ -14,6 +14,48 @@ import (
 	"unsafe"
 )
 
+type QGraphicsView__ViewportAnchor int
+
+const (
+	QGraphicsView__ViewportAnchor__NoAnchor         QGraphicsView__ViewportAnchor = 0
+	QGraphicsView__ViewportAnchor__AnchorViewCenter QGraphicsView__ViewportAnchor = 1
+	QGraphicsView__ViewportAnchor__AnchorUnderMouse QGraphicsView__ViewportAnchor = 2
+)
+
+type QGraphicsView__CacheModeFlag int
+
+const (
+	QGraphicsView__CacheModeFlag__CacheNone       QGraphicsView__CacheModeFlag = 0
+	QGraphicsView__CacheModeFlag__CacheBackground QGraphicsView__CacheModeFlag = 1
+)
+
+type QGraphicsView__DragMode int
+
+const (
+	QGraphicsView__DragMode__NoDrag         QGraphicsView__DragMode = 0
+	QGraphicsView__DragMode__ScrollHandDrag QGraphicsView__DragMode = 1
+	QGraphicsView__DragMode__RubberBandDrag QGraphicsView__DragMode = 2
+)
+
+type QGraphicsView__ViewportUpdateMode int
+
+const (
+	QGraphicsView__ViewportUpdateMode__FullViewportUpdate         QGraphicsView__ViewportUpdateMode = 0
+	QGraphicsView__ViewportUpdateMode__MinimalViewportUpdate      QGraphicsView__ViewportUpdateMode = 1
+	QGraphicsView__ViewportUpdateMode__SmartViewportUpdate        QGraphicsView__ViewportUpdateMode = 2
+	QGraphicsView__ViewportUpdateMode__NoViewportUpdate           QGraphicsView__ViewportUpdateMode = 3
+	QGraphicsView__ViewportUpdateMode__BoundingRectViewportUpdate QGraphicsView__ViewportUpdateMode = 4
+)
+
+type QGraphicsView__OptimizationFlag int
+
+const (
+	QGraphicsView__OptimizationFlag__DontClipPainter           QGraphicsView__OptimizationFlag = 1
+	QGraphicsView__OptimizationFlag__DontSavePainterState      QGraphicsView__OptimizationFlag = 2
+	QGraphicsView__OptimizationFlag__DontAdjustForAntialiasing QGraphicsView__OptimizationFlag = 4
+	QGraphicsView__OptimizationFlag__IndirectPainting          QGraphicsView__OptimizationFlag = 8
+)
+
 type QGraphicsView struct {
 	h *C.QGraphicsView
 	*QAbstractScrollArea
@@ -104,7 +146,7 @@ func (this *QGraphicsView) RenderHints() int {
 	return (int)(ret)
 }
 
-func (this *QGraphicsView) SetRenderHint(hint uintptr) {
+func (this *QGraphicsView) SetRenderHint(hint QPainter__RenderHint) {
 	C.QGraphicsView_SetRenderHint(this.h, (C.uintptr_t)(hint))
 }
 
@@ -121,30 +163,30 @@ func (this *QGraphicsView) SetAlignment(alignment int) {
 	C.QGraphicsView_SetAlignment(this.h, (C.int)(alignment))
 }
 
-func (this *QGraphicsView) TransformationAnchor() uintptr {
+func (this *QGraphicsView) TransformationAnchor() QGraphicsView__ViewportAnchor {
 	ret := C.QGraphicsView_TransformationAnchor(this.h)
-	return (uintptr)(ret)
+	return (QGraphicsView__ViewportAnchor)(ret)
 }
 
-func (this *QGraphicsView) SetTransformationAnchor(anchor uintptr) {
+func (this *QGraphicsView) SetTransformationAnchor(anchor QGraphicsView__ViewportAnchor) {
 	C.QGraphicsView_SetTransformationAnchor(this.h, (C.uintptr_t)(anchor))
 }
 
-func (this *QGraphicsView) ResizeAnchor() uintptr {
+func (this *QGraphicsView) ResizeAnchor() QGraphicsView__ViewportAnchor {
 	ret := C.QGraphicsView_ResizeAnchor(this.h)
-	return (uintptr)(ret)
+	return (QGraphicsView__ViewportAnchor)(ret)
 }
 
-func (this *QGraphicsView) SetResizeAnchor(anchor uintptr) {
+func (this *QGraphicsView) SetResizeAnchor(anchor QGraphicsView__ViewportAnchor) {
 	C.QGraphicsView_SetResizeAnchor(this.h, (C.uintptr_t)(anchor))
 }
 
-func (this *QGraphicsView) ViewportUpdateMode() uintptr {
+func (this *QGraphicsView) ViewportUpdateMode() QGraphicsView__ViewportUpdateMode {
 	ret := C.QGraphicsView_ViewportUpdateMode(this.h)
-	return (uintptr)(ret)
+	return (QGraphicsView__ViewportUpdateMode)(ret)
 }
 
-func (this *QGraphicsView) SetViewportUpdateMode(mode uintptr) {
+func (this *QGraphicsView) SetViewportUpdateMode(mode QGraphicsView__ViewportUpdateMode) {
 	C.QGraphicsView_SetViewportUpdateMode(this.h, (C.uintptr_t)(mode))
 }
 
@@ -153,7 +195,7 @@ func (this *QGraphicsView) OptimizationFlags() int {
 	return (int)(ret)
 }
 
-func (this *QGraphicsView) SetOptimizationFlag(flag uintptr) {
+func (this *QGraphicsView) SetOptimizationFlag(flag QGraphicsView__OptimizationFlag) {
 	C.QGraphicsView_SetOptimizationFlag(this.h, (C.uintptr_t)(flag))
 }
 
@@ -161,21 +203,21 @@ func (this *QGraphicsView) SetOptimizationFlags(flags int) {
 	C.QGraphicsView_SetOptimizationFlags(this.h, (C.int)(flags))
 }
 
-func (this *QGraphicsView) DragMode() uintptr {
+func (this *QGraphicsView) DragMode() QGraphicsView__DragMode {
 	ret := C.QGraphicsView_DragMode(this.h)
-	return (uintptr)(ret)
+	return (QGraphicsView__DragMode)(ret)
 }
 
-func (this *QGraphicsView) SetDragMode(mode uintptr) {
+func (this *QGraphicsView) SetDragMode(mode QGraphicsView__DragMode) {
 	C.QGraphicsView_SetDragMode(this.h, (C.uintptr_t)(mode))
 }
 
-func (this *QGraphicsView) RubberBandSelectionMode() uintptr {
+func (this *QGraphicsView) RubberBandSelectionMode() ItemSelectionMode {
 	ret := C.QGraphicsView_RubberBandSelectionMode(this.h)
-	return (uintptr)(ret)
+	return (ItemSelectionMode)(ret)
 }
 
-func (this *QGraphicsView) SetRubberBandSelectionMode(mode uintptr) {
+func (this *QGraphicsView) SetRubberBandSelectionMode(mode ItemSelectionMode) {
 	C.QGraphicsView_SetRubberBandSelectionMode(this.h, (C.uintptr_t)(mode))
 }
 
@@ -504,7 +546,7 @@ func (this *QGraphicsView) MapFromScene2(x float64, y float64) *QPoint {
 	return ret1
 }
 
-func (this *QGraphicsView) InputMethodQuery(query uintptr) *QVariant {
+func (this *QGraphicsView) InputMethodQuery(query InputMethodQuery) *QVariant {
 	ret := C.QGraphicsView_InputMethodQuery(this.h, (C.uintptr_t)(query))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQVariant(ret)
@@ -627,11 +669,11 @@ func QGraphicsView_TrUtf83(s string, c string, n int) string {
 	return ret
 }
 
-func (this *QGraphicsView) SetRenderHint2(hint uintptr, enabled bool) {
+func (this *QGraphicsView) SetRenderHint2(hint QPainter__RenderHint, enabled bool) {
 	C.QGraphicsView_SetRenderHint2(this.h, (C.uintptr_t)(hint), (C.bool)(enabled))
 }
 
-func (this *QGraphicsView) SetOptimizationFlag2(flag uintptr, enabled bool) {
+func (this *QGraphicsView) SetOptimizationFlag2(flag QGraphicsView__OptimizationFlag, enabled bool) {
 	C.QGraphicsView_SetOptimizationFlag2(this.h, (C.uintptr_t)(flag), (C.bool)(enabled))
 }
 
@@ -667,15 +709,15 @@ func (this *QGraphicsView) EnsureVisible32(item *QGraphicsItem, xmargin int, yma
 	C.QGraphicsView_EnsureVisible32(this.h, item.cPointer(), (C.int)(xmargin), (C.int)(ymargin))
 }
 
-func (this *QGraphicsView) FitInView22(rect *QRectF, aspectRadioMode uintptr) {
+func (this *QGraphicsView) FitInView22(rect *QRectF, aspectRadioMode AspectRatioMode) {
 	C.QGraphicsView_FitInView22(this.h, rect.cPointer(), (C.uintptr_t)(aspectRadioMode))
 }
 
-func (this *QGraphicsView) FitInView5(x float64, y float64, w float64, h float64, aspectRadioMode uintptr) {
+func (this *QGraphicsView) FitInView5(x float64, y float64, w float64, h float64, aspectRadioMode AspectRatioMode) {
 	C.QGraphicsView_FitInView5(this.h, (C.double)(x), (C.double)(y), (C.double)(w), (C.double)(h), (C.uintptr_t)(aspectRadioMode))
 }
 
-func (this *QGraphicsView) FitInView23(item *QGraphicsItem, aspectRadioMode uintptr) {
+func (this *QGraphicsView) FitInView23(item *QGraphicsItem, aspectRadioMode AspectRatioMode) {
 	C.QGraphicsView_FitInView23(this.h, item.cPointer(), (C.uintptr_t)(aspectRadioMode))
 }
 
@@ -687,11 +729,11 @@ func (this *QGraphicsView) Render3(painter *QPainter, target *QRectF, source *QR
 	C.QGraphicsView_Render3(this.h, painter.cPointer(), target.cPointer(), source.cPointer())
 }
 
-func (this *QGraphicsView) Render4(painter *QPainter, target *QRectF, source *QRect, aspectRatioMode uintptr) {
+func (this *QGraphicsView) Render4(painter *QPainter, target *QRectF, source *QRect, aspectRatioMode AspectRatioMode) {
 	C.QGraphicsView_Render4(this.h, painter.cPointer(), target.cPointer(), source.cPointer(), (C.uintptr_t)(aspectRatioMode))
 }
 
-func (this *QGraphicsView) Items22(rect *QRect, mode uintptr) []*QGraphicsItem {
+func (this *QGraphicsView) Items22(rect *QRect, mode ItemSelectionMode) []*QGraphicsItem {
 	var _out **C.QGraphicsItem = nil
 	var _out_len C.size_t = 0
 	C.QGraphicsView_Items22(this.h, rect.cPointer(), (C.uintptr_t)(mode), &_out, &_out_len)
@@ -704,7 +746,7 @@ func (this *QGraphicsView) Items22(rect *QRect, mode uintptr) []*QGraphicsItem {
 	return ret
 }
 
-func (this *QGraphicsView) Items5(x int, y int, w int, h int, mode uintptr) []*QGraphicsItem {
+func (this *QGraphicsView) Items5(x int, y int, w int, h int, mode ItemSelectionMode) []*QGraphicsItem {
 	var _out **C.QGraphicsItem = nil
 	var _out_len C.size_t = 0
 	C.QGraphicsView_Items5(this.h, (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.uintptr_t)(mode), &_out, &_out_len)
@@ -717,7 +759,7 @@ func (this *QGraphicsView) Items5(x int, y int, w int, h int, mode uintptr) []*Q
 	return ret
 }
 
-func (this *QGraphicsView) Items24(path *QPainterPath, mode uintptr) []*QGraphicsItem {
+func (this *QGraphicsView) Items24(path *QPainterPath, mode ItemSelectionMode) []*QGraphicsItem {
 	var _out **C.QGraphicsItem = nil
 	var _out_len C.size_t = 0
 	C.QGraphicsView_Items24(this.h, path.cPointer(), (C.uintptr_t)(mode), &_out, &_out_len)

qt/gen_qgraphicswidget.go

@@ -14,6 +14,12 @@ import (
 	"unsafe"
 )
 
+type QGraphicsWidget__ int
+
+const (
+	QGraphicsWidget____Type QGraphicsWidget__ = 11
+)
+
 type QGraphicsWidget struct {
 	h *C.QGraphicsWidget
 	*QGraphicsObject
@@ -96,12 +102,12 @@ func (this *QGraphicsWidget) AdjustSize() {
 	C.QGraphicsWidget_AdjustSize(this.h)
 }
 
-func (this *QGraphicsWidget) LayoutDirection() uintptr {
+func (this *QGraphicsWidget) LayoutDirection() LayoutDirection {
 	ret := C.QGraphicsWidget_LayoutDirection(this.h)
-	return (uintptr)(ret)
+	return (LayoutDirection)(ret)
 }
 
-func (this *QGraphicsWidget) SetLayoutDirection(direction uintptr) {
+func (this *QGraphicsWidget) SetLayoutDirection(direction LayoutDirection) {
 	C.QGraphicsWidget_SetLayoutDirection(this.h, (C.uintptr_t)(direction))
 }
 
@@ -250,9 +256,9 @@ func (this *QGraphicsWidget) WindowFlags() int {
 	return (int)(ret)
 }
 
-func (this *QGraphicsWidget) WindowType() uintptr {
+func (this *QGraphicsWidget) WindowType() WindowType {
 	ret := C.QGraphicsWidget_WindowType(this.h)
-	return (uintptr)(ret)
+	return (WindowType)(ret)
 }
 
 func (this *QGraphicsWidget) SetWindowFlags(wFlags int) {
@@ -279,12 +285,12 @@ func (this *QGraphicsWidget) WindowTitle() string {
 	return ret
 }
 
-func (this *QGraphicsWidget) FocusPolicy() uintptr {
+func (this *QGraphicsWidget) FocusPolicy() FocusPolicy {
 	ret := C.QGraphicsWidget_FocusPolicy(this.h)
-	return (uintptr)(ret)
+	return (FocusPolicy)(ret)
 }
 
-func (this *QGraphicsWidget) SetFocusPolicy(policy uintptr) {
+func (this *QGraphicsWidget) SetFocusPolicy(policy FocusPolicy) {
 	C.QGraphicsWidget_SetFocusPolicy(this.h, (C.uintptr_t)(policy))
 }
 
@@ -359,11 +365,11 @@ func (this *QGraphicsWidget) Actions() []*QAction {
 	return ret
 }
 
-func (this *QGraphicsWidget) SetAttribute(attribute uintptr) {
+func (this *QGraphicsWidget) SetAttribute(attribute WidgetAttribute) {
 	C.QGraphicsWidget_SetAttribute(this.h, (C.uintptr_t)(attribute))
 }
 
-func (this *QGraphicsWidget) TestAttribute(attribute uintptr) bool {
+func (this *QGraphicsWidget) TestAttribute(attribute WidgetAttribute) bool {
 	ret := C.QGraphicsWidget_TestAttribute(this.h, (C.uintptr_t)(attribute))
 	return (bool)(ret)
 }
@@ -484,7 +490,7 @@ func QGraphicsWidget_TrUtf83(s string, c string, n int) string {
 	return ret
 }
 
-func (this *QGraphicsWidget) GrabShortcut2(sequence *QKeySequence, context uintptr) int {
+func (this *QGraphicsWidget) GrabShortcut2(sequence *QKeySequence, context ShortcutContext) int {
 	ret := C.QGraphicsWidget_GrabShortcut2(this.h, sequence.cPointer(), (C.uintptr_t)(context))
 	return (int)(ret)
 }
@@ -497,7 +503,7 @@ func (this *QGraphicsWidget) SetShortcutAutoRepeat2(id int, enabled bool) {
 	C.QGraphicsWidget_SetShortcutAutoRepeat2(this.h, (C.int)(id), (C.bool)(enabled))
 }
 
-func (this *QGraphicsWidget) SetAttribute2(attribute uintptr, on bool) {
+func (this *QGraphicsWidget) SetAttribute2(attribute WidgetAttribute, on bool) {
 	C.QGraphicsWidget_SetAttribute2(this.h, (C.uintptr_t)(attribute), (C.bool)(on))
 }
 

qt/gen_qgridlayout.go

@@ -236,13 +236,13 @@ func (this *QGridLayout) AddLayout2(param1 *QLayout, row int, column int, rowSpa
 	C.QGridLayout_AddLayout2(this.h, param1.cPointer(), (C.int)(row), (C.int)(column), (C.int)(rowSpan), (C.int)(columnSpan))
 }
 
-func (this *QGridLayout) SetOriginCorner(originCorner uintptr) {
+func (this *QGridLayout) SetOriginCorner(originCorner Corner) {
 	C.QGridLayout_SetOriginCorner(this.h, (C.uintptr_t)(originCorner))
 }
 
-func (this *QGridLayout) OriginCorner() uintptr {
+func (this *QGridLayout) OriginCorner() Corner {
 	ret := C.QGridLayout_OriginCorner(this.h)
-	return (uintptr)(ret)
+	return (Corner)(ret)
 }
 
 func (this *QGridLayout) ItemAt(index int) *QLayoutItem {
@@ -273,7 +273,7 @@ func (this *QGridLayout) AddItem(item *QLayoutItem, row int, column int) {
 	C.QGridLayout_AddItem(this.h, item.cPointer(), (C.int)(row), (C.int)(column))
 }
 
-func (this *QGridLayout) SetDefaultPositioning(n int, orient uintptr) {
+func (this *QGridLayout) SetDefaultPositioning(n int, orient Orientation) {
 	C.QGridLayout_SetDefaultPositioning(this.h, (C.int)(n), (C.uintptr_t)(orient))
 }
 

qt/gen_qguiapplication.go

@@ -285,13 +285,13 @@ func QGuiApplication_MouseButtons() int {
 	return (int)(ret)
 }
 
-func QGuiApplication_SetLayoutDirection(direction uintptr) {
+func QGuiApplication_SetLayoutDirection(direction LayoutDirection) {
 	C.QGuiApplication_SetLayoutDirection((C.uintptr_t)(direction))
 }
 
-func QGuiApplication_LayoutDirection() uintptr {
+func QGuiApplication_LayoutDirection() LayoutDirection {
 	ret := C.QGuiApplication_LayoutDirection()
-	return (uintptr)(ret)
+	return (LayoutDirection)(ret)
 }
 
 func QGuiApplication_IsRightToLeft() bool {
@@ -332,18 +332,18 @@ func QGuiApplication_QuitOnLastWindowClosed() bool {
 	return (bool)(ret)
 }
 
-func QGuiApplication_ApplicationState() uintptr {
+func QGuiApplication_ApplicationState() ApplicationState {
 	ret := C.QGuiApplication_ApplicationState()
-	return (uintptr)(ret)
+	return (ApplicationState)(ret)
 }
 
-func QGuiApplication_SetHighDpiScaleFactorRoundingPolicy(policy uintptr) {
+func QGuiApplication_SetHighDpiScaleFactorRoundingPolicy(policy HighDpiScaleFactorRoundingPolicy) {
 	C.QGuiApplication_SetHighDpiScaleFactorRoundingPolicy((C.uintptr_t)(policy))
 }
 
-func QGuiApplication_HighDpiScaleFactorRoundingPolicy() uintptr {
+func QGuiApplication_HighDpiScaleFactorRoundingPolicy() HighDpiScaleFactorRoundingPolicy {
 	ret := C.QGuiApplication_HighDpiScaleFactorRoundingPolicy()
-	return (uintptr)(ret)
+	return (HighDpiScaleFactorRoundingPolicy)(ret)
 }
 
 func QGuiApplication_Exec() int {
@@ -481,7 +481,7 @@ func (this *QGuiApplication) OnFocusWindowChanged(slot func()) {
 	C.QGuiApplication_connect_FocusWindowChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slotWrapper))))
 }
 
-func (this *QGuiApplication) ApplicationStateChanged(state uintptr) {
+func (this *QGuiApplication) ApplicationStateChanged(state ApplicationState) {
 	C.QGuiApplication_ApplicationStateChanged(this.h, (C.uintptr_t)(state))
 }
 
@@ -493,7 +493,7 @@ func (this *QGuiApplication) OnApplicationStateChanged(slot func()) {
 	C.QGuiApplication_connect_ApplicationStateChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slotWrapper))))
 }
 
-func (this *QGuiApplication) LayoutDirectionChanged(direction uintptr) {
+func (this *QGuiApplication) LayoutDirectionChanged(direction LayoutDirection) {
 	C.QGuiApplication_LayoutDirectionChanged(this.h, (C.uintptr_t)(direction))
 }
 

qt/gen_qheaderview.go

@@ -14,6 +14,16 @@ import (
 	"unsafe"
 )
 
+type QHeaderView__ResizeMode int
+
+const (
+	QHeaderView__ResizeMode__Interactive      QHeaderView__ResizeMode = 0
+	QHeaderView__ResizeMode__Stretch          QHeaderView__ResizeMode = 1
+	QHeaderView__ResizeMode__Fixed            QHeaderView__ResizeMode = 2
+	QHeaderView__ResizeMode__ResizeToContents QHeaderView__ResizeMode = 3
+	QHeaderView__ResizeMode__Custom           QHeaderView__ResizeMode = 2
+)
+
 type QHeaderView struct {
 	h *C.QHeaderView
 	*QAbstractItemView
@@ -38,13 +48,13 @@ func newQHeaderView_U(h unsafe.Pointer) *QHeaderView {
 }
 
 // NewQHeaderView constructs a new QHeaderView object.
-func NewQHeaderView(orientation uintptr) *QHeaderView {
+func NewQHeaderView(orientation Orientation) *QHeaderView {
 	ret := C.QHeaderView_new((C.uintptr_t)(orientation))
 	return newQHeaderView(ret)
 }
 
 // NewQHeaderView2 constructs a new QHeaderView object.
-func NewQHeaderView2(orientation uintptr, parent *QWidget) *QHeaderView {
+func NewQHeaderView2(orientation Orientation, parent *QWidget) *QHeaderView {
 	ret := C.QHeaderView_new2((C.uintptr_t)(orientation), parent.cPointer())
 	return newQHeaderView(ret)
 }
@@ -80,9 +90,9 @@ func (this *QHeaderView) SetModel(model *QAbstractItemModel) {
 	C.QHeaderView_SetModel(this.h, model.cPointer())
 }
 
-func (this *QHeaderView) Orientation() uintptr {
+func (this *QHeaderView) Orientation() Orientation {
 	ret := C.QHeaderView_Orientation(this.h)
-	return (uintptr)(ret)
+	return (Orientation)(ret)
 }
 
 func (this *QHeaderView) Offset() int {
@@ -162,7 +172,7 @@ func (this *QHeaderView) ResizeSection(logicalIndex int, size int) {
 	C.QHeaderView_ResizeSection(this.h, (C.int)(logicalIndex), (C.int)(size))
 }
 
-func (this *QHeaderView) ResizeSections(mode uintptr) {
+func (this *QHeaderView) ResizeSections(mode QHeaderView__ResizeMode) {
 	C.QHeaderView_ResizeSections(this.h, (C.uintptr_t)(mode))
 }
 
@@ -239,16 +249,16 @@ func (this *QHeaderView) HighlightSections() bool {
 	return (bool)(ret)
 }
 
-func (this *QHeaderView) SectionResizeMode(logicalIndex int) uintptr {
+func (this *QHeaderView) SectionResizeMode(logicalIndex int) QHeaderView__ResizeMode {
 	ret := C.QHeaderView_SectionResizeMode(this.h, (C.int)(logicalIndex))
-	return (uintptr)(ret)
+	return (QHeaderView__ResizeMode)(ret)
 }
 
-func (this *QHeaderView) SetSectionResizeMode(mode uintptr) {
+func (this *QHeaderView) SetSectionResizeMode(mode QHeaderView__ResizeMode) {
 	C.QHeaderView_SetSectionResizeMode(this.h, (C.uintptr_t)(mode))
 }
 
-func (this *QHeaderView) SetSectionResizeMode2(logicalIndex int, mode uintptr) {
+func (this *QHeaderView) SetSectionResizeMode2(logicalIndex int, mode QHeaderView__ResizeMode) {
 	C.QHeaderView_SetSectionResizeMode2(this.h, (C.int)(logicalIndex), (C.uintptr_t)(mode))
 }
 
@@ -275,7 +285,7 @@ func (this *QHeaderView) IsSortIndicatorShown() bool {
 	return (bool)(ret)
 }
 
-func (this *QHeaderView) SetSortIndicator(logicalIndex int, order uintptr) {
+func (this *QHeaderView) SetSortIndicator(logicalIndex int, order SortOrder) {
 	C.QHeaderView_SetSortIndicator(this.h, (C.int)(logicalIndex), (C.uintptr_t)(order))
 }
 
@@ -284,9 +294,9 @@ func (this *QHeaderView) SortIndicatorSection() int {
 	return (int)(ret)
 }
 
-func (this *QHeaderView) SortIndicatorOrder() uintptr {
+func (this *QHeaderView) SortIndicatorOrder() SortOrder {
 	ret := C.QHeaderView_SortIndicatorOrder(this.h)
-	return (uintptr)(ret)
+	return (SortOrder)(ret)
 }
 
 func (this *QHeaderView) StretchLastSection() bool {
@@ -393,7 +403,7 @@ func (this *QHeaderView) SetOffsetToLastSection() {
 	C.QHeaderView_SetOffsetToLastSection(this.h)
 }
 
-func (this *QHeaderView) HeaderDataChanged(orientation uintptr, logicalFirst int, logicalLast int) {
+func (this *QHeaderView) HeaderDataChanged(orientation Orientation, logicalFirst int, logicalLast int) {
 	C.QHeaderView_HeaderDataChanged(this.h, (C.uintptr_t)(orientation), (C.int)(logicalFirst), (C.int)(logicalLast))
 }
 
@@ -505,7 +515,7 @@ func (this *QHeaderView) OnGeometriesChanged(slot func()) {
 	C.QHeaderView_connect_GeometriesChanged(this.h, unsafe.Pointer(uintptr(cgo.NewHandle(slotWrapper))))
 }
 
-func (this *QHeaderView) SortIndicatorChanged(logicalIndex int, order uintptr) {
+func (this *QHeaderView) SortIndicatorChanged(logicalIndex int, order SortOrder) {
 	C.QHeaderView_SortIndicatorChanged(this.h, (C.int)(logicalIndex), (C.uintptr_t)(order))
 }
 

qt/gen_qhistorystate.go

@@ -12,6 +12,13 @@ import (
 	"unsafe"
 )
 
+type QHistoryState__HistoryType int
+
+const (
+	QHistoryState__HistoryType__ShallowHistory QHistoryState__HistoryType = 0
+	QHistoryState__HistoryType__DeepHistory    QHistoryState__HistoryType = 1
+)
+
 type QHistoryState struct {
 	h *C.QHistoryState
 	*QAbstractState
@@ -42,7 +49,7 @@ func NewQHistoryState() *QHistoryState {
 }
 
 // NewQHistoryState2 constructs a new QHistoryState object.
-func NewQHistoryState2(typeVal uintptr) *QHistoryState {
+func NewQHistoryState2(typeVal QHistoryState__HistoryType) *QHistoryState {
 	ret := C.QHistoryState_new2((C.uintptr_t)(typeVal))
 	return newQHistoryState(ret)
 }
@@ -54,7 +61,7 @@ func NewQHistoryState3(parent *QState) *QHistoryState {
 }
 
 // NewQHistoryState4 constructs a new QHistoryState object.
-func NewQHistoryState4(typeVal uintptr, parent *QState) *QHistoryState {
+func NewQHistoryState4(typeVal QHistoryState__HistoryType, parent *QState) *QHistoryState {
 	ret := C.QHistoryState_new4((C.uintptr_t)(typeVal), parent.cPointer())
 	return newQHistoryState(ret)
 }
@@ -104,12 +111,12 @@ func (this *QHistoryState) SetDefaultState(state *QAbstractState) {
 	C.QHistoryState_SetDefaultState(this.h, state.cPointer())
 }
 
-func (this *QHistoryState) HistoryType() uintptr {
+func (this *QHistoryState) HistoryType() QHistoryState__HistoryType {
 	ret := C.QHistoryState_HistoryType(this.h)
-	return (uintptr)(ret)
+	return (QHistoryState__HistoryType)(ret)
 }
 
-func (this *QHistoryState) SetHistoryType(typeVal uintptr) {
+func (this *QHistoryState) SetHistoryType(typeVal QHistoryState__HistoryType) {
 	C.QHistoryState_SetHistoryType(this.h, (C.uintptr_t)(typeVal))
 }
 

qt/gen_qicon.go

@@ -13,6 +13,22 @@ import (
 	"unsafe"
 )
 
+type QIcon__Mode int
+
+const (
+	QIcon__Mode__Normal   QIcon__Mode = 0
+	QIcon__Mode__Disabled QIcon__Mode = 1
+	QIcon__Mode__Active   QIcon__Mode = 2
+	QIcon__Mode__Selected QIcon__Mode = 3
+)
+
+type QIcon__State int
+
+const (
+	QIcon__State__On  QIcon__State = 0
+	QIcon__State__Off QIcon__State = 1
+)
+
 type QIcon struct {
 	h *C.QIcon
 }
@@ -332,7 +348,7 @@ func QIcon_SetFallbackThemeName(name string) {
 	C.QIcon_SetFallbackThemeName(name_Cstring, C.size_t(len(name)))
 }
 
-func (this *QIcon) Pixmap22(size *QSize, mode uintptr) *QPixmap {
+func (this *QIcon) Pixmap22(size *QSize, mode QIcon__Mode) *QPixmap {
 	ret := C.QIcon_Pixmap22(this.h, size.cPointer(), (C.uintptr_t)(mode))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQPixmap(ret)
@@ -343,7 +359,7 @@ func (this *QIcon) Pixmap22(size *QSize, mode uintptr) *QPixmap {
 	return ret1
 }
 
-func (this *QIcon) Pixmap32(size *QSize, mode uintptr, state uintptr) *QPixmap {
+func (this *QIcon) Pixmap32(size *QSize, mode QIcon__Mode, state QIcon__State) *QPixmap {
 	ret := C.QIcon_Pixmap32(this.h, size.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(state))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQPixmap(ret)
@@ -354,7 +370,7 @@ func (this *QIcon) Pixmap32(size *QSize, mode uintptr, state uintptr) *QPixmap {
 	return ret1
 }
 
-func (this *QIcon) Pixmap33(w int, h int, mode uintptr) *QPixmap {
+func (this *QIcon) Pixmap33(w int, h int, mode QIcon__Mode) *QPixmap {
 	ret := C.QIcon_Pixmap33(this.h, (C.int)(w), (C.int)(h), (C.uintptr_t)(mode))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQPixmap(ret)
@@ -365,7 +381,7 @@ func (this *QIcon) Pixmap33(w int, h int, mode uintptr) *QPixmap {
 	return ret1
 }
 
-func (this *QIcon) Pixmap4(w int, h int, mode uintptr, state uintptr) *QPixmap {
+func (this *QIcon) Pixmap4(w int, h int, mode QIcon__Mode, state QIcon__State) *QPixmap {
 	ret := C.QIcon_Pixmap4(this.h, (C.int)(w), (C.int)(h), (C.uintptr_t)(mode), (C.uintptr_t)(state))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQPixmap(ret)
@@ -376,7 +392,7 @@ func (this *QIcon) Pixmap4(w int, h int, mode uintptr, state uintptr) *QPixmap {
 	return ret1
 }
 
-func (this *QIcon) Pixmap23(extent int, mode uintptr) *QPixmap {
+func (this *QIcon) Pixmap23(extent int, mode QIcon__Mode) *QPixmap {
 	ret := C.QIcon_Pixmap23(this.h, (C.int)(extent), (C.uintptr_t)(mode))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQPixmap(ret)
@@ -387,7 +403,7 @@ func (this *QIcon) Pixmap23(extent int, mode uintptr) *QPixmap {
 	return ret1
 }
 
-func (this *QIcon) Pixmap34(extent int, mode uintptr, state uintptr) *QPixmap {
+func (this *QIcon) Pixmap34(extent int, mode QIcon__Mode, state QIcon__State) *QPixmap {
 	ret := C.QIcon_Pixmap34(this.h, (C.int)(extent), (C.uintptr_t)(mode), (C.uintptr_t)(state))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQPixmap(ret)
@@ -398,7 +414,7 @@ func (this *QIcon) Pixmap34(extent int, mode uintptr, state uintptr) *QPixmap {
 	return ret1
 }
 
-func (this *QIcon) Pixmap35(window *QWindow, size *QSize, mode uintptr) *QPixmap {
+func (this *QIcon) Pixmap35(window *QWindow, size *QSize, mode QIcon__Mode) *QPixmap {
 	ret := C.QIcon_Pixmap35(this.h, window.cPointer(), size.cPointer(), (C.uintptr_t)(mode))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQPixmap(ret)
@@ -409,7 +425,7 @@ func (this *QIcon) Pixmap35(window *QWindow, size *QSize, mode uintptr) *QPixmap
 	return ret1
 }
 
-func (this *QIcon) Pixmap42(window *QWindow, size *QSize, mode uintptr, state uintptr) *QPixmap {
+func (this *QIcon) Pixmap42(window *QWindow, size *QSize, mode QIcon__Mode, state QIcon__State) *QPixmap {
 	ret := C.QIcon_Pixmap42(this.h, window.cPointer(), size.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(state))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQPixmap(ret)
@@ -420,7 +436,7 @@ func (this *QIcon) Pixmap42(window *QWindow, size *QSize, mode uintptr, state ui
 	return ret1
 }
 
-func (this *QIcon) ActualSize22(size *QSize, mode uintptr) *QSize {
+func (this *QIcon) ActualSize22(size *QSize, mode QIcon__Mode) *QSize {
 	ret := C.QIcon_ActualSize22(this.h, size.cPointer(), (C.uintptr_t)(mode))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQSize(ret)
@@ -431,7 +447,7 @@ func (this *QIcon) ActualSize22(size *QSize, mode uintptr) *QSize {
 	return ret1
 }
 
-func (this *QIcon) ActualSize3(size *QSize, mode uintptr, state uintptr) *QSize {
+func (this *QIcon) ActualSize3(size *QSize, mode QIcon__Mode, state QIcon__State) *QSize {
 	ret := C.QIcon_ActualSize3(this.h, size.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(state))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQSize(ret)
@@ -442,7 +458,7 @@ func (this *QIcon) ActualSize3(size *QSize, mode uintptr, state uintptr) *QSize
 	return ret1
 }
 
-func (this *QIcon) ActualSize32(window *QWindow, size *QSize, mode uintptr) *QSize {
+func (this *QIcon) ActualSize32(window *QWindow, size *QSize, mode QIcon__Mode) *QSize {
 	ret := C.QIcon_ActualSize32(this.h, window.cPointer(), size.cPointer(), (C.uintptr_t)(mode))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQSize(ret)
@@ -453,7 +469,7 @@ func (this *QIcon) ActualSize32(window *QWindow, size *QSize, mode uintptr) *QSi
 	return ret1
 }
 
-func (this *QIcon) ActualSize4(window *QWindow, size *QSize, mode uintptr, state uintptr) *QSize {
+func (this *QIcon) ActualSize4(window *QWindow, size *QSize, mode QIcon__Mode, state QIcon__State) *QSize {
 	ret := C.QIcon_ActualSize4(this.h, window.cPointer(), size.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(state))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQSize(ret)
@@ -468,11 +484,11 @@ func (this *QIcon) Paint3(painter *QPainter, rect *QRect, alignment int) {
 	C.QIcon_Paint3(this.h, painter.cPointer(), rect.cPointer(), (C.int)(alignment))
 }
 
-func (this *QIcon) Paint4(painter *QPainter, rect *QRect, alignment int, mode uintptr) {
+func (this *QIcon) Paint4(painter *QPainter, rect *QRect, alignment int, mode QIcon__Mode) {
 	C.QIcon_Paint4(this.h, painter.cPointer(), rect.cPointer(), (C.int)(alignment), (C.uintptr_t)(mode))
 }
 
-func (this *QIcon) Paint5(painter *QPainter, rect *QRect, alignment int, mode uintptr, state uintptr) {
+func (this *QIcon) Paint5(painter *QPainter, rect *QRect, alignment int, mode QIcon__Mode, state QIcon__State) {
 	C.QIcon_Paint5(this.h, painter.cPointer(), rect.cPointer(), (C.int)(alignment), (C.uintptr_t)(mode), (C.uintptr_t)(state))
 }
 
@@ -480,19 +496,19 @@ func (this *QIcon) Paint6(painter *QPainter, x int, y int, w int, h int, alignme
 	C.QIcon_Paint6(this.h, painter.cPointer(), (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(alignment))
 }
 
-func (this *QIcon) Paint7(painter *QPainter, x int, y int, w int, h int, alignment int, mode uintptr) {
+func (this *QIcon) Paint7(painter *QPainter, x int, y int, w int, h int, alignment int, mode QIcon__Mode) {
 	C.QIcon_Paint7(this.h, painter.cPointer(), (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(alignment), (C.uintptr_t)(mode))
 }
 
-func (this *QIcon) Paint8(painter *QPainter, x int, y int, w int, h int, alignment int, mode uintptr, state uintptr) {
+func (this *QIcon) Paint8(painter *QPainter, x int, y int, w int, h int, alignment int, mode QIcon__Mode, state QIcon__State) {
 	C.QIcon_Paint8(this.h, painter.cPointer(), (C.int)(x), (C.int)(y), (C.int)(w), (C.int)(h), (C.int)(alignment), (C.uintptr_t)(mode), (C.uintptr_t)(state))
 }
 
-func (this *QIcon) AddPixmap2(pixmap *QPixmap, mode uintptr) {
+func (this *QIcon) AddPixmap2(pixmap *QPixmap, mode QIcon__Mode) {
 	C.QIcon_AddPixmap2(this.h, pixmap.cPointer(), (C.uintptr_t)(mode))
 }
 
-func (this *QIcon) AddPixmap3(pixmap *QPixmap, mode uintptr, state uintptr) {
+func (this *QIcon) AddPixmap3(pixmap *QPixmap, mode QIcon__Mode, state QIcon__State) {
 	C.QIcon_AddPixmap3(this.h, pixmap.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(state))
 }
 
@@ -502,19 +518,19 @@ func (this *QIcon) AddFile2(fileName string, size *QSize) {
 	C.QIcon_AddFile2(this.h, fileName_Cstring, C.size_t(len(fileName)), size.cPointer())
 }
 
-func (this *QIcon) AddFile3(fileName string, size *QSize, mode uintptr) {
+func (this *QIcon) AddFile3(fileName string, size *QSize, mode QIcon__Mode) {
 	fileName_Cstring := C.CString(fileName)
 	defer C.free(unsafe.Pointer(fileName_Cstring))
 	C.QIcon_AddFile3(this.h, fileName_Cstring, C.size_t(len(fileName)), size.cPointer(), (C.uintptr_t)(mode))
 }
 
-func (this *QIcon) AddFile4(fileName string, size *QSize, mode uintptr, state uintptr) {
+func (this *QIcon) AddFile4(fileName string, size *QSize, mode QIcon__Mode, state QIcon__State) {
 	fileName_Cstring := C.CString(fileName)
 	defer C.free(unsafe.Pointer(fileName_Cstring))
 	C.QIcon_AddFile4(this.h, fileName_Cstring, C.size_t(len(fileName)), size.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(state))
 }
 
-func (this *QIcon) AvailableSizes1(mode uintptr) []QSize {
+func (this *QIcon) AvailableSizes1(mode QIcon__Mode) []QSize {
 	var _out **C.QSize = nil
 	var _out_len C.size_t = 0
 	C.QIcon_AvailableSizes1(this.h, (C.uintptr_t)(mode), &_out, &_out_len)
@@ -527,7 +543,7 @@ func (this *QIcon) AvailableSizes1(mode uintptr) []QSize {
 	return ret
 }
 
-func (this *QIcon) AvailableSizes2(mode uintptr, state uintptr) []QSize {
+func (this *QIcon) AvailableSizes2(mode QIcon__Mode, state QIcon__State) []QSize {
 	var _out **C.QSize = nil
 	var _out_len C.size_t = 0
 	C.QIcon_AvailableSizes2(this.h, (C.uintptr_t)(mode), (C.uintptr_t)(state), &_out, &_out_len)

qt/gen_qiconengine.go

@@ -13,6 +13,15 @@ import (
 	"unsafe"
 )
 
+type QIconEngine__IconEngineHook int
+
+const (
+	QIconEngine__IconEngineHook__AvailableSizesHook QIconEngine__IconEngineHook = 1
+	QIconEngine__IconEngineHook__IconNameHook       QIconEngine__IconEngineHook = 2
+	QIconEngine__IconEngineHook__IsNullHook         QIconEngine__IconEngineHook = 3
+	QIconEngine__IconEngineHook__ScaledPixmapHook   QIconEngine__IconEngineHook = 4
+)
+
 type QIconEngine struct {
 	h *C.QIconEngine
 }
@@ -35,11 +44,11 @@ func newQIconEngine_U(h unsafe.Pointer) *QIconEngine {
 	return newQIconEngine((*C.QIconEngine)(h))
 }
 
-func (this *QIconEngine) Paint(painter *QPainter, rect *QRect, mode uintptr, state uintptr) {
+func (this *QIconEngine) Paint(painter *QPainter, rect *QRect, mode QIcon__Mode, state QIcon__State) {
 	C.QIconEngine_Paint(this.h, painter.cPointer(), rect.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(state))
 }
 
-func (this *QIconEngine) ActualSize(size *QSize, mode uintptr, state uintptr) *QSize {
+func (this *QIconEngine) ActualSize(size *QSize, mode QIcon__Mode, state QIcon__State) *QSize {
 	ret := C.QIconEngine_ActualSize(this.h, size.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(state))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQSize(ret)
@@ -50,7 +59,7 @@ func (this *QIconEngine) ActualSize(size *QSize, mode uintptr, state uintptr) *Q
 	return ret1
 }
 
-func (this *QIconEngine) Pixmap(size *QSize, mode uintptr, state uintptr) *QPixmap {
+func (this *QIconEngine) Pixmap(size *QSize, mode QIcon__Mode, state QIcon__State) *QPixmap {
 	ret := C.QIconEngine_Pixmap(this.h, size.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(state))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQPixmap(ret)
@@ -61,11 +70,11 @@ func (this *QIconEngine) Pixmap(size *QSize, mode uintptr, state uintptr) *QPixm
 	return ret1
 }
 
-func (this *QIconEngine) AddPixmap(pixmap *QPixmap, mode uintptr, state uintptr) {
+func (this *QIconEngine) AddPixmap(pixmap *QPixmap, mode QIcon__Mode, state QIcon__State) {
 	C.QIconEngine_AddPixmap(this.h, pixmap.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(state))
 }
 
-func (this *QIconEngine) AddFile(fileName string, size *QSize, mode uintptr, state uintptr) {
+func (this *QIconEngine) AddFile(fileName string, size *QSize, mode QIcon__Mode, state QIcon__State) {
 	fileName_Cstring := C.CString(fileName)
 	defer C.free(unsafe.Pointer(fileName_Cstring))
 	C.QIconEngine_AddFile(this.h, fileName_Cstring, C.size_t(len(fileName)), size.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(state))
@@ -122,7 +131,7 @@ func (this *QIconEngine) IsNull() bool {
 	return (bool)(ret)
 }
 
-func (this *QIconEngine) ScaledPixmap(size *QSize, mode uintptr, state uintptr, scale float64) *QPixmap {
+func (this *QIconEngine) ScaledPixmap(size *QSize, mode QIcon__Mode, state QIcon__State, scale float64) *QPixmap {
 	ret := C.QIconEngine_ScaledPixmap(this.h, size.cPointer(), (C.uintptr_t)(mode), (C.uintptr_t)(state), (C.double)(scale))
 	// Qt uses pass-by-value semantics for this type. Mimic with finalizer
 	ret1 := newQPixmap(ret)
@@ -133,7 +142,7 @@ func (this *QIconEngine) ScaledPixmap(size *QSize, mode uintptr, state uintptr,
 	return ret1
 }
 
-func (this *QIconEngine) AvailableSizes1(mode uintptr) []QSize {
+func (this *QIconEngine) AvailableSizes1(mode QIcon__Mode) []QSize {
 	var _out **C.QSize = nil
 	var _out_len C.size_t = 0
 	C.QIconEngine_AvailableSizes1(this.h, (C.uintptr_t)(mode), &_out, &_out_len)
@@ -146,7 +155,7 @@ func (this *QIconEngine) AvailableSizes1(mode uintptr) []QSize {
 	return ret
 }
 
-func (this *QIconEngine) AvailableSizes2(mode uintptr, state uintptr) []QSize {
+func (this *QIconEngine) AvailableSizes2(mode QIcon__Mode, state QIcon__State) []QSize {
 	var _out **C.QSize = nil
 	var _out_len C.size_t = 0
 	C.QIconEngine_AvailableSizes2(this.h, (C.uintptr_t)(mode), (C.uintptr_t)(state), &_out, &_out_len)